@weborigami/async-tree 0.0.52 → 0.0.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/async-tree",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "Asynchronous tree drivers based on standard JavaScript classes",
   "type": "module",
   "main": "./main.js",
@@ -11,7 +11,7 @@
     "typescript": "5.4.5"
   },
   "dependencies": {
-    "@weborigami/types": "0.0.52"
+    "@weborigami/types": "0.0.54"
   },
   "scripts": {
     "test": "node --test --test-reporter=spec",

package/src/operations/deepMerge.js

@@ -16,10 +16,11 @@ export default function deepMerge(...sources) {
     async get(key) {
       const subtrees = [];
 
-      for (const tree of trees) {
-        const value = await tree.get(key);
+      // Check trees for the indicated key in reverse order.
+      for (let index = trees.length - 1; index >= 0; index--) {
+        const value = await trees[index].get(key);
         if (Tree.isAsyncTree(value)) {
-          subtrees.push(value);
+          subtrees.unshift(value);
         } else if (value !== undefined) {
           return value;
         }
@@ -29,8 +30,9 @@ export default function deepMerge(...sources) {
     },
 
     async isKeyForSubtree(key) {
-      for (const tree of trees) {
-        if (await Tree.isKeyForSubtree(tree, key)) {
+      // Check trees for the indicated key in reverse order.
+      for (let index = trees.length - 1; index >= 0; index--) {
+        if (await Tree.isKeyForSubtree(trees[index], key)) {
           return true;
         }
       }
@@ -39,6 +41,7 @@ export default function deepMerge(...sources) {
 
     async keys() {
       const keys = new Set();
+      // Collect keys in the order the trees were provided.
       for (const tree of trees) {
         for (const key of await tree.keys()) {
           keys.add(key);

package/src/operations/merge.js

@@ -20,8 +20,9 @@ export default function merge(...sources) {
     description: "merge",
 
     async get(key) {
-      for (const tree of trees) {
-        const value = await tree.get(key);
+      // Check trees for the indicated key in reverse order.
+      for (let index = trees.length - 1; index >= 0; index--) {
+        const value = await trees[index].get(key);
         if (value !== undefined) {
           return value;
         }
@@ -30,8 +31,9 @@ export default function merge(...sources) {
     },
 
     async isKeyForSubtree(key) {
-      for (const tree of trees) {
-        if (await Tree.isKeyForSubtree(tree, key)) {
+      // Check trees for the indicated key in reverse order.
+      for (let index = trees.length - 1; index >= 0; index--) {
+        if (await Tree.isKeyForSubtree(trees[index], key)) {
           return true;
         }
       }
@@ -40,6 +42,7 @@ export default function merge(...sources) {
 
     async keys() {
       const keys = new Set();
+      // Collect keys in the order the trees were provided.
       for (const tree of trees) {
         for (const key of await tree.keys()) {
           keys.add(key);

package/test/operations/deepMerge.test.js

@@ -8,7 +8,7 @@ describe("mergeDeep", () => {
     const fixture = mergeDeep(
       new DeepObjectTree({
         a: {
-          b: 1,
+          b: 0, // Will be obscured by `b` below
           c: {
             d: 2,
           },
@@ -16,7 +16,7 @@ describe("mergeDeep", () => {
       }),
       new DeepObjectTree({
         a: {
-          b: 0, // Will be obscured by `b` above
+          b: 1,
           c: {
             e: 3,
           },

package/test/operations/merge.test.js

@@ -6,34 +6,34 @@ import merge from "../../src/operations/merge.js";
 describe("merge", () => {
   test("performs a shallow merge", async () => {
     const fixture = merge(
-      Tree.from({
+      {
         a: 1,
+        // Will be obscured by `b` that follows
         b: {
           c: 2,
         },
-      }),
-      Tree.from({
-        // Will be obscured by `b` above
+      },
+      {
         b: {
           d: 3,
         },
         e: {
           f: 4,
         },
-      })
+      }
     );
 
     assert.deepEqual(await Tree.plain(fixture), {
       a: 1,
       b: {
-        c: 2,
+        d: 3,
       },
       e: {
         f: 4,
       },
     });
 
-    const d = await Tree.traverse(fixture, "b", "d");
-    assert.equal(d, undefined);
+    const c = await Tree.traverse(fixture, "b", "c");
+    assert.equal(c, undefined);
   });
 });