@weborigami/language 0.6.14 → 0.6.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.6.14",
+  "version": "0.6.16",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
@@ -11,7 +11,7 @@
     "typescript": "5.9.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.6.14",
+    "@weborigami/async-tree": "0.6.16",
     "exif-parser": "0.1.12",
     "watcher": "2.3.1",
     "yaml": "2.8.2"

package/src/runtime/WatchFilesMixin.d.ts

@@ -1,7 +1,8 @@
 import { Mixin } from "../../index.ts";
 
 declare const WatchFilesMixin: Mixin<{
-  watch(): Promise<void>;
+  unwatch(): void;
+  watch(): void;
 }>;
 
 export default WatchFilesMixin;

package/src/runtime/WatchFilesMixin.js

@@ -27,7 +27,7 @@ export default function WatchFilesMixin(Base) {
       this.dispatchEvent(new TreeEvent("change", { filePath }));
     }
 
-    async unwatch() {
+    unwatch() {
       if (!this.watching) {
         return;
       }
@@ -37,7 +37,7 @@ export default function WatchFilesMixin(Base) {
     }
 
     // Turn on watching for the directory.
-    async watch() {
+    watch() {
       if (this.watching) {
         return;
       }

package/src/runtime/explainTraverseError.js

@@ -27,8 +27,9 @@ export default async function explainTraverseError(error) {
   }
 
   // The key that caused the error is the one before the current position
-  const path = pathFromKeys(keys.slice(0, position));
-  let message = `The path traversal ended unexpectedly at: ${path}`;
+  const path = pathFromKeys(keys);
+  const problemKey = keys[position - 1];
+  let message = `Tried to traverse path:  ${path}\nStopped unexpectedly at: ${problemKey}`;
 
   const key = trailingSlash.remove(keys[position - 1]);
 

package/src/runtime/ops.js

@@ -92,7 +92,7 @@ export async function cache(cache, path, code) {
   }
 
   // Don't await: might get another request for this before promise resolves
-  const promise = await execute(code);
+  const promise = execute(code);
 
   // Save promise so another request will get the same promise
   cache[path] = promise;
@@ -178,7 +178,10 @@ addOpLabel(exponentiation, "«ops.exponentiation»");
  * @param {...any} args
  */
 export async function flat(...args) {
-  return Tree.flat(args);
+  // Unpack packed arguments so they can be flattened
+  const unpacked = args.map((arg) => (isUnpackable(arg) ? arg.unpack() : arg));
+  // Flatten to depth 2: 1 for args array, 1 for flattening
+  return Tree.flat(unpacked, 2);
 }
 addOpLabel(flat, "«ops.flat»");
 
@@ -258,7 +261,8 @@ export function lambda(length, parameters, code, state = {}) {
       // interim stack frame.
       const interimStack = stack.slice();
       interimStack.push(args);
-      const frame = await expressionObject(parameters, { stack: interimStack });
+      const paramState = { ...state, stack: interimStack };
+      const frame = await expressionObject(parameters, paramState);
       // Record which code this stack frame is associated with
       Object.defineProperty(frame, codeSymbol, {
         value: code,

package/test/runtime/errors.test.js

@@ -210,7 +210,8 @@ evaluating: \x1B[31mrepeat\x1B[0m`,
       await assertError(
         `a/b/sup/c`,
         `TraverseError: A path hit a null or undefined value.
-The path traversal ended unexpectedly at: a/b/sup/
+Tried to traverse path:  a/b/sup/c
+Stopped unexpectedly at: sup/
 Perhaps you intended: sub/
 evaluating: \x1B[31msup/\x1B[0m`,
         { parent },
@@ -224,7 +225,8 @@ evaluating: \x1B[31msup/\x1B[0m`,
       await assertError(
         `map/1/a`,
         `TraverseError: A path hit a null or undefined value.
-The path traversal ended unexpectedly at: map/1/
+Tried to traverse path:  map/1/a
+Stopped unexpectedly at: 1/
 Slash-separated keys are searched as strings. Here there's no string "1" key, but there is a number 1 key.
 To get the value for that number key, use parentheses: map/(1)
 evaluating: \x1B[31m1/\x1B[0m`,
@@ -239,25 +241,27 @@ evaluating: \x1B[31m1/\x1B[0m`,
       await assertError(
         `file.foo/bar`,
         `TraverseError: A path hit binary file data that can't be unpacked.
-The path traversal ended unexpectedly at: file.foo/
+Tried to traverse path:  file.foo/bar
+Stopped unexpectedly at: file.foo/
 The value couldn't be unpacked because no file extension handler is registered for ".foo".
 evaluating: \x1B[31mfile.foo/\x1B[0m`,
         { parent },
       );
     });
 
-    test("identifies when a value didn't need to be unpacked", async () => {
+    test("identifies when data was already unpacked", async () => {
       const parent = {
         a: {
-          b: 1,
+          "b.json": 1,
         },
       };
       await assertError(
-        `a/b/`,
+        `a/b.json/`,
         `TraverseError: A path tried to unpack data that's already unpacked.
-The path traversal ended unexpectedly at: a/b/
-You can drop the trailing slash and just use: b
-evaluating: \x1B[31mb/\x1B[0m`,
+Tried to traverse path:  a/b.json/
+Stopped unexpectedly at: b.json/
+You can drop the trailing slash and just use: b.json
+evaluating: \x1B[31mb.json/\x1B[0m`,
         { parent },
       );
     });
@@ -269,7 +273,8 @@ evaluating: \x1B[31mb/\x1B[0m`,
       await assertError(
         `a/b/`,
         `TraverseError: A path tried to unpack a value that doesn't exist.
-The path traversal ended unexpectedly at: a/b/
+Tried to traverse path:  a/b/
+Stopped unexpectedly at: b/
 evaluating: \x1B[31mb/\x1B[0m`,
         { parent },
       );

package/test/runtime/ops.test.js

@@ -158,7 +158,8 @@ describe("ops", () => {
         d: 4,
       });
       const array = [5, 6];
-      const result = await ops.flat(object, tree, array);
+      const set = new Set([7, 8]);
+      const result = await ops.flat(object, tree, array, set);
       assert.deepEqual(await Tree.plain(result), {
         a: 1,
         b: 2,
@@ -166,6 +167,8 @@ describe("ops", () => {
         d: 4,
         0: 5,
         1: 6,
+        2: 7,
+        3: 8,
       });
     });
   });