@weborigami/async-tree 0.6.15 → 0.6.16

package/package.json

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

package/src/operations/deepEntriesIterator.js

@@ -13,7 +13,7 @@ import isMaplike from "./isMaplike.js";
  * specified depth. A depth of 0 will yield values only at the tree's top level.
  *
  * @param {import("../../index.ts").Maplike} maplike
- * @param {{ depth?: number, expand?: boolean }} [options]
+ * @param {{ depth?: number, expand?: boolean, unpack?: boolean }} [options]
  * @returns {AsyncGenerator<[any, any], void, undefined>}
  */
 export default async function* deepEntriesIterator(maplike, options = {}) {
@@ -22,12 +22,13 @@ export default async function* deepEntriesIterator(maplike, options = {}) {
   });
 
   const depth = options.depth ?? Infinity;
-  const expand = options.expand ?? false;
+  const expand = options.expand ?? true;
+  const unpack = options.unpack ?? false;
 
   for await (let [key, value] of tree.entries()) {
     value = await value;
 
-    if (expand && isUnpackable(value)) {
+    if (unpack && isUnpackable(value)) {
       value = await value.unpack();
     }
 
@@ -37,7 +38,7 @@ export default async function* deepEntriesIterator(maplike, options = {}) {
       (isMap(value) ||
         (expand && typeof value !== "function" && isMaplike(value)));
     if (recurse) {
-      yield* deepEntriesIterator(value, { depth: depth - 1, expand });
+      yield* deepEntriesIterator(value, { depth: depth - 1, expand, unpack });
     } else {
       yield [key, value];
     }

package/src/operations/traverseOrThrow.js

@@ -86,7 +86,9 @@ export default async function traverseOrThrow(maplike, ...keys) {
       const message =
         value === undefined
           ? "A path tried to unpack a value that doesn't exist."
-          : "A path tried to unpack data that's already unpacked.";
+          : isPacked(value)
+            ? "A path tried to unpack data but there's no unpack function."
+            : "A path tried to unpack data that's already unpacked.";
       throw new TraverseError(message, {
         head: maplike,
         lastValue,

package/test/operations/deepEntriesIterator.test.js

@@ -67,7 +67,7 @@ describe("deepEntriesIterator", () => {
       packed,
     };
     const entries = [];
-    for await (const entry of deepEntriesIterator(tree, { expand: true })) {
+    for await (const entry of deepEntriesIterator(tree, { unpack: true })) {
       entries.push(entry);
     }
     assert.deepEqual(entries, [

package/test/operations/flat.test.js

@@ -6,7 +6,7 @@ import plain from "../../src/operations/plain.js";
 
 describe("flat", () => {
   test("flattens an array one level by default", async () => {
-    const result = await flat([1, 2, [3], [[4, [5]]]], 1);
+    const result = await flat([1, 2, [3], [[4, [5]]]]);
     assert.deepEqual(await plain(result), [1, 2, 3, [4, [5]]]);
   });