@weborigami/async-tree 0.2.5 → 0.2.7

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Jan Miksovsky and other contributors
+Copyright (c) 2025 Jan Miksovsky and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

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

package/src/operations/cachedKeyFunctions.js

@@ -1,6 +1,6 @@
 import * as trailingSlash from "../trailingSlash.js";
 
-const treeToCaches = new WeakMap();
+const treeToCaches = new Map();
 
 /**
  * Given a key function, return a new key function and inverse key function that
@@ -111,12 +111,10 @@ function searchKeyMap(keyMap, key) {
   let match;
   if (keyMap.has(key)) {
     match = keyMap.get(key);
-  } else if (!trailingSlash.has(key)) {
-    // Check key without trailing slash
-    const withSlash = trailingSlash.add(key);
-    if (keyMap.has(withSlash)) {
-      match = keyMap.get(withSlash);
-    }
+  } else {
+    // Check alternative with/without slash
+    const alternativeKey = trailingSlash.toggle(key, !trailingSlash.has(key));
+    match = keyMap.get(alternativeKey);
   }
   return match
     ? trailingSlash.toggle(match, trailingSlash.has(key))

package/src/operations/concat.js

@@ -20,14 +20,16 @@ export default async function concatTreeValues(treelike) {
   for await (const value of deepValuesIterator(treelike, { expand: true })) {
     let string;
     if (value === null) {
-      console.warn("Warning: Origami template encountered a null value");
       string = "null";
     } else if (value === undefined) {
-      console.warn("Warning: Origami template encountered an undefined value");
       string = "undefined";
     } else {
       string = toString(value);
     }
+    if (value === null || value === undefined) {
+      const message = `Warning: Origami template encountered a ${string} value. To locate where this happened, build your project and search your build output for the text "${string}".`;
+      console.warn(message);
+    }
     strings.push(string);
   }
   return strings.join("");

package/src/utilities.d.ts

@@ -13,6 +13,6 @@ export function keysFromPath(path: string): string[];
 export const naturalOrder: (a: string, b: string) => number;
 export function pathFromKeys(keys: string[]): string;
 export function pipeline(start: any, ...functions: Function[]): Promise<any>;
-export function setParent(child: any, parent: AsyncTree): void;
+export function setParent(child: any, parent: AsyncTree|null): void;
 export function toPlainValue(object: any): Promise<any>;
 export function toString(object: any): string;

package/src/utilities.js

@@ -5,6 +5,8 @@ import * as trailingSlash from "./trailingSlash.js";
 const textDecoder = new TextDecoder();
 const TypedArray = Object.getPrototypeOf(Uint8Array);
 
+/** @typedef {import("@weborigami/types").AsyncTree} AsyncTree */
+
 /**
  * Return the value as an object. If the value is already an object it will be
  * returned as is. If the value is a primitive, it will be wrapped in an object:
@@ -219,8 +221,12 @@ export const naturalOrder = new Intl.Collator(undefined, {
  * @param {string[]} keys
  */
 export function pathFromKeys(keys) {
-  const normalized = keys.map((key) => trailingSlash.remove(key));
-  return normalized.join("/");
+  // Ensure there's a slash between all keys. If the last key has a trailing
+  // slash, leave it there.
+  const normalized = keys.map((key, index) =>
+    index < keys.length - 1 ? trailingSlash.add(key) : key
+  );
+  return normalized.join("");
 }
 
 /**
@@ -240,7 +246,7 @@ export async function pipeline(start, ...fns) {
  * set the `symbols.parent` property.
  *
  * @param {*} child
- * @param {*} parent
+ * @param {AsyncTree|null} parent
  */
 export function setParent(child, parent) {
   if (Tree.isAsyncTree(child)) {

package/test/utilities.test.js

@@ -59,6 +59,7 @@ describe("utilities", () => {
     assert.equal(utilities.pathFromKeys([]), "");
     assert.equal(utilities.pathFromKeys(["a", "b", "c"]), "a/b/c");
     assert.equal(utilities.pathFromKeys(["a/", "b/", "c"]), "a/b/c");
+    assert.equal(utilities.pathFromKeys(["a/", "b/", "c/"]), "a/b/c/");
   });
 
   test("pipeline applies a series of functions to a value", async () => {