@weborigami/origami 0.7.0-beta.1 → 0.7.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.7.0-beta.1",
+  "version": "0.7.0-beta.3",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -18,9 +18,9 @@
   },
   "dependencies": {
     "@hpcc-js/wasm-graphviz": "1.21.7",
-    "@weborigami/async-tree": "0.7.0-beta.1",
+    "@weborigami/async-tree": "0.7.0-beta.3",
     "@weborigami/json-feed-to-rss": "1.0.1",
-    "@weborigami/language": "0.7.0-beta.1",
+    "@weborigami/language": "0.7.0-beta.3",
     "css-tree": "3.2.1",
     "highlight.js": "11.11.1",
     "jsdom": "29.1.1",

package/src/common/documentObject.js

@@ -1,4 +1,5 @@
 import { isPlainObject, isUnpackable, toString } from "@weborigami/async-tree";
+import { toYaml } from "./serialize.js";
 
 /**
  * In Origami, a text document object is any object with a `_body` property.
@@ -29,6 +30,7 @@ export default async function documentObject(input, data) {
 
   const result = {};
   Object.assign(result, inputData, data);
+
   Object.defineProperty(result, "_body", {
     configurable: true,
     enumerable: true,
@@ -36,5 +38,29 @@ export default async function documentObject(input, data) {
     writable: true,
   });
 
+  Object.defineProperty(result, "pack", {
+    configurable: true,
+    enumerable: false,
+    value: pack.bind(null, result),
+  });
+
+  Object.defineProperty(result, "toString", {
+    configurable: true,
+    enumerable: false,
+    value: pack.bind(null, result),
+  });
+
   return result;
 }
+
+// If the document is just a _body, return its text. Otherwise, return the body
+// as a string with the other properties as YAML front matter.
+async function pack(document) {
+  if (Object.keys(document).length === 1 && "_body" in document) {
+    return document._body;
+  }
+  const frontData = { ...document };
+  delete frontData._body;
+  const frontMatter = await toYaml(frontData);
+  return `---\n${frontMatter}---\n\n${document._body}`;
+}

package/src/dev/ExplorableSiteTransform.js

@@ -68,9 +68,11 @@ export default function ExplorableSiteTransform(Base) {
     }
 
     // If this value is given to the server, the server will call this pack()
-    // method. We respond with the index page.
+    // method. If the source defines pack(), we use that, otherwise we return
+    // undefined. The server will redirect to the URL with a trailing slash,
+    // which will call `get("index.html")` (above) to get the index page.
     async pack() {
-      return this.get("index.html");
+      return super.pack ? await super.pack() : undefined;
     }
   };
 }

package/src/dev/debug2/debugTransform.js

@@ -82,10 +82,11 @@ export default function debugTransform(input) {
     },
 
     // If this value is given to the server, the server will call this pack()
-    // method. We respond with the index page.
+    // method. If the source defines pack(), we use that, otherwise we return
+    // undefined. The server will redirect to the URL with a trailing slash,
+    // which will call `get("index.html")` (above) to get the index page.
     async pack() {
-      // @ts-ignore
-      return source.pack?.() ?? this.get("index.html");
+      return /** @type {any} */ (source)?.pack?.();
     },
 
     // @ts-ignore

package/src/dev/dev.js

@@ -19,5 +19,6 @@ export { default as serve } from "./serve.js";
 export { default as stdin } from "./stdin.js";
 export { default as svg } from "./svg.js";
 export { default as syscache } from "./syscache.js";
+export { default as syscount } from "./syscount.js";
 export { default as version } from "./version.js";
 export { default as watch } from "./watch.js";

package/src/dev/help.yaml

@@ -247,6 +247,12 @@ Tree:
     filter:
       args: (tree, options)
       description: Filter a tree by a condition
+    find:
+      args: (map, test)
+      description: The value of the first entry satisfying the test
+    findKey:
+      args: (map, test)
+      description: The key of the first entry satisfying the test
     first:
       args: (map)
       description: The first value in the map

package/src/dev/syscache.js

@@ -15,9 +15,11 @@ export default function syscache() {
     const result = {};
     if (entry.downstreams) {
       result.downstreams = preferRelativePaths(projectRoot, entry.downstreams);
+      result.downstreams.sort((a, b) => a.localeCompare(b));
     }
     if (entry.upstreams) {
       result.upstreams = preferRelativePaths(projectRoot, entry.upstreams);
+      result.upstreams.sort((a, b) => a.localeCompare(b));
     }
     return [preferRelativePath(projectRoot, path), result];
   });

package/src/dev/syscount.js

@@ -0,0 +1,5 @@
+import { counters } from "@weborigami/language";
+
+export default function syscount() {
+  return counters;
+}

package/src/origami/htmlDom.js

@@ -1,4 +1,4 @@
-import { args } from "@weborigami/async-tree";
+import { args, isUnpackable } from "@weborigami/async-tree";
 import loadJsDom from "../common/loadJsDom.js";
 
 /**
@@ -7,6 +7,9 @@ import loadJsDom from "../common/loadJsDom.js";
  * @param {import("@weborigami/async-tree").Stringlike} html
  */
 export default async function htmlDom(html) {
+  if (isUnpackable(html)) {
+    html = await html.unpack();
+  }
   html = args.stringlike(html, "Origami.htmlDom");
   const { JSDOM } = await loadJsDom();
   let dom = JSDOM.fragment(html);

package/src/server/constructResponse.js

@@ -22,12 +22,16 @@ export default async function constructResponse(request, resource) {
   const url = new URL(request?.url ?? "", `https://${request?.headers.host}`);
 
   if (!isPacked(resource) && typeof resource.pack === "function") {
-    resource = await resource.pack();
-    if (typeof resource === "function") {
-      resource = await resource();
-    }
-    if (resource instanceof Response) {
-      return resource;
+    let packed = await resource.pack();
+    if (packed) {
+      if (typeof packed === "function") {
+        packed = await packed();
+      }
+      if (packed instanceof Response) {
+        // Already a Response
+        return packed;
+      }
+      resource = packed;
     }
   }
 
@@ -104,6 +108,8 @@ export default async function constructResponse(request, resource) {
     const hash = createHash("sha1");
     if (typeof body === "string" || body instanceof String) {
       hash.update(String(body), "utf8");
+    } else if (body instanceof ArrayBuffer) {
+      hash.update(new Uint8Array(body));
     } else {
       hash.update(body);
     }