@weborigami/origami 0.0.68 → 0.0.70

package/exports/exports.js

@@ -7,6 +7,7 @@ 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 code } from "../src/builtins/@code.js";
 export { default as concat } from "../src/builtins/@concat.js";
 export { default as config } from "../src/builtins/@config.js";
 export { default as copy } from "../src/builtins/@copy.js";
@@ -40,6 +41,7 @@ export { default as imageFormat } from "../src/builtins/@image/format.js";
 export { default as imageFormatFn } from "../src/builtins/@image/formatFn.js";
 export { default as imageResize } from "../src/builtins/@image/resize.js";
 export { default as imageResizeFn } from "../src/builtins/@image/resizeFn.js";
+export { default as indent } from "../src/builtins/@indent.js";
 export { default as index } from "../src/builtins/@index.js";
 export { default as inherited } from "../src/builtins/@inherited.js";
 export { default as inline } from "../src/builtins/@inline.js";
@@ -86,6 +88,7 @@ export { default as serve } from "../src/builtins/@serve.js";
 export { default as setDeep } from "../src/builtins/@setDeep.js";
 export { default as shell } from "../src/builtins/@shell.js";
 export { default as shuffle } from "../src/builtins/@shuffle.js";
+export { default as siteAudit } from "../src/builtins/@siteAudit.js";
 export { default as sitemap } from "../src/builtins/@sitemap.js";
 export * from "../src/builtins/@slash.js";
 export { default as slug } from "../src/builtins/@slug.js";
@@ -136,6 +139,9 @@ export { default as processUnpackedContent } from "../src/common/processUnpacked
 export * from "../src/common/serialize.js";
 export { default as ShuffleTransform } from "../src/common/ShuffleTransform.js";
 export * from "../src/common/utilities.js";
+export { default as crawlResources } from "../src/crawler/crawlResources.js";
+export { default as findPaths } from "../src/crawler/findPaths.js";
+export * from "../src/crawler/utilities.js";
 export { default as assertTreeIsDefined } from "../src/misc/assertTreeIsDefined.js";
 export { default as getTreeArgument } from "../src/misc/getTreeArgument.js";
 export { default as OriCommandTransform } from "../src/misc/OriCommandTransform.js";

package/package.json

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

package/src/builtins/@changes.js

@@ -1,4 +1,4 @@
-import { Tree } from "@weborigami/async-tree";
+import { trailingSlash, Tree } from "@weborigami/async-tree";
 
 /**
  * Given an old tree and a new tree, return a tree of changes indicated
@@ -17,36 +17,46 @@ export default async function changes(oldTreelike, newTreelike) {
   const oldKeys = Array.from(await oldTree.keys());
   const newKeys = Array.from(await newTree.keys());
 
-  const result = {};
+  const oldKeysNormalized = oldKeys.map(trailingSlash.remove);
+  const newKeysNormalized = newKeys.map(trailingSlash.remove);
 
-  for (const key of oldKeys) {
-    if (!newKeys.includes(key)) {
-      result[key] = "deleted";
+  let result;
+
+  for (const oldKey of oldKeys) {
+    const oldNormalized = trailingSlash.remove(oldKey);
+    if (!newKeysNormalized.includes(oldNormalized)) {
+      result ??= {};
+      result[oldKey] = "deleted";
       continue;
     }
 
-    const oldValue = await oldTree.get(key);
-    const newValue = await newTree.get(key);
+    const oldValue = await oldTree.get(oldKey);
+    const newValue = await newTree.get(oldKey);
 
     if (Tree.isAsyncTree(oldValue) && Tree.isAsyncTree(newValue)) {
       const treeChanges = await changes.call(this, oldValue, newValue);
-      if (Object.keys(treeChanges).length > 0) {
-        result[key] = treeChanges;
+      if (treeChanges && Object.keys(treeChanges).length > 0) {
+        result ??= {};
+        result[oldKey] = treeChanges;
       }
     } else if (oldValue?.toString && newValue?.toString) {
       const oldText = oldValue.toString();
       const newText = newValue.toString();
       if (oldText !== newText) {
-        result[key] = "changed";
+        result ??= {};
+        result[oldKey] = "changed";
       }
     } else {
-      result[key] = "changed";
+      result ??= {};
+      result[oldKey] = "changed";
     }
   }
 
-  for (const key of newKeys) {
-    if (!oldKeys.includes(key)) {
-      result[key] = "added";
+  for (const newKey of newKeys) {
+    const newNormalized = trailingSlash.remove(newKey);
+    if (!oldKeysNormalized.includes(newNormalized)) {
+      result ??= {};
+      result[newKey] = "added";
     }
   }
 

package/src/builtins/@code.js

@@ -0,0 +1,37 @@
+import { symbols } from "@weborigami/language";
+import getTreeArgument from "../misc/getTreeArgument.js";
+
+/**
+ * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
+ *
+ * @this {AsyncTree|null}
+ * @param {any} value
+ */
+export default async function code(value) {
+  if (value === undefined) {
+    value = await getTreeArgument(this, arguments, value, "@clean");
+  }
+  if (value === undefined) {
+    return undefined;
+  }
+  const code = value.code ?? value[symbols.codeSymbol];
+  return code ? functionNames(code) : undefined;
+}
+
+function functionNames(code) {
+  if (!Array.isArray(code)) {
+    return code;
+  }
+  let [head, ...tail] = code;
+  if (typeof head === "function") {
+    const text = head.toString();
+    if (text.startsWith("«ops.")) {
+      head = text;
+    } else {
+      head = head.name;
+    }
+  } else {
+    head = functionNames(head);
+  }
+  return [head, ...tail.map(functionNames)];
+}