refactor: optimise object creation & spread

canboat · Apr 18, 2024 · 97c912d · 97c912d
1 parent e9b666b
commit 97c912d
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/lib/stringMsg.js b/lib/stringMsg.js
@@ -20,12 +20,14 @@ const {
  * @return {Object}           All canId fields with format and data props added.
  */
 function buildMsg(canIdInfo, format, data, rest = {}) {
-  return {
-    ...canIdInfo,
-    format,
-    data,
-    ...rest,
+  canIdInfo.format = canIdInfo.format ? canIdInfo.format : format
+  canIdInfo.data = canIdInfo.data ? canIdInfo.data : data
+  for (const property in rest) {
+    if (canIdInfo[property] === undefined) {
+      canIdInfo[property] = rest[property]
+    }
   }
+  return canIdInfo
 }
 function buildErrMsg(msg, input) {
   if (input && isString(input)) return `${msg} - ${input}`