@weborigami/origami 0.0.64-beta.2 → 0.0.65-beta.1

package/exports/exports.js

@@ -4,6 +4,7 @@ export { default as basename } from "../src/builtins/@basename.js";
 export { default as breakpoint } from "../src/builtins/@breakpoint.js";
 export { default as builtins } from "../src/builtins/@builtins.js";
 export { default as cache } from "../src/builtins/@cache.js";
+export { default as calendarTree } from "../src/builtins/@calendarTree.js";
 export { default as changes } from "../src/builtins/@changes.js";
 export { default as clean } from "../src/builtins/@clean.js";
 export { default as concat } from "../src/builtins/@concat.js";
@@ -46,10 +47,11 @@ export { default as inners } from "../src/builtins/@inners.js";
 export { default as invoke } from "../src/builtins/@invoke.js";
 export { default as js } from "../src/builtins/@js.js";
 export { default as json } from "../src/builtins/@json.js";
+export { default as jsonKeys } from "../src/builtins/@jsonKeys.js";
 export { default as jsonParse } from "../src/builtins/@jsonParse.js";
 export { default as keys } from "../src/builtins/@keys.js";
-export { default as keysJson } from "../src/builtins/@keysJson.js";
 export { default as length } from "../src/builtins/@length.js";
+export { default as log } from "../src/builtins/@log.js";
 export { default as map } from "../src/builtins/@map.js";
 export { default as mapFn } from "../src/builtins/@mapFn.js";
 export { default as match } from "../src/builtins/@match.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.64-beta.2",
+  "version": "0.0.65-beta.1",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -13,22 +13,22 @@
   "main": "./exports/exports.js",
   "types": "./index.ts",
   "devDependencies": {
-    "@types/node": "20.14.9",
-    "typescript": "5.5.3"
+    "@types/node": "22.5.4",
+    "typescript": "5.5.4"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.64-beta.2",
-    "@weborigami/language": "0.0.64-beta.2",
-    "@weborigami/types": "0.0.64-beta.2",
+    "@weborigami/async-tree": "https://gitpkg.vercel.app/WebOrigami/origami/async-tree?b5d8eebf",
+    "@weborigami/language": "https://gitpkg.vercel.app/WebOrigami/origami/language?b5d8eebf",
+    "@weborigami/types": "0.0.65-beta.1",
     "exif-parser": "0.1.12",
     "graphviz-wasm": "3.0.2",
-    "highlight.js": "11.9.0",
-    "marked": "13.0.1",
-    "marked-gfm-heading-id": "4.0.0",
-    "marked-highlight": "2.1.3",
-    "marked-smartypants": "1.1.7",
-    "sharp": "0.33.4",
-    "yaml": "2.4.5"
+    "highlight.js": "11.10.0",
+    "marked": "14.1.1",
+    "marked-gfm-heading-id": "4.1.0",
+    "marked-highlight": "2.1.4",
+    "marked-smartypants": "1.1.8",
+    "sharp": "0.33.5",
+    "yaml": "2.5.1"
   },
   "scripts": {
     "build": "ori exports/buildExports.js src > exports/exports.js",

package/src/builtins/@calendarTree.js

@@ -0,0 +1,5 @@
+import calendarTree from "@weborigami/async-tree/src/calendarTree.js";
+
+export default function calendarTreeBuiltin(start, end) {
+  return calendarTree(start, end);
+}

package/src/builtins/@js.js

@@ -6,11 +6,13 @@ const js = {
   Infinity,
   Intl,
   JSON,
+  Map,
   Math,
   NaN,
   Number,
   Object,
   RegExp,
+  Set,
   String,
   Symbol,
   decodeURI,

package/src/builtins/{@keysJson.js → @jsonKeys.js}

@@ -1,4 +1,4 @@
-import { Tree, keysJson } from "@weborigami/async-tree";
+import { Tree, jsonKeys } from "@weborigami/async-tree";
 import { transformObject } from "../common/utilities.js";
 import getTreeArgument from "../misc/getTreeArgument.js";
 
@@ -10,7 +10,7 @@ import getTreeArgument from "../misc/getTreeArgument.js";
  * @this {AsyncTree|null}
  * @param {Treelike} treelike
  */
-export default async function treeKeysJson(treelike) {
+export default async function jsonKeysBuiltin(treelike) {
   const tree = await getTreeArgument(
     this,
     arguments,
@@ -26,7 +26,7 @@ function KeysJsonTransform(Base) {
     async get(key) {
       let value = await super.get(key);
       if (value === undefined && key === ".keys.json") {
-        value = await keysJson.stringify(this);
+        value = await jsonKeys.stringify(this);
       } else if (Tree.isTreelike(value)) {
         const tree = Tree.from(value, { deep: true });
         value = transformObject(KeysJsonTransform, tree);

package/src/builtins/@log.js

@@ -0,0 +1,16 @@
+import yaml from "./@yaml.js";
+
+/**
+ * Log the first argument to the console as a side effect and return the second
+ * argument. If no second argument is provided, return the first argument.
+ *
+ * @this {import("@weborigami/types").AsyncTree|null}
+ * @param {any} object
+ * @param {any} [result]
+ */
+export default async function log(result, object = result) {
+  let text = object !== undefined ? await yaml.call(this, object) : "undefined";
+  text = text?.trim();
+  console.log(text);
+  return result;
+}

package/src/builtins/@mapFn.js

@@ -79,13 +79,15 @@ export default function mapFnBuiltin(operation) {
     extendedInverseKeyFn = keyFns.inverseKey;
   } else if (keyFn) {
     const resolvedKeyFn = toFunction(keyFn);
-    async function scopedKeyFn(sourceKey, tree) {
-      const sourceValue = await tree.get(sourceKey);
+    async function scopedKeyFn(sourceKey, sourceTree) {
+      const sourceValue = await sourceTree.get(sourceKey);
+      // The key function will be given the source tree, but will run with the
+      // scope of this tree.
       const resultKey = await resolvedKeyFn.call(
         tree,
         sourceValue,
         sourceKey,
-        tree
+        sourceTree
       );
       return resultKey;
     }

package/src/builtins/@static.js

@@ -1,4 +1,4 @@
-import { Tree, keysJson } from "@weborigami/async-tree";
+import { Tree, jsonKeys } from "@weborigami/async-tree";
 import { transformObject } from "../common/utilities.js";
 import getTreeArgument from "../misc/getTreeArgument.js";
 import index from "./@index.js";
@@ -24,7 +24,7 @@ function StaticTransform(Base) {
       if (value === undefined && key === "index.html") {
         value = index.call(this, this);
       } else if (value === undefined && key === ".keys.json") {
-        value = keysJson.stringify(this);
+        value = jsonKeys.stringify(this);
       } else if (Tree.isAsyncTree(value)) {
         value = transformObject(StaticTransform, value);
       }

package/src/common/ExplorableSiteTransform.js

@@ -1,4 +1,4 @@
-import { Tree, keysJson } from "@weborigami/async-tree";
+import { Tree, jsonKeys } from "@weborigami/async-tree";
 import index from "../builtins/@index.js";
 import { isTransformApplied, transformObject } from "../common/utilities.js";
 
@@ -39,7 +39,7 @@ export default function ExplorableSiteTransform(Base) {
           // This tree is both the function call target and the parameter.
           value = await index.call(this, this);
         } else if (key === ".keys.json") {
-          value = await keysJson.stringify(this);
+          value = await jsonKeys.stringify(this);
         }
       }
 

package/src/misc/treeDot.js

@@ -47,7 +47,7 @@ async function statements(tree, nodePath, nodeLabel, options) {
   );
 
   // Draw edges and collect labels for the nodes they lead to.
-  let nodes = {};
+  let nodes = new Map();
   for (const key of await tree.keys()) {
     const destPath = nodePath ? `${nodePath}/${key}` : key;
     const arc = `  "${nodePath}" -> "${destPath}" [label="${key}"];`;
@@ -80,27 +80,29 @@ async function statements(tree, nodePath, nodeLabel, options) {
       if (value === undefined) {
         isError = true;
       }
-      nodes[key] = { label };
+
+      const data = { label };
       if (isError) {
-        nodes[key].isError = true;
+        data.isError = true;
       }
+      nodes.set(key, data);
     }
   }
 
   // If we have more than one label, we'll focus on the labels' differences.
   // We'll use the first label as a representative baseline for all labels but
   // the first (which will use the second label as a baseline).
-  const values = Object.values(nodes);
+  const values = [...nodes.values()];
   const showLabelDiffs = values.length > 1;
   const label1 = showLabelDiffs ? String(values[0].label) : undefined;
   const label2 = showLabelDiffs ? String(values[1].label) : undefined;
 
   // Trim labels.
   let i = 0;
-  for (const key of Object.keys(nodes)) {
-    let label = nodes[key].label;
+  for (const data of nodes.values()) {
+    let label = data.label;
     if (label === null) {
-      nodes[key].label = "[binary data]";
+      data.label = "[binary data]";
     } else if (label) {
       let clippedStart = false;
       let clippedEnd = false;
@@ -146,14 +148,13 @@ async function statements(tree, nodePath, nodeLabel, options) {
         label += "\\l";
       }
 
-      nodes[key].label = label;
+      data.label = label;
     }
     i++;
   }
 
   // Draw labels.
-  for (const key in nodes) {
-    const node = nodes[key];
+  for (const [key, node] of nodes.entries()) {
     const icon = node.isError ? "⚠️ " : "";
     // GraphViz has trouble rendering DOT nodes whose labels contain ellipsis
     // characters, so we map those to three periods. GraphViz appears to turn

package/src/server/constructResponse.js

@@ -44,7 +44,7 @@ export default async function constructResponse(request, resource) {
 
   if (!url.pathname.endsWith("/") && Tree.isTreelike(resource)) {
     // Treelike resource: redirect to its index page.
-    const Location = `${request.url}/`;
+    const Location = `${url.pathname}/`;
     return new Response("ok", {
       headers: {
         Location,

package/src/server/server.js

@@ -1,4 +1,4 @@
-import { DeepObjectTree, Tree, keysFromPath } from "@weborigami/async-tree";
+import { ObjectTree, Tree, keysFromPath } from "@weborigami/async-tree";
 import { formatError } from "@weborigami/language";
 import { ServerResponse } from "node:http";
 import constructResponse from "./constructResponse.js";
@@ -51,11 +51,17 @@ function extendTreeScopeWithParams(tree, url) {
     return tree;
   }
 
-  const paramTree = new DeepObjectTree({
+  const paramTree = new ObjectTree({
     "@params": params,
   });
-  paramTree.parent = tree;
-  return paramTree;
+
+  // Create a new tree that's like the original one, but has the parameters in
+  // its parent hierarchy.
+  const extendedTree = Object.create(tree);
+  const realParent = tree.parent;
+  paramTree.parent = realParent;
+  extendedTree.parent = paramTree;
+  return extendedTree;
 }
 
 /**