@weborigami/async-tree 0.0.70 → 0.0.71-beta.1

package/index.ts

@@ -19,7 +19,9 @@ export type HasString = {
  * A packed value is one that can be written to a file via fs.writeFile or into
  * an HTTP response via response.write, or readily converted to such a form.
  */
-export type Packed = ArrayBuffer | Buffer | ReadableStream | string | String | TypedArray;
+export type Packed = (ArrayBuffer | Buffer | ReadableStream | string | String | TypedArray) & {
+  unpack?(): Promise<any>;
+};
 
 export type PlainObject = {
   [key: string]: any;

package/package.json

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

package/src/operations/groupFn.js

@@ -18,6 +18,12 @@ export default function createGroupByTransform(groupKeyFn) {
     }
 
     const tree = Tree.from(treelike);
+
+    const keys = Array.from(await tree.keys());
+
+    // Are all the keys integers?
+    const isArray = keys.every((key) => !Number.isNaN(parseInt(key)));
+
     const result = {};
     for (const key of await tree.keys()) {
       const value = await tree.get(key);
@@ -35,10 +41,14 @@ export default function createGroupByTransform(groupKeyFn) {
       groups = Tree.from(groups);
 
       // Add the value to each group.
-      for (const groupKey of await groups.keys()) {
-        const group = await groups.get(groupKey);
-        result[group] ??= [];
-        result[group].push(value);
+      for (const group of await Tree.values(groups)) {
+        if (isArray) {
+          result[group] ??= [];
+          result[group].push(value);
+        } else {
+          result[group] ??= {};
+          result[group][key] = value;
+        }
       }
     }
 

package/test/transforms/groupFn.test.js

@@ -4,7 +4,7 @@ import { Tree } from "../../src/internal.js";
 import groupFn from "../../src/operations/groupFn.js";
 
 describe("groupFn transform", () => {
-  test("groups using a group key function", async () => {
+  test("groups an array using a group key function", async () => {
     const fonts = [
       { name: "Aboreto", tags: ["Sans Serif"] },
       { name: "Albert Sans", tags: ["Geometric", "Sans Serif"] },
@@ -24,4 +24,31 @@ describe("groupFn transform", () => {
       Serif: [{ name: "Alegreya", tags: ["Serif"] }],
     });
   });
+
+  test("groups an object using a group key function", async () => {
+    const fonts = {
+      Aboreto: { tags: ["Sans Serif"] },
+      "Albert Sans": { tags: ["Geometric", "Sans Serif"] },
+      Alegreya: { tags: ["Serif"] },
+      "Work Sans": { tags: ["Grotesque", "Sans Serif"] },
+    };
+    const tree = Tree.from(fonts);
+    const grouped = await groupFn((value, key, tree) => value.tags)(tree);
+    assert.deepEqual(await Tree.plain(grouped), {
+      Geometric: {
+        "Albert Sans": { tags: ["Geometric", "Sans Serif"] },
+      },
+      Grotesque: {
+        "Work Sans": { tags: ["Grotesque", "Sans Serif"] },
+      },
+      "Sans Serif": {
+        Aboreto: { tags: ["Sans Serif"] },
+        "Albert Sans": { tags: ["Geometric", "Sans Serif"] },
+        "Work Sans": { tags: ["Grotesque", "Sans Serif"] },
+      },
+      Serif: {
+        Alegreya: { tags: ["Serif"] },
+      },
+    });
+  });
 });