@weborigami/origami 0.0.62 → 0.0.64-beta.1

package/exports/exports.js

@@ -68,7 +68,6 @@ export { default as package } from "../src/builtins/@package.js";
 export { default as paginate } from "../src/builtins/@paginate.js";
 export { default as paginateFn } from "../src/builtins/@paginateFn.js";
 export { default as parent } from "../src/builtins/@parent.js";
-export { default as paths } from "../src/builtins/@paths.js";
 export { default as perf } from "../src/builtins/@perf.js";
 export { default as plain } from "../src/builtins/@plain.js";
 export { default as project } from "../src/builtins/@project.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.62",
+  "version": "0.0.64-beta.1",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -17,9 +17,9 @@
     "typescript": "5.5.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.62",
-    "@weborigami/language": "0.0.62",
-    "@weborigami/types": "0.0.62",
+    "@weborigami/async-tree": "0.0.64-beta.1",
+    "@weborigami/language": "0.0.64-beta.1",
+    "@weborigami/types": "0.0.64-beta.1",
     "exif-parser": "0.1.12",
     "graphviz-wasm": "3.0.2",
     "highlight.js": "11.9.0",

package/src/builtins/@keysJson.js

@@ -11,7 +11,13 @@ import getTreeArgument from "../misc/getTreeArgument.js";
  * @param {Treelike} treelike
  */
 export default async function treeKeysJson(treelike) {
-  const tree = await getTreeArgument(this, arguments, treelike, "@keysJson");
+  const tree = await getTreeArgument(
+    this,
+    arguments,
+    treelike,
+    "@keysJson",
+    true
+  );
   return transformObject(KeysJsonTransform, tree);
 }
 
@@ -21,8 +27,9 @@ function KeysJsonTransform(Base) {
       let value = await super.get(key);
       if (value === undefined && key === ".keys.json") {
         value = await keysJson.stringify(this);
-      } else if (Tree.isAsyncTree(value)) {
-        value = transformObject(KeysJsonTransform, value);
+      } else if (Tree.isTreelike(value)) {
+        const tree = Tree.from(value, { deep: true });
+        value = transformObject(KeysJsonTransform, tree);
       }
       return value;
     }

package/src/builtins/@sitemap.js

@@ -1,7 +1,7 @@
+import { Tree } from "@weborigami/async-tree";
 import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 import getTreeArgument from "../misc/getTreeArgument.js";
 import builtins from "./@builtins.js";
-import paths from "./@paths.js";
 import fileTypeOrigami from "./ori_handler.js";
 
 const templateText = `(urls) => \`<?xml version="1.0" encoding="UTF-8"?>
@@ -41,7 +41,7 @@ export default async function sitemap(treelike, baseHref = "") {
     },
   };
 
-  const treePaths = await paths.call(this, filterTree, baseHref);
+  const treePaths = await Tree.paths(filterTree, baseHref);
 
   // For simplicity, we assume that HTML pages will end in .html.
   // If the page is named index.html, we remove index.html from

package/src/server/server.js

@@ -14,6 +14,7 @@ async function copyResponse(constructed, response) {
   response.statusCode = constructed.status;
   response.statusMessage = constructed.statusText;
 
+  // @ts-ignore Headers has an iterator in ES2022 but tsc doesn't know that.
   for (const [key, value] of constructed.headers) {
     response.setHeader(key, value);
   }

package/src/builtins/@paths.js

@@ -1,30 +0,0 @@
-import { Tree } from "@weborigami/async-tree";
-import getTreeArgument from "../misc/getTreeArgument.js";
-
-/**
- * Return an array of paths to the values in the tree.
- *
- * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
- * @typedef {import("@weborigami/async-tree").Treelike} Treelike
- *
- * @this {AsyncTree|null}
- * @param {Treelike} [treelike]
- * @param {string} [prefix]
- */
-export default async function paths(treelike, prefix = "") {
-  const tree = await getTreeArgument(this, arguments, treelike, "@paths");
-  const result = [];
-  for (const key of await tree.keys()) {
-    const valuePath = prefix ? `${prefix}/${key}` : key;
-    const value = await tree.get(key);
-    if (await Tree.isAsyncTree(value)) {
-      const subPaths = await paths.call(this, value, valuePath);
-      result.push(...subPaths);
-    } else {
-      result.push(valuePath);
-    }
-  }
-  return result;
-}
-
-paths.usage = `@paths(tree)\tReturn an array of paths to the values in the tree`;