@weborigami/language 0.0.44 → 0.0.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "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.44",
-    "@weborigami/types": "0.0.44",
+    "@weborigami/async-tree": "0.0.46",
+    "@weborigami/types": "0.0.46",
     "peggy": "3.0.2",
     "watcher": "2.3.0"
   },

package/src/runtime/FileLoadersTransform.js

@@ -1,7 +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 * as symbols from "./symbols.js";
+import attachFileLoader from "./attachFileLoader.js";
 
 /**
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
@@ -15,33 +14,11 @@ export default function FileLoadersTransform(Base) {
     async get(key) {
       let value = await super.get(key);
 
-      // If the key is string-like and has an extension, look for a loader that
-      // handles that extension.
+      // 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 extension = extname(String(key)).toLowerCase().slice(1);
-        if (extension) {
-          /** @type {any} */
-          const scope = Scope.getScope(this);
-          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.
-            if (typeof input === "string") {
-              value = new String(input);
-            }
-            const parent = this;
-            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;
-            };
-          }
-        }
+        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/functionResultsMap.js

@@ -11,7 +11,7 @@ export default function functionResultsMap(tree) {
   return map({
     description: "functionResultsMap",
 
-    valueMap: async (sourceValue, sourceKey, tree) => {
+    value: async (sourceValue, sourceKey, tree) => {
       let resultValue;
       if (typeof sourceValue === "function") {
         const scope = Scope.getScope(tree);

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/test/compiler/parse.test.js

@@ -87,7 +87,7 @@ describe("Origami parser", () => {
       `
         {
           index.html = index.ori(teamData.yaml)
-          thumbnails = @map(images, { valueMap: thumbnail.js })
+          thumbnails = @map(images, { value: thumbnail.js })
         }
       `,
       [
@@ -104,7 +104,7 @@ describe("Origami parser", () => {
           [
             [ops.scope, "@map"],
             [ops.scope, "images"],
-            [ops.object, ["valueMap", [ops.scope, "thumbnail.js"]]],
+            [ops.object, ["value", [ops.scope, "thumbnail.js"]]],
           ],
         ],
       ]