@weborigami/origami 0.0.41 → 0.0.42

package/src/builtins/{@tree/inners.js → @inners.js}

@@ -1,6 +1,6 @@
 import { Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import getTreeArgument from "../../misc/getTreeArgument.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Return the source nodes of the tree: the nodes with children.
@@ -11,7 +11,7 @@ import getTreeArgument from "../../misc/getTreeArgument.js";
  * @param {Treelike} [treelike]
  */
 export default async function inners(treelike) {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@inners");
 
   /** @type {AsyncTree} */
   let result = {
@@ -35,5 +35,5 @@ export default async function inners(treelike) {
   return result;
 }
 
-inners.usage = `inners <tree>\tThe source nodes of the tree`;
+inners.usage = `@inners <tree>\tThe source nodes of the tree`;
 inners.documentation = "https://weborigami.org/cli/builtins.html#inners";

package/src/builtins/@invoke.js

@@ -23,7 +23,7 @@ import builtins from "./@builtins.js";
  * @this {import("@weborigami/types").AsyncTree|null}
  */
 export default async function invoke(fn) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "invoke");
   // A fragment of the logic from getTreeArgument.js
   if (arguments.length > 0 && fn === undefined) {
     throw new Error(

package/src/builtins/{@tree/isAsyncTree.js → @isAsyncTree.js}

@@ -12,6 +12,6 @@ export default function isAsyncTree(value) {
   return Tree.isAsyncTree(value);
 }
 
-isAsyncTree.usage = `@tree/isAsyncTree <value>\tReturn true for an async tree`;
+isAsyncTree.usage = `@isAsyncTree <value>\tReturn true for an async tree`;
 isAsyncTree.documentation =
   "https://weborigami.org/cli/builtins.html#isAsyncTree";

package/src/builtins/@json.js

@@ -9,7 +9,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {any} [obj]
  */
 export default async function json(obj) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "json");
   // A fragment of the logic from getTreeArgument.js
   if (arguments.length > 0 && obj === undefined) {
     throw new Error(

package/src/builtins/{@tree/keys.js → @keys.js}

@@ -1,4 +1,4 @@
-import getTreeArgument from "../../misc/getTreeArgument.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Return the top-level keys in the tree as an array.
@@ -9,10 +9,10 @@ import getTreeArgument from "../../misc/getTreeArgument.js";
  * @param {Treelike} [treelike]
  */
 export default async function keys(treelike) {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@keys");
   const keys = await tree.keys();
   return Array.from(keys);
 }
 
-keys.usage = `keys <tree>\tThe top-level keys in the tree`;
+keys.usage = `@keys <tree>\tThe top-level keys in the tree`;
 keys.documentation = "https://weborigami.org/cli/builtins.html#keys";

package/src/builtins/{@tree/keysJson.js → @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 getTreeArgument from "../../misc/getTreeArgument.js";
+import { transformObject } from "../common/utilities.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Expose .keys.json for a tree.
@@ -12,7 +12,7 @@ import getTreeArgument from "../../misc/getTreeArgument.js";
  * @param {Treelike} treelike
  */
 export default async function treeKeysJson(treelike) {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@keysJson");
   let result = transformObject(KeysJsonTransform, tree);
   result = Scope.treeWithScope(result, this);
   return result;

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

@@ -17,27 +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);
-  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})`;
+  // Construct an object to represent the source code.
+  const sourceName = options.key;
+  let url;
+  if (sourceName && parent?.url) {
+    let parentHref = parent.url.href;
+    if (!parentHref.endsWith("/")) {
+      parentHref += "/";
     }
-    throw error;
+    url = new URL(sourceName, parentHref);
   }
+
+  const source = {
+    text: utilities.toString(inputDocument),
+    name: options.key,
+    url,
+  };
+
+  // Compile the source code as an Origami expression and evaluate it.
+  const compiler = options.compiler ?? compile.expression;
+  const fn = compiler(source);
   const parentScope = parent ? Scope.getScope(parent) : builtins;
   let content = await fn.call(parentScope);
 

package/src/builtins/@map.js

@@ -47,8 +47,16 @@ export default function treeMap(param1, param2) {
   // or the second.
   let source;
   let options;
-  if (param2 === undefined) {
+  if (arguments.length === 0) {
+    throw new TypeError(
+      `@map: You must give @map a function or a dictionary of options.`
+    );
+  } else if (!param1) {
+    throw new TypeError(`@map: The first argument was undefined.`);
+  } else if (arguments.length === 1) {
     options = param1;
+  } else if (!param2) {
+    throw new TypeError(`@map: The second argument was undefined.`);
   } else {
     source = param1;
     options = param2;
@@ -63,6 +71,10 @@ export default function treeMap(param1, param2) {
   ) {
     valueMap = options;
     options = {};
+  } else if (!options) {
+    throw new TypeError(
+      `@map: You must specify a valueMap function or options dictionary.`
+    );
   } else {
     valueMap = options.valueMap;
   }

package/src/builtins/@match.js

@@ -26,7 +26,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @this {AsyncTree|null}
  */
 export default function match(pattern, resultFn, keys = []) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "match");
   let regex;
   if (typeof pattern === "string") {
     // Convert the simple pattern format into a regular expression.

package/src/builtins/{@tree/merge.js → @merge.js}

@@ -1,6 +1,6 @@
 import { merge } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 
 /**
  * Create a tree that's the result of merging the given trees.
@@ -12,7 +12,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {(Treelike|null)[]} trees
  */
 export default async function treeMerge(...trees) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "merge");
 
   // Filter out null or undefined trees.
   /** @type {Treelike[]}

package/src/builtins/{@tree/mergeDeep.js → @mergeDeep.js}

@@ -1,6 +1,6 @@
 import { mergeDeep } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 
 /**
  * Create a tree that's the result of deep merging the given trees.
@@ -11,7 +11,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {Treelike[]} trees
  */
 export default async function treeMergeDeep(...trees) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "mergeDeep");
   // Filter out null or undefined trees.
   const filtered = trees.filter((tree) => tree);
 
@@ -39,6 +39,6 @@ export default async function treeMergeDeep(...trees) {
   return result;
 }
 
-treeMergeDeep.usage = `mergeDeep <...trees>\tMerge the given trees deeply`;
+treeMergeDeep.usage = `@mergeDeep <...trees>\tMerge the given trees deeply`;
 treeMergeDeep.documentation =
   "https://weborigami.org/cli/builtins.html#mergeDeep";

package/src/builtins/@once.js

@@ -10,7 +10,7 @@ const fnPromiseMap = new WeakMap();
  * @param {Function} fn
  */
 export default async function once(fn) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "once");
   if (!fnPromiseMap.has(fn)) {
     fnPromiseMap.set(fn, fn.call(this));
   }

package/src/builtins/@ori.js

@@ -19,7 +19,7 @@ export default async function ori(
   expression,
   options = { formatResult: true }
 ) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "ori");
   // In case expression is a Buffer, cast it to a string.
   expression = String(expression);
 

package/src/builtins/@pack.js

@@ -8,6 +8,6 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @returns
  */
 export default function pack(obj) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "pack");
   return obj?.pack?.();
 }

package/src/builtins/{@tree/parent.js → @parent.js}

@@ -1,4 +1,4 @@
-import getTreeArgument from "../../misc/getTreeArgument.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Returns the parent of the current tree.
@@ -10,9 +10,9 @@ import getTreeArgument from "../../misc/getTreeArgument.js";
  * @param {Treelike} [treelike]
  */
 export default async function parent(treelike) {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@parent");
   return tree.parent;
 }
 
-parent.usage = `parent\tThe parent of the current tree`;
+parent.usage = `@parent\tThe parent of the current tree`;
 parent.documentation = "https://weborigami.org/cli/builtins.html#parent";

package/src/builtins/{@tree/paths.js → @paths.js}

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

package/src/builtins/@perf.js

@@ -0,0 +1,18 @@
+import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+
+/**
+ * Return the number of milliseconds required to execute the given function the
+ * specified number of times.
+ *
+ * @this {import("@weborigami/types").AsyncTree|null}
+ * @param {Function} fn
+ */
+export default async function perf(fn, count = 10000) {
+  assertScopeIsDefined(this, "perf");
+  const start = performance.now();
+  for (let i = 0; i < count; i++) {
+    await fn.call(this);
+  }
+  const end = performance.now();
+  return end - start;
+}

package/src/builtins/{@tree/plain.js → @plain.js}

@@ -1,5 +1,5 @@
 import { Tree } from "@weborigami/async-tree";
-import getTreeArgument from "../../misc/getTreeArgument.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Return the interior nodes of the tree.
@@ -10,9 +10,9 @@ import getTreeArgument from "../../misc/getTreeArgument.js";
  * @param {Treelike} [treelike]
  */
 export default async function plain(treelike) {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@plain");
   return Tree.plain(tree);
 }
 
-plain.usage = `plain <tree>\tA plain JavaScript object representation of the tree`;
+plain.usage = `@plain <tree>\tA plain JavaScript object representation of the tree`;
 plain.documentation = "https://weborigami.org/cli/builtins.html#plain";

package/src/builtins/@project.js

@@ -21,7 +21,7 @@ const configFileName = "ori.config.js";
  * @param {any} [key]
  */
 export default async function project(key) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "project");
 
   const dirname = process.cwd();
   const currentTree = new OrigamiFiles(dirname);

package/src/builtins/@redirect.js

@@ -0,0 +1,8 @@
+export default function redirect(url, options = { permanent: false }) {
+  return new Response("ok", {
+    headers: {
+      Location: url,
+    },
+    status: options.permanent ? 301 : 307,
+  });
+}

package/src/builtins/{@tree/reverse.js → @reverse.js}

@@ -1,6 +1,6 @@
 import { Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import getTreeArgument from "../../misc/getTreeArgument.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Reverse the order of the top-level keys in the tree.
@@ -14,7 +14,7 @@ import getTreeArgument from "../../misc/getTreeArgument.js";
  * @param {PlainObject} [options]
  */
 export default async function reverse(treelike, options = {}) {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@reverse");
   const scope = this;
   const deep = options.deep ?? false;
 
@@ -42,5 +42,5 @@ export default async function reverse(treelike, options = {}) {
   return reversed;
 }
 
-reverse.usage = `reverse <tree>\tReverses the order of the tree's top-level keys`;
+reverse.usage = `@reverse <tree>\tReverses the order of the tree's top-level keys`;
 reverse.documentation = "https://weborigami.org/cli/builtins.html#reverse";

package/src/builtins/@rss.js

@@ -8,7 +8,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {Treelike} jsonFeedTree
  */
 export default async function rss(jsonFeedTree) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "rss");
   const jsonFeed = await Tree.plain(jsonFeedTree);
   const { description, home_page_url, items, feed_url, title } = jsonFeed;
 

package/src/builtins/@scope/extend.js

@@ -1,5 +1,5 @@
 import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
-import setScope from "./set.js";
+import scopeSet from "./set.js";
 
 /**
  * Return a copy of the given tree whose scope includes the given trees *and*
@@ -12,11 +12,11 @@ import setScope from "./set.js";
  * @param  {...Treelike} scopeTrees
  * @this {AsyncTree|null}
  */
-export default function extendScope(treelike, ...scopeTrees) {
-  assertScopeIsDefined(this);
+export default function scopeExtend(treelike, ...scopeTrees) {
+  assertScopeIsDefined(this, "scopeExtend");
   const scope = this;
-  return setScope.call(scope, treelike, ...scopeTrees, scope);
+  return scopeSet.call(scope, treelike, ...scopeTrees, scope);
 }
 
-extendScope.usage = `@scope/extend <tree>, <...trees>\tExtends tree's scope with the given trees`;
-extendScope.documentation = "https://weborigami.org/cli/builtins.html#@scope";
+scopeExtend.usage = `@scope/extend <tree>, <...trees>\tExtends tree's scope with the given trees`;
+scopeExtend.documentation = "https://weborigami.org/cli/builtins.html#@scope";

package/src/builtins/@scope/get.js

@@ -11,7 +11,7 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {any} [obj]
  */
 export default async function getScope(obj) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "getScope");
   if (obj) {
     /** @type {any}  */
     const tree = Tree.from(obj);

package/src/builtins/@scope/set.js

@@ -12,8 +12,8 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param  {...(Treelike|null)} scopeTrees
  * @this {AsyncTree|null}
  */
-export default function setScope(treelike, ...scopeTrees) {
-  assertScopeIsDefined(this);
+export default function scopeSet(treelike, ...scopeTrees) {
+  assertScopeIsDefined(this, "scopeSet");
   const tree = Tree.from(treelike);
   const scope = scopeTrees.length === 0 ? this : new Scope(...scopeTrees);
   const result = Scope.treeWithScope(tree, scope);
@@ -21,5 +21,5 @@ export default function setScope(treelike, ...scopeTrees) {
   return result;
 }
 
-setScope.usage = `@scope/set <tree>, <...trees>\tReturns a tree copy with the given scope`;
-setScope.documentation = "https://weborigami.org/cli/builtins.html#@scope";
+scopeSet.usage = `@scope/set <tree>, <...trees>\tReturns a tree copy with the given scope`;
+scopeSet.documentation = "https://weborigami.org/cli/builtins.html#@scope";

package/src/builtins/@serve.js

@@ -22,7 +22,7 @@ const defaultPort = 5000;
  * @this {AsyncTree|null}
  */
 export default async function serve(treelike, port) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "serve");
   let tree;
   if (treelike) {
     tree = Tree.from(treelike);

package/src/builtins/{@tree/setDeep.js → @setDeep.js}

@@ -41,5 +41,5 @@ async function applyUpdateForKey(source, target, key) {
   await target.set(key, sourceValue);
 }
 
-setDeep.usage = `setDeep <target>, <source>\tApplies the source tree to the target`;
+setDeep.usage = `@setDeep <target>, <source>\tApplies the source tree to the target`;
 setDeep.documentation = "https://weborigami.org/cli/builtins.html#setDeep";

package/src/builtins/{@tree/shuffle.js → @shuffle.js}

@@ -1,7 +1,7 @@
 import { Scope } from "@weborigami/language";
-import ShuffleTransform from "../../common/ShuffleTransform.js";
-import { transformObject } from "../../common/utilities.js";
-import getTreeArgument from "../../misc/getTreeArgument.js";
+import ShuffleTransform from "../common/ShuffleTransform.js";
+import { transformObject } from "../common/utilities.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Return a new tree with the original's keys shuffled
@@ -13,7 +13,7 @@ import getTreeArgument from "../../misc/getTreeArgument.js";
  * @param {Treelike} [treelike]
  */
 export default async function shuffle(treelike) {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@shuffle");
 
   /** @type {AsyncTree} */
   let shuffled = transformObject(ShuffleTransform, tree);
@@ -21,5 +21,5 @@ export default async function shuffle(treelike) {
   return shuffled;
 }
 
-shuffle.usage = `shuffle <tree>\tReturn a new tree with the original's keys shuffled`;
+shuffle.usage = `@shuffle <tree>\tReturn a new tree with the original's keys shuffled`;
 shuffle.documentation = "https://weborigami.org/cli/builtins.html#shuffle";

package/src/builtins/{@tree/sitemap.js → @sitemap.js}

@@ -1,7 +1,7 @@
-import getTreeArgument from "../../misc/getTreeArgument.js";
-import builtins from "../@builtins.js";
-import unpackOrigamiExpression from "../@loaders/ori.js";
-import paths from "./paths.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
+import builtins from "./@builtins.js";
+import unpackOrigamiExpression from "./@loaders/ori.js";
+import paths from "./@paths.js";
 
 const templateText = `=\`<?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
@@ -22,7 +22,7 @@ const templateText = `=\`<?xml version="1.0" encoding="UTF-8"?>
  * @param {string} [baseHref ]
  */
 export default async function sitemap(treelike, baseHref = "") {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@sitemap");
 
   // We're only interested in keys that end in .html or with no extension.
   function test(key) {

package/src/builtins/{@tree/sort.js → @sort.js}

@@ -1,23 +1,23 @@
 import { sortNatural } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import getTreeArgument from "../../misc/getTreeArgument.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Return a new tree with the original's keys sorted in natural sort order.
  *
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
  * @typedef {import("@weborigami/async-tree").Treelike} Treelike
- * @typedef {import("../../../index.ts").Invocable} Invocable
+ * @typedef {import("../../index.ts").Invocable} Invocable
  *
  * @this {AsyncTree|null}
  * @param {Treelike} [treelike]
  */
 export default async function sort(treelike) {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@sort");
   const sorted = sortNatural()(tree);
   const scoped = Scope.treeWithScope(sorted, this);
   return scoped;
 }
 
-sort.usage = `sort <tree>\tReturn a new tree with the original's keys sorted`;
+sort.usage = `@sort <tree>\tReturn a new tree with the original's keys sorted`;
 sort.documentation = "https://weborigami.org/cli/builtins.html#@sort";

package/src/builtins/{@tree/sortBy.js → @sortBy.js}

@@ -1,8 +1,8 @@
 import { sortBy } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import addValueKeyToScope from "../../common/addValueKeyToScope.js";
-import { toFunction } from "../../common/utilities.js";
-import getTreeArgument from "../../misc/getTreeArgument.js";
+import addValueKeyToScope from "../common/addValueKeyToScope.js";
+import { toFunction } from "../common/utilities.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Return a new tree with the original's keys sorted using the given function to
@@ -10,14 +10,14 @@ import getTreeArgument from "../../misc/getTreeArgument.js";
  *
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
  * @typedef {import("@weborigami/async-tree").Treelike} Treelike
- * @typedef {import("../../../index.ts").Invocable} Invocable
+ * @typedef {import("../../index.ts").Invocable} Invocable
  *
  * @this {AsyncTree|null}
  * @param {Treelike} treelike
  * @param {Invocable} sortKeyFn
  */
 export default async function sortByBuiltin(treelike, sortKeyFn) {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@sortBy");
 
   const fn = toFunction(sortKeyFn);
   const baseScope = Scope.getScope(this);
@@ -33,5 +33,5 @@ export default async function sortByBuiltin(treelike, sortKeyFn) {
   return scoped;
 }
 
-sortByBuiltin.usage = `sortBy <tree>, [sortKeyFn]\tReturn a new tree with the original's keys sorted`;
+sortByBuiltin.usage = `@sortBy <tree>, [sortKeyFn]\tReturn a new tree with the original's keys sorted`;
 sortByBuiltin.documentation = "https://weborigami.org/cli/builtins.html#@sort";

package/src/builtins/{@tree/static.js → @static.js}

@@ -1,8 +1,8 @@
 import { Tree, keysJson } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import { transformObject } from "../../common/utilities.js";
-import getTreeArgument from "../../misc/getTreeArgument.js";
-import index from "../@index.js";
+import { transformObject } from "../common/utilities.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
+import index from "./@index.js";
 
 /**
  * Expose common static keys (index.html, .keys.json) for a tree.
@@ -13,7 +13,7 @@ import index from "../@index.js";
  * @param {Treelike} treelike
  */
 export default async function staticTree(treelike) {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@static");
   let result = transformObject(StaticTransform, tree);
   result = Scope.treeWithScope(result, this);
   return result;
@@ -42,5 +42,5 @@ function StaticTransform(Base) {
   };
 }
 
-staticTree.usage = `static <tree>\tAdd keys for generating common static files`;
+staticTree.usage = `@static <tree>\tAdd keys for generating common static files`;
 staticTree.documentation = "https://weborigami.org/cli/builtins.html#static";

package/src/builtins/@svg.js

@@ -1,6 +1,6 @@
 import graphviz from "graphviz-wasm";
 import getTreeArgument from "../misc/getTreeArgument.js";
-import dot from "./@tree/dot.js";
+import dot from "../misc/treeDot.js";
 
 let graphvizLoaded = false;
 
@@ -20,7 +20,7 @@ export default async function svg(treelike, options = {}) {
     await graphviz.loadWASM();
     graphvizLoaded = true;
   }
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@svg");
   const dotText = await dot.call(this, tree, options);
   if (dotText === undefined) {
     return undefined;

package/src/builtins/{@tree/table.js → @table.js}

@@ -1,5 +1,5 @@
 import { Tree } from "@weborigami/async-tree";
-import getTreeArgument from "../../misc/getTreeArgument.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
@@ -8,7 +8,7 @@ import getTreeArgument from "../../misc/getTreeArgument.js";
  * @param {Treelike} treelike
  */
 export default async function table(treelike) {
-  const tree = await getTreeArgument(this, arguments, treelike);
+  const tree = await getTreeArgument(this, arguments, treelike, "@table");
   const firstValue = await valueForFirstKey(tree);
   if (Tree.isAsyncTree(firstValue)) {
     return fullTable(tree, firstValue);
@@ -65,5 +65,5 @@ async function valueForFirstKey(tree) {
 }
 
 table.usage =
-  "table <tree>\tFormat the tree's top level as a tab-delimited table";
+  "@table <tree>\tFormat the tree's top level as a tab-delimited table";
 table.documentation = "https://weborigami.org/cli/builtins.html#table";