@weborigami/origami 0.0.40 → 0.0.42

package/src/builtins/{@tree/shuffle.js → @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 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
@@ -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, "@shuffle");
 
   /** @type {AsyncTree} */
   let shuffled = transformObject(ShuffleTransform, tree);
@@ -27,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,8 +1,7 @@
-import { Tree } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.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">
@@ -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, "@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,25 +1,23 @@
-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.
  *
  * @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) {
-  assertScopeIsDefined(this);
-  treelike = treelike ?? (await this?.get("@current"));
-  const tree = Tree.from(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 { 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 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,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} 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, "@sortBy");
 
   const fn = toFunction(sortKeyFn);
   const baseScope = Scope.getScope(this);
@@ -35,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 assertScopeIsDefined from "../../misc/assertScopeIsDefined.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,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, "@static");
   let result = transformObject(StaticTransform, tree);
   result = Scope.treeWithScope(result, this);
   return result;
@@ -47,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,7 +1,6 @@
-import { Tree } from "@weborigami/async-tree";
 import graphviz from "graphviz-wasm";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
-import dot from "./@tree/dot.js";
+import getTreeArgument from "../misc/getTreeArgument.js";
+import dot from "../misc/treeDot.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, "@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 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, "@table");
   const firstValue = await valueForFirstKey(tree);
   if (Tree.isAsyncTree(firstValue)) {
     return fullTable(tree, firstValue);
@@ -70,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";

package/src/builtins/{@tree/take.js → @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, "@take");
 
   /** @type {AsyncTree} */
   let takeTree = {
@@ -36,5 +30,5 @@ export default async function take(treelike, n) {
   return takeTree;
 }
 
-take.usage = `take tree, n\tReturn the first n items from tree`;
+take.usage = `@take tree, n\tReturn the first n items from tree`;
 take.documentation = "https://weborigami.org/cli/builtins.html#take";

package/src/builtins/@tree.js

@@ -0,0 +1,19 @@
+import { Scope } from "@weborigami/language";
+import getTreeArgument from "../misc/getTreeArgument.js";
+
+/**
+ * Cast the indicated treelike to a tree.
+ *
+ * @typedef  {import("@weborigami/types").AsyncTree} AsyncTree
+ * @typedef {import("@weborigami/async-tree").Treelike} Treelike
+ * @this {AsyncTree|null}
+ * @param {Treelike} [treelike]
+ */
+export default async function tree(treelike) {
+  let tree = await getTreeArgument(this, arguments, treelike, "@tree");
+  tree = Scope.treeWithScope(tree, this);
+  return tree;
+}
+
+tree.usage = `@tree <treelike>\tConvert JSON, YAML, function, or plain object to a tree`;
+tree.documentation = "https://weborigami.org/cli/builtins.html#tree";

package/src/builtins/@treeHttp.js

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

package/src/builtins/@treeHttps.js

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

package/src/builtins/@unpack.js

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

package/src/builtins/{@tree/values.js → @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,14 +10,9 @@ 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, "@values");
   return Tree.values(tree);
 }
 
-values.usage = `values <tree>\tThe top-level values in the tree`;
+values.usage = `@values <tree>\tThe top-level values in the tree`;
 values.documentation = "https://weborigami.org/cli/builtins.html#values";

package/src/builtins/{@tree/valuesDeep.js → @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,14 +10,10 @@ 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, "@valuesDeep");
+  return Tree.mapReduce(tree, null, async (values) => values.flat());
 }
 
-valuesDeep.usage = `valuesDeep <tree>\tThe in-order tree values as a flat array`;
+valuesDeep.usage = `@valuesDeep <tree>\tThe in-order tree values as a flat array`;
 valuesDeep.documentation =
   "https://weborigami.org/cli/builtins.html#valuesDeep";

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");
 
   // Watch the indicated tree.
-  /** @type {any} */
-  const container = Tree.from(treelike);
   await /** @type {any} */ (container).watch?.();
 
   // // Watch trees in scope.

package/src/builtins/@with.js

@@ -14,7 +14,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param  {Invocable} invocable
  */
 export default function withTree(treelike, invocable) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "with");
   const tree = Tree.from(treelike);
   const fn = toFunction(invocable);
   const scope = new Scope(tree, this);

package/src/builtins/@yaml.js

@@ -10,7 +10,13 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {any} [obj]
  */
 export default async function toYaml(obj) {
-  assertScopeIsDefined(this);
+  assertScopeIsDefined(this, "yaml");
+  // 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/{@tree/map.d.ts → map.d.ts}

@@ -1,6 +1,6 @@
 import { KeyFn, Treelike, ValueKeyFn } from "@weborigami/async-tree";
 import { AsyncTree } from "@weborigami/types";
-import { TreelikeTransform } from "../../../index.ts";
+import { TreelikeTransform } from "../../index.ts";
 
 type TreeMapOptions = {
   deep?: boolean;
@@ -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/cli/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { ObjectTree, Tree } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
+import { Scope, formatError } from "@weborigami/language";
 import path from "node:path";
 import process, { stdout } from "node:process";
 import ori from "../builtins/@ori.js";
@@ -75,19 +75,6 @@ while (args[0] === "") {
 try {
   await main(...args);
 } catch (/** @type {any} */ error) {
-  // Work up to the root cause, displaying intermediate messages as we go up.
-  if (!error.cause && !error.stack) {
-    console.error(error.message);
-  } else {
-    while (error.cause) {
-      console.error(error.message);
-      error = error.cause;
-    }
-  }
-  if (error.stack) {
-    // Display stack trace for root cause, under the theory that that's the most
-    // useful place to look for the problem.
-    console.error(error.stack);
-  }
+  console.error(formatError(error));
   process.exitCode = 1;
 }

package/src/common/ExplorableSiteTransform.js

@@ -37,10 +37,12 @@ export default function ExplorableSiteTransform(Base) {
       if (value === undefined) {
         // The tree doesn't have the key; try the defaults.
         const scope = Scope.getScope(this);
-        if (key === "index.html") {
-          value = await index.call(scope, this);
-        } else if (key === ".keys.json") {
-          value = await keysJson.stringify(this);
+        if (scope) {
+          if (key === "index.html") {
+            value = await index.call(scope, this);
+          } else if (key === ".keys.json") {
+            value = await keysJson.stringify(this);
+          }
         }
       }
 

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,13 +24,8 @@ 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;
+    const boundFn = fn.bind(extendedScope);
+    return boundFn;
   } else if (
     Tree.isAsyncTree(content) &&
     !(/** @type {any} */ (content).scope)

package/src/misc/assertScopeIsDefined.js

@@ -1,7 +1,7 @@
-export default function assertScopeIsDefined(scope) {
+export default function assertScopeIsDefined(scope, methodName) {
   if (scope === undefined) {
     throw new Error(
-      "Tree methods must be called a scope. If you don't want to pass a scope, invoke with: <methodName>.call(null)"
+      `${methodName} must be called with a scope. If you don't want to pass a scope, invoke with: ${methodName}.call(null)`
     );
   }
 }

package/src/misc/getTreeArgument.js

@@ -0,0 +1,51 @@
+import { Tree } from "@weborigami/async-tree";
+import { isTreelike } from "@weborigami/async-tree/src/Tree.js";
+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
+ * @param {string} methodName
+ * @returns {Promise<AsyncTree>}
+ */
+export default async function getTreeArgument(
+  scope,
+  args,
+  treelike,
+  methodName
+) {
+  assertScopeIsDefined(scope);
+
+  if (treelike !== undefined) {
+    if (isTreelike(treelike)) {
+      return Tree.from(treelike);
+    }
+    throw new Error(
+      `${methodName}: The first argument must be a tree, like an array, object, or files.`
+    );
+  }
+
+  if (args.length === 0) {
+    if (!scope) {
+      // Should never happen because assertScopeIsDefined throws an exception.
+      throw new Error(
+        `${methodName} was called with no tree argument and no scope.`
+      );
+    }
+    return scope.get("@current");
+  }
+
+  throw new Error(`${methodName}: The first argument was undefined.`);
+}

package/src/{builtins/@tree/dot.js → misc/treeDot.js}

@@ -1,11 +1,7 @@
 import { Tree, isPlainObject, isStringLike } from "@weborigami/async-tree";
 import { extname } from "@weborigami/language";
-import * as serialize from "../../common/serialize.js";
-import {
-  hasNonPrintableCharacters,
-  keySymbol,
-} from "../../common/utilities.js";
-import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
+import * as serialize from "../common/serialize.js";
+import { hasNonPrintableCharacters, keySymbol } from "../common/utilities.js";
 
 /**
  * Render a tree in DOT format.
@@ -19,11 +15,6 @@ 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 rootLabel = tree[keySymbol] ?? "";
   const treeArcs = await statements(tree, "", rootLabel, options);