@weborigami/origami 0.3.3-jse.2 → 0.3.3-jse.3

package/main.js

@@ -1,10 +1,9 @@
 export { default as documentObject } from "./src/common/documentObject.js";
 export { toString } from "./src/common/utilities.js";
 export * from "./src/dev/dev.js";
-export * from "./src/handlers/handlerExports.js";
+export { default as handlerBuiltins } from "./src/handlers/handlerBuiltins.js";
 export * from "./src/handlers/handlers.js";
 export * from "./src/image/image.js";
-export { builtinsTree } from "./src/internal.js";
 export * from "./src/origami/origami.js";
 export { default as packageBuiltin } from "./src/protocols/package.js";
 export * from "./src/server/server.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.3.3-jse.2",
+  "version": "0.3.3-jse.3",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -17,10 +17,10 @@
     "typescript": "5.8.2"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.3.3-jse.2",
+    "@weborigami/async-tree": "0.3.3-jse.3",
     "@weborigami/json-feed-to-rss": "1.0.0",
-    "@weborigami/language": "0.3.3-jse.2",
-    "@weborigami/types": "0.3.3-jse.2",
+    "@weborigami/language": "0.3.3-jse.3",
+    "@weborigami/types": "0.3.3-jse.3",
     "css-tree": "3.1.0",
     "exif-parser": "0.1.12",
     "graphviz-wasm": "3.0.2",

package/src/BuiltinsTree.js

@@ -0,0 +1,18 @@
+import { trailingSlash } from "@weborigami/async-tree";
+
+// We create our own tree instead of using ObjectTree, since that binds the
+// functions would be bound to the object. We want to leave them unbound.
+export default class BuiltinsTree {
+  constructor(object) {
+    this.object = object;
+  }
+
+  async get(key) {
+    const normalizedKey = trailingSlash.remove(key);
+    return this.object[normalizedKey];
+  }
+
+  async keys() {
+    return Object.keys(this.object);
+  }
+}

package/src/builtinsJse.js

@@ -0,0 +1,67 @@
+import { text as treeText } from "@weborigami/async-tree";
+import { jsGlobals } from "@weborigami/language";
+import BuiltinsTree from "./BuiltinsTree.js";
+import * as dev from "./dev/dev.js";
+import handlerBuiltins from "./handlers/handlerBuiltins.js";
+import help from "./help/help.js";
+import * as image from "./image/image.js";
+import node from "./node.js";
+import * as origami from "./origami/origami.js";
+import explore from "./protocols/explore.js";
+import files from "./protocols/files.js";
+import http from "./protocols/http.js";
+import https from "./protocols/https.js";
+import httpstree from "./protocols/httpstree.js";
+import httptree from "./protocols/httptree.js";
+import inherited from "./protocols/inherited.js";
+import packageNamespace from "./protocols/package.js";
+import scope from "./protocols/scope.js";
+import * as site from "./site/site.js";
+import * as text from "./text/text.js";
+import * as tree from "./tree/tree.js";
+
+let result;
+
+export default function builtinsJse() {
+  if (!result) {
+    const Tree = new BuiltinsTree({
+      ...tree,
+      indent: text.indent,
+      json: origami.json,
+      text: treeText,
+    });
+
+    const Origami = new BuiltinsTree({
+      ...dev,
+      image,
+      ...origami,
+      ...site,
+      ...text,
+    });
+
+    /** @type {any} */
+    result = new BuiltinsTree({
+      ...jsGlobals,
+
+      "explore:": explore,
+      "files:": files,
+      "help:": help,
+      "http:": http,
+      "https:": https,
+      "httpstree:": httpstree,
+      "httptree:": httptree,
+      "inherited:": inherited,
+      "node:": node,
+      "package:": packageNamespace,
+      "scope:": scope,
+
+      Tree,
+      Origami,
+
+      // Handlers need to be exposed at top level
+      ...handlerBuiltins(),
+    });
+  }
+
+  return result;
+}

package/src/builtinsShell.js

@@ -0,0 +1,83 @@
+import { jsGlobals } from "@weborigami/language";
+import BuiltinsTree from "./BuiltinsTree.js";
+import * as dev from "./dev/dev.js";
+import handlerBuiltins from "./handlers/handlerBuiltins.js";
+import help from "./help/help.js";
+import * as image from "./image/image.js";
+import node from "./node.js";
+import * as origami from "./origami/origami.js";
+import explore from "./protocols/explore.js";
+import files from "./protocols/files.js";
+import http from "./protocols/http.js";
+import https from "./protocols/https.js";
+import httpstree from "./protocols/httpstree.js";
+import httptree from "./protocols/httptree.js";
+import inherited from "./protocols/inherited.js";
+import instantiate from "./protocols/new.js";
+import packageNamespace from "./protocols/package.js";
+import scope from "./protocols/scope.js";
+import * as site from "./site/site.js";
+import * as text from "./text/text.js";
+import * as tree from "./tree/tree.js";
+
+let result;
+
+export default function builtinsShell() {
+  if (!result) {
+    const builtins = {
+      "dev:": dev,
+      "explore:": explore,
+      "files:": files,
+      "help:": help,
+      "http:": http,
+      "https:": https,
+      "httpstree:": httpstree,
+      "httptree:": httptree,
+      "image:": image,
+      "inherited:": inherited,
+      "js:": jsGlobals,
+      "new:": instantiate,
+      "node:": node,
+      "origami:": origami,
+      "package:": packageNamespace,
+      "scope:": scope,
+      "site:": adjustReservedWords(site),
+      "text:": text,
+      "tree:": tree,
+
+      // Handlers need to be exposed at top level
+      ...handlerBuiltins(),
+    };
+
+    // For all builtins like `tree:keys`, add a shorthand `keys`.
+    for (const [key, value] of Object.entries(builtins)) {
+      const isNamespace = key.endsWith(":");
+      if (isNamespace) {
+        for (const [subKey, subValue] of Object.entries(value)) {
+          // HACK: Skip description keys until we can make them all non-enumerable.
+          if (subKey === "description") {
+            continue;
+          }
+          if (subKey in builtins) {
+            throw new Error(`Internal Origami error: Duplicate key: ${subKey}`);
+          }
+          builtins[subKey] = subValue;
+        }
+      }
+    }
+
+    result = new BuiltinsTree(builtins);
+  }
+
+  return result;
+}
+
+// Handle cases where a builtin name conflicts with a JS reserved word
+function adjustReservedWords(obj) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    const name = value.key ?? key;
+    result[name] = value;
+  }
+  return result;
+}

package/src/cli/getConfig.js

@@ -0,0 +1,10 @@
+import { Tree } from "@weborigami/async-tree";
+
+// Return the config for the given tree
+export default function getConfig(tree) {
+  if (!tree) {
+    return null;
+  }
+  const root = Tree.root(tree);
+  return root.config;
+}

package/src/common/documentObject.js

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

package/src/dev/explore.js

@@ -5,7 +5,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import assertTreeIsDefined from "../common/assertTreeIsDefined.js";
 import { getDescriptor } from "../common/utilities.js";
-import { builtinsTree } from "../internal.js";
+import oriHandler from "../handlers/ori.handler.js";
 import debug from "./debug.js";
 
 let templatePromise;
@@ -44,7 +44,7 @@ export default async function explore(...keys) {
     const data = await getScopeData(scope(tree));
     templatePromise ??= loadTemplate();
     const template = await templatePromise;
-    const text = await template(data);
+    const text = await template.call(this, data);
 
     result = new String(text);
     result.unpack = () => debug.call(tree, tree);
@@ -57,10 +57,6 @@ async function getScopeData(scope) {
   const trees = scope.trees ?? [scope];
   const data = [];
   for (const tree of trees) {
-    if (tree.parent === undefined) {
-      // Skip builtins.
-      continue;
-    }
     const name = getDescriptor(tree);
     const treeKeys = Array.from(await tree.keys());
     // Skip system-ish files that start with a period.
@@ -73,8 +69,7 @@ async function getScopeData(scope) {
 async function loadTemplate() {
   const folderPath = path.resolve(fileURLToPath(import.meta.url), "..");
   const folder = new OrigamiFiles(folderPath);
-  folder.parent = builtinsTree;
   const templateFile = await folder.get("explore.ori");
-  const template = await templateFile.unpack();
+  const template = await oriHandler.unpack(templateFile, { parent: folder });
   return template;
 }

package/src/handlers/css.handler.js

@@ -1,7 +1,7 @@
 // .css files use the .txt loader
-import fileTypeText from "./txt.handler.js";
+import { txtHandler } from "./handlers.js";
 
 export default {
-  ...fileTypeText,
+  ...txtHandler,
   mediaType: "text/css",
 };

package/src/handlers/handlerBuiltins.js

@@ -0,0 +1,26 @@
+import * as handlers from "./handlers.js";
+
+export default function handlerBuiltins() {
+  return {
+    "css.handler": handlers.cssHandler,
+    "csv.handler": handlers.csvHandler,
+    "htm.handler": handlers.htmHandler,
+    "html.handler": handlers.htmlHandler,
+    "jpeg.handler": handlers.jpegHandler,
+    "jpg.handler": handlers.jpgHandler,
+    "js.handler": handlers.jsHandler,
+    "jse.handler": handlers.jseHandler,
+    "jsedocument.handler": handlers.jsedocumentHandler,
+    "json.handler": handlers.jsonHandler,
+    "md.handler": handlers.mdHandler,
+    "mjs.handler": handlers.mjsHandler,
+    "ori.handler": handlers.oriHandler,
+    "oridocument.handler": handlers.oridocumentHandler,
+    "ts.handler": handlers.tsHandler,
+    "txt.handler": handlers.txtHandler,
+    "wasm.handler": handlers.wasmHandler,
+    "xhtml.handler": handlers.xhtmlHandler,
+    "yaml.handler": handlers.yamlHandler,
+    "yml.handler": handlers.ymlHandler,
+  };
+}

package/src/handlers/handlers.js

@@ -1,46 +1,37 @@
-import {
-  jsHandler,
-  oriHandler,
-  oridocumentHandler,
-  wasmHandler,
-  yamlHandler,
-} from "../internal.js";
-import cssHandler from "./css.handler.js";
-import csvHandler from "./csv.handler.js";
-import htmHandler from "./htm.handler.js";
-import htmlHandler from "./html.handler.js";
-import jpegHandler from "./jpeg.handler.js";
-import jpgHandler from "./jpg.handler.js";
-import jseHandler from "./jse.handler.js";
-import jseDocumentHandler from "./jsedocument.handler.js";
-import jsonHandler from "./json.handler.js";
-import mdHandler from "./md.handler.js";
-import mjsHandler from "./mjs.handler.js";
-import tsHandler from "./ts.handler.js";
-import txtHandler from "./txt.handler.js";
-import xhtmlHandler from "./xhtml.handler.js";
-import ymlHandler from "./yml.handler.js";
+//
+// This library includes a number of modules with circular dependencies. This
+// module exists to explicitly set the loading order for those modules. To
+// enforce use of this loading order, other modules should only load the modules
+// below via this module.
+//
+// About this pattern:
+// https://medium.com/visual-development/how-to-fix-nasty-circular-dependency-issues-once-and-for-all-in-javascript-typescript-a04c987cf0de
+//
+// Note: to avoid having VS Code auto-sort the imports, keep lines between them.
 
-export default {
-  "css.handler": cssHandler,
-  "csv.handler": csvHandler,
-  "htm.handler": htmHandler,
-  "html.handler": htmlHandler,
-  "jpeg.handler": jpegHandler,
-  "jpg.handler": jpgHandler,
-  "js.handler": jsHandler,
-  "jse.handler": jseHandler,
-  "jsep.handler": jseHandler,
-  "jsedocument.handler": jseDocumentHandler,
-  "json.handler": jsonHandler,
-  "md.handler": mdHandler,
-  "mjs.handler": mjsHandler,
-  "ori.handler": oriHandler,
-  "oridocument.handler": oridocumentHandler,
-  "ts.handler": tsHandler,
-  "txt.handler": txtHandler,
-  "wasm.handler": wasmHandler,
-  "xhtml.handler": xhtmlHandler,
-  "yaml.handler": yamlHandler,
-  "yml.handler": ymlHandler,
-};
+export { default as jsHandler } from "./js.handler.js";
+export { default as tsHandler } from "./ts.handler.js";
+
+export { default as oriHandler } from "./ori.handler.js";
+
+export { default as jseHandler } from "./jse.handler.js";
+
+export { default as oridocumentHandler } from "./oridocument.handler.js";
+
+export { default as jsedocumentHandler } from "./jsedocument.handler.js";
+
+export { default as txtHandler } from "./txt.handler.js";
+
+export { default as cssHandler } from "./css.handler.js";
+export { default as csvHandler } from "./csv.handler.js";
+export { default as htmHandler } from "./htm.handler.js";
+export { default as htmlHandler } from "./html.handler.js";
+export { default as jpegHandler } from "./jpeg.handler.js";
+export { default as jpgHandler } from "./jpg.handler.js";
+export { default as jsonHandler } from "./json.handler.js";
+export { default as mdHandler } from "./md.handler.js";
+export { default as mjsHandler } from "./mjs.handler.js";
+export { default as wasmHandler } from "./wasm.handler.js";
+export { default as xhtmlHandler } from "./xhtml.handler.js";
+export { default as yamlHandler } from "./yaml.handler.js";
+export { default as ymlHandler } from "./yml.handler.js";

package/src/handlers/htm.handler.js

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

package/src/handlers/html.handler.js

@@ -1,7 +1,7 @@
 // .html files use the .txt loader
-import fileTypeText from "./txt.handler.js";
+import { txtHandler } from "./handlers.js";
 
 export default {
-  ...fileTypeText,
+  ...txtHandler,
   mediaType: "text/html",
 };

package/src/handlers/jpg.handler.js

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

package/src/handlers/js.handler.js

@@ -1,4 +1,4 @@
-import { processUnpackedContent } from "../internal.js";
+import processUnpackedContent from "./processUnpackedContent.js";
 
 /**
  * A JavaScript file

package/src/handlers/jse.handler.js

@@ -1,6 +1,6 @@
-import { oriHandler } from "../internal.js";
+import builtinsJse from "../builtinsJse.js";
 import getParent from "./getParent.js";
-import jseModeParent from "./jseModeParent.js";
+import { oriHandler } from "./handlers.js";
 
 export default {
   ...oriHandler,
@@ -9,8 +9,9 @@ export default {
     const parent = getParent(packed, options);
     return oriHandler.unpack(packed, {
       ...options,
+      globals: builtinsJse(),
       mode: "jse",
-      parent: await jseModeParent(parent),
+      parent,
     });
   },
 };

package/src/handlers/jsedocument.handler.js

@@ -1,6 +1,6 @@
-import { oridocumentHandler } from "../internal.js";
+import builtinsJse from "../builtinsJse.js";
 import getParent from "./getParent.js";
-import jseModeParent from "./jseModeParent.js";
+import { oridocumentHandler } from "./handlers.js";
 
 export default {
   ...oridocumentHandler,
@@ -9,8 +9,9 @@ export default {
     const parent = getParent(packed, options);
     return oridocumentHandler.unpack(packed, {
       ...options,
+      globals: builtinsJse(),
       mode: "jse",
-      parent: await jseModeParent(parent),
+      parent,
     });
   },
 };

package/src/handlers/md.handler.js

@@ -1,7 +1,7 @@
 // .md files use the .txt loader
-import fileTypeText from "./txt.handler.js";
+import { txtHandler } from "./handlers.js";
 
 export default {
-  ...fileTypeText,
+  ...txtHandler,
   mediaType: "text/markdown",
 };

package/src/handlers/mjs.handler.js

@@ -1,2 +1,2 @@
 // .mjs is a synonynm for .js
-export { jsHandler as default } from "../internal.js";
+export { jsHandler as default } from "./handlers.js";

package/src/handlers/ori.handler.js

@@ -1,7 +1,10 @@
+import { merge } from "@weborigami/async-tree";
 import { compile } from "@weborigami/language";
+import builtinsShell from "../builtinsShell.js";
+import getConfig from "../cli/getConfig.js";
 import * as utilities from "../common/utilities.js";
-import { builtinsTree, processUnpackedContent } from "../internal.js";
 import getParent from "./getParent.js";
+import processUnpackedContent from "./processUnpackedContent.js";
 
 /**
  * An Origami expression file
@@ -34,11 +37,15 @@ export default {
 
     // Compile the source code as an Origami program and evaluate it.
     const compiler = options.compiler ?? compile.program;
+
+    const config = getConfig(parent);
+    const globals = merge(options.globals ?? builtinsShell(), config);
+
     const mode = options.mode ?? "shell";
-    const fn = compiler(source, { mode });
-    const target = parent ?? builtinsTree;
-    let content = await fn.call(target);
+    const fn = compiler(source, { globals, mode });
+
+    let result = await fn.call(parent);
 
-    return processUnpackedContent(content, parent);
+    return processUnpackedContent(result, parent);
   },
 };

package/src/handlers/oridocument.handler.js

@@ -1,8 +1,9 @@
 import { extension, trailingSlash } from "@weborigami/async-tree";
 import { compile } from "@weborigami/language";
+import builtinsShell from "../builtinsShell.js";
 import { toString } from "../common/utilities.js";
-import { processUnpackedContent } from "../internal.js";
 import getParent from "./getParent.js";
+import processUnpackedContent from "./processUnpackedContent.js";
 
 /**
  * An Origami template document: a plain text file that contains Origami
@@ -35,8 +36,19 @@ export default {
       text,
       url,
     };
+
+    let globals;
+    if (options.globals) {
+      globals = options.globals;
+    } else {
+      globals = builtinsShell();
+    }
+
     const mode = options.mode ?? "shell";
-    const defineFn = compile.templateDocument(source, { mode });
+    const defineFn = compile.templateDocument(source, {
+      globals,
+      mode,
+    });
 
     // Invoke the definition to get back the template function
     const result = await defineFn.call(parent);

package/src/{common → handlers}/processUnpackedContent.js

@@ -1,5 +1,4 @@
 import { symbols, Tree } from "@weborigami/async-tree";
-import { builtinsTree } from "../internal.js";
 
 /**
  * Perform any necessary post-processing on the unpacked content of a file. This
@@ -14,8 +13,7 @@ import { builtinsTree } from "../internal.js";
 export default function processUnpackedContent(content, parent) {
   if (typeof content === "function") {
     // Bind the function to the parent as the `this` context.
-    const target = parent ?? builtinsTree;
-    const result = content.bind(target);
+    const result = content.bind(parent);
     // Copy over any properties that were attached to the function
     Object.assign(result, content);
     return result;

package/src/handlers/ts.handler.js

@@ -1 +1 @@
-export { default as default } from "./js.handler.js";
+export { jsHandler as default } from "./handlers.js";

package/src/handlers/txt.handler.js

@@ -77,7 +77,7 @@ export default {
       unpacked = Object.assign({}, frontData, { "@text": body });
       Object.defineProperty(unpacked, "_body", {
         configurable: true,
-        value: text,
+        value: body,
         enumerable: false, // TODO: Make enumerable
         writable: true,
       });

package/src/handlers/wasm.handler.js

@@ -1,4 +1,4 @@
-import { processUnpackedContent } from "../internal.js";
+import processUnpackedContent from "./processUnpackedContent.js";
 
 /**
  * A WebAssembly module

package/src/handlers/yaml.handler.js

@@ -2,7 +2,7 @@ import { symbols } from "@weborigami/async-tree";
 import * as YAMLModule from "yaml";
 import { parseYaml } from "../common/serialize.js";
 import * as utilities from "../common/utilities.js";
-import { processUnpackedContent } from "../internal.js";
+import processUnpackedContent from "./processUnpackedContent.js";
 
 // See notes at serialize.js
 // @ts-ignore

package/src/handlers/yml.handler.js

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

package/src/origami/config.js

@@ -13,8 +13,6 @@ import project from "./project.js";
  */
 export default async function config(key) {
   const projectTree = await project.call(this);
-  // HACK: We use specific knowledge of how @project returns a tree to get the
-  // config. The config is always the parent of the project folder.
-  const parent = projectTree.parent;
-  return key === undefined ? parent : parent.get(key);
+  const projectConfig = projectTree.config;
+  return key === undefined ? projectConfig : projectConfig.get(key);
 }

package/src/origami/ori.js

@@ -1,10 +1,12 @@
 import {
   Tree,
   getRealmObjectPrototype,
+  merge,
   toString,
 } from "@weborigami/async-tree";
 import { compile } from "@weborigami/language";
-import builtinsTree from "../builtinsTree.js";
+import builtinsShell from "../builtinsShell.js";
+import getConfig from "../cli/getConfig.js";
 import assertTreeIsDefined from "../common/assertTreeIsDefined.js";
 import { toYaml } from "../common/serialize.js";
 
@@ -28,13 +30,20 @@ export default async function ori(
   // In case expression has come from a file, cast it to a string.
   expression = toString(expression);
 
-  // Run in the context of `this` if defined, otherwise use the builtins.
-  const tree = this ?? builtinsTree;
+  // Run in the context of `this` if defined
+  const tree = this;
+
+  const config = getConfig(tree);
+  const globals = merge(builtinsShell(), config);
 
   // 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 });
+  const fn = compile.expression(expression, {
+    globals,
+    mode: "shell",
+    scopeCaching: false,
+  });
 
   // Execute
   let result = await fn.call(tree);

package/src/origami/origami.js

@@ -1,8 +1,3 @@
-// Use a dynamic import to avoid circular dependencies
-export const builtins = import("../internal.js").then(
-  (internal) => internal.builtinsTree
-);
-
 export { extension } from "@weborigami/async-tree";
 export { toFunction } from "../common/utilities.js";
 

package/src/origami/project.js

@@ -1,13 +1,17 @@
 /** @typedef {import("@weborigami/types").AsyncTree} AsyncTree */
-import { Tree } from "@weborigami/async-tree";
+import { merge } from "@weborigami/async-tree";
 import { OrigamiFiles } from "@weborigami/language";
 import assertTreeIsDefined from "../common/assertTreeIsDefined.js";
-import { builtinsTree, oriHandler } from "../internal.js";
+import handlerBuiltins from "../handlers/handlerBuiltins.js";
+import { oriHandler } from "../handlers/handlers.js";
 
 const configFileName = "config.ori";
 
 /**
- * Return the tree for the current project's root folder.
+ * Return an object for the current project including
+ *
+ * `config`: the evaluated config.ori file
+ * `root`: the project's root folder
  *
  * This searches the current directory and its ancestors for an Origami file
  * called `config.ori`. If an Origami configuration file is found, the
@@ -19,81 +23,70 @@ const configFileName = "config.ori";
  * returned as a tree, with the builtins as its parent.
  *
  * @this {AsyncTree|null}
- * @param {any} [key]
  */
-export default async function project(key) {
+export default async function project() {
   assertTreeIsDefined(this, "origami:project");
 
   const dirname = process.cwd();
   const currentTree = new OrigamiFiles(dirname);
-  currentTree.parent = builtinsTree;
 
   // Search up the tree for the configuration file or package.json to determine
   // the project root.
-  const configContainer =
-    (await findAncestorFile(currentTree, configFileName)) ??
-    (await findAncestorFile(currentTree, "package.json"));
-
-  let projectRoot;
-  if (!configContainer) {
-    // No configuration file or package.json found; use the current directory.
-    projectRoot = currentTree;
+  let root;
+  const foundConfig = await findAncestorFile(currentTree, configFileName);
+  if (foundConfig) {
+    root = foundConfig.container;
+    // Unpack Origami configuration file
+    const buffer = foundConfig.value;
+    root.config = await oriHandler.unpack(buffer, {
+      key: configFileName,
+      parent: root,
+    });
   } else {
-    // Load the configuration file if one exists.
-    const buffer = await configContainer.get(configFileName);
-    if (!buffer) {
-      // Project root defined by package.json
-      projectRoot = configContainer;
+    // No Origami configuration file, look for package.json
+    const foundPackageJson = await findAncestorFile(
+      currentTree,
+      "package.json"
+    );
+    if (foundPackageJson) {
+      // Found package.json; use its parent as the project root
+      root = foundPackageJson.container;
     } else {
-      // Load Origami configuration file
-      const config = await oriHandler.unpack(buffer, {
-        key: configFileName,
-        parent: configContainer,
-      });
-      if (!config) {
-        const configPath = /** @type {any} */ (configContainer).path;
-        throw new Error(
-          `Couldn't load the Origami configuration in ${configPath}/${configFileName}`
-        );
-      }
-
-      // 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 = builtinsTree;
+      // No package.json found; use the current directory as root
+      root = currentTree;
     }
   }
 
-  return key === undefined ? projectRoot : projectRoot.get(key);
+  // Merge config if present into handlers
+  root.handlers = merge(handlerBuiltins(), root.config);
+
+  return root;
 }
 
-// Return the first ancestor of the given tree that contains a file with the
-// given name.
+// Find the first ancestor of the given folder that contains a file with the
+// given name. Return the container and the file contents.
 async function findAncestorFile(start, fileName) {
-  let current = start;
-  while (current) {
-    const value = await current.get(fileName);
+  let container = start;
+  while (container) {
+    const value = await container.get(fileName);
     if (value) {
-      // Found the desired file; its container is the project root. Set the
-      // parent to the builtins; in the context of this project, there's nothing
-      // higher up.
-      current.parent = builtinsTree;
-      return current;
+      // Found the desired file
+      return {
+        container,
+        value,
+      };
     }
-    // Not found; try the parent.
-    const parent = await current.get("..");
+    // Not found; try the parent
+    const parent = await container.get("..");
     if (
       !parent ||
-      (parent.path && current.path && parent.path === current.path)
+      (parent.path && container.path && parent.path === container.path)
     ) {
       break;
     }
-    current = parent;
+    container = parent;
   }
-  return undefined;
+
+  // Not found
+  return null;
 }

package/src/protocols/files.js

@@ -1,4 +1,4 @@
-import { OrigamiFiles } from "@weborigami/language";
+import { OrigamiFiles, getHandlers } from "@weborigami/language";
 import os from "node:os";
 import path from "node:path";
 import process from "node:process";
@@ -26,5 +26,6 @@ export default async function files(...keys) {
   const resolved = path.resolve(basePath, relativePath);
 
   const result = new OrigamiFiles(resolved);
+  result.handlers = getHandlers(this);
   return result;
 }

package/src/protocols/inherited.js

@@ -1,5 +1,4 @@
-import { Tree } from "@weborigami/async-tree";
-import { ops } from "@weborigami/language";
+import { scope, Tree } from "@weborigami/async-tree";
 import assertTreeIsDefined from "../common/assertTreeIsDefined.js";
 
 /**
@@ -13,6 +12,10 @@ import assertTreeIsDefined from "../common/assertTreeIsDefined.js";
 export default async function inherited(...keys) {
   assertTreeIsDefined(this, "inherited:");
   const key = keys.shift();
-  const value = await ops.inherited.call(this, key);
+  if (!this?.parent) {
+    return undefined;
+  }
+  const parentScope = scope(this.parent);
+  const value = await parentScope.get(key);
   return keys.length > 0 ? await Tree.traverse(value, ...keys) : value;
 }

package/src/protocols/scope.js

@@ -1,5 +1,4 @@
-import { Tree } from "@weborigami/async-tree";
-import { ops } from "@weborigami/language";
+import { Tree, scope as scopeFn } from "@weborigami/async-tree";
 
 /**
  * @typedef  {import("@weborigami/types").AsyncTree} AsyncTree
@@ -12,7 +11,8 @@ export default async function scope(...keys) {
   let value;
   try {
     // Look up key in scope but don't throw if it's undefined
-    value = await ops.scope.call(this, key);
+    const thisScope = scopeFn(this);
+    value = await thisScope.get(key);
   } catch (error) {
     if (error instanceof ReferenceError) {
       value = undefined;

package/src/site/sitemap.js

@@ -1,7 +1,7 @@
 import { Tree } from "@weborigami/async-tree";
 import assertTreeIsDefined from "../common/assertTreeIsDefined.js";
 import getTreeArgument from "../common/getTreeArgument.js";
-import { builtinsTree, oriHandler } from "../internal.js";
+import { oriHandler } from "../handlers/handlers.js";
 
 const templateText = `(urls) => \`<?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
@@ -48,7 +48,6 @@ export default async function sitemap(treelike, baseHref = "") {
     .map((path) => (path.endsWith("index.html") ? path.slice(0, -10) : path));
 
   const templateFn = await oriHandler.unpack(templateText);
-  const target = this ?? builtinsTree;
-  const templateResult = await templateFn.call(target, htmlPaths);
+  const templateResult = await templateFn.call(this, htmlPaths);
   return String(templateResult);
 }

package/src/text/inline.js

@@ -6,7 +6,7 @@ import {
 } from "@weborigami/async-tree";
 import assertTreeIsDefined from "../common/assertTreeIsDefined.js";
 import documentObject from "../common/documentObject.js";
-import { oridocumentHandler } from "../internal.js";
+import { oridocumentHandler } from "../handlers/handlers.js";
 
 /**
  * Inline any Origami expressions found inside ${...} placeholders in the input

package/src/tree/map.js

@@ -69,7 +69,7 @@ function extendedOptions(context, operation) {
     options = {};
   } else {
     throw new TypeError(
-      `map: You must specify a value function or options dictionary as the first parameter.`
+      `map: You must specify a value function or options dictionary as the second parameter.`
     );
   }
 

package/src/builtins.js

@@ -1,56 +0,0 @@
-import * as dev from "./dev/dev.js";
-import * as handlers from "./handlers/handlers.js";
-import help from "./help/help.js";
-import * as image from "./image/image.js";
-import js from "./js.js";
-import node from "./node.js";
-import * as origami from "./origami/origami.js";
-import explore from "./protocols/explore.js";
-import files from "./protocols/files.js";
-import http from "./protocols/http.js";
-import https from "./protocols/https.js";
-import httpstree from "./protocols/httpstree.js";
-import httptree from "./protocols/httptree.js";
-import inherited from "./protocols/inherited.js";
-import instantiate from "./protocols/new.js";
-import packageNamespace from "./protocols/package.js";
-import scope from "./protocols/scope.js";
-import * as site from "./site/site.js";
-import * as text from "./text/text.js";
-import * as tree from "./tree/tree.js";
-
-/** @type {any} */
-export default {
-  "dev:": dev,
-  "explore:": explore,
-  "files:": files,
-  "help:": help,
-  "http:": http,
-  "https:": https,
-  "httpstree:": httpstree,
-  "httptree:": httptree,
-  "image:": image,
-  "inherited:": inherited,
-  "js:": js,
-  "new:": instantiate,
-  "node:": node,
-  "origami:": origami,
-  "package:": packageNamespace,
-  "scope:": scope,
-  "site:": adjustReservedWords(site),
-  "text:": text,
-  "tree:": tree,
-
-  // Some builtins need to be exposed at top level
-  ...handlers.default,
-};
-
-// Handle cases where a builtin name conflicts with a JS reserved word
-function adjustReservedWords(obj) {
-  const result = {};
-  for (const [key, value] of Object.entries(obj)) {
-    const name = value.key ?? key;
-    result[name] = value;
-  }
-  return result;
-}

package/src/builtinsNew.js

@@ -1,84 +0,0 @@
-import {
-  ObjectTree,
-  trailingSlash,
-  text as treeText,
-} from "@weborigami/async-tree";
-import * as dev from "./dev/dev.js";
-import * as handlers from "./handlers/handlers.js";
-import help from "./help/help.js";
-import * as image from "./image/image.js";
-import js from "./js.js";
-import node from "./node.js";
-import * as origami from "./origami/origami.js";
-import explore from "./protocols/explore.js";
-import files from "./protocols/files.js";
-import http from "./protocols/http.js";
-import https from "./protocols/https.js";
-import httpstree from "./protocols/httpstree.js";
-import httptree from "./protocols/httptree.js";
-import inherited from "./protocols/inherited.js";
-import instantiate from "./protocols/new.js";
-import packageNamespace from "./protocols/package.js";
-import scope from "./protocols/scope.js";
-import * as site from "./site/site.js";
-import * as text from "./text/text.js";
-import * as tree from "./tree/tree.js";
-
-// See notes in builtinsTree.js
-class BuiltinsTree {
-  constructor(object) {
-    this.object = object;
-  }
-
-  async get(key) {
-    const normalizedKey = trailingSlash.remove(key);
-    return this.object[normalizedKey];
-  }
-
-  async keys() {
-    return Object.keys(this.object);
-  }
-}
-
-const Tree = new BuiltinsTree({
-  ...tree,
-  indent: text.indent,
-  json: origami.json,
-  text: treeText,
-});
-
-const Origami = new BuiltinsTree({
-  ...dev,
-  ...origami,
-  ...site,
-  ...text,
-});
-
-const Image = new BuiltinsTree({
-  ...image,
-});
-
-/** @type {any} */
-export default new ObjectTree({
-  "explore:": explore,
-  "files:": files,
-  "help:": help,
-  "http:": http,
-  "https:": https,
-  "httpstree:": httpstree,
-  "httptree:": httptree,
-  "inherited:": inherited,
-  "new:": instantiate,
-  "node:": node,
-  "package:": packageNamespace,
-  "scope:": scope,
-
-  ...js,
-
-  Tree,
-  Origami,
-  Image,
-
-  // Some builtins need to be exposed at top level
-  ...handlers.default,
-});

package/src/builtinsTree.js

@@ -1,36 +0,0 @@
-import { trailingSlash } from "@weborigami/async-tree";
-import builtins from "./builtins.js";
-
-const expanded = { ...builtins };
-
-// For all builtins like `tree:keys`, add a shorthand `keys`.
-for (const [key, value] of Object.entries(expanded)) {
-  const isNamespace = key.endsWith(":");
-  if (isNamespace) {
-    for (const [subKey, subValue] of Object.entries(value)) {
-      // HACK: Skip description keys until we can make them all non-enumerable.
-      if (subKey === "description") {
-        continue;
-      }
-      if (subKey in expanded) {
-        throw new Error(`Internal Origami error: Duplicate key: ${subKey}`);
-      }
-      expanded[subKey] = subValue;
-    }
-  }
-}
-
-// We create our own tree instead of using ObjectTree, since that binds the
-// functions would be bound to the object. We want to leave them unbound.
-class BuiltinsTree {
-  async get(key) {
-    const normalizedKey = trailingSlash.remove(key);
-    return expanded[normalizedKey];
-  }
-
-  async keys() {
-    return Object.keys(expanded);
-  }
-}
-
-export default new BuiltinsTree();

package/src/handlers/handlerExports.js

@@ -1,16 +0,0 @@
-export { default as cssHandler } from "./css.handler.js";
-export { default as htmHandler } from "./htm.handler.js";
-export { default as htmlHandler } from "./html.handler.js";
-export { default as jpegHandler } from "./jpeg.handler.js";
-export { default as jpgHandler } from "./jpg.handler.js";
-export { default as jsHandler } from "./js.handler.js";
-export { default as jsonHandler } from "./json.handler.js";
-export { default as mdHandler } from "./md.handler.js";
-export { default as mjsHandler } from "./mjs.handler.js";
-export { default as oriHandler } from "./ori.handler.js";
-export { default as oridocumentHandler } from "./oridocument.handler.js";
-export { default as txtHandler } from "./txt.handler.js";
-export { default as wasmHandler } from "./wasm.handler.js";
-export { default as xhtmlHandler } from "./xhtml.handler.js";
-export { default as yamlHandler } from "./yaml.handler.js";
-export { default as ymlHandler } from "./yml.handler.js";

package/src/handlers/jseModeParent.js

@@ -1,30 +0,0 @@
-import { FileTree, ObjectTree } from "@weborigami/async-tree";
-
-let builtinsNew;
-
-// Adapt the existing parent chain to use the new builtins
-export default async function jseModeParent(parent) {
-  builtinsNew ??= (await import("../builtinsNew.js")).default;
-  return cloneParent(parent);
-}
-
-function cloneParent(parent) {
-  let clone;
-  // We expect the parent to be a FileTree (or a subclass), ObjectTree (or a
-  // subclass), or builtins.
-  if (!parent) {
-    return null;
-  } else if (parent instanceof FileTree) {
-    clone = Reflect.construct(parent.constructor, [parent.path]);
-  } else if (parent instanceof ObjectTree) {
-    clone = Reflect.construct(parent.constructor, [parent.object]);
-  } else if (!parent.parent) {
-    // Builtins
-    clone = builtinsNew;
-  } else {
-    // Maybe a map? Skip it and hope for the best.
-    return cloneParent(parent.parent);
-  }
-  clone.parent = cloneParent(parent.parent);
-  return clone;
-}

package/src/internal.js

@@ -1,28 +0,0 @@
-//
-// This library includes a number of modules with circular dependencies. This
-// module exists to explicitly set the loading order for those modules. To
-// enforce use of this loading order, other modules should only load the modules
-// below via this module.
-//
-// About this pattern:
-// https://medium.com/visual-development/how-to-fix-nasty-circular-dependency-issues-once-and-for-all-in-javascript-typescript-a04c987cf0de
-//
-// Note: to avoid having VS Code auto-sort the imports, keep lines between them.
-
-export { default as jsHandler } from "./handlers/js.handler.js";
-
-export { default as oriHandler } from "./handlers/ori.handler.js";
-
-export { default as oridocumentHandler } from "./handlers/oridocument.handler.js";
-
-export { default as jseHandler } from "./handlers/jse.handler.js";
-
-export { default as jsedocumentHandler } from "./handlers/jsedocument.handler.js";
-
-export { default as processUnpackedContent } from "./common/processUnpackedContent.js";
-
-export { default as wasmHandler } from "./handlers/wasm.handler.js";
-
-export { default as yamlHandler } from "./handlers/yaml.handler.js";
-
-export { default as builtinsTree } from "./builtinsTree.js";

package/src/js.js

@@ -1,79 +0,0 @@
-/**
- * The complete set of support JavaScript globals and global-like values.
- *
- * See
- * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects.
- * That page lists some things like `TypedArrays` which are not globals so are
- * omitted here.
- */
-export default {
-  AggregateError,
-  Array,
-  ArrayBuffer,
-  Atomics,
-  BigInt,
-  BigInt64Array,
-  BigUint64Array,
-  Boolean,
-  DataView,
-  Date,
-  Error,
-  EvalError,
-  FinalizationRegistry,
-  Float32Array,
-  Float64Array,
-  Function,
-  Infinity,
-  Int16Array,
-  Int32Array,
-  Int8Array,
-  Intl,
-  // @ts-ignore Iterator does exist despite what TypeScript thinks
-  Iterator,
-  JSON,
-  Map,
-  Math,
-  NaN,
-  Number,
-  Object,
-  Promise,
-  Proxy,
-  RangeError,
-  ReferenceError,
-  Reflect,
-  RegExp,
-  Set,
-  SharedArrayBuffer,
-  String,
-  Symbol,
-  SyntaxError,
-  TypeError,
-  URIError,
-  Uint16Array,
-  Uint32Array,
-  Uint8Array,
-  Uint8ClampedArray,
-  WeakMap,
-  WeakRef,
-  WeakSet,
-  decodeURI,
-  decodeURIComponent,
-  encodeURI,
-  encodeURIComponent,
-  eval,
-  false: false, // treat like a global
-  fetch: fetchWrapper, // special case
-  globalThis,
-  isFinite,
-  isNaN,
-  null: null, // treat like a global
-  parseFloat,
-  parseInt,
-  true: true, // treat like a global
-  undefined,
-};
-
-async function fetchWrapper(resource, options) {
-  const response = await fetch(resource, options);
-  return response.ok ? await response.arrayBuffer() : undefined;
-}