@weborigami/origami 0.0.40 → 0.0.42

package/exports/exports.js

@@ -4,17 +4,24 @@ export { default as arrows } from "../src/builtins/@arrows.js";
 export { default as basename } from "../src/builtins/@basename.js";
 export { default as builtins } from "../src/builtins/@builtins.js";
 export { default as cache } from "../src/builtins/@cache.js";
+export { default as concat } from "../src/builtins/@concat.js";
 export { default as config } from "../src/builtins/@config.js";
 export { default as copy } from "../src/builtins/@copy.js";
+export { default as count } from "../src/builtins/@count.js";
 export { default as crawl } from "../src/builtins/@crawl.js";
 export { default as debug } from "../src/builtins/@debug.js";
+export { default as defineds } from "../src/builtins/@defineds.js";
 export { default as document } from "../src/builtins/@document.js";
 export { default as equals } from "../src/builtins/@equals.js";
+export { default as exceptions } from "../src/builtins/@exceptions.js";
 export { default as explore } from "../src/builtins/@explore.js";
 export { default as fetch } from "../src/builtins/@fetch.js";
 export { default as files } from "../src/builtins/@files.js";
 export { default as filter } from "../src/builtins/@filter.js";
+export { default as first } from "../src/builtins/@first.js";
+export { default as fnTree } from "../src/builtins/@fnTree.js";
 export { default as globs } from "../src/builtins/@globs.js";
+export { default as groupBy } from "../src/builtins/@groupBy.js";
 export { default as help } from "../src/builtins/@help.js";
 export { default as http } from "../src/builtins/@http.js";
 export { default as https } from "../src/builtins/@https.js";
@@ -24,9 +31,13 @@ export { default as imageResize } from "../src/builtins/@image/resize.js";
 export { default as index } from "../src/builtins/@index.js";
 export { default as inherited } from "../src/builtins/@inherited.js";
 export { default as inline } from "../src/builtins/@inline.js";
+export { default as inners } from "../src/builtins/@inners.js";
 export { default as invoke } from "../src/builtins/@invoke.js";
+export { default as isAsyncTree } from "../src/builtins/@isAsyncTree.js";
 export { default as js } from "../src/builtins/@js.js";
 export { default as json } from "../src/builtins/@json.js";
+export { default as keys } from "../src/builtins/@keys.js";
+export { default as keysJson } from "../src/builtins/@keysJson.js";
 export { default as loadersCss } from "../src/builtins/@loaders/css.js";
 export { default as loadersHtm } from "../src/builtins/@loaders/htm.js";
 export { default as loadersHtml } from "../src/builtins/@loaders/html.js";
@@ -43,6 +54,8 @@ export { default as map } from "../src/builtins/@map.js";
 export { default as mapDeep } from "../src/builtins/@mapDeep.js";
 export { default as match } from "../src/builtins/@match.js";
 export { default as mdHtml } from "../src/builtins/@mdHtml.js";
+export { default as merge } from "../src/builtins/@merge.js";
+export { default as mergeDeep } from "../src/builtins/@mergeDeep.js";
 export { default as node } from "../src/builtins/@node.js";
 export { default as not } from "../src/builtins/@not.js";
 export { default as once } from "../src/builtins/@once.js";
@@ -50,56 +63,39 @@ export { default as or } from "../src/builtins/@or.js";
 export { default as ori } from "../src/builtins/@ori.js";
 export { default as pack } from "../src/builtins/@pack.js";
 export { default as package } from "../src/builtins/@package.js";
+export { default as parent } from "../src/builtins/@parent.js";
 export { default as parseJson } from "../src/builtins/@parse/json.js";
 export { default as parseYaml } from "../src/builtins/@parse/yaml.js";
+export { default as paths } from "../src/builtins/@paths.js";
+export { default as perf } from "../src/builtins/@perf.js";
+export { default as plain } from "../src/builtins/@plain.js";
 export { default as project } from "../src/builtins/@project.js";
+export { default as redirect } from "../src/builtins/@redirect.js";
 export { default as repeat } from "../src/builtins/@repeat.js";
+export { default as reverse } from "../src/builtins/@reverse.js";
 export { default as rss } from "../src/builtins/@rss.js";
 export { default as scopeExtend } from "../src/builtins/@scope/extend.js";
 export { default as scopeGet } from "../src/builtins/@scope/get.js";
 export { default as scopeInvoke } from "../src/builtins/@scope/invoke.js";
 export { default as scopeSet } from "../src/builtins/@scope/set.js";
 export { default as serve } from "../src/builtins/@serve.js";
+export { default as setDeep } from "../src/builtins/@setDeep.js";
 export { default as shell } from "../src/builtins/@shell.js";
+export { default as shuffle } from "../src/builtins/@shuffle.js";
+export { default as sitemap } from "../src/builtins/@sitemap.js";
+export { default as sort } from "../src/builtins/@sort.js";
+export { default as sortBy } from "../src/builtins/@sortBy.js";
+export { default as static } from "../src/builtins/@static.js";
 export { default as stdin } from "../src/builtins/@stdin.js";
 export { default as svg } from "../src/builtins/@svg.js";
-export { default as treeConcat } from "../src/builtins/@tree/concat.js";
-export { default as treeCount } from "../src/builtins/@tree/count.js";
-export { default as treeDefineds } from "../src/builtins/@tree/defineds.js";
-export { default as treeDot } from "../src/builtins/@tree/dot.js";
-export { default as treeExceptions } from "../src/builtins/@tree/exceptions.js";
-export { default as treeFirst } from "../src/builtins/@tree/first.js";
-export { default as treeFlowSvg } from "../src/builtins/@tree/flowSvg.js";
-export { default as treeFn } from "../src/builtins/@tree/fn.js";
-export { default as treeFrom } from "../src/builtins/@tree/from.js";
-export { default as treeFromJson } from "../src/builtins/@tree/fromJson.js";
-export { default as treeFromYaml } from "../src/builtins/@tree/fromYaml.js";
-export { default as treeGroupBy } from "../src/builtins/@tree/groupBy.js";
-export { default as treeInners } from "../src/builtins/@tree/inners.js";
-export { default as treeIsAsyncTree } from "../src/builtins/@tree/isAsyncTree.js";
-export { default as treeKeys } from "../src/builtins/@tree/keys.js";
-export { default as treeKeysJson } from "../src/builtins/@tree/keysJson.js";
-export { default as treeMerge } from "../src/builtins/@tree/merge.js";
-export { default as treeMergeDeep } from "../src/builtins/@tree/mergeDeep.js";
-export { default as treeNextKey } from "../src/builtins/@tree/nextKey.js";
-export { default as treeParent } from "../src/builtins/@tree/parent.js";
-export { default as treePaths } from "../src/builtins/@tree/paths.js";
-export { default as treePlain } from "../src/builtins/@tree/plain.js";
-export { default as treePreviousKey } from "../src/builtins/@tree/previousKey.js";
-export { default as treeReverse } from "../src/builtins/@tree/reverse.js";
-export { default as treeSetDeep } from "../src/builtins/@tree/setDeep.js";
-export { default as treeShuffle } from "../src/builtins/@tree/shuffle.js";
-export { default as treeSitemap } from "../src/builtins/@tree/sitemap.js";
-export { default as treeSort } from "../src/builtins/@tree/sort.js";
-export { default as treeSortBy } from "../src/builtins/@tree/sortBy.js";
-export { default as treeStatic } from "../src/builtins/@tree/static.js";
-export { default as treeTable } from "../src/builtins/@tree/table.js";
-export { default as treeTake } from "../src/builtins/@tree/take.js";
-export { default as treeValues } from "../src/builtins/@tree/values.js";
-export { default as treeValuesDeep } from "../src/builtins/@tree/valuesDeep.js";
+export { default as table } from "../src/builtins/@table.js";
+export { default as take } from "../src/builtins/@take.js";
+export { default as tree } from "../src/builtins/@tree.js";
 export { default as treeHttp } from "../src/builtins/@treeHttp.js";
 export { default as treeHttps } from "../src/builtins/@treeHttps.js";
 export { default as unpack } from "../src/builtins/@unpack.js";
+export { default as values } from "../src/builtins/@values.js";
+export { default as valuesDeep } from "../src/builtins/@valuesDeep.js";
 export { default as watch } from "../src/builtins/@watch.js";
 export { default as with } from "../src/builtins/@with.js";
 export { default as yaml } from "../src/builtins/@yaml.js";
@@ -119,7 +115,10 @@ 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 treeDot } from "../src/misc/treeDot.js";
 export { default as yamlOrigamiTag } from "../src/misc/yamlOrigamiTag.js";
+export { default as constructResponse } from "../src/server/constructResponse.js";
 export * from "../src/server/mediaTypes.js";
 export * from "../src/server/server.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -19,9 +19,9 @@
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.40",
-    "@weborigami/language": "0.0.40",
-    "@weborigami/types": "0.0.40",
+    "@weborigami/async-tree": "https://gitpkg.now.sh/WebOrigami/origami/async-tree?e08c2451",
+    "@weborigami/language": "https://gitpkg.now.sh/WebOrigami/origami/language?e08c2451",
+    "@weborigami/types": "0.0.42",
     "graphviz-wasm": "3.0.1",
     "highlight.js": "11.9.0",
     "marked": "11.1.1",

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, "@arrows");
   const mapped = functionResultsMap(arrowFunctionsMap()(tree));
   const scope = this ?? builtins;
   const scoped = Scope.treeWithScope(mapped, scope);

package/src/builtins/@builtins.js

@@ -1,15 +1,12 @@
 import { FileTree } from "@weborigami/async-tree";
 import { ImportModulesMixin } from "@weborigami/language";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
 import CommandModulesTransform from "../common/CommandModulesTransform.js";
 
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-const commandsFolder = path.resolve(dirname, "../builtins");
+const commandsUrl = new URL("../builtins", import.meta.url);
 
 /** @type {any} */
 const builtins = new (CommandModulesTransform(ImportModulesMixin(FileTree)))(
-  commandsFolder
+  commandsUrl
 );
 
 builtins.usage = `@builtins\tThe Tree Origami built-in functions`;

package/src/builtins/@cache.js

@@ -18,7 +18,7 @@ export default async function cacheBuiltin(
   cacheTreelike,
   filterTreelike
 ) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "cache");
 
   const sourceTree = Tree.from(sourceTreelike);
   /** @type {any} */

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

@@ -1,6 +1,6 @@
 import { Tree } from "@weborigami/async-tree";
 import { ops } from "@weborigami/language";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 
 /**
  * Concatenate the text content of objects or trees.
@@ -11,11 +11,11 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
  * @param {any[]} args
  */
 export default async function concat(...args) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "concat");
   const tree =
     args.length === 0 ? await this?.get("@current") : Tree.from(args);
   return ops.concat.call(this, tree);
 }
 
-concat.usage = `concat <...objs>\tConcatenate text and/or trees of text`;
+concat.usage = `@concat <...objs>\tConcatenate text and/or trees of text`;
 concat.documentation = "https://weborigami.org/cli/@tree.html#concat";

package/src/builtins/@copy.js

@@ -2,7 +2,7 @@ import { Tree } from "@weborigami/async-tree";
 import process, { stdout } from "node:process";
 import { transformObject } from "../common/utilities.js";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
-import setDeep from "./@tree/setDeep.js";
+import setDeep from "./@setDeep.js";
 
 /**
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
@@ -13,7 +13,7 @@ import setDeep from "./@tree/setDeep.js";
  * @param {Treelike} target
  */
 export default async function copy(source, target) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "copy");
   // const start = performance.now();
   const sourceTree = Tree.from(source);
   /** @type {any} */ let targetTree = Tree.from(target);

package/src/builtins/{@tree/count.js → @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,15 +9,10 @@ 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, "@count");
   const keys = [...(await tree.keys())];
   return keys.length;
 }
 
-count.usage = `count <treelike>\tReturn the number of keys in the tree`;
+count.usage = `@count <treelike>\tReturn the number of keys in the tree`;
 count.documentation = "https://weborigami.org/cli/@tree.html#count";

package/src/builtins/@crawl.js

@@ -30,7 +30,7 @@ const fakeBaseUrl = new URL("https://fake");
  * @returns {Promise<AsyncTree>}
  */
 export default async function crawl(treelike, baseHref) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "crawl");
   const tree =
     typeof treelike === "string"
       ? treeHttps.call(this, treelike)

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, "@debug");
 
   if (!isTransformApplied(ExplorableSiteTransform, tree)) {
     tree = transformObject(ExplorableSiteTransform, tree);

package/src/builtins/{@tree/defineds.js → @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, "@defineds");
 
   /** @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/@document.js

@@ -12,7 +12,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @returns
  */
 export default function document(text, data, parent) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "document");
   const merged = Object.assign({}, data, { "@text": text });
   return new TextDocument(merged, parent ?? this);
 }

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

@@ -1,7 +1,7 @@
 import { Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
-import defineds from "./defineds.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
+import defineds from "./@defineds.js";
 
 /**
  * @typedef  {import("@weborigami/types").AsyncTree} AsyncTree
@@ -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, "@exceptions");
 
   /** @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) {
@@ -45,6 +44,6 @@ class ExceptionsTree {
   }
 }
 
-exceptions.usage = `exceptions tree\tReturn a tree of exceptions thrown in the tree`;
+exceptions.usage = `@exceptions tree\tReturn a tree of exceptions thrown in the tree`;
 exceptions.documentation =
   "https://weborigami.org/cli/builtins.html#exceptions";

package/src/builtins/@explore.js

@@ -1,15 +1,12 @@
 /** @typedef {import("@weborigami/types").AsyncTree} AsyncTree */
 import { ObjectTree, Tree } from "@weborigami/async-tree";
 import { OrigamiFiles, Scope } from "@weborigami/language";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
 import builtins from "../builtins/@builtins.js";
 import { keySymbol } from "../common/utilities.js";
 import debug from "./@debug.js";
 
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-const miscDir = path.resolve(dirname, "../misc");
-const miscFiles = Scope.treeWithScope(new OrigamiFiles(miscDir), builtins);
+const miscUrl = new URL("../misc", import.meta.url);
+const miscFiles = Scope.treeWithScope(new OrigamiFiles(miscUrl), builtins);
 
 /**
  * @this {AsyncTree|null}

package/src/builtins/@files.js

@@ -10,7 +10,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {string[]} keys
  */
 export default async function files(...keys) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "files");
   const resolved = path.resolve(process.cwd(), ...keys);
   /** @type {AsyncTree} */
   let result = new OrigamiFiles(resolved);

package/src/builtins/@filter.js

@@ -12,7 +12,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {Treelike} filterVariant
  */
 export default async function filter(treelike, filterVariant) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "filter");
   /** @type {AsyncTree} */
   let result = new FilterTree(treelike, filterVariant);
   result = Scope.treeWithScope(result, this);

package/src/builtins/{@tree/first.js → @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, "@first");
   for (const key of await tree.keys()) {
     // Just return first value immediately.
     const value = await tree.get(key);
@@ -24,5 +18,5 @@ export default async function first(treelike) {
   return undefined;
 }
 
-first.usage = `first <tree>\tReturns the first value in the tree.`;
+first.usage = `@first <tree>\tReturns the first value in the tree.`;
 first.documentation = "https://weborigami.org/cli/builtins.html#first";

package/src/builtins/{@tree/fn.js → @fnTree.js}

@@ -1,20 +1,26 @@
 import { FunctionTree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
-import { toFunction } from "../../common/utilities.js";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import { toFunction } from "../common/utilities.js";
+import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 
 /**
  * Create a tree from a function and a set of keys.
  *
  * @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 {Invocable} [invocable]
  */
-export default async function fn(invocable, keys = []) {
-  assertScopeIsDefined(this);
+export default async function fnTree(invocable, keys = []) {
+  assertScopeIsDefined(this, "fnTree");
+  // 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;
@@ -30,5 +36,5 @@ export default async function fn(invocable, keys = []) {
   return new FunctionTree(extendedFn, keys);
 }
 
-fn.usage = `fn <fn>, [<keys>]\tCreate a tree from a function and a set of keys`;
-fn.documentation = "https://weborigami.org/cli/tree.html#fn";
+fnTree.usage = `@fnTree <fn>, [<keys>]\tCreate a tree from a function and a set of keys`;
+fnTree.documentation = "https://weborigami.org/cli/tree.html#fn";

package/src/builtins/@globs.js

@@ -12,7 +12,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @this {AsyncTree|null}
  */
 export default async function globs(tree) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "globs");
   /** @type {AsyncTree} */
   let result = new GlobTree(tree);
   result = Scope.treeWithScope(result, this);

package/src/builtins/{@tree/groupBy.js → @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 addValueKeyToScope from "../common/addValueKeyToScope.js";
+import { toFunction } from "../common/utilities.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
  * Return a new tree with the values from the original tree in groups.
@@ -10,16 +10,14 @@ import assertScopeIsDefined from "../../misc/assertScopeIsDefined.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} 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, "@groupBy");
 
   const fn = toFunction(groupKeyFn);
   const baseScope = Scope.getScope(this);
@@ -34,6 +32,6 @@ export default async function groupByBuiltin(treelike, groupKeyFn) {
   return scoped;
 }
 
-groupByBuiltin.usage = `groupBy <tree>, [groupKeyFn]\tReturn a new tree with the original's values grouped`;
+groupByBuiltin.usage = `@groupBy <tree>, [groupKeyFn]\tReturn a new tree with the original's values grouped`;
 groupByBuiltin.documentation =
   "https://weborigami.org/cli/builtins.html#@group";

package/src/builtins/@help.js

@@ -15,7 +15,7 @@ const groupUrls = {
  * @param {string} [name]
  */
 export default async function help(name) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "help");
   let url;
   const scope = this;
   if (scope && name) {

package/src/builtins/@http.js

@@ -11,7 +11,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param  {...string} keys
  */
 export default async function http(host, ...keys) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "http");
   return ops.http.call(this, host, ...keys);
 }
 

package/src/builtins/@https.js

@@ -11,7 +11,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param  {...string} keys
  */
 export default async function https(host, ...keys) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "https");
   return ops.https.call(this, host, ...keys);
 }
 

package/src/builtins/@if.js

@@ -9,7 +9,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {any} [falseResult]
  */
 export default async function ifCommand(value, trueResult, falseResult) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "if");
   let condition = await value;
   if (Tree.isAsyncTree(condition)) {
     const keys = Array.from(await condition.keys());

package/src/builtins/@image/format.js

@@ -1,5 +1,39 @@
 import sharp from "sharp";
 
-export default function format(buffer, format, options) {
-  return sharp(buffer).toFormat(format, options).toBuffer();
+/**
+ * Return the image in a different format.
+ *
+ * @this {import("@weborigami/types").AsyncTree|null}
+ *
+ * @typedef {import("sharp").ResizeOptions} ResizeOptions
+ *
+ * @overload
+ * @param {any} param1
+ * @param {any} param2
+ * @returns {(buffer: Buffer) => Promise<Buffer>}
+ *
+ * @overload
+ * @param {Buffer} param1
+ * @param {any} param2
+ * @param {any} param3
+ * @returns {Promise<Buffer>}
+ */
+export default function format(param1, param2, param3) {
+  // Identify which overload was used.
+  let buffer;
+  let format;
+  let options;
+  if (param1 instanceof Buffer) {
+    buffer = param1;
+    format = param2;
+    options = param3;
+  } else {
+    format = param1;
+    options = param2;
+  }
+
+  const transform = (buffer) =>
+    sharp(buffer).toFormat(format, options).toBuffer();
+
+  return buffer ? transform(buffer) : transform;
 }