@weborigami/async-tree 0.0.43 → 0.0.45

package/package.json

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

package/src/ObjectTree.js

@@ -41,6 +41,11 @@ export default class ObjectTree {
       value.parent = this;
     }
 
+    if (typeof value === "function" && !Object.hasOwn(this.object, key)) {
+      // Value is an inherited method; bind it to the object.
+      value = value.bind(this.object);
+    }
+
     return value;
   }
 

package/src/SetTree.js

@@ -11,7 +11,7 @@ export default class SetTree {
    * @param {Set} set
    */
   constructor(set) {
-    this.values = [...set];
+    this.values = Array.from(set);
     this.parent = null;
   }
 

package/src/Tree.js

@@ -74,7 +74,7 @@ export async function clear(tree) {
  * @param {AsyncTree} tree
  */
 export async function entries(tree) {
-  const keys = [...(await tree.keys())];
+  const keys = Array.from(await tree.keys());
   const promises = keys.map(async (key) => [key, await tree.get(key)]);
   return Promise.all(promises);
 }
@@ -87,7 +87,7 @@ export async function entries(tree) {
  * @param {Function} callbackFn
  */
 export async function forEach(tree, callbackFn) {
-  const keys = [...(await tree.keys())];
+  const keys = Array.from(await tree.keys());
   const promises = keys.map(async (key) => {
     const value = await tree.get(key);
     return callbackFn(value, key);
@@ -430,7 +430,7 @@ class TraverseError extends ReferenceError {
  * @param {AsyncTree} tree
  */
 export async function values(tree) {
-  const keys = [...(await tree.keys())];
+  const keys = Array.from(await tree.keys());
   const promises = keys.map(async (key) => tree.get(key));
   return Promise.all(promises);
 }

package/src/transforms/map.js

@@ -100,7 +100,7 @@ export default function createMapTransform(options) {
     if (keyMap) {
       transformed.keys = async () => {
         // Apply the keyMap to source keys for leaf values (not subtrees).
-        const sourceKeys = [...(await tree.keys())];
+        const sourceKeys = Array.from(await tree.keys());
         const mapped = await Promise.all(
           sourceKeys.map(async (sourceKey) => {
             let resultKey;

package/src/transforms/regExpKeys.js

@@ -29,7 +29,7 @@ export default async function regExpKeys(tree) {
     },
 
     async keys() {
-      return [...map.keys()];
+      return map.keys();
     },
   };
 

package/src/transforms/sort.js

@@ -13,7 +13,7 @@ export default function createSortTransform(compareFn) {
   return function sortTransform(tree) {
     const transform = Object.create(tree);
     transform.keys = async () => {
-      const keys = [...(await tree.keys())];
+      const keys = Array.from(await tree.keys());
       keys.sort(compareFn);
       return keys;
     };

package/src/transforms/sortBy.js

@@ -22,7 +22,8 @@ export default function createSortByTransform(sortKeyFn) {
       keysAndSortKeys.sort((a, b) =>
         a.sortKey < b.sortKey ? -1 : a.sortKey > b.sortKey ? 1 : 0
       );
-      return keysAndSortKeys.map(({ key }) => key);
+      const sortedKeys = keysAndSortKeys.map(({ key }) => key);
+      return sortedKeys;
     };
     return transform;
   };

package/test/BrowserFileTree.test.js

@@ -9,10 +9,11 @@ if (isBrowser) {
   describe("BrowserFileTree", async () => {
     test("can get the keys of the tree", async () => {
       const fixture = await createFixture();
-      assert.deepEqual(
-        [...(await fixture.keys())],
-        ["Alice.md", "Bob.md", "Carol.md"]
-      );
+      assert.deepEqual(Array.from(await fixture.keys()), [
+        "Alice.md",
+        "Bob.md",
+        "Carol.md",
+      ]);
     });
 
     test("can get the value for a key", async () => {

package/test/FileTree.test.js

@@ -12,10 +12,11 @@ const tempDirectory = path.join(dirname, "fixtures/temp");
 describe("FileTree", async () => {
   test("can get the keys of the tree", async () => {
     const fixture = createFixture("fixtures/markdown");
-    assert.deepEqual(
-      [...(await fixture.keys())],
-      ["Alice.md", "Bob.md", "Carol.md"]
-    );
+    assert.deepEqual(Array.from(await fixture.keys()), [
+      "Alice.md",
+      "Bob.md",
+      "Carol.md",
+    ]);
   });
 
   test("can get the value for a key", async () => {

package/test/FunctionTree.test.js

@@ -5,10 +5,11 @@ import FunctionTree from "../src/FunctionTree.js";
 describe("FunctionTree", async () => {
   test("can get the keys of the tree", async () => {
     const fixture = createFixture();
-    assert.deepEqual(
-      [...(await fixture.keys())],
-      ["Alice.md", "Bob.md", "Carol.md"]
-    );
+    assert.deepEqual(Array.from(await fixture.keys()), [
+      "Alice.md",
+      "Bob.md",
+      "Carol.md",
+    ]);
   });
 
   test("can get the value for a key", async () => {

package/test/MapTree.test.js

@@ -5,7 +5,7 @@ import MapTree from "../src/MapTree.js";
 describe("MapTree", () => {
   test("can get the keys of the tree", async () => {
     const fixture = createFixture();
-    assert.deepEqual([...(await fixture.keys())], ["a", "b", "c"]);
+    assert.deepEqual(Array.from(await fixture.keys()), ["a", "b", "c"]);
   });
 
   test("can get the value for a key", async () => {

package/test/ObjectTree.test.js

@@ -6,10 +6,11 @@ import * as Tree from "../src/Tree.js";
 describe("ObjectTree", () => {
   test("can get the keys of the tree", async () => {
     const fixture = createFixture();
-    assert.deepEqual(
-      [...(await fixture.keys())],
-      ["Alice.md", "Bob.md", "Carol.md"]
-    );
+    assert.deepEqual(Array.from(await fixture.keys()), [
+      "Alice.md",
+      "Bob.md",
+      "Carol.md",
+    ]);
   });
 
   test("can get the value for a key", async () => {
@@ -115,6 +116,13 @@ describe("ObjectTree", () => {
     });
     assert.equal(await tree.get("subtree"), subtree);
   });
+
+  test("method on an object is bound to the object", async () => {
+    const n = new Number(123);
+    const tree = new ObjectTree(n);
+    const method = await tree.get("toString");
+    assert.equal(method(), "123");
+  });
 });
 
 function createFixture() {

package/test/SetTree.test.js

@@ -7,7 +7,7 @@ describe("SetTree", () => {
   test("can get the keys of the tree", async () => {
     const set = new Set(["a", "b", "c"]);
     const fixture = new SetTree(set);
-    assert.deepEqual([...(await fixture.keys())], [0, 1, 2]);
+    assert.deepEqual(Array.from(await fixture.keys()), [0, 1, 2]);
   });
 
   test("can get the value for a key", async () => {

package/test/SiteTree.test.js

@@ -43,7 +43,11 @@ describe("SiteTree", () => {
     const fixture = new SiteTree(mockHost);
     const about = fixture.resolve("about");
     const keys = await about.keys();
-    assert.deepEqual([...keys], ["Alice.html", "Bob.html", "Carol.html"]);
+    assert.deepEqual(Array.from(keys), [
+      "Alice.html",
+      "Bob.html",
+      "Carol.html",
+    ]);
   });
 
   test("can get the value for a key", async () => {

package/test/Tree.test.js

@@ -55,19 +55,16 @@ describe("Tree", () => {
   test("clear() removes all values", async () => {
     const fixture = createFixture();
     await Tree.clear(fixture);
-    assert.deepEqual([...(await Tree.entries(fixture))], []);
+    assert.deepEqual(Array.from(await Tree.entries(fixture)), []);
   });
 
   test("entries() returns the [key, value] pairs", async () => {
     const fixture = createFixture();
-    assert.deepEqual(
-      [...(await Tree.entries(fixture))],
-      [
-        ["Alice.md", "Hello, **Alice**."],
-        ["Bob.md", "Hello, **Bob**."],
-        ["Carol.md", "Hello, **Carol**."],
-      ]
-    );
+    assert.deepEqual(Array.from(await Tree.entries(fixture)), [
+      ["Alice.md", "Hello, **Alice**."],
+      ["Bob.md", "Hello, **Bob**."],
+      ["Carol.md", "Hello, **Carol**."],
+    ]);
   });
 
   test("forEach() invokes a callback for each entry", async () => {
@@ -246,13 +243,10 @@ describe("Tree", () => {
   test("remove method removes a value", async () => {
     const fixture = createFixture();
     await Tree.remove(fixture, "Alice.md");
-    assert.deepEqual(
-      [...(await Tree.entries(fixture))],
-      [
-        ["Bob.md", "Hello, **Bob**."],
-        ["Carol.md", "Hello, **Carol**."],
-      ]
-    );
+    assert.deepEqual(Array.from(await Tree.entries(fixture)), [
+      ["Bob.md", "Hello, **Bob**."],
+      ["Carol.md", "Hello, **Carol**."],
+    ]);
   });
 
   test("toFunction returns a function that invokes a tree's get() method", async () => {
@@ -337,10 +331,11 @@ describe("Tree", () => {
 
   test("values() returns the store's values", async () => {
     const fixture = createFixture();
-    assert.deepEqual(
-      [...(await Tree.values(fixture))],
-      ["Hello, **Alice**.", "Hello, **Bob**.", "Hello, **Carol**."]
-    );
+    assert.deepEqual(Array.from(await Tree.values(fixture)), [
+      "Hello, **Alice**.",
+      "Hello, **Bob**.",
+      "Hello, **Carol**.",
+    ]);
   });
 });