@weborigami/language 0.0.53 → 0.0.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
@@ -11,8 +11,8 @@
     "typescript": "5.4.5"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.53",
-    "@weborigami/types": "0.0.53",
+    "@weborigami/async-tree": "0.0.54",
+    "@weborigami/types": "0.0.54",
     "watcher": "2.3.1"
   },
   "scripts": {

package/src/runtime/mergeTrees.js

@@ -30,7 +30,7 @@ export default async function mergeTrees(...trees) {
 
   // If all trees are plain objects, return a plain object.
   if (unpacked.every((tree) => isPlainObject(tree))) {
-    return mergeObjects(...unpacked);
+    return Object.assign({}, ...unpacked);
   }
 
   // If all trees are arrays, return an array.
@@ -56,23 +56,3 @@ export default async function mergeTrees(...trees) {
 
   return result;
 }
-
-/**
- * Merge the indicated plain objects. If a key is present in multiple objects,
- * the value from the first object is used.
- *
- * This is similar to calling Object.assign() with the objects in reverse order,
- * but we want to ensure the keys end up in the same order they're encountered
- * in the objects.
- *
- * @param  {...any} objects
- */
-function mergeObjects(...objects) {
-  const result = {};
-  for (const obj of objects) {
-    for (const key of Object.keys(obj)) {
-      result[key] ??= obj[key];
-    }
-  }
-  return result;
-}

package/test/runtime/mergeTrees.test.js

@@ -13,16 +13,15 @@ describe("mergeTrees", () => {
         b: 2,
       },
       {
-        c: 3,
-        d: 4,
+        b: 3,
+        c: 4,
       }
     );
     // @ts-ignore
     assert.deepEqual(await Tree.plain(tree), {
       a: 1,
-      b: 2,
-      c: 3,
-      d: 4,
+      b: 3,
+      c: 4,
     });
   });
 
@@ -55,15 +54,14 @@ describe("mergeTrees", () => {
         b: 2,
       },
       {
-        c: 3,
-        d: 4,
+        b: 3,
+        c: 4,
       }
     );
     assert.deepEqual(result, {
       a: 1,
-      b: 2,
-      c: 3,
-      d: 4,
+      b: 3,
+      c: 4,
     });
   });