@weborigami/language 0.0.43 → 0.0.45

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.45",
   "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.45",
+    "@weborigami/types": "0.0.45",
     "peggy": "3.0.2",
     "watcher": "2.3.0"
   },

package/src/runtime/FileLoadersTransform.js

@@ -1,6 +1,6 @@
-import { Tree, isStringLike } from "@weborigami/async-tree";
+import { isStringLike } from "@weborigami/async-tree";
 import Scope from "./Scope.js";
-import extname from "./extname.js";
+import attachFileLoader from "./attachFileLoader.js";
 
 /**
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
@@ -14,27 +14,11 @@ 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)) {
-        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 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);
-            const parent = this;
-            value.parent = parent;
-            value.unpack = unpackFn.bind(null, input, { key, parent });
-          }
-        }
+      // If the key is string-like and has an extension, attach a loader (if one
+      // exists) that handles that extension.
+      if (value && isStringLike(key)) {
+        const scope = Scope.getScope(this);
+        value = await attachFileLoader(scope, String(key), value, this);
       }
 
       return value;

package/src/runtime/attachFileLoader.js

@@ -0,0 +1,31 @@
+import { Tree } from "@weborigami/async-tree";
+import extname from "./extname.js";
+import * as symbols from "./symbols.js";
+
+export default async function attachFileLoader(scope, key, value, parent) {
+  const extension = extname(key);
+  let result = value;
+  if (extension) {
+    const loaderName = extension.slice(1);
+    const loader = await Tree.traverse(scope, "@loaders", loaderName);
+    if (loader) {
+      const input = value;
+
+      // If the result is a plain string, box it as a String so we can attach
+      // data to it.
+      if (typeof result === "string") {
+        result = new String(result);
+      }
+      result[symbols.parent] = parent;
+
+      // Wrap the loader with a function that will only be called once per
+      // value.
+      let loaded;
+      result.unpack = async () => {
+        loaded ??= await loader(input, { key, parent });
+        return loaded;
+      };
+    }
+  }
+  return result;
+}

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/ops.js

@@ -7,6 +7,7 @@ import { SiteTree, Tree } from "@weborigami/async-tree";
 import FileLoadersTransform from "./FileLoadersTransform.js";
 import OrigamiFiles from "./OrigamiFiles.js";
 import Scope from "./Scope.js";
+import attachFileLoader from "./attachFileLoader.js";
 import concatTreeValues from "./concatTreeValues.js";
 import { OrigamiTree, evaluate, expressionFunction } from "./internal.js";
 
@@ -60,11 +61,24 @@ function constructHref(protocol, host, ...keys) {
 /**
  * Fetch the resource at the given href.
  *
+ * @this {AsyncTree|null}
  * @param {string} href
  */
 async function fetchResponse(href) {
   const response = await fetch(href);
-  return response.ok ? await response.arrayBuffer() : undefined;
+  if (!response.ok) {
+    return undefined;
+  }
+  let buffer = await response.arrayBuffer();
+
+  // Attach any loader defined for the file type.
+  const url = new URL(href);
+  const filename = url.pathname.split("/").pop();
+  if (filename) {
+    buffer = await attachFileLoader(this, filename, buffer, null);
+  }
+
+  return buffer;
 }
 
 /**
@@ -93,7 +107,7 @@ export async function filesRoot() {
  */
 export async function http(host, ...keys) {
   const href = constructHref("http:", host, ...keys);
-  return fetchResponse(href);
+  return fetchResponse.call(this, href);
 }
 http.toString = () => "«ops.http»";
 
@@ -106,7 +120,7 @@ http.toString = () => "«ops.http»";
  */
 export function https(host, ...keys) {
   const href = constructHref("https:", host, ...keys);
-  return fetchResponse(href);
+  return fetchResponse.call(this, href);
 }
 https.toString = () => "«ops.https»";
 

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);