@weborigami/origami 0.0.45 → 0.0.47

package/exports/buildExports.js

@@ -1,6 +1,6 @@
 /** @typedef {import("@weborigami/types").AsyncTree} AsyncTree */
-import { keyMapsForExtensions, map } from "@weborigami/async-tree";
-import unpackOrigamiTemplate from "../src/builtins/@loaders/ori.js";
+import { keyFunctionsForExtensions, map } from "@weborigami/async-tree";
+import fileTypeOrigami from "../src/builtins/ori_handler.js";
 import { transformObject } from "../src/common/utilities.js";
 import PathTransform from "./PathTransform.js";
 
@@ -22,7 +22,7 @@ const templateText = `=\`// This file is generated by running buildExports.js --
 // file's export(s) in the top-level export file.
 export default async function exportFile(src) {
   const statements = await exportStatements(src);
-  const templateFn = await unpackOrigamiTemplate(templateText);
+  const templateFn = await fileTypeOrigami.unpack(templateText);
   const result = await templateFn(statements);
   return result;
 }
@@ -47,7 +47,8 @@ async function exportStatementForCode(codeBuffer, key) {
   const pathParts = path.split("/");
   pathParts.pop(); // Drop key
 
-  const exportsDefault = code.match(/^export default /m);
+  const exportsDefault =
+    code.match(/^export default /m) || code.match(/^export { default } /m);
   if (!exportsDefault) {
     // Export everything.
     return `export * from "../src/${path}";\n`;
@@ -76,12 +77,15 @@ async function exportStatementForCode(codeBuffer, key) {
     name = specialName;
   }
 
+  // Split the name into parts based on dots.
+  const nameParts = name.split(".");
+
   // Add the name to the parts.
-  exportIdentifierParts.push(name);
+  exportIdentifierParts.push(...nameParts);
 
-  // Remove the @ prefix from any parts, if present.
+  // Remove characters that can't be in JavaScript identifiers.
   exportIdentifierParts = exportIdentifierParts.map((part) =>
-    part.startsWith("@") ? part.slice(1) : part
+    part.replace(/[^a-zA-Z0-9]/g, "")
   );
 
   // Join the parts in camelCase to form the identifier.
@@ -101,8 +105,8 @@ function exportStatements(src) {
   // Map each source file to an export statement.
   const mapped = map({
     deep: true,
-    valueMap: exportStatementForCode,
-    ...keyMapsForExtensions({ sourceExtension: "js" }),
+    value: exportStatementForCode,
+    ...keyFunctionsForExtensions({ sourceExtension: "js" }),
   })(withPaths);
 
   return mapped;

package/exports/exports.js

@@ -38,27 +38,13 @@ 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 * from "../src/builtins/@loaders/css.js";
-export * from "../src/builtins/@loaders/htm.js";
-export * from "../src/builtins/@loaders/html.js";
-export { default as loadersJpeg } from "../src/builtins/@loaders/jpeg.js";
-export * from "../src/builtins/@loaders/jpg.js";
-export { default as loadersJs } from "../src/builtins/@loaders/js.js";
-export { default as loadersJson } from "../src/builtins/@loaders/json.js";
-export * from "../src/builtins/@loaders/md.js";
-export * from "../src/builtins/@loaders/mjs.js";
-export { default as loadersOri } from "../src/builtins/@loaders/ori.js";
-export { default as loadersTxt } from "../src/builtins/@loaders/txt.js";
-export { default as loadersWasm } from "../src/builtins/@loaders/wasm.js";
-export * from "../src/builtins/@loaders/xhtml.js";
-export { default as loadersYaml } from "../src/builtins/@loaders/yaml.js";
-export * from "../src/builtins/@loaders/yml.js";
 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 mkdir } from "../src/builtins/@mkdir.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";
@@ -103,19 +89,34 @@ 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";
 export { default as homeFiles } from "../src/builtins/~.js";
+export { default as csshandler } from "../src/builtins/css_handler.js";
+export { default as htmhandler } from "../src/builtins/htm_handler.js";
+export { default as htmlhandler } from "../src/builtins/html_handler.js";
+export { default as jpeghandler } from "../src/builtins/jpeg_handler.js";
+export { default as jpghandler } from "../src/builtins/jpg_handler.js";
+export { default as jshandler } from "../src/builtins/js_handler.js";
+export { default as jsonhandler } from "../src/builtins/json_handler.js";
+export { default as mdhandler } from "../src/builtins/md_handler.js";
+export { default as mjshandler } from "../src/builtins/mjs_handler.js";
+export { default as orihandler } from "../src/builtins/ori_handler.js";
+export { default as txthandler } from "../src/builtins/txt_handler.js";
+export { default as wasmhandler } from "../src/builtins/wasm_handler.js";
+export { default as xhtmlhandler } from "../src/builtins/xhtml_handler.js";
+export { default as yamlhandler } from "../src/builtins/yaml_handler.js";
+export { default as ymlhandler } from "../src/builtins/yml_handler.js";
 export { default as defaultModuleExport } from "../src/cli/defaultModuleExport.js";
 export { default as showUsage } from "../src/cli/showUsage.js";
 export { default as addValueKeyToScope } from "../src/common/addValueKeyToScope.js";
 export { default as arrowFunctionsMap } from "../src/common/arrowFunctionsMap.js";
 export { default as CommandModulesTransform } from "../src/common/CommandModulesTransform.js";
 export { default as ConstantTree } from "../src/common/ConstantTree.js";
+export { default as documentObject } from "../src/common/documentObject.js";
 export { default as ExplorableSiteTransform } from "../src/common/ExplorableSiteTransform.js";
 export { default as FilterTree } from "../src/common/FilterTree.js";
 export { default as GlobTree } from "../src/common/GlobTree.js";
 export { default as processUnpackedContent } from "../src/common/processUnpackedContent.js";
 export * from "../src/common/serialize.js";
 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";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.45",
+  "version": "0.0.47",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -13,24 +13,22 @@
   "main": "./exports/exports.js",
   "types": "./index.ts",
   "devDependencies": {
-    "@types/chai": "4.3.11",
-    "@types/mocha": "10.0.6",
-    "@types/node": "20.11.7",
-    "typescript": "5.3.3"
+    "@types/node": "20.11.27",
+    "typescript": "5.4.2"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.45",
-    "@weborigami/language": "0.0.45",
-    "@weborigami/types": "0.0.45",
+    "@weborigami/async-tree": "0.0.47",
+    "@weborigami/language": "0.0.47",
+    "@weborigami/types": "0.0.47",
     "exif-parser": "0.1.12",
     "graphviz-wasm": "3.0.1",
     "highlight.js": "11.9.0",
-    "marked": "11.1.1",
-    "marked-gfm-heading-id": "3.1.2",
-    "marked-highlight": "2.1.0",
-    "marked-smartypants": "1.1.5",
+    "marked": "12.0.1",
+    "marked-gfm-heading-id": "3.1.3",
+    "marked-highlight": "2.1.1",
+    "marked-smartypants": "1.1.6",
     "sharp": "0.33.2",
-    "yaml": "2.3.4"
+    "yaml": "2.4.1"
   },
   "scripts": {
     "build": "ori exports/buildExports.js src > exports/exports.js",

package/src/builtins/@cache.js

@@ -1,4 +1,4 @@
-import { cache, Tree } from "@weborigami/async-tree";
+import { Tree, cache } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 
@@ -19,14 +19,10 @@ export default async function cacheBuiltin(
   filterTreelike
 ) {
   assertScopeIsDefined(this, "cache");
-
-  const sourceTree = Tree.from(sourceTreelike);
   /** @type {any} */
   const cacheTree = cacheTreelike ? Tree.from(cacheTreelike) : undefined;
-  const filterTree = filterTreelike ? Tree.from(filterTreelike) : undefined;
-
   /** @type {AsyncTree} */
-  let result = cache(sourceTree, cacheTree, filterTree);
+  let result = cache(sourceTreelike, cacheTree, filterTreelike);
   result = Scope.treeWithScope(result, this);
   return result;
 }

package/src/builtins/@config.js

@@ -1,11 +1,11 @@
+import { Scope } from "@weborigami/language";
 import project from "./@project.js";
 
 /**
  * Return the configuration for the current project.
  *
- * If the project's root defines an ori.config.js file, the configuration is
- * the default export of that file. Otherwise, the configuration is the set of
- * built-in functions.
+ * The configuration is the project's config.ori file (if defined in the project
+ * root) plus the Origami builtins.
  *
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
  *
@@ -14,10 +14,17 @@ import project from "./@project.js";
  */
 export default async function config(key) {
   const projectTree = await project.call(this);
-  const scope = projectTree?.parent;
-  if (!scope) {
+  // HACK: We use specific knowledge of how @project returns a tree to get the
+  // config. We get the scope of the project's root folder, then remove that
+  // folder from the scope, leaving config + builtins.
+  /** @type {any} */
+  const projectTreeScope = Scope.getScope(projectTree);
+  const trees = projectTreeScope?.trees;
+  if (!trees) {
     return undefined;
   }
+  trees.shift();
+  const scope = new Scope(...trees);
   return key === undefined ? scope : scope.get(key);
 }
 

package/src/builtins/@crawl.js

@@ -1,5 +1,5 @@
 import {
-  ObjectTree,
+  DeepObjectTree,
   Tree,
   isPlainObject,
   keysFromPath,
@@ -94,8 +94,8 @@ export default async function crawl(treelike, baseHref) {
   // value.
   /** @type {AsyncTree} */
   let result = mergeDeep(
-    new ObjectTree(cache),
-    new (InvokeFunctionsTransform(ObjectTree))(resources)
+    new DeepObjectTree(cache),
+    new (InvokeFunctionsTransform(DeepObjectTree))(resources)
   );
   result = Scope.treeWithScope(result, this);
   return result;

package/src/builtins/@debug.js

@@ -1,4 +1,5 @@
 import { Tree, isPlainObject } from "@weborigami/async-tree";
+import { Scope } from "@weborigami/language";
 import ExplorableSiteTransform from "../common/ExplorableSiteTransform.js";
 import { isTransformApplied, transformObject } from "../common/utilities.js";
 import OriCommandTransform from "../misc/OriCommandTransform.js";
@@ -54,12 +55,18 @@ function DebugTransform(Base) {
         const original = value.unpack.bind(value);
         value.unpack = async () => {
           let content = await original();
-          if (!Tree.isTreelike(content)) {
+          if (!Tree.isTraversable(content)) {
             return content;
           }
           /** @type {any} */
           let tree = Tree.from(content);
-          tree = transformObject(ExplorableSiteTransform, tree);
+          if (!tree.parent && !tree.scope) {
+            const scope = Scope.getScope(this);
+            tree = Scope.treeWithScope(tree, scope);
+          }
+          if (!isTransformApplied(ExplorableSiteTransform, tree)) {
+            tree = transformObject(ExplorableSiteTransform, tree);
+          }
           tree = transformObject(DebugTransform, tree);
           return tree;
         };

package/src/builtins/@document.js

@@ -1,4 +1,4 @@
-import TextDocument from "../common/TextDocument.js";
+import documentObject from "../common/documentObject.js";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 
 /**
@@ -8,11 +8,9 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @this {AsyncTree|null}
  * @param {StringLike} text
  * @param {any} [data]
- * @param {AsyncTree|null} [parent]
  * @returns
  */
-export default function document(text, data, parent) {
+export default function documentBuiltin(text, data) {
   assertScopeIsDefined(this, "document");
-  const merged = Object.assign({}, data, { "@text": text });
-  return new TextDocument(merged, parent ?? this);
+  return documentObject(text, data);
 }

package/src/builtins/@fnTree.js

@@ -1,4 +1,4 @@
-import { FunctionTree } from "@weborigami/async-tree";
+import { FunctionTree, ObjectTree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import { toFunction } from "../common/utilities.js";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
@@ -29,7 +29,10 @@ export default async function fnTree(invocable, keys = []) {
 
   /** @this {AsyncTree|null} */
   async function extendedFn(key) {
-    const ambientsTree = Scope.treeWithScope({ "@key": key }, this);
+    const ambientsTree = Scope.treeWithScope(
+      new ObjectTree({ "@key": key }),
+      this
+    );
     return invocableFn.call(ambientsTree, key);
   }
 

package/src/builtins/@inline.js

@@ -1,8 +1,9 @@
-import { Tree, isPlainObject } from "@weborigami/async-tree";
+import { isUnpackable, symbols } from "@weborigami/async-tree";
 import { compile } from "@weborigami/language";
-import unpackText from "../builtins/@loaders/txt.js";
+import documentObject from "../common/documentObject.js";
+import { toString } from "../common/utilities.js";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
-import unpackOrigamiExpression from "./@loaders/ori.js";
+import fileTypeOrigami from "./ori_handler.js";
 
 /**
  * Inline any Origami expressions found inside ${...} placeholders in the input
@@ -18,33 +19,25 @@ export default async function inline(input) {
   assertScopeIsDefined(this, "inline");
 
   // Get the input text and any attached front matter.
-  let inputDocument;
-  if (input["@text"]) {
-    inputDocument = input;
-  } else if (/** @type {any} */ (input).unpack) {
-    // Have the input unpack itself.
-    inputDocument = await /** @type {any} */ (input).unpack();
-  } else {
-    // Unpack the input as a text document with possible front matter.
-    inputDocument = await unpackText(input);
+  if (isUnpackable(input)) {
+    input = await input.unpack();
   }
+  const inputIsDocument = input["@text"] !== undefined;
+  const origami = inputIsDocument ? input["@text"] : toString(input);
+  const parent = input.parent ?? input[symbols.parent];
 
-  // If the input document is a plain object or AsyncTree, we'll have it
-  // included in scope for the evaluated expression. We ignore other kinds of
-  // treelike inputs for this test: in particular, a Buffer will be interpreted
-  // as a tree, but we don't want to put a Buffer in scope.
-  const attachedData =
-    isPlainObject(inputDocument) || Tree.isAsyncTree(inputDocument)
-      ? inputDocument
-      : null;
+  // If the input document is a plain object, include it in scope for the
+  // evaluated expression.
+  const inputData = inputIsDocument ? input : null;
 
-  const templateFn = await unpackOrigamiExpression(inputDocument, {
-    attachedData,
+  const templateFn = await fileTypeOrigami.unpack(origami, {
+    attachedData: inputData,
     compiler: compile.templateDocument,
+    parent,
   });
-  const templateResult = await templateFn(inputDocument);
-  return inputDocument
-    ? Object.assign({}, inputDocument, { "@text": String(templateResult) })
+  const templateResult = await templateFn(inputData);
+  return inputIsDocument
+    ? documentObject(templateResult, inputData)
     : templateResult;
 }
 

package/src/builtins/@inners.js

@@ -1,5 +1,4 @@
 import { Tree } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
 import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
@@ -14,7 +13,7 @@ export default async function inners(treelike) {
   const tree = await getTreeArgument(this, arguments, treelike, "@inners");
 
   /** @type {AsyncTree} */
-  let result = {
+  const result = {
     async get(key) {
       const value = await tree.get(key);
       return Tree.isAsyncTree(value) ? inners.call(this, value) : undefined;
@@ -31,7 +30,6 @@ export default async function inners(treelike) {
     },
   };
 
-  result = Scope.treeWithScope(result, this);
   return result;
 }
 

package/src/builtins/@invoke.js

@@ -1,3 +1,4 @@
+import { isUnpackable } from "@weborigami/async-tree";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 import builtins from "./@builtins.js";
 
@@ -30,7 +31,7 @@ export default async function invoke(fn) {
       "An Origami function was called with an initial argument, but its value is undefined."
     );
   }
-  if (typeof fn !== "function" && fn.unpack) {
+  if (isUnpackable(fn)) {
     fn = await fn.unpack();
   }
   const scope = (await this?.get("@current")) ?? builtins;

package/src/builtins/@json.js

@@ -20,9 +20,6 @@ export default async function json(obj) {
   if (obj === undefined) {
     return undefined;
   }
-  if (typeof obj.unpack === "function") {
-    obj = await obj.unpack();
-  }
   const value = await serialize.toJsonValue(obj);
   return JSON.stringify(value, null, 2);
 }

package/src/builtins/@keysJson.js

@@ -1,5 +1,4 @@
 import { Tree, keysJson } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
 import { transformObject } from "../common/utilities.js";
 import getTreeArgument from "../misc/getTreeArgument.js";
 
@@ -13,9 +12,7 @@ import getTreeArgument from "../misc/getTreeArgument.js";
  */
 export default async function treeKeysJson(treelike) {
   const tree = await getTreeArgument(this, arguments, treelike, "@keysJson");
-  let result = transformObject(KeysJsonTransform, tree);
-  result = Scope.treeWithScope(result, this);
-  return result;
+  return transformObject(KeysJsonTransform, tree);
 }
 
 function KeysJsonTransform(Base) {

package/src/builtins/@map.js

@@ -1,8 +1,7 @@
 import {
-  cachedKeyMaps,
-  keyMapsForExtensions,
+  cachedKeyFunctions,
+  keyFunctionsForExtensions,
   map,
-  Tree,
 } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import addValueKeyToScope from "../common/addValueKeyToScope.js";
@@ -18,9 +17,9 @@ import { toFunction } from "../common/utilities.js";
  * @typedef {import("../../index.ts").TreelikeTransform} TreelikeTransform
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
  *
- * @typedef {{ deep?: boolean, description?: string, extensions?: string,
- * inverseKeyMap?: KeyFn, keyMap?: ValueKeyFn, valueMap?: ValueKeyFn }}
- * TreeMapOptions
+ * @typedef {{ deep?: boolean, description?: string, extension?: string,
+ * extensions?: string, inverseKey?: KeyFn, key?: ValueKeyFn, keyMap?:
+ * ValueKeyFn, value?: ValueKeyFn, valueFn?: ValueKeyFn }} TreeMapOptions
  *
  * @this {import("@weborigami/types").AsyncTree|null}
  *
@@ -43,7 +42,7 @@ import { toFunction } from "../common/utilities.js";
  * @returns {AsyncTree}
  */
 export default function treeMap(param1, param2) {
-  // Identify whether the valueMap/options are the first parameter
+  // Identify whether the valueFn/options are the first parameter
   // or the second.
   let source;
   let options;
@@ -62,37 +61,32 @@ export default function treeMap(param1, param2) {
     options = param2;
   }
 
-  // Identify whether the valueMap/options is a valueMap function
+  // Identify whether the valueFn/options is a valueFn function
   // or an options dictionary.
-  let valueMap;
+  let valueFn;
   if (
     typeof options === "function" ||
     typeof (/** @type {any} */ (options)?.unpack) === "function"
   ) {
-    valueMap = options;
+    valueFn = options;
     options = {};
   } else if (!options) {
     throw new TypeError(
-      `@map: You must specify a valueMap function or options dictionary.`
+      `@map: You must specify a value function or options dictionary.`
     );
   } else {
-    valueMap = options.valueMap;
+    valueFn = options.value ?? options.valueMap;
   }
 
-  let {
-    deep,
-    description,
-    extensions,
-    inverseKeyMap,
-    keyMap,
-    needsSourceValue,
-  } = options;
+  let { deep, description, inverseKey, needsSourceValue } = options;
+  let extension = options.extension ?? options.extensions;
+  let keyFn = options.keyMap ?? options.key;
 
-  description ??= `@map ${extensions ?? ""}`;
+  description ??= `@map ${extension ?? ""}`;
 
-  if (extensions && (keyMap || inverseKeyMap)) {
+  if (extension && (keyFn || inverseKey)) {
     throw new TypeError(
-      `@map: You can't specify both extensions and a keyMap or inverseKeyMap`
+      `@map: You can't specify extensions and also a key or inverseKey function`
     );
   }
 
@@ -100,8 +94,8 @@ export default function treeMap(param1, param2) {
 
   // Extend the value function to include the value and key in scope.
   let extendedValueFn;
-  if (valueMap) {
-    const resolvedValueFn = toFunction(valueMap);
+  if (valueFn) {
+    const resolvedValueFn = toFunction(valueFn);
     extendedValueFn = function (sourceValue, sourceKey, tree) {
       const scope = addValueKeyToScope(baseScope, sourceValue, sourceKey);
       return resolvedValueFn.call(scope, sourceValue, sourceKey, tree);
@@ -109,18 +103,18 @@ export default function treeMap(param1, param2) {
   }
 
   // Extend the key function to include the value and key in scope.
-  let extendedKeyMap;
-  let extendedInverseKeyMap;
-  if (extensions) {
-    let { resultExtension, sourceExtension } = parseExtensions(extensions);
-    const keyFns = keyMapsForExtensions({
+  let extendedKeyFn;
+  let extendedInverseKeyFn;
+  if (extension) {
+    let { resultExtension, sourceExtension } = parseExtensions(extension);
+    const keyFns = keyFunctionsForExtensions({
       resultExtension,
       sourceExtension,
     });
-    extendedKeyMap = keyFns.keyMap;
-    extendedInverseKeyMap = keyFns.inverseKeyMap;
-  } else if (keyMap) {
-    const resolvedKeyFn = toFunction(keyMap);
+    extendedKeyFn = keyFns.key;
+    extendedInverseKeyFn = keyFns.inverseKey;
+  } else if (keyFn) {
+    const resolvedKeyFn = toFunction(keyFn);
     async function scopedKeyFn(sourceKey, tree) {
       const sourceValue = await tree.get(sourceKey);
       const scope = addValueKeyToScope(baseScope, sourceValue, sourceKey);
@@ -132,25 +126,24 @@ export default function treeMap(param1, param2) {
       );
       return resultKey;
     }
-    const keyFns = cachedKeyMaps(scopedKeyFn);
-    extendedKeyMap = keyFns.keyMap;
-    extendedInverseKeyMap = keyFns.inverseKeyMap;
+    const keyFns = cachedKeyFunctions(scopedKeyFn);
+    extendedKeyFn = keyFns.key;
+    extendedInverseKeyFn = keyFns.inverseKey;
   } else {
-    // Use sidecar keyMap/inverseKeyMap functions if the valueMap defines them.
-    extendedKeyMap = valueMap?.keyMap;
-    extendedInverseKeyMap = valueMap?.inverseKeyMap;
+    // Use sidecar keyFn/inverseKey functions if the valueFn defines them.
+    extendedKeyFn = valueFn?.key;
+    extendedInverseKeyFn = valueFn?.inverseKey;
   }
 
   const transform = function mapTreelike(treelike) {
-    const tree = Tree.from(treelike);
     return map({
       deep,
       description,
-      inverseKeyMap: extendedInverseKeyMap,
-      keyMap: extendedKeyMap,
+      inverseKey: extendedInverseKeyFn,
+      key: extendedKeyFn,
       needsSourceValue,
-      valueMap: extendedValueFn,
-    })(tree);
+      value: extendedValueFn,
+    })(treelike);
   };
 
   return source ? transform(source) : transform;

package/src/builtins/@mapDeep.js

@@ -2,7 +2,7 @@ import { isPlainObject } from "@weborigami/async-tree";
 import treeMap from "./@map.js";
 
 export default function mapDeep(param1, param2) {
-  // Identify whether the valueMap/options are the first parameter
+  // Identify whether the valueFn/options are the first parameter
   // or the second.
   let source;
   let options;
@@ -13,7 +13,7 @@ export default function mapDeep(param1, param2) {
     if (isPlainObject(param2)) {
       options = param2;
     } else {
-      options = { valueMap: param2 };
+      options = { value: param2 };
     }
   }
 

package/src/builtins/@mdHtml.js

@@ -1,9 +1,11 @@
+import { isUnpackable } from "@weborigami/async-tree";
 import highlight from "highlight.js";
 import { marked } from "marked";
 import { gfmHeadingId as markedGfmHeadingId } from "marked-gfm-heading-id";
 import { markedHighlight } from "marked-highlight";
 import { markedSmartypants } from "marked-smartypants";
-import { replaceExtension } from "../common/utilities.js";
+import documentObject from "../common/documentObject.js";
+import { replaceExtension, toString } from "../common/utilities.js";
 
 marked.use(
   markedGfmHeadingId(),
@@ -31,20 +33,17 @@ marked.use(
  * @param {StringLike|UnpackableStringlike} input
  */
 export default async function mdHtml(input) {
-  if (/** @type {any} */ (input).unpack) {
-    input = await /** @type {any} */ (input).unpack();
+  if (isUnpackable(input)) {
+    input = await input.unpack();
   }
-  const inputDocument = input["@text"] ? input : null;
-  const markdown = inputDocument?.["@text"] ?? String(input);
+  const inputIsDocument = input["@text"] !== undefined;
+  const markdown = inputIsDocument ? input["@text"] : toString(input);
   const html = marked(markdown);
-  return inputDocument
-    ? Object.assign({}, inputDocument, { "@text": html })
-    : html;
+  return inputIsDocument ? documentObject(html, input) : html;
 }
 
-mdHtml.keyMap = (sourceKey) => replaceExtension(sourceKey, ".md", ".html");
-mdHtml.inverseKeyMap = (resultKey) =>
-  replaceExtension(resultKey, ".html", ".md");
+mdHtml.key = (sourceKey) => replaceExtension(sourceKey, ".md", ".html");
+mdHtml.inverseKey = (resultKey) => replaceExtension(resultKey, ".html", ".md");
 
 mdHtml.usage = `@mdHtml <markdown>\tRender the markdown text as HTML`;
 mdHtml.documentation = "https://weborigami.org/language/@mdHtml.html";