@weborigami/origami 0.0.39 → 0.0.41

package/exports/exports.js

@@ -119,6 +119,7 @@ export { default as ShuffleTransform } from "../src/common/ShuffleTransform.js";
 export { default as TextDocument } from "../src/common/TextDocument.js";
 export * from "../src/common/utilities.js";
 export { default as assertScopeIsDefined } from "../src/misc/assertScopeIsDefined.js";
+export { default as getTreeArgument } from "../src/misc/getTreeArgument.js";
 export { default as OriCommandTransform } from "../src/misc/OriCommandTransform.js";
 export { default as yamlOrigamiTag } from "../src/misc/yamlOrigamiTag.js";
 export * from "../src/server/mediaTypes.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -15,13 +15,13 @@
   "devDependencies": {
     "@types/chai": "4.3.11",
     "@types/mocha": "10.0.6",
-    "@types/node": "20.11.3",
+    "@types/node": "20.11.7",
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.39",
-    "@weborigami/language": "0.0.39",
-    "@weborigami/types": "0.0.39",
+    "@weborigami/async-tree": "0.0.41",
+    "@weborigami/language": "0.0.41",
+    "@weborigami/types": "0.0.41",
     "graphviz-wasm": "3.0.1",
     "highlight.js": "11.9.0",
     "marked": "11.1.1",
@@ -34,7 +34,7 @@
   "scripts": {
     "build": "ori exports/buildExports.js src > exports/exports.js",
     "prepublishOnly": "npm run build",
-    "test": "node --test --test-reporter=spec test/*/*.test.js test/*/*/*.test.js",
+    "test": "node --test --test-reporter=spec",
     "typecheck": "node node_modules/typescript/bin/tsc"
   }
 }

package/src/builtins/@arrows.js

@@ -1,9 +1,8 @@
-import { Tree } from "@weborigami/async-tree";
 import { Scope, functionResultsMap } from "@weborigami/language";
 import builtins from "../../src/builtins/@builtins.js";
 import arrowFunctionsMap from "../common/arrowFunctionsMap.js";
 import { keySymbol } from "../common/utilities.js";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Interpret arrow keys in the tree as function calls.
@@ -14,15 +13,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function arrows(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    throw TypeError(
-      "@arrows requires a treelike argument, but received undefined"
-    );
-  }
-  /** @type {AsyncTree} */
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   const mapped = functionResultsMap(arrowFunctionsMap()(tree));
   const scope = this ?? builtins;
   const scoped = Scope.treeWithScope(mapped, scope);

package/src/builtins/@debug.js

@@ -2,7 +2,7 @@ import { Tree, isPlainObject } from "@weborigami/async-tree";
 import ExplorableSiteTransform from "../common/ExplorableSiteTransform.js";
 import { isTransformApplied, transformObject } from "../common/utilities.js";
 import OriCommandTransform from "../misc/OriCommandTransform.js";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Add debugging features to the indicated tree.
@@ -14,15 +14,9 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function debug(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return;
-  }
-
   // The debug command leaves the tree's existing scope intact; it does not
   // apply its own scope to the tree.
-  let tree = Tree.from(treelike);
+  let tree = await getTreeArgument(this, arguments, treelike);
 
   if (!isTransformApplied(ExplorableSiteTransform, tree)) {
     tree = transformObject(ExplorableSiteTransform, tree);

package/src/builtins/@explore.js

@@ -1,5 +1,5 @@
 /** @typedef {import("@weborigami/types").AsyncTree} AsyncTree */
-import { ObjectTree } from "@weborigami/async-tree";
+import { ObjectTree, Tree } from "@weborigami/async-tree";
 import { OrigamiFiles, Scope } from "@weborigami/language";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -14,14 +14,8 @@ const miscFiles = Scope.treeWithScope(new OrigamiFiles(miscDir), builtins);
 /**
  * @this {AsyncTree|null}
  */
-export default async function explore() {
+export default async function explore(...keys) {
   const scope = Scope.getScope(this);
-  const templateFile = await miscFiles.get("explore.ori");
-  const template = await templateFile.unpack();
-
-  const data = await getScopeData(scope);
-  const text = await template(data);
-
   const ambientsTree = new ObjectTree({
     "@current": this,
   });
@@ -29,8 +23,34 @@ export default async function explore() {
   const extendedScope = new Scope(ambientsTree, scope);
 
   /** @type {any} */
-  const result = new String(text);
-  result.unpack = () => debug.call(scope, extendedScope);
+  let result;
+  if (keys.length > 0) {
+    // Traverse the scope using the given keys.
+    const debugScope = await debug.call(scope, extendedScope);
+    if (!debugScope) {
+      return undefined;
+    }
+
+    // HACK: reproduce logic of ExplorableSiteTransform that turns a trailing
+    // slash into index.html. Calling `debug` applies that transform and the
+    // transform should handle that logic, but unfortunately the `traverse`
+    // operation has special casing to treat a trailing slash, and never gives
+    // ExplorableSiteTransform a chance.
+    if (keys.at(-1) === "") {
+      keys[keys.length - 1] = "index.html";
+    }
+    result = await Tree.traverse(debugScope, ...keys);
+  } else {
+    // Return the Explore page for the current scope.
+    const templateFile = await miscFiles.get("explore.ori");
+    const template = await templateFile.unpack();
+
+    const data = await getScopeData(scope);
+    const text = await template(data);
+
+    result = new String(text);
+    result.unpack = () => debug.call(scope, extendedScope);
+  }
 
   return result;
 }

package/src/builtins/@index.js

@@ -1,6 +1,5 @@
-import { Tree } from "@weborigami/async-tree";
 import { keySymbol } from "../common/utilities.js";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Return a default index.html page for the current tree.
@@ -11,12 +10,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function index(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   const keys = Array.from(await tree.keys());
 
   // Skip system-ish files that start with a period. Also skip `index.html`.

package/src/builtins/@inline.js

@@ -1,5 +1,5 @@
+import { compile } from "@weborigami/language";
 import unpackText from "../builtins/@loaders/txt.js";
-import * as utilities from "../common/utilities.js";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 import unpackOrigamiExpression from "./@loaders/ori.js";
 
@@ -28,13 +28,9 @@ export default async function inline(input) {
     inputDocument = await unpackText(input);
   }
 
-  // Treat the input text as the body of an Origami template literal.
-  const inputText = utilities.toString(inputDocument);
-  const templateDocument = Object.assign({}, inputDocument, {
-    "@text": `=\`${inputText}\``,
+  const templateFn = await unpackOrigamiExpression(inputDocument, {
+    compiler: compile.templateDocument,
   });
-
-  const templateFn = await unpackOrigamiExpression(templateDocument);
   const templateResult = await templateFn(inputDocument);
   return inputDocument
     ? Object.assign({}, inputDocument, { "@text": String(templateResult) })

package/src/builtins/@invoke.js

@@ -1,3 +1,4 @@
+import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 import builtins from "./@builtins.js";
 
 /**
@@ -22,6 +23,13 @@ import builtins from "./@builtins.js";
  * @this {import("@weborigami/types").AsyncTree|null}
  */
 export default async function invoke(fn) {
+  assertScopeIsDefined(this);
+  // A fragment of the logic from getTreeArgument.js
+  if (arguments.length > 0 && fn === undefined) {
+    throw new Error(
+      "An Origami function was called with an initial argument, but its value is undefined."
+    );
+  }
   if (typeof fn !== "function" && fn.unpack) {
     fn = await fn.unpack();
   }

package/src/builtins/@json.js

@@ -10,6 +10,12 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  */
 export default async function json(obj) {
   assertScopeIsDefined(this);
+  // A fragment of the logic from getTreeArgument.js
+  if (arguments.length > 0 && obj === undefined) {
+    throw new Error(
+      "An Origami function was called with an initial argument, but its value is undefined."
+    );
+  }
   obj = obj ?? (await this?.get("@current"));
   if (obj === undefined) {
     return undefined;

package/src/builtins/@loaders/ori.js

@@ -17,10 +17,27 @@ export default async function unpackOrigamiExpression(
     options.parent ??
     /** @type {any} */ (inputDocument).parent ??
     /** @type {any} */ (inputDocument)[utilities.parentSymbol];
+  const compiler = options.compiler ?? compile.expression;
 
   // Compile the body text as an Origami expression and evaluate it.
   const inputText = utilities.toString(inputDocument);
-  const fn = compile.expression(inputText);
+  let fn;
+  try {
+    fn = compiler(inputText);
+  } catch (/** @type {any} */ error) {
+    let location = "";
+    if (options.key) {
+      location += `${options.key}`;
+    }
+    if (error.location) {
+      const { start } = error.location;
+      location += `, line ${start.line}, column ${start.column}`;
+    }
+    if (location) {
+      error.message += ` (${location})`;
+    }
+    throw error;
+  }
   const parentScope = parent ? Scope.getScope(parent) : builtins;
   let content = await fn.call(parentScope);
 

package/src/builtins/@map.js

@@ -19,8 +19,8 @@ import { toFunction } from "../common/utilities.js";
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
  *
  * @typedef {{ deep?: boolean, description?: string, extensions?: string,
- * inverseKeyMap?: KeyFn, keyMap?: ValueKeyFn, keyName?: string, valueMap?:
- * ValueKeyFn, valueName?: string }} TreeMapOptions
+ * inverseKeyMap?: KeyFn, keyMap?: ValueKeyFn, valueMap?: ValueKeyFn }}
+ * TreeMapOptions
  *
  * @this {import("@weborigami/types").AsyncTree|null}
  *
@@ -73,9 +73,7 @@ export default function treeMap(param1, param2) {
     extensions,
     inverseKeyMap,
     keyMap,
-    keyName,
     needsSourceValue,
-    valueName,
   } = options;
 
   description ??= `@map ${extensions ?? ""}`;
@@ -93,13 +91,7 @@ export default function treeMap(param1, param2) {
   if (valueMap) {
     const resolvedValueFn = toFunction(valueMap);
     extendedValueFn = function (sourceValue, sourceKey, tree) {
-      const scope = addValueKeyToScope(
-        baseScope,
-        sourceValue,
-        sourceKey,
-        valueName,
-        keyName
-      );
+      const scope = addValueKeyToScope(baseScope, sourceValue, sourceKey);
       return resolvedValueFn.call(scope, sourceValue, sourceKey, tree);
     };
   }
@@ -119,13 +111,7 @@ export default function treeMap(param1, param2) {
     const resolvedKeyFn = toFunction(keyMap);
     async function scopedKeyFn(sourceKey, tree) {
       const sourceValue = await tree.get(sourceKey);
-      const scope = addValueKeyToScope(
-        baseScope,
-        sourceValue,
-        sourceKey,
-        valueName,
-        keyName
-      );
+      const scope = addValueKeyToScope(baseScope, sourceValue, sourceKey);
       const resultKey = await resolvedKeyFn.call(
         scope,
         sourceValue,

package/src/builtins/@ori.js

@@ -15,7 +15,10 @@ const TypedArray = Object.getPrototypeOf(Uint8Array);
  * @this {AsyncTree|null}
  * @param {string} expression
  */
-export default async function ori(expression) {
+export default async function ori(
+  expression,
+  options = { formatResult: true }
+) {
   assertScopeIsDefined(this);
   // In case expression is a Buffer, cast it to a string.
   expression = String(expression);
@@ -34,8 +37,7 @@ export default async function ori(expression) {
     result = await result.call(scope);
   }
 
-  const formatted = await formatResult(result);
-  return formatted;
+  return options.formatResult ? await formatResult(result) : result;
 }
 
 async function formatResult(result) {

package/src/builtins/@package.js

@@ -4,25 +4,49 @@ import project from "./@project.js";
 
 /**
  * @this {import("@weborigami/types").AsyncTree|null}
- * @param {string[]} packageKeys
+ * @param {string[]} keys
  */
-export default async function packageBuiltin(...packageKeys) {
+export default async function packageBuiltin(...keys) {
   let scope = this;
   if (!scope) {
     const projectRoot = await project.call(null);
     scope = Scope.getScope(projectRoot);
   }
+
+  const packageKeys = [keys.shift()];
+  if (packageKeys[0]?.startsWith("@")) {
+    // First key is an npm organization, get the next key too.
+    packageKeys.push(keys.shift());
+  }
+
   const packageRoot = await Tree.traverse(
     // @ts-ignore
     scope,
     "node_modules",
     ...packageKeys
   );
+  if (!packageRoot) {
+    throw new Error(`Can't find node_modules/${packageKeys.join("/")}`);
+  }
+
   const mainPath = await Tree.traverse(packageRoot, "package.json", "main");
+  if (!mainPath) {
+    throw new Error(
+      `node_modules/${keys.join(
+        "/"
+      )} doesn't contain a package.json with a "main" entry.`
+    );
+  }
+
   const mainKeys = keysFromPath(mainPath);
   const mainContainerKeys = mainKeys.slice(0, -1);
   const mainFileName = mainKeys[mainKeys.length - 1];
   const mainContainer = await Tree.traverse(packageRoot, ...mainContainerKeys);
   const packageExports = await mainContainer.import(mainFileName);
-  return packageExports;
+
+  const result =
+    keys.length > 0
+      ? await Tree.traverse(packageExports, ...keys)
+      : packageExports;
+  return result;
 }

package/src/builtins/@svg.js

@@ -1,6 +1,5 @@
-import { Tree } from "@weborigami/async-tree";
 import graphviz from "graphviz-wasm";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 import dot from "./@tree/dot.js";
 
 let graphvizLoaded = false;
@@ -17,16 +16,11 @@ let graphvizLoaded = false;
  * @param {PlainObject} [options]
  */
 export default async function svg(treelike, options = {}) {
-  assertScopeIsDefined(this);
   if (!graphvizLoaded) {
     await graphviz.loadWASM();
     graphvizLoaded = true;
   }
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   const dotText = await dot.call(this, tree, options);
   if (dotText === undefined) {
     return undefined;

package/src/builtins/@tree/count.js

@@ -1,5 +1,4 @@
-import { Tree } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return the number of keys in the tree.
@@ -10,12 +9,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function count(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = await Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   const keys = [...(await tree.keys())];
   return keys.length;
 }

package/src/builtins/@tree/defineds.js

@@ -1,6 +1,6 @@
 import { Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return only the defined (not `undefined`) values in the tree.
@@ -12,14 +12,10 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} treelike
  */
 export default async function defineds(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    throw new TypeError("A treelike argument is required");
-  }
+  const tree = await getTreeArgument(this, arguments, treelike);
 
   /** @type {AsyncTree} */
-  let result = await Tree.mapReduce(treelike, null, async (values, keys) => {
+  let result = await Tree.mapReduce(tree, null, async (values, keys) => {
     const result = {};
     let someValuesExist = false;
     for (let i = 0; i < keys.length; i++) {

package/src/builtins/@tree/dot.js

@@ -5,7 +5,7 @@ import {
   hasNonPrintableCharacters,
   keySymbol,
 } from "../../common/utilities.js";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Render a tree in DOT format.
@@ -19,12 +19,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {PlainObject} [options]
  */
 export default async function dot(treelike, options = {}) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   const rootLabel = tree[keySymbol] ?? "";
   const treeArcs = await statements(tree, "", rootLabel, options);
   return `digraph g {

package/src/builtins/@tree/exceptions.js

@@ -1,6 +1,6 @@
 import { Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 import defineds from "./defineds.js";
 
 /**
@@ -10,11 +10,10 @@ import defineds from "./defineds.js";
  * @param {Treelike} treelike
  */
 export default async function exceptions(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
+  const tree = await getTreeArgument(this, arguments, treelike);
 
   /** @type {AsyncTree} */
-  let exceptionsTree = new ExceptionsTree(treelike);
+  let exceptionsTree = new ExceptionsTree(tree);
   exceptionsTree = Scope.treeWithScope(exceptionsTree, this);
   return defineds.call(this, exceptionsTree);
 }
@@ -23,8 +22,8 @@ export default async function exceptions(treelike) {
  * @implements {AsyncTree}
  */
 class ExceptionsTree {
-  constructor(treelike) {
-    this.tree = Tree.from(treelike);
+  constructor(tree) {
+    this.tree = tree;
   }
 
   async get(key) {

package/src/builtins/@tree/first.js

@@ -1,5 +1,4 @@
-import { Tree } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return the first value in the tree.
@@ -10,12 +9,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function first(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   for (const key of await tree.keys()) {
     // Just return first value immediately.
     const value = await tree.get(key);

package/src/builtins/@tree/fn.js

@@ -15,6 +15,12 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  */
 export default async function fn(invocable, keys = []) {
   assertScopeIsDefined(this);
+  // A fragment of the logic from getTreeArgument.js
+  if (arguments.length > 0 && invocable === undefined) {
+    throw new Error(
+      "An Origami function was called with an initial argument, but its value is undefined."
+    );
+  }
   invocable = invocable ?? (await this?.get("@current"));
   if (invocable === undefined) {
     return undefined;

package/src/builtins/@tree/from.js

@@ -1,6 +1,5 @@
-import { Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Cast the indicated treelike to a tree.
@@ -11,16 +10,9 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function tree(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-
-  /** @type {AsyncTree} */
-  let result = Tree.from(treelike);
-  result = Scope.treeWithScope(result, this);
-  return result;
+  let tree = await getTreeArgument(this, arguments, treelike);
+  tree = Scope.treeWithScope(tree, this);
+  return tree;
 }
 
 tree.usage = `from <treelike>\tConvert JSON, YAML, function, or plain object to a tree`;

package/src/builtins/@tree/groupBy.js

@@ -1,8 +1,8 @@
-import { Tree, groupBy } from "@weborigami/async-tree";
+import { groupBy } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import addValueKeyToScope from "../../common/addValueKeyToScope.js";
 import { toFunction } from "../../common/utilities.js";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return a new tree with the values from the original tree in groups.
@@ -17,9 +17,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Invocable} groupKeyFn
  */
 export default async function groupByBuiltin(treelike, groupKeyFn) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
 
   const fn = toFunction(groupKeyFn);
   const baseScope = Scope.getScope(this);

package/src/builtins/@tree/inners.js

@@ -1,6 +1,6 @@
 import { Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return the source nodes of the tree: the nodes with children.
@@ -11,12 +11,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function inners(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
 
   /** @type {AsyncTree} */
   let result = {

package/src/builtins/@tree/keys.js

@@ -1,5 +1,4 @@
-import { Tree } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return the top-level keys in the tree as an array.
@@ -10,12 +9,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function keys(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   const keys = await tree.keys();
   return Array.from(keys);
 }

package/src/builtins/@tree/keysJson.js

@@ -1,7 +1,7 @@
 import { Tree, keysJson } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import { transformObject } from "../../common/utilities.js";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Expose .keys.json for a tree.
@@ -12,12 +12,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} treelike
  */
 export default async function treeKeysJson(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   let result = transformObject(KeysJsonTransform, tree);
   result = Scope.treeWithScope(result, this);
   return result;

package/src/builtins/@tree/map.d.ts

@@ -8,9 +8,7 @@ type TreeMapOptions = {
   extensions?: string;
   inverseKeyMap?: KeyFn;
   keyMap?: ValueKeyFn;
-  keyName?: string;
   valueMap?: ValueKeyFn;
-  valueName?: string
 };
 
 export default function treeMap(valueMap: ValueKeyFn): TreelikeTransform;

package/src/builtins/@tree/parent.js

@@ -1,5 +1,4 @@
-import { Tree } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Returns the parent of the current tree.
@@ -11,12 +10,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function parent(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   return tree.parent;
 }
 

package/src/builtins/@tree/paths.js

@@ -1,5 +1,5 @@
 import { Tree } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return an array of paths to the values in the tree.
@@ -12,13 +12,8 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {string} [prefix]
  */
 export default async function paths(treelike, prefix = "") {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
+  const tree = await getTreeArgument(this, arguments, treelike);
   const result = [];
-  const tree = Tree.from(treelike);
   for (const key of await tree.keys()) {
     const valuePath = prefix ? `${prefix}/${key}` : key;
     const value = await tree.get(key);

package/src/builtins/@tree/plain.js

@@ -1,5 +1,5 @@
 import { Tree } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return the interior nodes of the tree.
@@ -10,12 +10,8 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function plain(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  return Tree.plain(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
+  return Tree.plain(tree);
 }
 
 plain.usage = `plain <tree>\tA plain JavaScript object representation of the tree`;

package/src/builtins/@tree/reverse.js

@@ -1,6 +1,6 @@
 import { Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Reverse the order of the top-level keys in the tree.
@@ -14,13 +14,8 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {PlainObject} [options]
  */
 export default async function reverse(treelike, options = {}) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
+  const tree = await getTreeArgument(this, arguments, treelike);
   const scope = this;
-  const tree = Tree.from(treelike);
   const deep = options.deep ?? false;
 
   /** @type {AsyncTree} */

package/src/builtins/@tree/shuffle.js

@@ -1,8 +1,7 @@
-import { Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import ShuffleTransform from "../../common/ShuffleTransform.js";
 import { transformObject } from "../../common/utilities.js";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return a new tree with the original's keys shuffled
@@ -14,12 +13,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function shuffle(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
 
   /** @type {AsyncTree} */
   let shuffled = transformObject(ShuffleTransform, tree);

package/src/builtins/@tree/sitemap.js

@@ -1,5 +1,4 @@
-import { Tree } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 import builtins from "../@builtins.js";
 import unpackOrigamiExpression from "../@loaders/ori.js";
 import paths from "./paths.js";
@@ -23,9 +22,7 @@ const templateText = `=\`<?xml version="1.0" encoding="UTF-8"?>
  * @param {string} [baseHref ]
  */
 export default async function sitemap(treelike, baseHref = "") {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
 
   // We're only interested in keys that end in .html or with no extension.
   function test(key) {

package/src/builtins/@tree/sort.js

@@ -1,6 +1,6 @@
-import { Tree, sortNatural } from "@weborigami/async-tree";
+import { sortNatural } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return a new tree with the original's keys sorted in natural sort order.
@@ -13,9 +13,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function sort(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   const sorted = sortNatural()(tree);
   const scoped = Scope.treeWithScope(sorted, this);
   return scoped;

package/src/builtins/@tree/sortBy.js

@@ -1,8 +1,8 @@
-import { Tree, sortBy } from "@weborigami/async-tree";
+import { sortBy } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import addValueKeyToScope from "../../common/addValueKeyToScope.js";
 import { toFunction } from "../../common/utilities.js";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return a new tree with the original's keys sorted using the given function to
@@ -17,9 +17,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Invocable} sortKeyFn
  */
 export default async function sortByBuiltin(treelike, sortKeyFn) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
 
   const fn = toFunction(sortKeyFn);
   const baseScope = Scope.getScope(this);

package/src/builtins/@tree/static.js

@@ -1,7 +1,7 @@
 import { Tree, keysJson } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import { transformObject } from "../../common/utilities.js";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 import index from "../@index.js";
 
 /**
@@ -13,12 +13,7 @@ import index from "../@index.js";
  * @param {Treelike} treelike
  */
 export default async function staticTree(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   let result = transformObject(StaticTransform, tree);
   result = Scope.treeWithScope(result, this);
   return result;

package/src/builtins/@tree/table.js

@@ -1,5 +1,5 @@
 import { Tree } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
@@ -8,12 +8,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} treelike
  */
 export default async function table(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   const firstValue = await valueForFirstKey(tree);
   if (Tree.isAsyncTree(firstValue)) {
     return fullTable(tree, firstValue);

package/src/builtins/@tree/take.js

@@ -1,6 +1,5 @@
-import { Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Given a tree, take the first n items from it.
@@ -12,12 +11,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {number} n
  */
 export default async function take(treelike, n) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
 
   /** @type {AsyncTree} */
   let takeTree = {

package/src/builtins/@tree/values.js

@@ -1,5 +1,5 @@
 import { Tree } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return the interior nodes of the tree.
@@ -10,12 +10,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function values(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  const tree = Tree.from(treelike);
+  const tree = await getTreeArgument(this, arguments, treelike);
   return Tree.values(tree);
 }
 

package/src/builtins/@tree/valuesDeep.js

@@ -1,5 +1,5 @@
 import { Tree } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../../misc/getTreeArgument.js";
 
 /**
  * Return the in-order exterior values of a tree as a flat array.
@@ -10,12 +10,8 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike} [treelike]
  */
 export default async function valuesDeep(treelike) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
-  return Tree.mapReduce(treelike, null, async (values) => values.flat());
+  const tree = await getTreeArgument(this, arguments, treelike);
+  return Tree.mapReduce(tree, null, async (values) => values.flat());
 }
 
 valuesDeep.usage = `valuesDeep <tree>\tThe in-order tree values as a flat array`;

package/src/builtins/@watch.js

@@ -1,7 +1,7 @@
 import { Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import ConstantTree from "../common/ConstantTree.js";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Let a tree (e.g., of files) respond to changes.
@@ -15,15 +15,10 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {Invocable} [fn]
  */
 export default async function watch(treelike, fn) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  if (treelike === undefined) {
-    return undefined;
-  }
+  /** @type {any} */
+  const container = await getTreeArgument(this, arguments, treelike);
 
   // Watch the indicated tree.
-  /** @type {any} */
-  const container = Tree.from(treelike);
   await /** @type {any} */ (container).watch?.();
 
   // // Watch trees in scope.

package/src/builtins/@yaml.js

@@ -11,6 +11,12 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  */
 export default async function toYaml(obj) {
   assertScopeIsDefined(this);
+  // A fragment of the logic from getTreeArgument.js
+  if (arguments.length > 0 && obj === undefined) {
+    throw new Error(
+      "An Origami function was called with an initial argument, but its value is undefined."
+    );
+  }
   obj = obj ?? (await this?.get("@current"));
   if (obj === undefined) {
     return undefined;

package/src/common/FilterTree.js

@@ -1,4 +1,4 @@
-import { Tree } from "@weborigami/async-tree";
+import { DeepObjectTree, Tree, isPlainObject } from "@weborigami/async-tree";
 
 /**
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
@@ -7,7 +7,9 @@ import { Tree } from "@weborigami/async-tree";
 export default class FilterTree {
   constructor(tree, filter) {
     this.tree = Tree.from(tree);
-    this.filter = Tree.from(filter);
+    this.filter = isPlainObject(filter)
+      ? new DeepObjectTree(filter)
+      : Tree.from(filter);
   }
 
   async get(key) {

package/src/common/GlobTree.js

@@ -1,4 +1,10 @@
-import { ObjectTree, Tree, merge } from "@weborigami/async-tree";
+import {
+  DeepObjectTree,
+  ObjectTree,
+  Tree,
+  isPlainObject,
+  merge,
+} from "@weborigami/async-tree";
 
 const globstar = "**";
 
@@ -8,7 +14,9 @@ const globstar = "**";
  */
 export default class GlobTree {
   constructor(globs) {
-    this.globs = Tree.from(globs);
+    this.globs = isPlainObject(globs)
+      ? new DeepObjectTree(globs)
+      : Tree.from(globs);
   }
 
   async get(key) {

package/src/common/addValueKeyToScope.js

@@ -11,20 +11,12 @@ import { Scope } from "@weborigami/language";
  * @param {AsyncTree|null} scope
  * @param {any} value
  * @param {any} key
- * @param {string} [valueName]
- * @param {string} [keyName]
  */
-export default function addValueKeyToScope(
-  scope,
-  value,
-  key,
-  valueName = "_",
-  keyName = "@key"
-) {
+export default function addValueKeyToScope(scope, value, key) {
   // Add the key and value to the scope as ambients.
   const ambients = {
-    [keyName]: key,
-    [valueName]: value,
+    "@key": key,
+    _: value,
   };
   return new Scope(ambients, scope);
 }

package/src/common/processUnpackedContent.js

@@ -24,14 +24,12 @@ export default function processUnpackedContent(content, parent, inputDocument) {
       ? new Scope(inputDocument, parentScope)
       : parentScope;
 
-    /** @this {AsyncTree|null} */
-    async function extendScope(input, ...rest) {
-      return fn.call(extendedScope, input, ...rest);
-    }
-
-    extendScope.code = fn.code;
-    return extendScope;
-  } else if (Tree.isAsyncTree(content)) {
+    const boundFn = fn.bind(extendedScope);
+    return boundFn;
+  } else if (
+    Tree.isAsyncTree(content) &&
+    !(/** @type {any} */ (content).scope)
+  ) {
     const result = Object.create(content);
     result.parent = parent;
     return result;

package/src/misc/OriCommandTransform.js

@@ -33,7 +33,7 @@ export default function OriCommandTransform(Base) {
         ambientsTree[keySymbol] = "ori command";
         const extendedScope = new Scope(ambientsTree, Scope.getScope(this));
         const source = key.slice(1).trim();
-        value = await ori.call(extendedScope, source);
+        value = await ori.call(extendedScope, source, { formatResult: false });
 
         // Ensure this transform is applied to any subtree.
         if (Tree.isAsyncTree(value)) {

package/src/misc/getTreeArgument.js

@@ -0,0 +1,41 @@
+import { Tree } from "@weborigami/async-tree";
+import assertScopeIsDefined from "./assertScopeIsDefined.js";
+
+/**
+ * Many Origami built-in functions accept an optional treelike object as their
+ * first argument. If no tree is supplied, then the current context for the
+ * Origami command is used as the tree.
+ *
+ * So the argument is optional -- but if supplied, it must be defined. The
+ * caller should pass its `arguments` object to this function so that the actual
+ * number of supplied arguments can be checked.
+ *
+ * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
+ * @typedef {import("@weborigami/async-tree").Treelike} Treelike
+ *
+ * @param {AsyncTree|null} scope
+ * @param {IArguments} args
+ * @param {Treelike|undefined} treelike
+ * @returns {Promise<AsyncTree>}
+ */
+export default async function getTreeArgument(scope, args, treelike) {
+  assertScopeIsDefined(scope);
+
+  if (treelike !== undefined) {
+    return Tree.from(treelike);
+  }
+
+  if (args.length === 0) {
+    if (!scope) {
+      // Should never happen because assertScopeIsDefined throws an exception.
+      throw new Error(
+        "An Origami tree function was called with no tree argument and no scope."
+      );
+    }
+    return scope.get("@current");
+  }
+
+  throw new Error(
+    "An Origami tree function was called with an initial argument, but its value is undefined."
+  );
+}

package/src/server/server.js

@@ -53,21 +53,7 @@ export function treeRouter(tree) {
 export async function handleRequest(request, response, tree) {
   // For parsing purposes, we assume HTTPS -- it doesn't affect parsing.
   const url = new URL(request.url, `https://${request.headers.host}`);
-
-  // Split on occurrences of `/!`, which represent Origami debug commands.
-  // Command arguments can contain slashes; don't treat those as path keys.
-  const parts = url.pathname.split(/\/!/);
-  const keys = parts.flatMap((part, index) => {
-    const decoded = decodeURIComponent(part);
-    // Split keys that aren't commands; add back the `!` to commands.
-    return index % 2 === 0 ? keysFromPath(decoded) : `!${decoded}`;
-  });
-
-  // If the path ends with a trailing slash, the final key will be an empty
-  // string. Change that to "index.html".
-  if (keys[keys.length - 1] === "") {
-    keys[keys.length - 1] = "index.html";
-  }
+  const keys = keysFromUrl(url);
 
   const extendedTree =
     url.searchParams && "parent" in tree
@@ -176,6 +162,28 @@ export async function handleRequest(request, response, tree) {
   return true;
 }
 
+function keysFromUrl(url) {
+  // Split on occurrences of `/!`, which represent Origami debug commands.
+  // Command arguments can contain slashes; don't treat those as path keys.
+  const parts = url.pathname.split(/\/!/);
+
+  // Split everything before the first command by slashes and decode those.
+  const path = parts.shift();
+  const pathKeys = keysFromPath(path).map((key) => decodeURIComponent(key));
+
+  // If there are no commands, and the path ends with a trailing slash, the
+  // final key will be an empty string. Change that to "index.html".
+  if (parts.length === 0 && pathKeys[pathKeys.length - 1] === "") {
+    pathKeys[pathKeys.length - 1] = "index.html";
+  }
+
+  // Add back the `!` to commands.
+  const commandKeys = parts.map((command) => `!${command}`);
+
+  const keys = [...pathKeys, ...commandKeys];
+  return keys;
+}
+
 /**
  * A request listener for use with the node http.createServer and
  * https.createServer calls, letting you serve an async tree as a set of pages.