@weborigami/origami 0.6.1 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -17,9 +17,9 @@
     "typescript": "5.9.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.6.1",
-    "@weborigami/json-feed-to-rss": "1.0.0",
-    "@weborigami/language": "0.6.1",
+    "@weborigami/async-tree": "0.6.2",
+    "@weborigami/json-feed-to-rss": "1.0.1",
+    "@weborigami/language": "0.6.2",
     "css-tree": "3.1.0",
     "graphviz-wasm": "3.0.2",
     "highlight.js": "11.11.1",

package/src/dev/crawler/audit.js

@@ -1,10 +1,6 @@
-import {
-  getTreeArgument,
-  pathFromKeys,
-  symbols,
-  Tree,
-} from "@weborigami/async-tree";
+import { pathFromKeys, symbols, Tree } from "@weborigami/async-tree";
 import crawlResources from "./crawlResources.js";
+import getSiteArgument from "./getSiteArgument.js";
 import { getBaseUrl } from "./utilities.js";
 
 /**
@@ -17,7 +13,7 @@ import { getBaseUrl } from "./utilities.js";
  * @param {string} [baseHref]
  */
 export default async function audit(maplike, baseHref) {
-  const tree = await getTreeArgument(maplike, "audit");
+  const tree = await getSiteArgument(maplike, "audit");
   const baseUrl = getBaseUrl(baseHref, maplike);
 
   let errors = {};

package/src/dev/crawler/crawl.js

@@ -1,10 +1,6 @@
-import {
-  ObjectMap,
-  Tree,
-  getTreeArgument,
-  keysFromPath,
-} from "@weborigami/async-tree";
+import { ObjectMap, Tree, keysFromPath } from "@weborigami/async-tree";
 import crawlResources from "./crawlResources.js";
+import getSiteArgument from "./getSiteArgument.js";
 import { addValueToObject, getBaseUrl } from "./utilities.js";
 
 /**
@@ -23,7 +19,7 @@ import { addValueToObject, getBaseUrl } from "./utilities.js";
  * @returns {Promise<AsyncMap>}
  */
 export default async function crawlBuiltin(maplike, baseHref) {
-  const tree = await getTreeArgument(maplike, "crawl");
+  const tree = await getSiteArgument(maplike, "crawl");
   const baseUrl = getBaseUrl(baseHref, maplike);
 
   const cache = {};

package/src/dev/crawler/getSiteArgument.js

@@ -0,0 +1,12 @@
+import { getTreeArgument, SiteMap } from "@weborigami/async-tree";
+
+/**
+ * Return a site: if it's a tree, return the tree; if it's a string, create a
+ * tree for that URL.
+ */
+export default async function getSiteArgument(site, command) {
+  if (typeof site === "string") {
+    return new SiteMap(site);
+  }
+  return getTreeArgument(site, command);
+}

package/src/dev/help.yaml

@@ -68,6 +68,9 @@ Origami:
     fetch:
       args: (url, options)
       description: Fetch a resource from a URL with support for extensions
+    htmlEscape:
+      args: (text)
+      description: Escape HTML entities in the text
     image:
       description: Collection of functions for working with images
     indexPage:

package/src/origami/htmlEscape.js

@@ -0,0 +1,14 @@
+import { toString } from "@weborigami/async-tree";
+import loadJsDom from "../common/loadJsDom.js";
+
+/**
+ * Escapes HTML entities in a string.
+ *
+ * @param {import("@weborigami/async-tree").Stringlike} html
+ */
+export default async function htmlEscape(html) {
+  const { JSDOM } = await loadJsDom();
+  const div = JSDOM.fragment("<div></div>").firstChild;
+  div.textContent = toString(html);
+  return div.innerHTML;
+}

package/src/origami/inline.js

@@ -9,7 +9,7 @@ import documentObject from "../common/documentObject.js";
  *
  * @param {any} input
  */
-export default async function inline(input) {
+export default async function inline(input, options = {}) {
   // Get the input text and any attached front matter.
   if (isUnpackable(input)) {
     input = await input.unpack();
@@ -21,6 +21,7 @@ export default async function inline(input) {
   }
 
   const parent =
+    options.parent ??
     /** @type {any} */ (input).parent ??
     /** @type {any} */ (input)[symbols.parent];
 

package/src/origami/origami.js

@@ -14,6 +14,7 @@ export { default as static } from "../origami/static.js";
 export { default as basename } from "./basename.js";
 export { default as csv } from "./csv.js";
 export { default as fetch } from "./fetch.js";
+export { default as htmlEscape } from "./htmlEscape.js";
 export { default as format } from "./image/format.js";
 export * as image from "./image/image.js";
 export { default as resize } from "./image/resize.js";

package/src/server/server.js

@@ -121,6 +121,8 @@ export function requestListener(maplike) {
  */
 function respondWithError(response, error) {
   let message = formatError(error);
+  // Remove ANSI escape codes from the message.
+  message = message.replace(/\x1b\[[0-9;]*m/g, "");
   // Prevent HTML in the error message from being interpreted as HTML.
   message = message.replace(/</g, "&lt;").replace(/>/g, "&gt;");
   const html = `<!DOCTYPE html>