@weborigami/async-tree 0.7.0-beta.2 → 0.7.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/async-tree",
-  "version": "0.7.0-beta.2",
+  "version": "0.7.0-beta.3",
   "description": "Asynchronous tree drivers based on standard JavaScript classes",
   "type": "module",
   "main": "./main.js",

package/src/operations/traverseOrThrow.js

@@ -96,7 +96,7 @@ export default async function traverseOrThrow(maplike, ...keys) {
             : "A path tried to unpack data that's already unpacked.";
       throw new TraverseError(message, {
         head: maplike,
-        lastValue,
+        lastValue: value ?? lastValue,
         keys,
         position,
       });

package/src/utilities/toFunction.js

@@ -16,19 +16,22 @@ export default function toFunction(obj) {
     return obj;
   } else if (isUnpackable(obj)) {
     // Extract the contents of the object and convert that to a function.
-    let fnPromise;
-    return async function (...args) {
-      if (!fnPromise) {
-        // unpack() may return a function or a promise for a function; normalize
-        // to a promise for a function
-        const unpackPromise = Promise.resolve(
-          /** @type {any} */ (obj).unpack()
-        );
-        fnPromise = unpackPromise.then((content) => toFunction(content));
+    const unpacked = /** @type {any} */ (obj).unpack();
+    if (unpacked instanceof Promise) {
+      return async function (...args) {
+        const fn = toFunction(await unpacked);
+        if (fn === null) {
+          throw new TypeError("unpack() did not return a function");
+        }
+        return fn(...args);
+      };
+    } else {
+      const fn = toFunction(unpacked);
+      if (fn === null) {
+        throw new TypeError("unpack() did not return a function");
       }
-      const fn = await fnPromise;
-      return fn(...args);
-    };
+      return fn;
+    }
   } else if (isMaplike(obj)) {
     // Return a function that invokes the tree's getter.
     const tree = from(obj);

package/test/utilities/castArrayLike.test.js

@@ -65,7 +65,7 @@ describe("castArraylike", () => {
     });
   });
 
-  test.only("preserves trailing slashes if map has both forms of the key", () => {
+  test("preserves trailing slashes if map has both forms of the key", () => {
     const map = new /** @type {any} */ (Map)([
       ["a/", 1],
       ["a", 2],

package/test/utilities/toFunction.test.js

@@ -26,6 +26,14 @@ describe("toFunction", () => {
     assert.equal(await fn(), "result");
   });
 
+  test("can use a packed object's async `unpack` as a function", async () => {
+    const obj = new String();
+    /** @type {any} */ (obj).unpack = async () => () => "result";
+    const fn = toFunction(obj);
+    // @ts-ignore
+    assert.equal(await fn(), "result");
+  });
+
   test("returns null for something that's not a function", () => {
     // @ts-ignore
     const result = toFunction("this is not a function");