@weborigami/origami 0.6.12 → 0.6.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.6.12",
+  "version": "0.6.13",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -18,9 +18,9 @@
   },
   "dependencies": {
     "@hpcc-js/wasm-graphviz": "^1.21.0",
-    "@weborigami/async-tree": "0.6.12",
+    "@weborigami/async-tree": "0.6.13",
     "@weborigami/json-feed-to-rss": "1.0.1",
-    "@weborigami/language": "0.6.12",
+    "@weborigami/language": "0.6.13",
     "css-tree": "3.1.0",
     "highlight.js": "11.11.1",
     "jsdom": "28.1.0",

package/src/dev/crawler/audit.js

@@ -1,8 +1,14 @@
 import { pathFromKeys, symbols, Tree } from "@weborigami/async-tree";
+import * as YAMLModule from "yaml";
 import crawlResources from "./crawlResources.js";
 import getSiteArgument from "./getSiteArgument.js";
 import { getBaseUrl } from "./utilities.js";
 
+// The "yaml" package doesn't seem to provide a default export that the browser can
+// recognize, so we have to handle two ways to accommodate Node and the browser.
+// @ts-ignore
+const YAML = YAMLModule.default ?? YAMLModule.YAML;
+
 /**
  * Crawl the indicated tree and return an audit of any broken links to internal
  * pages or other resources.
@@ -43,10 +49,10 @@ export default async function audit(maplike, baseHref) {
         // Start request, don't wait for it to complete yet
         resourcePromises[resourcePath] ??= Tree.traversePath(
           tree,
-          resourcePath
+          resourcePath,
         ).then(
           // Just return true or false to indicate if value is defined
-          (value) => value !== undefined
+          (value) => value !== undefined,
         );
       }
     }
@@ -54,7 +60,7 @@ export default async function audit(maplike, baseHref) {
 
   // Add any references to missing resources to the errors
   for (const [refererPath, resourcePaths] of Object.entries(
-    resourceReferences
+    resourceReferences,
   )) {
     for (const resourcePath of resourcePaths) {
       const found = await resourcePromises[resourcePath];
@@ -76,5 +82,19 @@ export default async function audit(maplike, baseHref) {
     value: true,
   });
 
+  // Attach a string method to include an explanatory comment. This will be used
+  // if the result is rendered in the console.
+  Object.defineProperty(errors, "toString", {
+    enumerable: false,
+    value: () => {
+      const yamlText = YAML.stringify(errors);
+      const message = `
+# Pages with broken internal links, with the missing destinations indented:
+
+`;
+      return `${message}${yamlText}`;
+    },
+  });
+
   return errors;
 }

package/src/dev/help.yaml

@@ -45,9 +45,6 @@ Dev:
     version:
       args: ()
       description: Return the version number of the Origami language
-    visit:
-      args: (tree)
-      description: Force reading of all values from the tree
     watch:
       args: (tree, fn)
       description: Reevaluate fn when tree changes
@@ -190,6 +187,9 @@ Tree:
     clear:
       args: (map)
       description: Remove all values from the map
+    concat:
+      args: (...trees)
+      description: Merge trees, renumbering numeric keys
     constant:
       args: (value)
       description: Return a deep tree with a single constant value
@@ -223,6 +223,9 @@ Tree:
     first:
       args: (map)
       description: The first value in the map
+    flat:
+      args: (tree, [depth])
+      description: Flatten the tree to the indicated depth
     forEach:
       args: (map, fn)
       description: Apply fn to each (value, key)
@@ -343,6 +346,9 @@ Tree:
     values:
       args: (map)
       description: The map's values
+    visit:
+      args: (tree)
+      description: Force reading of all values from the tree
     withKeys:
       args: (map, keys)
       description: Use the given keys for the map

package/src/origami/yaml.js

@@ -1,5 +1,5 @@
-import { isUnpackable, toPlainValue } from "@weborigami/async-tree";
-import YAML from "yaml";
+import { isUnpackable } from "@weborigami/async-tree";
+import { toYaml } from "../common/serialize.js";
 
 /**
  * Render the object as text in YAML format.
@@ -13,6 +13,5 @@ export default async function yamlBuiltin(obj) {
   if (isUnpackable(obj)) {
     obj = await obj.unpack();
   }
-  const value = await toPlainValue(obj);
-  return YAML.stringify(value);
+  return toYaml(obj);
 }