@weborigami/origami 0.0.38 → 0.0.39

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021–2023 Jan Miksovsky and other contributors
+Copyright (c) 2024 Jan Miksovsky and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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/orit.js";
+import unpackOrigamiTemplate from "../src/builtins/@loaders/ori.js";
 import { transformObject } from "../src/common/utilities.js";
 import PathTransform from "./PathTransform.js";
 
@@ -14,8 +14,8 @@ const specialBuiltinNames = {
 };
 
 // Top-level template for the export file
-const templateText = `// This file is generated by running buildExports.js -- do not edit by hand.
-{{ _ }}`;
+const templateText = `=\`// This file is generated by running buildExports.js -- do not edit by hand.
+{{ _ }}\``;
 
 // Generate a top-level export file for the entire project. For each .js file in
 // the given source tree, generate an appropriate statement that includes that

package/exports/exports.js

@@ -1,6 +1,7 @@
 // This file is generated by running buildExports.js -- do not edit by hand.
 export { default as apply } from "../src/builtins/@apply.js";
 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 config } from "../src/builtins/@config.js";
@@ -10,6 +11,7 @@ export { default as debug } from "../src/builtins/@debug.js";
 export { default as document } from "../src/builtins/@document.js";
 export { default as equals } from "../src/builtins/@equals.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 globs } from "../src/builtins/@globs.js";
@@ -33,19 +35,21 @@ export { default as loadersJson } from "../src/builtins/@loaders/json.js";
 export { default as loadersMd } from "../src/builtins/@loaders/md.js";
 export { default as loadersMjs } from "../src/builtins/@loaders/mjs.js";
 export { default as loadersOri } from "../src/builtins/@loaders/ori.js";
-export { default as loadersOrit } from "../src/builtins/@loaders/orit.js";
 export { default as loadersTxt } from "../src/builtins/@loaders/txt.js";
 export { default as loadersXhtml } from "../src/builtins/@loaders/xhtml.js";
 export { default as loadersYaml } from "../src/builtins/@loaders/yaml.js";
 export { default as loadersYml } 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 node } from "../src/builtins/@node.js";
 export { default as not } from "../src/builtins/@not.js";
+export { default as once } from "../src/builtins/@once.js";
 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 parseJson } from "../src/builtins/@parse/json.js";
 export { default as parseYaml } from "../src/builtins/@parse/yaml.js";
 export { default as project } from "../src/builtins/@project.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -13,23 +13,23 @@
   "main": "./exports/exports.js",
   "types": "./index.ts",
   "devDependencies": {
-    "@types/chai": "4.3.9",
-    "@types/mocha": "10.0.3",
-    "@types/node": "20.8.10",
-    "typescript": "5.2.2"
+    "@types/chai": "4.3.11",
+    "@types/mocha": "10.0.6",
+    "@types/node": "20.11.3",
+    "typescript": "5.3.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "*",
-    "@weborigami/language": "*",
-    "@weborigami/types": "0.0.38",
+    "@weborigami/async-tree": "0.0.39",
+    "@weborigami/language": "0.0.39",
+    "@weborigami/types": "0.0.39",
     "graphviz-wasm": "3.0.1",
     "highlight.js": "11.9.0",
-    "marked": "9.1.5",
-    "marked-gfm-heading-id": "3.1.0",
-    "marked-highlight": "2.0.6",
-    "marked-smartypants": "1.1.3",
-    "sharp": "0.32.6",
-    "yaml": "2.3.3"
+    "marked": "11.1.1",
+    "marked-gfm-heading-id": "3.1.2",
+    "marked-highlight": "2.1.0",
+    "marked-smartypants": "1.1.5",
+    "sharp": "0.33.2",
+    "yaml": "2.3.4"
   },
   "scripts": {
     "build": "ori exports/buildExports.js src > exports/exports.js",

package/src/builtins/@basename.js

@@ -0,0 +1,6 @@
+import { extname } from "@weborigami/language";
+
+export default function basename(key) {
+  const ext = extname(key);
+  return ext ? key.slice(0, -ext.length) : key;
+}

package/src/builtins/@explore.js

@@ -16,7 +16,7 @@ const miscFiles = Scope.treeWithScope(new OrigamiFiles(miscDir), builtins);
  */
 export default async function explore() {
   const scope = Scope.getScope(this);
-  const templateFile = await miscFiles.get("explore.orit");
+  const templateFile = await miscFiles.get("explore.ori");
   const template = await templateFile.unpack();
 
   const data = await getScopeData(scope);

package/src/builtins/@fetch.js

@@ -0,0 +1,7 @@
+export default async function fetchBuiltin(href) {
+  const response = await fetch(href);
+  return response.ok ? await response.arrayBuffer() : undefined;
+}
+
+fetchBuiltin.usage = `@fetch href\tReturns the contents of the given URL as an ArrayBuffer`;
+fetchBuiltin.documentation = "https://weborigami.org/languages/@fetch.html";

package/src/builtins/@inline.js

@@ -1,5 +1,7 @@
+import unpackText from "../builtins/@loaders/txt.js";
+import * as utilities from "../common/utilities.js";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
-import unpackOrigamiTemplate from "./@loaders/orit.js";
+import unpackOrigamiExpression from "./@loaders/ori.js";
 
 /**
  * Inline any Origami expressions found inside {{...}} placeholders in the input
@@ -13,16 +15,30 @@ import unpackOrigamiTemplate from "./@loaders/orit.js";
  */
 export default async function inline(input) {
   assertScopeIsDefined(this);
-  if (/** @type {any} */ (input).unpack) {
-    input = await /** @type {any} */ (input).unpack();
+
+  // 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);
   }
-  const inputDocument = input["@text"] ? input : null;
-  const templateInput = inputDocument ?? input;
-  const templateFn = await unpackOrigamiTemplate(templateInput);
-  const text = await templateFn(inputDocument);
+
+  // Treat the input text as the body of an Origami template literal.
+  const inputText = utilities.toString(inputDocument);
+  const templateDocument = Object.assign({}, inputDocument, {
+    "@text": `=\`${inputText}\``,
+  });
+
+  const templateFn = await unpackOrigamiExpression(templateDocument);
+  const templateResult = await templateFn(inputDocument);
   return inputDocument
-    ? Object.assign({}, inputDocument, { "@text": String(text) })
-    : text;
+    ? Object.assign({}, inputDocument, { "@text": String(templateResult) })
+    : templateResult;
 }
 
 inline.usage = `@inline <text>\tInline Origami expressions found in the text`;

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

@@ -1,6 +1,7 @@
 import { Scope } from "@weborigami/language";
 import * as compile from "../../../../language/src/compiler/compile.js";
 import processUnpackedContent from "../../common/processUnpackedContent.js";
+import * as utilities from "../../common/utilities.js";
 import builtins from "../@builtins.js";
 
 /**
@@ -8,14 +9,20 @@ import builtins from "../@builtins.js";
  *
  * @type {import("@weborigami/language").FileUnpackFunction}
  */
-export default async function unpackOrigamiExpression(input, options = {}) {
-  const parent = options.parent ?? null;
+export default async function unpackOrigamiExpression(
+  inputDocument,
+  options = {}
+) {
+  const parent =
+    options.parent ??
+    /** @type {any} */ (inputDocument).parent ??
+    /** @type {any} */ (inputDocument)[utilities.parentSymbol];
 
   // Compile the body text as an Origami expression and evaluate it.
-  const text = String(input);
-  const fn = compile.expression(text);
+  const inputText = utilities.toString(inputDocument);
+  const fn = compile.expression(inputText);
   const parentScope = parent ? Scope.getScope(parent) : builtins;
   let content = await fn.call(parentScope);
 
-  return processUnpackedContent(content, parent);
+  return processUnpackedContent(content, parent, inputDocument);
 }

package/src/builtins/@map.js

@@ -74,6 +74,7 @@ export default function treeMap(param1, param2) {
     inverseKeyMap,
     keyMap,
     keyName,
+    needsSourceValue,
     valueName,
   } = options;
 
@@ -105,7 +106,7 @@ export default function treeMap(param1, param2) {
 
   // Extend the key function to include the value and key in scope.
   let extendedKeyMap;
-  let extendedInnerKeyMap;
+  let extendedInverseKeyMap;
   if (extensions) {
     let { resultExtension, sourceExtension } = parseExtensions(extensions);
     const keyFns = keyMapsForExtensions({
@@ -113,7 +114,7 @@ export default function treeMap(param1, param2) {
       sourceExtension,
     });
     extendedKeyMap = keyFns.keyMap;
-    extendedInnerKeyMap = keyFns.inverseKeyMap;
+    extendedInverseKeyMap = keyFns.inverseKeyMap;
   } else if (keyMap) {
     const resolvedKeyFn = toFunction(keyMap);
     async function scopedKeyFn(sourceKey, tree) {
@@ -135,7 +136,11 @@ export default function treeMap(param1, param2) {
     }
     const keyFns = cachedKeyMaps(scopedKeyFn);
     extendedKeyMap = keyFns.keyMap;
-    extendedInnerKeyMap = keyFns.inverseKeyMap;
+    extendedInverseKeyMap = keyFns.inverseKeyMap;
+  } else {
+    // Use sidecar keyMap/inverseKeyMap functions if the valueMap defines them.
+    extendedKeyMap = valueMap?.keyMap;
+    extendedInverseKeyMap = valueMap?.inverseKeyMap;
   }
 
   const transform = function mapTreelike(treelike) {
@@ -143,8 +148,9 @@ export default function treeMap(param1, param2) {
     return map({
       deep,
       description,
-      inverseKeyMap: extendedInnerKeyMap,
+      inverseKeyMap: extendedInverseKeyMap,
       keyMap: extendedKeyMap,
+      needsSourceValue,
       valueMap: extendedValueFn,
     })(tree);
   };

package/src/builtins/@mapDeep.js

@@ -0,0 +1,22 @@
+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
+  // or the second.
+  let source;
+  let options;
+  if (param2 === undefined) {
+    options = param1;
+  } else {
+    source = param1;
+    if (isPlainObject(param2)) {
+      options = param2;
+    } else {
+      options = { valueMap: param2 };
+    }
+  }
+
+  options.deep = true;
+  return treeMap(source, options);
+}

package/src/builtins/@mdHtml.js

@@ -3,6 +3,7 @@ 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";
 
 marked.use(
   markedGfmHeadingId(),
@@ -41,5 +42,9 @@ export default async function mdHtml(input) {
     : html;
 }
 
+mdHtml.keyMap = (sourceKey) => replaceExtension(sourceKey, ".md", ".html");
+mdHtml.inverseKeyMap = (resultKey) =>
+  replaceExtension(resultKey, ".html", ".md");
+
 mdHtml.usage = `@mdHtml <markdown>\tRender the markdown text as HTML`;
 mdHtml.documentation = "https://weborigami.org/language/@mdHtml.html";

package/src/builtins/@once.js

@@ -0,0 +1,18 @@
+import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+
+const fnPromiseMap = new WeakMap();
+
+/**
+ * Evaluate the given function only once and cache the result.
+ *
+ * @typedef  {import("@weborigami/types").AsyncTree} AsyncTree
+ * @this {AsyncTree|null}
+ * @param {Function} fn
+ */
+export default async function once(fn) {
+  assertScopeIsDefined(this);
+  if (!fnPromiseMap.has(fn)) {
+    fnPromiseMap.set(fn, fn.call(this));
+  }
+  return fnPromiseMap.get(fn);
+}

package/src/builtins/@ori.js

@@ -39,7 +39,11 @@ export default async function ori(expression) {
 }
 
 async function formatResult(result) {
-  if (typeof result === "string" || result instanceof TypedArray) {
+  if (
+    typeof result === "string" ||
+    result instanceof ArrayBuffer ||
+    result instanceof TypedArray
+  ) {
     // Use as is
     return result;
   }

package/src/builtins/@package.js

@@ -0,0 +1,28 @@
+import { Tree, keysFromPath } from "@weborigami/async-tree";
+import { Scope } from "@weborigami/language";
+import project from "./@project.js";
+
+/**
+ * @this {import("@weborigami/types").AsyncTree|null}
+ * @param {string[]} packageKeys
+ */
+export default async function packageBuiltin(...packageKeys) {
+  let scope = this;
+  if (!scope) {
+    const projectRoot = await project.call(null);
+    scope = Scope.getScope(projectRoot);
+  }
+  const packageRoot = await Tree.traverse(
+    // @ts-ignore
+    scope,
+    "node_modules",
+    ...packageKeys
+  );
+  const mainPath = await Tree.traverse(packageRoot, "package.json", "main");
+  const mainKeys = keysFromPath(mainPath);
+  const mainContainerKeys = mainKeys.slice(0, -1);
+  const mainFileName = mainKeys[mainKeys.length - 1];
+  const mainContainer = await Tree.traverse(packageRoot, ...mainContainerKeys);
+  const packageExports = await mainContainer.import(mainFileName);
+  return packageExports;
+}

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

@@ -1,7 +1,10 @@
 import { Tree, isPlainObject, isStringLike } from "@weborigami/async-tree";
 import { extname } from "@weborigami/language";
 import * as serialize from "../../common/serialize.js";
-import { keySymbol } from "../../common/utilities.js";
+import {
+  hasNonPrintableCharacters,
+  keySymbol,
+} from "../../common/utilities.js";
 import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
 
 /**
@@ -36,12 +39,6 @@ ${treeArcs.join("\n")}
 }`;
 }
 
-// Return true if the text appears to contain non-printable binary characters.
-function probablyBinary(text) {
-  // https://stackoverflow.com/a/1677660/76472
-  return /[\x00-\x08\x0E-\x1F]/.test(text);
-}
-
 async function statements(tree, nodePath, nodeLabel, options) {
   let result = [];
   const createLinks = options.createLinks ?? true;
@@ -110,7 +107,7 @@ async function statements(tree, nodePath, nodeLabel, options) {
   let i = 0;
   for (const key of Object.keys(nodes)) {
     let label = String(nodes[key].label);
-    if (probablyBinary(label)) {
+    if (hasNonPrintableCharacters(label)) {
       nodes[key].label = "[binary data]";
     } else if (label) {
       let clippedStart = false;

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

@@ -1,10 +1,10 @@
 import { Tree } from "@weborigami/async-tree";
 import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
 import builtins from "../@builtins.js";
-import unpackOrigamiTemplate from "../@loaders/orit.js";
+import unpackOrigamiExpression from "../@loaders/ori.js";
 import paths from "./paths.js";
 
-const templateText = `<?xml version="1.0" encoding="UTF-8"?>
+const templateText = `=\`<?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 {{ @map(=\`
   <url>
@@ -12,6 +12,7 @@ const templateText = `<?xml version="1.0" encoding="UTF-8"?>
   </url>
 \`)(_) }}
 </urlset>
+\`
 `;
 
 /**
@@ -50,7 +51,7 @@ export default async function sitemap(treelike, baseHref = "") {
     .filter((path) => path.endsWith(".html"))
     .map((path) => (path.endsWith("index.html") ? path.slice(0, -10) : path));
 
-  const templateFn = await unpackOrigamiTemplate(templateText);
+  const templateFn = await unpackOrigamiExpression(templateText);
   const templateResult = await templateFn.call(builtins, htmlPaths);
   return String(templateResult);
 }

package/src/cli/cli.js

@@ -9,6 +9,8 @@ import project from "../builtins/@project.js";
 import { keySymbol } from "../common/utilities.js";
 import showUsage from "./showUsage.js";
 
+const TypedArray = Object.getPrototypeOf(Uint8Array);
+
 async function main(...args) {
   const expression = args.join(" ");
 
@@ -42,7 +44,12 @@ async function main(...args) {
   const scope = Scope.getScope(tree);
   const result = await ori.call(scope, expression);
   if (result !== undefined) {
-    const output = result instanceof Buffer ? result : String(result);
+    const output =
+      result instanceof ArrayBuffer
+        ? new Uint8Array(result)
+        : typeof result === "string" || result instanceof TypedArray
+        ? result
+        : String(result);
     await stdout.write(output);
 
     // If stdout points to the console, and the result didn't end in a newline,

package/src/common/processUnpackedContent.js

@@ -10,17 +10,19 @@ import builtins from "../builtins/@builtins.js";
  *
  * @param {any} content
  * @param {AsyncTree|null} parent
- * @param {any} [attachedData]
+ * @param {any} [inputDocument]
  * @returns
  */
-export default function processUnpackedContent(content, parent, attachedData) {
+export default function processUnpackedContent(content, parent, inputDocument) {
   if (typeof content === "function") {
     // Wrap the function such to add ambients to the scope.
     const fn = content;
 
     // Use the parent's scope, adding any attached data.
     const parentScope = parent ? Scope.getScope(parent) : builtins;
-    const extendedScope = new Scope(attachedData, parentScope);
+    const extendedScope = Tree.isTreelike(inputDocument)
+      ? new Scope(inputDocument, parentScope)
+      : parentScope;
 
     /** @this {AsyncTree|null} */
     async function extendScope(input, ...rest) {

package/src/common/utilities.d.ts

@@ -1,7 +1,9 @@
 
 export const keySymbol: unique symbol;
 export const parentSymbol: unique symbol;
+export function hasNonPrintableCharacters(text: string): boolean;
 export function isTransformApplied(Transform: Function, object: any): boolean;
+export function replaceExtension(key: string, sourceExtension: string, resultExtension: string): string;
 export function toFunction(object: any): Function;
 export function toString(object: any): string|null;
 export function transformObject(Transform: Function, object: any): any;

package/src/common/utilities.js

@@ -3,6 +3,13 @@ import { Tree, isPlainObject, isStringLike } from "@weborigami/async-tree";
 const textDecoder = new TextDecoder();
 const TypedArray = Object.getPrototypeOf(Uint8Array);
 
+// Return true if the text appears to contain non-printable binary characters;
+// used to infer whether a file is binary or text.
+export function hasNonPrintableCharacters(text) {
+  // https://stackoverflow.com/a/1677660/76472
+  return /[\x00-\x08\x0E-\x1F]/.test(text);
+}
+
 export function isTransformApplied(Transform, obj) {
   let transformName = Transform.name;
   if (!transformName) {
@@ -25,6 +32,22 @@ export const keySymbol = Symbol("key");
 
 export const parentSymbol = Symbol("parent");
 
+/**
+ * If the given key ends in the source extension (which will generally include a
+ * period), replace that extension with the result extension (which again should
+ * generally include a period). Otherwise, return the key as is.
+ *
+ * @param {string} key
+ * @param {string} sourceExtension
+ * @param {string} resultExtension
+ */
+export function replaceExtension(key, sourceExtension, resultExtension) {
+  if (!key.endsWith(sourceExtension)) {
+    return key;
+  }
+  return key.slice(0, -sourceExtension.length) + resultExtension;
+}
+
 /**
  * Convert the given object to a function.
  *
@@ -80,7 +103,9 @@ export function toString(object) {
     return object["@text"];
   } else if (object instanceof ArrayBuffer || object instanceof TypedArray) {
     // Serialize data as UTF-8.
-    return textDecoder.decode(object);
+    const decoded = textDecoder.decode(object);
+    // If the result has non-printable characters, it's probably not a string.
+    return hasNonPrintableCharacters(decoded) ? null : decoded;
   } else if (isStringLike(object)) {
     return String(object);
   } else {

package/src/misc/explore.css

@@ -0,0 +1,88 @@
+* {
+  box-sizing: border-box;
+}
+
+html {
+  height: 100%;
+}
+
+body {
+  background: #333;
+  color: #eee;
+  display: grid;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  grid-template-columns: 200px 1fr;
+  grid-template-rows: minMax(0, 1fr);
+  height: 100%;
+  margin: 0;
+  overflow: hidden;
+}
+
+nav {
+  display: grid;
+  gap: 1em;
+  grid-auto-rows: min-content;
+  grid-template-columns: minmax(0, 1fr);
+  overflow: auto;
+  padding: 1em 0.5em;
+}
+
+#label {
+  font-weight: bold;
+}
+
+#scopeToolbar {
+  display: grid;
+  grid-template-columns: repeat(4, auto);        
+}
+
+button {
+  background: transparent;
+  border: solid 1px #555;
+  color: inherit;
+  font-size: smaller;
+  font-family: inherit;
+  font-weight: inherit;
+  padding: 0.25em;
+}
+button:hover {
+  border-color: #999;
+}
+button:active {
+  border-color: #eee;
+}
+button[aria-pressed="true"] {
+  background: #555;
+}
+
+ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+h2 {
+  color: #999;
+  font-size: inherit;
+  margin: 0.25em 0;
+  padding-left: 0.25em;
+}
+
+li {
+  padding: 0.25em;
+  padding-left: 1em;
+  text-indent: -0.75em;
+}
+
+a {
+  color: inherit;
+  text-decoration: none;
+}
+
+iframe {
+  background: white;
+  border: none;
+  height: 100%;
+  width: 100%;
+}

package/src/misc/explore.js.inline

@@ -0,0 +1,119 @@
+let defaultPath;
+let frame;
+
+const modes = {
+  Content: "",
+  Index: "!@index",
+  YAML: "!@yaml",
+  SVG: "!@svg",
+};
+
+// Extract the path from the URL hash.
+function getPathFromHash() {
+  return window.location.hash.slice(1); // Remove `#`
+}
+
+function getModeFromLocation() {
+  const href = document.location.href;
+  const match = /[\/](?<command>\!(?:@index|@yaml|@svg))$/.exec(href);
+  const command = match?.groups?.command ?? "";
+  const mode =
+    Object.keys(modes).find((key) => modes[key] === command) ?? "Content";
+  return mode;
+}
+
+function removeDocumentPath(path) {
+  const documentPath = document.location.pathname;
+  if (path.startsWith(documentPath)) {
+    // Remove the document path prefix.
+    path = path.slice(documentPath.length);
+  }
+  if (path.startsWith("/")) {
+    // Remove the leading slash.
+    path = path.slice(1);
+  }
+  return path;
+}
+
+function selectMode(newMode) {
+  const currentMode = getModeFromLocation();
+  if (newMode !== currentMode) {
+    let newPath = removeDocumentPath(frame.contentDocument.location.pathname);
+    const currentExtension = modes[currentMode];
+    if (currentExtension && newPath.endsWith(currentExtension)) {
+      // Remove the current extension.
+      newPath = newPath.slice(0, -currentExtension.length);
+    }
+    const newExtension = modes[newMode];
+    const separator = newPath.endsWith("/") ? "" : "/";
+    const newFullPath = `${newPath}${separator}${newExtension}`;
+    setPath(newFullPath);
+  }
+}
+
+function setPath(path) {
+  // Show the indicated page in the frame.
+  const abbreviatedPath = `/${path}`;
+  const fullPath = `${document.location.pathname}/${path}`;
+  const framePathname = frame.contentDocument.location.pathname;
+  if (framePathname !== abbreviatedPath && framePathname !== fullPath) {
+    // Use `replace` to avoid affecting browser history.
+    frame.contentWindow.location.replace(fullPath);
+  }
+
+  // If the path ends with a file name corresponding to a mode, select
+  // the corresponding mode button.
+  const mode = getModeFromLocation();
+  const selectedButtonId = `button${mode}`;
+  scopeToolbar.querySelectorAll("button").forEach((button) => {
+    const pressed = button.id === selectedButtonId ? "true" : "false";
+    button.setAttribute("aria-pressed", pressed);
+  });
+}
+
+// When hash changes, load the indicated page.
+window.addEventListener("hashchange", () => {
+  const hashPath = getPathFromHash();
+  const newPath = hashPath !== undefined ? hashPath : defaultPath;
+  if (newPath) {
+    setPath(newPath);
+  }
+});
+
+// Initialize
+window.addEventListener("load", () => {
+  // Refresh title on page load.
+  frame = document.getElementById("frame");
+  frame.addEventListener("load", () => {
+    if (frame.contentDocument.location.href !== "about:blank") {
+      document.title = frame.contentDocument.title;
+      const newPath = removeDocumentPath(
+        frame.contentDocument.location.pathname
+      );
+      const hash = `#${newPath}`;
+      if (window.location.hash !== hash) {
+        // Use `replace` to avoid affecting browser history.
+        window.location.replace(hash);
+      }
+    }
+  });
+
+  buttonContent.addEventListener("click", () => {
+    selectMode("Content");
+  });
+  buttonIndex.addEventListener("click", () => {
+    selectMode("Index");
+  });
+  buttonYAML.addEventListener("click", () => {
+    selectMode("YAML");
+  });
+  buttonSVG.addEventListener("click", () => {
+    selectMode("SVG");
+  });
+
+  // Navigate to any path already in the hash.
+  defaultPath = getPathFromHash();
+  if (defaultPath) {
+    setPath(defaultPath);
+  }
+});

package/src/misc/explore.ori

@@ -0,0 +1,33 @@
+=`<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <title>Web Origami Explorer</title>
+    <style>{{ explore.css }}</style>
+    <script>{{ explore.js.inline }}</script>
+  </head>
+  <body>
+    <nav>
+    <div id="label">Web Origami Explorer</div>
+    <div id="scopeToolbar">
+      <button id="buttonContent">Content</button>
+      <button id="buttonIndex">Index</button>
+      <button id="buttonSVG">SVG</button>
+      <button id="buttonYAML">YAML</button>
+    </div>
+    {{ @map(=`
+      <ul>
+        <h2>{{ _/name }}</h2>
+        {{ @map(=`
+        <li>
+          <a href="./!@explore/{{ _ }}" target="frame">{{ _ }}</a>
+        </li>
+        `)(_/keys) }}
+      </ul>
+    `)(_) }}
+    </nav>
+    <iframe id="frame" name="frame"></iframe>
+  </body>
+</html>
+`

package/src/server/server.js

@@ -7,6 +7,7 @@ import {
 } from "@weborigami/async-tree";
 import { Scope, extname } from "@weborigami/language";
 import * as serialize from "../common/serialize.js";
+import { toString } from "../common/utilities.js";
 import { mediaTypeForExtension, mediaTypeIsText } from "./mediaTypes.js";
 
 const TypedArray = Object.getPrototypeOf(Uint8Array);
@@ -53,11 +54,14 @@ export async function handleRequest(request, response, tree) {
   // For parsing purposes, we assume HTTPS -- it doesn't affect parsing.
   const url = new URL(request.url, `https://${request.headers.host}`);
 
-  // We allow the use of %2F in paths as a way to insert a slash into a key, so
-  // we parse the path into keys first, then decode them.
-  const keys = keysFromPath(url.pathname).map((key) =>
-    typeof key === "string" ? decodeURIComponent(key) : key
-  );
+  // Split on occurrences of `/!`, which represent Origami debug commands.
+  // Command arguments can contain slashes; don't treat those as path keys.
+  const parts = url.pathname.split(/\/!/);
+  const keys = parts.flatMap((part, index) => {
+    const decoded = decodeURIComponent(part);
+    // Split keys that aren't commands; add back the `!` to commands.
+    return index % 2 === 0 ? keysFromPath(decoded) : `!${decoded}`;
+  });
 
   // If the path ends with a trailing slash, the final key will be an empty
   // string. Change that to "index.html".
@@ -131,7 +135,7 @@ export async function handleRequest(request, response, tree) {
 
   let data;
   if (mediaType) {
-    data = mediaTypeIsText[mediaType] ? String(resource) : resource;
+    data = mediaTypeIsText[mediaType] ? toString(resource) : resource;
   } else {
     data = textOrObject(resource);
   }
@@ -152,7 +156,7 @@ export async function handleRequest(request, response, tree) {
   const validResponse = typeof data === "string" || data instanceof TypedArray;
 
   if (!validResponse) {
-    const typeName = data.constructor?.name ?? typeof data;
+    const typeName = data?.constructor?.name ?? typeof data;
     console.error(
       `A served tree must return a string or a TypedArray (such as a Buffer) but returned an instance of ${typeName}.`
     );
@@ -233,26 +237,12 @@ ${message}
  * Convert to a string if we can, but leave objects that convert to something
  * like "[object Object]" alone.
  *
- * @param {any} obj
+ * @param {any} object
  */
-function textOrObject(obj) {
-  if (typeof obj === "string") {
-    // Return string as is.
-    return obj;
-  }
-
-  // See if we can convert the object to a string.
-  const text = String(obj);
-
-  // See if we ended up with a default string.
-  const constructor = obj.constructor;
-  const name = constructor.name || "Object";
-  if (text === `[object Object]` || text === `[object ${name}]`) {
-    // Got a default string, so probably not what we wanted.
-    // Return original object.
-    return obj;
-  } else {
-    // We appear to have cast the object to a string; return that.
-    return text;
+function textOrObject(object) {
+  // Return buffers and typed arrays as is.
+  if (object instanceof ArrayBuffer || object instanceof TypedArray) {
+    return object;
   }
+  return toString(object);
 }

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

@@ -1,48 +0,0 @@
-import { Scope } from "@weborigami/language";
-import * as compile from "../../../../language/src/compiler/compile.js";
-import processUnpackedContent from "../../common/processUnpackedContent.js";
-import * as utilities from "../../common/utilities.js";
-import builtins from "../@builtins.js";
-import unpackText from "./txt.js";
-
-/**
- * Load and evaluate an Origami template from a file.
- *
- * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
- * @type {import("@weborigami/language").FileUnpackFunction}
- */
-export default async function unpackOrigamiTemplate(input, options = {}) {
-  const parent =
-    options.parent ??
-    /** @type {any} */ (input).parent ??
-    /** @type {any} */ (input)[utilities.parentSymbol];
-
-  // Get the input text and any attached front matter.
-  let inputDocument;
-  if (input["@text"]) {
-    inputDocument = input;
-  } else {
-    // Unpack the input as a text document with possible front matter.
-    inputDocument = await unpackText(input, options);
-  }
-  const text = utilities.toString(inputDocument);
-
-  // Compile the body text as an Origami expression and evaluate it.
-  const expression = compile.templateDocument(text);
-  const parentScope = parent ? Scope.getScope(parent) : builtins;
-  const lambda = await expression.call(parentScope);
-
-  // Wrap the lambda with a function that will attach the input data to the
-  // result.
-  /** @this {AsyncTree|null} */
-  const fn = async function createTemplateResult(templateInput) {
-    const text = await lambda.call(this, templateInput);
-    /** @type {any} */
-    const result = new String(text);
-    result.unpack = () => templateInput;
-    return result;
-  };
-  fn.code = lambda.code;
-
-  return processUnpackedContent(fn, parent, inputDocument);
-}

package/src/misc/explore.orit

@@ -1,241 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <title>Web Origami Explorer</title>
-    <style>
-      * {
-        box-sizing: border-box;
-      }
-
-      html {
-        height: 100%;
-      }
-
-      body {
-        background: #333;
-        color: #eee;
-        display: grid;
-        font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-        font-size: 13px;
-        grid-template-columns: 200px 1fr;
-        grid-template-rows: minMax(0, 1fr);
-        height: 100%;
-        margin: 0;
-        overflow: hidden;
-      }
-
-      nav {
-        display: grid;
-        gap: 1em;
-        grid-auto-rows: min-content;
-        grid-template-columns: minmax(0, 1fr);
-        overflow: auto;
-        padding: 1em 0.5em;
-      }
-
-      #label {
-        font-weight: bold;
-      }
-
-      #scopeToolbar {
-        display: grid;
-        grid-template-columns: repeat(4, auto);        
-      }
-
-      button {
-        background: transparent;
-        border: solid 1px #555;
-        color: inherit;
-        font-size: smaller;
-        font-family: inherit;
-        font-weight: inherit;
-        padding: 0.25em;
-      }
-      button:hover {
-        border-color: #999;
-      }
-      button:active {
-        border-color: #eee;
-      }
-      button[aria-pressed="true"] {
-        background: #555;
-      }
-
-      ul {
-        list-style: none;
-        margin: 0;
-        padding: 0;
-      }
-
-      h2 {
-        color: #999;
-        font-size: inherit;
-        margin: 0.25em 0;
-        padding-left: 0.25em;
-      }
-
-      li {
-        padding: 0.25em;
-        padding-left: 1em;
-        text-indent: -0.75em;
-      }
-
-      a {
-        color: inherit;
-        text-decoration: none;
-      }
-
-      iframe {
-        background: white;
-        border: none;
-        height: 100%;
-        width: 100%;
-      }
-    </style>
-    <script>
-      let defaultPath;
-      let path;
-      let frame;
-
-      const modes = {
-        Content: "",
-        Index: "!@index",
-        YAML: "!@yaml",
-        SVG: "!@svg",
-      };
-
-      // Extract the path from the URL hash.
-      function getPathFromHash() {
-        return window.location.hash.slice(1); // Remove `#`
-      }
-
-      function getModeFromLocation() {
-        const href = document.location.href;
-        const match = /[\/](?<command>\!(?:@index|@yaml|@svg))$/.exec(href);
-        const command = match?.groups.command ?? "";
-        const mode = Object.keys(modes).find(key => modes[key] === command) ?? "Content";
-        return mode;
-      }
-
-      function removeDocumentPath(path) {
-        const documentPath = document.location.pathname;
-        if (path.startsWith(documentPath)) {
-          // Remove the document path prefix.
-          path = path.slice(documentPath.length);
-        }
-        if (path.startsWith("/")) {
-          // Remove the leading slash.
-          path = path.slice(1);
-        }
-        return path;
-      }
-
-      function selectMode(newMode) {
-        const currentMode = getModeFromLocation();
-        if (newMode !== currentMode) {
-          let newPath = removeDocumentPath(frame.contentDocument.location.pathname);
-          const currentExtension = modes[currentMode];
-          if (currentExtension && newPath.endsWith(currentExtension)) {
-            // Remove the current extension.
-            newPath = newPath.slice(0, -currentExtension.length);
-          }
-          const newExtension = modes[newMode];
-          const separator = newPath.endsWith("/") ? "" : "/";
-          const newFullPath = `${newPath}${separator}${newExtension}`;
-          setPath(newFullPath);
-        }
-      }
-
-      function setPath(path) {
-        currentPath = path;
-
-        // Show the indicated page in the frame.
-        const abbreviatedPath = `/${path}`;
-        const fullPath = `${document.location.pathname}/${path}`;
-        const framePathname = frame.contentDocument.location.pathname;
-        if (framePathname !== abbreviatedPath && framePathname !== fullPath) {
-          // Use `replace` to avoid affecting browser history.
-          frame.contentWindow.location.replace(fullPath);
-        }
-
-        // If the path ends with a file name corresponding to a mode, select
-        // the corresponding mode button.
-        const mode = getModeFromLocation();
-        const selectedButtonId = `button${mode}`;
-        scopeToolbar.querySelectorAll("button").forEach(button => {
-          const pressed = button.id === selectedButtonId ? "true" : "false";
-          button.setAttribute("aria-pressed", pressed);
-        });
-      }
-
-      // When hash changes, load the indicated page.
-      window.addEventListener("hashchange", () => {
-        const hashPath = getPathFromHash();
-        const newPath = hashPath !== undefined ? hashPath : defaultPath;
-        if (newPath) {
-          setPath(newPath);
-        }
-      });
-
-      // Initialize
-      window.addEventListener("load", () => {
-        // Refresh title on page load.
-        frame = document.getElementById("frame");
-        frame.addEventListener("load", () => {
-          if (frame.contentDocument.location.href !== "about:blank") {
-            document.title = frame.contentDocument.title;
-            const newPath = removeDocumentPath(frame.contentDocument.location.pathname);
-            const hash = `#${newPath}`;
-            if (window.location.hash !== hash) {
-              // Use `replace` to avoid affecting browser history.
-              window.location.replace(hash);
-            }
-          }
-        });
-
-        buttonContent.addEventListener("click", () => {
-          selectMode("Content");
-        });
-        buttonIndex.addEventListener("click", () => {
-          selectMode("Index");
-        });
-        buttonYAML.addEventListener("click", () => {
-          selectMode("YAML");
-        });
-        buttonSVG.addEventListener("click", () => {
-          selectMode("SVG");
-        });
-
-        // Navigate to any path already in the hash.
-        defaultPath = getPathFromHash();
-        if (defaultPath) {
-          setPath(defaultPath);
-        }
-      })
-    </script>
-  </head>
-  <body>
-    <nav>
-    <div id="label">Web Origami Explorer</div>
-    <div id="scopeToolbar">
-      <button id="buttonContent">Content</button>
-      <button id="buttonIndex">Index</button>
-      <button id="buttonSVG">SVG</button>
-      <button id="buttonYAML">YAML</button>
-    </div>
-    {{ @map(=`
-      <ul>
-        <h2>{{ _/name }}</h2>
-        {{ @map(=`
-        <li>
-          <a href="./!@explore/{{ _ }}" target="frame">{{ _ }}</a>
-        </li>
-        `)(_/keys) }}
-      </ul>
-    `)(_) }}
-    </nav>
-    <iframe id="frame" name="frame"></iframe>
-  </body>
-</html>