@weborigami/origami 0.0.72 → 0.0.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.72",
+  "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.72",
-    "@weborigami/language": "0.0.72",
-    "@weborigami/types": "0.0.72",
+    "@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/@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,5 +1,5 @@
 /** @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";
@@ -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;
     }
   }