@weborigami/language 0.0.43 → 0.0.44

package/index.ts

@@ -1,5 +1,3 @@
-import { AsyncTree } from "@weborigami/types";
-import { StringLike } from "../async-tree/index.js";
 
 export * from "./main.js";
 
@@ -19,15 +17,12 @@ export type Code = ArrayWithSource;
 export type Constructor<T> = new (...args: any[]) => T;
 
 /**
- * A function that can convert a string-like input value into some live object.
+ * A function that can convert a value from some persistent form into some kind
+ * of live value.
  */
 export type FileUnpackFunction = (
-  input: StringLike,
-  options?: {
-    compiler?: any,
-    key?: any,
-    parent?: AsyncTree | null
-  }
+  input: any,
+  options?: any
 ) => any;
 
 /**

package/main.js

@@ -19,3 +19,4 @@ export * as expressionFunction from "./src/runtime/expressionFunction.js";
 export { default as extname } from "./src/runtime/extname.js";
 export { default as formatError } from "./src/runtime/formatError.js";
 export { default as functionResultsMap } from "./src/runtime/functionResultsMap.js";
+export * as symbols from "./src/runtime/symbols.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
@@ -10,8 +10,8 @@
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.43",
-    "@weborigami/types": "0.0.43",
+    "@weborigami/async-tree": "0.0.44",
+    "@weborigami/types": "0.0.44",
     "peggy": "3.0.2",
     "watcher": "2.3.0"
   },

package/src/runtime/FileLoadersTransform.js

@@ -1,6 +1,7 @@
 import { Tree, isStringLike } from "@weborigami/async-tree";
 import Scope from "./Scope.js";
 import extname from "./extname.js";
+import * as symbols from "./symbols.js";
 
 /**
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
@@ -14,25 +15,31 @@ export default function FileLoadersTransform(Base) {
     async get(key) {
       let value = await super.get(key);
 
-      // If the value is string-like and the key has an extension, look for a
-      // loader that handles that extension and call it. The value will
-      // typically be a Buffer loaded from the file system, but could also be a
-      // string-like object defined by a user function.
-      if (isStringLike(value) && isStringLike(key)) {
+      // If the key is string-like and has an extension, look for a loader that
+      // handles that extension.
+      if (value && isStringLike(key)) {
         const extension = extname(String(key)).toLowerCase().slice(1);
         if (extension) {
           /** @type {any} */
           const scope = Scope.getScope(this);
-          /** @type {FileUnpackFunction} */
-          const unpackFn = await Tree.traverse(scope, "@loaders", extension);
-          if (unpackFn) {
+          const loader = await Tree.traverse(scope, "@loaders", extension);
+          if (loader) {
             const input = value;
             // If the input is a plain string, convert it to a String so we can
             // attach data to it.
-            value = new String(input);
+            if (typeof input === "string") {
+              value = new String(input);
+            }
             const parent = this;
-            value.parent = parent;
-            value.unpack = unpackFn.bind(null, input, { key, parent });
+            value[symbols.parent] = parent;
+
+            // Wrap the loader with a function that will only be called once per
+            // value.
+            let loaded;
+            value.unpack = async () => {
+              loaded ??= await loader(input, { key, parent });
+              return loaded;
+            };
           }
         }
       }

package/src/runtime/evaluate.js

@@ -81,9 +81,13 @@ export default async function evaluate(code) {
     Object.isExtensible(result) &&
     !isPlainObject(result)
   ) {
-    result[codeSymbol] = code;
-    if (/** @type {any} */ (code).location) {
-      result[sourceSymbol] = codeFragment(code);
+    try {
+      result[codeSymbol] = code;
+      if (/** @type {any} */ (code).location) {
+        result[sourceSymbol] = codeFragment(code);
+      }
+    } catch (/** @type {any} */ error) {
+      // Ignore errors.
     }
   }
 

package/src/runtime/symbols.js

@@ -0,0 +1 @@
+export const parent = Symbol("parent");

package/test/runtime/FileLoadersTransform.test.js

@@ -33,7 +33,7 @@ function createFixture() {
   /** @type {any} */
   const scope = {
     "@loaders": {
-      json: (input) => JSON.parse(input),
+      json: (buffer) => JSON.parse(String(buffer)),
     },
   };
   tree = Scope.treeWithScope(tree, scope);