@weborigami/origami 0.0.71 → 0.0.73

package/exports/buildExports.js

@@ -4,7 +4,7 @@ import {
   map,
   toString,
 } from "@weborigami/async-tree";
-import fileTypeOrigami from "../src/builtins/ori_handler.js";
+import fileTypeOrigami from "../src/builtins/ori.handler.js";
 import { transformObject } from "../src/common/utilities.js";
 import PathTransform from "./PathTransform.js";
 

package/exports/exports.js

@@ -105,22 +105,22 @@ export { default as version } from "../src/builtins/@version.js";
 export { default as watch } from "../src/builtins/@watch.js";
 export { default as yaml } from "../src/builtins/@yaml.js";
 export { default as yamlParse } from "../src/builtins/@yamlParse.js";
-export { default as cssHandler } from "../src/builtins/css_handler.js";
-export { default as htmHandler } from "../src/builtins/htm_handler.js";
-export { default as htmlHandler } from "../src/builtins/html_handler.js";
-export { default as jpegHandler } from "../src/builtins/jpeg_handler.js";
-export { default as jpgHandler } from "../src/builtins/jpg_handler.js";
-export { default as jsHandler } from "../src/builtins/js_handler.js";
-export { default as jsonHandler } from "../src/builtins/json_handler.js";
-export { default as mdHandler } from "../src/builtins/md_handler.js";
-export { default as mjsHandler } from "../src/builtins/mjs_handler.js";
-export { default as oriDocumentHandler } from "../src/builtins/ori_document_handler.js";
-export { default as oriHandler } from "../src/builtins/ori_handler.js";
-export { default as txtHandler } from "../src/builtins/txt_handler.js";
-export { default as wasmHandler } from "../src/builtins/wasm_handler.js";
-export { default as xhtmlHandler } from "../src/builtins/xhtml_handler.js";
-export { default as yamlHandler } from "../src/builtins/yaml_handler.js";
-export { default as ymlHandler } from "../src/builtins/yml_handler.js";
+export { default as cssHandler } from "../src/builtins/css.handler.js";
+export { default as htmHandler } from "../src/builtins/htm.handler.js";
+export { default as htmlHandler } from "../src/builtins/html.handler.js";
+export { default as jpegHandler } from "../src/builtins/jpeg.handler.js";
+export { default as jpgHandler } from "../src/builtins/jpg.handler.js";
+export { default as jsHandler } from "../src/builtins/js.handler.js";
+export { default as jsonHandler } from "../src/builtins/json.handler.js";
+export { default as mdHandler } from "../src/builtins/md.handler.js";
+export { default as mjsHandler } from "../src/builtins/mjs.handler.js";
+export { default as oriHandler } from "../src/builtins/ori.handler.js";
+export { default as oridocumentHandler } from "../src/builtins/oridocument.handler.js";
+export { default as txtHandler } from "../src/builtins/txt.handler.js";
+export { default as wasmHandler } from "../src/builtins/wasm.handler.js";
+export { default as xhtmlHandler } from "../src/builtins/xhtml.handler.js";
+export { default as yamlHandler } from "../src/builtins/yaml.handler.js";
+export { default as ymlHandler } from "../src/builtins/yml.handler.js";
 export { default as defaultModuleExport } from "../src/cli/defaultModuleExport.js";
 export { default as showUsage } from "../src/cli/showUsage.js";
 export { default as arrowsMapFn } from "../src/common/arrowsMapFn.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.71",
+  "version": "0.0.73",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -17,9 +17,9 @@
     "typescript": "5.6.2"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.71",
-    "@weborigami/language": "0.0.71",
-    "@weborigami/types": "0.0.71",
+    "@weborigami/async-tree": "0.0.73",
+    "@weborigami/language": "0.0.73",
+    "@weborigami/types": "0.0.73",
     "exif-parser": "0.1.12",
     "graphviz-wasm": "3.0.2",
     "highlight.js": "11.10.0",

package/src/builtins/@inline.js

@@ -3,7 +3,7 @@ import { compile } from "@weborigami/language";
 import documentObject from "../common/documentObject.js";
 import { toString } from "../common/utilities.js";
 import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
-import fileTypeOrigami from "./ori_handler.js";
+import fileTypeOrigami from "./ori.handler.js";
 
 /**
  * Inline any Origami expressions found inside ${...} placeholders in the input

package/src/builtins/@ori.js

@@ -31,8 +31,10 @@ export default async function ori(
   // Run in the context of `this` if defined, otherwise use the builtins.
   const tree = this ?? builtins;
 
-  // Parse
-  const fn = compile.expression(expression);
+  // Compile the expression. Avoid caching scope references so that, e.g.,
+  // passing a function to the `watch` builtin will always look the current
+  // value of things in scope.
+  const fn = compile.expression(expression, { scopeCaching: false });
 
   // Execute
   let result = await fn.call(tree);

package/src/builtins/@project.js

@@ -1,9 +1,9 @@
 /** @typedef {import("@weborigami/types").AsyncTree} AsyncTree */
-import { merge } from "@weborigami/async-tree";
+import { Tree } from "@weborigami/async-tree";
 import { OrigamiFiles } from "@weborigami/language";
 import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 import builtins from "./@builtins.js";
-import fileTypeOrigami from "./ori_handler.js";
+import fileTypeOrigami from "./ori.handler.js";
 
 const configFileName = "config.ori";
 
@@ -47,20 +47,26 @@ export default async function project(key) {
       projectRoot = configContainer;
     } else {
       // Load Origami configuration file
-      const configTree = await fileTypeOrigami.unpack(buffer, {
+      const config = await fileTypeOrigami.unpack(buffer, {
         key: configFileName,
         parent: configContainer,
       });
-      if (!configTree) {
+      if (!config) {
         const configPath = /** @type {any} */ (configContainer).path;
         throw new Error(
           `Couldn't load the Origami configuration in ${configPath}/${configFileName}`
         );
       }
-      projectRoot = merge(configTree, configContainer);
-      // HACK so cli.js can get a path
-      /** @type {any} */ (projectRoot).path = configContainer.path;
-      projectRoot.parent = builtins;
+
+      // The config tree may refer to the container tree *and vice versa*. To
+      // support this, we put the container in the tree twice. The chain will
+      // be: projectRoot -> configTree -> configContainer -> builtins, where
+      // the projectRoot and configContainer are the same folder.
+      const configTree = Tree.from(config);
+      projectRoot = new OrigamiFiles(configContainer.path);
+      projectRoot.parent = configTree;
+      configTree.parent = configContainer;
+      configContainer.parent = builtins;
     }
   }
 

package/src/builtins/@sitemap.js

@@ -2,7 +2,7 @@ import { Tree } from "@weborigami/async-tree";
 import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 import getTreeArgument from "../misc/getTreeArgument.js";
 import builtins from "./@builtins.js";
-import fileTypeOrigami from "./ori_handler.js";
+import fileTypeOrigami from "./ori.handler.js";
 
 const templateText = `(urls) => \`<?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">

package/src/builtins/{css_handler.js → css.handler.js}

@@ -1,5 +1,5 @@
 // .css files use the .txt loader
-import fileTypeText from "./txt_handler.js";
+import fileTypeText from "./txt.handler.js";
 
 export default {
   ...fileTypeText,

package/src/builtins/htm.handler.js

@@ -0,0 +1,2 @@
+// .htm is a synonynm for .html
+export { default } from "./html.handler.js";

package/src/builtins/{html_handler.js → html.handler.js}

@@ -1,5 +1,5 @@
 // .html files use the .txt loader
-import fileTypeText from "./txt_handler.js";
+import fileTypeText from "./txt.handler.js";
 
 export default {
   ...fileTypeText,

package/src/builtins/jpg.handler.js

@@ -0,0 +1,2 @@
+// .jpg is a synonym for .jpeg
+export { default } from "./jpeg.handler.js";

package/src/builtins/{md_handler.js → md.handler.js}

@@ -1,5 +1,5 @@
 // .md files use the .txt loader
-import fileTypeText from "./txt_handler.js";
+import fileTypeText from "./txt.handler.js";
 
 export default {
   ...fileTypeText,

package/src/builtins/mjs.handler.js

@@ -0,0 +1,2 @@
+// .mjs is a synonynm for .js
+export { default } from "./js.handler.js";

package/src/builtins/xhtml.handler.js

@@ -0,0 +1,2 @@
+// .xhtml is a synonynm for .html
+export { default } from "./html.handler.js";

package/src/builtins/yml.handler.js

@@ -0,0 +1,2 @@
+// .yml is a synonym for .yaml
+export { default } from "./yaml.handler.js";

package/src/common/documentObject.js

@@ -1,5 +1,5 @@
 import { isPlainObject, isUnpackable, toString } from "@weborigami/async-tree";
-// import txtHandler from "../builtins/txt_handler.js";
+// import txtHandler from "../builtins/txt.handler.js";
 
 /**
  * In Origami, a text document object is any object with a `@text` property and

package/src/builtins/htm_handler.js

@@ -1,2 +0,0 @@
-// .htm is a synonynm for .html
-export { default } from "./html_handler.js";

package/src/builtins/jpg_handler.js

@@ -1,2 +0,0 @@
-// .jpg is a synonym for .jpeg
-export { default } from "./jpeg_handler.js";

package/src/builtins/mjs_handler.js

@@ -1,2 +0,0 @@
-// .mjs is a synonynm for .js
-export { default } from "./js_handler.js";

package/src/builtins/xhtml_handler.js

@@ -1,2 +0,0 @@
-// .xhtml is a synonynm for .html
-export { default } from "./html_handler.js";

package/src/builtins/yml_handler.js

@@ -1,2 +0,0 @@
-// .yml is a synonym for .yaml
-export { default } from "./yaml_handler.js";