@weborigami/origami 0.6.6 → 0.6.8

package/index.ts

@@ -1,8 +1,11 @@
 /**
- * Tree Origami is a JavaScript project, but we use TypeScript as an internal
- * tool to confirm our code is type safe.
+ * Origami is a JavaScript project, but we use TypeScript as an internal tool to
+ * confirm our code is type safe.
  */
 
+// Re-export all exports from main.js
+export * from "./main.js";
+
 /**
  * A class constructor is an object with a `new` method that returns an
  * instance of the indicated type.

package/main.js

@@ -1,6 +1,6 @@
 export { default as documentObject } from "./src/common/documentObject.js";
+export * from "./src/common/serialize.js";
 export * as Dev from "./src/dev/dev.js";
-export { default as initializeBuiltins } from "./src/initializeBuiltins.js";
 export * as Origami from "./src/origami/origami.js";
 export { default as origamiHighlightDefinition } from "./src/origami/origamiHighlightDefinition.js";
 export { default as constructResponse } from "./src/server/constructResponse.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -17,9 +17,9 @@
     "typescript": "5.9.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.6.6",
+    "@weborigami/async-tree": "0.6.8",
     "@weborigami/json-feed-to-rss": "1.0.1",
-    "@weborigami/language": "0.6.6",
+    "@weborigami/language": "0.6.8",
     "css-tree": "3.1.0",
     "graphviz-wasm": "3.0.2",
     "highlight.js": "11.11.1",

package/src/cli/cli.js

@@ -5,7 +5,6 @@ import { formatError, projectRootFromPath } from "@weborigami/language";
 import path from "node:path";
 import process, { stdout } from "node:process";
 import help from "../dev/help.js";
-import initializeBuiltins from "../initializeBuiltins.js";
 import ori from "../origami/ori.js";
 
 const TypedArray = Object.getPrototypeOf(Uint8Array);
@@ -13,10 +12,6 @@ const TypedArray = Object.getPrototypeOf(Uint8Array);
 async function main(...args) {
   const expression = args.join(" ");
 
-  // Need to initialize builtins before calling projectRoot, which instantiates
-  // an OrigamiFileMap object that handles extensions, which requires builtins.
-  initializeBuiltins();
-
   // Find the project root.
   const currentDirectory = process.cwd();
   const projectRoot = await projectRootFromPath(currentDirectory);
@@ -39,8 +34,8 @@ async function main(...args) {
       result instanceof ArrayBuffer
         ? new Uint8Array(result)
         : typeof result === "string" || result instanceof TypedArray
-        ? result
-        : String(result);
+          ? result
+          : String(result);
     await stdout.write(output);
 
     // If stdout points to the console, and the result didn't end in a newline,

package/src/dev/OriCommandTransform.js

@@ -28,7 +28,7 @@ export default function OriCommandTransform(Base) {
         }
 
         // Key is an Origami command; invoke it.
-        const globals = await projectGlobals();
+        const globals = await projectGlobals(/** @type {any} */ (this));
         const commandName = trailingSlash.remove(key.slice(1).trim());
 
         // Look for command as a global or Dev command

package/src/dev/help.yaml

@@ -105,7 +105,7 @@ Origami:
     post:
       args: (url, data)
       description: POST the given data to the URL
-    project:
+    projectRoot:
       description: The root folder for the current Origami project
     redirect:
       args: (url, options)

package/src/dev/watch.js

@@ -16,7 +16,7 @@ export default async function watch(maplike, fn) {
   const container = await getTreeArgument(maplike, "watch");
 
   // Watch the indicated tree.
-  await /** @type {any} */ (container).watch?.();
+  /** @type {any} */ (container).watch?.();
 
   if (fn === undefined) {
     return container;

package/src/origami/fetch.js

@@ -4,7 +4,7 @@ import { handleExtension } from "@weborigami/language";
  * Extend the JavaScript `fetch` function to implicity return an ArrayBuffer
  * with an unpack() method if the resource has a known file extension.
  */
-export default async function fetchBuiltin(resource, options) {
+export default async function fetchBuiltin(resource, options, state) {
   const response = await fetch(resource, options);
   if (!response.ok) {
     return undefined;
@@ -14,5 +14,7 @@ export default async function fetchBuiltin(resource, options) {
 
   const url = new URL(resource);
   const key = url.pathname;
-  return handleExtension(value, key);
+
+  return handleExtension(value, key, state.container);
 }
+fetchBuiltin.needsState = true;

package/src/origami/image/format.js

@@ -9,7 +9,13 @@ import sharp from "sharp";
  * @param {any} options
  */
 export default async function imageFormat(input, format, options) {
-  return input instanceof Uint8Array || input instanceof ArrayBuffer
-    ? sharp(input).toFormat(format, options).toBuffer()
-    : undefined;
+  if (!(input instanceof Uint8Array || input instanceof ArrayBuffer)) {
+    return undefined;
+  }
+
+  const data = await sharp(input).toFormat(format, options).toBuffer();
+
+  // Sharp WASM library returns what appears to be a SharedArrayBuffer, which is
+  // not accepted in some contexts, so we convert it to a regular Uint8Array.
+  return new Uint8Array(data);
 }

package/src/origami/image/resize.js

@@ -7,7 +7,13 @@ import sharp from "sharp";
  * @param {import("sharp").ResizeOptions} options
  */
 export default async function resize(input, options) {
-  return input instanceof Uint8Array || input instanceof ArrayBuffer
-    ? sharp(input).rotate().resize(options).toBuffer()
-    : undefined;
+  if (!(input instanceof Uint8Array || input instanceof ArrayBuffer)) {
+    return undefined;
+  }
+
+  const data = await sharp(input).rotate().resize(options).toBuffer();
+
+  // Sharp WASM library returns what appears to be a SharedArrayBuffer, which is
+  // not accepted in some contexts, so we convert it to a regular Uint8Array.
+  return new Uint8Array(data);
 }

package/src/origami/ori.js

@@ -30,7 +30,7 @@ export default async function ori(expression, options = {}) {
 
   // Add Dev builtins as top-level globals
   const globals = {
-    ...(await projectGlobals()),
+    ...(await projectGlobals(parent)),
     ...dev,
   };
 
@@ -47,17 +47,6 @@ export default async function ori(expression, options = {}) {
   // Execute
   let result = await fn();
 
-  // if (result === undefined) {
-  //   // Was the code a path traversal?
-  //   const wasTraversal =
-  //     fn.code[0] === ops.unpack ||
-  //     (fn.code[0] instanceof Array && fn.code[0][0] === ops.scope);
-  //   if (wasTraversal) {
-  //     // Yes, probably an error
-  //     console.warn(`ori: warning: undefined ${highlightError(expression)}`);
-  //   }
-  // }
-
   // If result was a function, execute it.
   if (typeof result === "function") {
     result = await result();

package/src/origami/origami.js

@@ -1,16 +1,7 @@
 export { extension } from "@weborigami/async-tree";
 export { default as help } from "../dev/help.js"; // Alias
-export { default as document } from "../origami/document.js";
-// export { default as htmlDom } from "../origami/htmlDom.js";
-export { default as indexPage } from "../origami/indexPage.js";
-export { default as inline } from "../origami/inline.js";
-export { default as jsonKeys } from "../origami/jsonKeys.js";
-export { default as mdHtml } from "../origami/mdHtml.js";
-export { default as redirect } from "../origami/redirect.js";
-export { default as rss } from "../origami/rss.js";
-export { default as sitemap } from "../origami/sitemap.js";
-export { default as slug } from "../origami/slug.js";
-export { default as static } from "../origami/static.js";
+export { default as document } from "./document.js";
+// export { default as htmlDom } from "./htmlDom.js";
 export { default as basename } from "./basename.js";
 export { default as csv } from "./csv.js";
 export { default as fetch } from "./fetch.js";
@@ -18,8 +9,12 @@ export { default as htmlEscape } from "./htmlEscape.js";
 export { default as format } from "./image/format.js";
 export * as image from "./image/image.js";
 export { default as resize } from "./image/resize.js";
+export { default as indexPage } from "./indexPage.js";
+export { default as inline } from "./inline.js";
 export { default as json } from "./json.js";
+export { default as jsonKeys } from "./jsonKeys.js";
 export { default as jsonParse } from "./jsonParse.js";
+export { default as mdHtml } from "./mdHtml.js";
 export { default as mdOutline } from "./mdOutline.js";
 export { default as naturalOrder } from "./naturalOrder.js";
 export { default as once } from "./once.js";
@@ -28,9 +23,14 @@ export { default as pack } from "./pack.js";
 export { default as post } from "./post.js";
 export { default as project } from "./project.js";
 export { default as projectRoot } from "./projectRoot.js";
+export { default as redirect } from "./redirect.js";
 export { default as repeat } from "./repeat.js";
+export { default as rss } from "./rss.js";
 export { default as shell } from "./shell.js";
+export { default as sitemap } from "./sitemap.js";
 export { default as slash } from "./slash.js";
+export { default as slug } from "./slug.js";
+export { default as static } from "./static.js";
 export { default as string } from "./string.js";
 export { default as tsv } from "./tsv.js";
 export { default as unpack } from "./unpack.js";

package/src/server/constructResponse.js

@@ -122,6 +122,9 @@ function maybeHtml(text) {
   if (text.startsWith("<!DOCTYPE html>")) {
     return true;
   }
+  if (text.startsWith("<!--")) {
+    return true;
+  }
   // Check if the text starts with an HTML tag.
   // - start with possible whitespace
   // - followed by '<'

package/src/initializeBuiltins.js

@@ -1,23 +0,0 @@
-import { builtins } from "@weborigami/language";
-import * as dev from "./dev/dev.js";
-import help from "./dev/help.js";
-import * as origami from "./origami/origami.js";
-
-let initialized = false;
-
-/**
- * Pass the Origami builtins to the compiler.
- */
-export default function initializeBuiltins() {
-  if (!initialized) {
-    const origamiBuiltins = {
-      Dev: dev,
-      Origami: origami,
-      "help:": help,
-    };
-
-    Object.assign(builtins, origamiBuiltins);
-  }
-
-  initialized = true;
-}