@weborigami/origami 0.6.5 → 0.6.7

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,5 +1,7 @@
 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.5",
+  "version": "0.6.7",
   "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.5",
+    "@weborigami/async-tree": "0.6.7",
     "@weborigami/json-feed-to-rss": "1.0.1",
-    "@weborigami/language": "0.6.5",
+    "@weborigami/language": "0.6.7",
     "css-tree": "3.1.0",
     "graphviz-wasm": "3.0.2",
     "highlight.js": "11.11.1",

package/src/cli/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { Tree } from "@weborigami/async-tree";
-import { formatError, projectRoot } from "@weborigami/language";
+import { formatError, projectRootFromPath } from "@weborigami/language";
 import path from "node:path";
 import process, { stdout } from "node:process";
 import help from "../dev/help.js";
@@ -18,7 +18,8 @@ async function main(...args) {
   initializeBuiltins();
 
   // Find the project root.
-  const projectTree = await projectRoot();
+  const currentDirectory = process.cwd();
+  const projectRoot = await projectRootFromPath(currentDirectory);
 
   // If no arguments were passed, show usage.
   if (!expression) {
@@ -28,9 +29,8 @@ async function main(...args) {
   }
 
   // Traverse from the project root to the current directory.
-  const currentDirectory = process.cwd();
-  const relative = path.relative(projectTree.path, currentDirectory);
-  const parent = await Tree.traversePath(projectTree, relative);
+  const relative = path.relative(projectRoot.path, currentDirectory);
+  const parent = await Tree.traversePath(projectRoot, relative);
 
   const result = await ori(expression, { parent });
 

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

@@ -4,8 +4,7 @@ import {
   isStringlike,
   toString,
 } from "@weborigami/async-tree";
-import { compile } from "@weborigami/language";
-import projectGlobals from "@weborigami/language/src/project/projectGlobals.js";
+import { compile, projectGlobals } from "@weborigami/language";
 import { toYaml } from "../common/serialize.js";
 import * as dev from "../dev/dev.js";
 

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";
@@ -27,9 +22,15 @@ export { default as ori } from "./ori.js";
 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/origami/project.js

@@ -1,3 +1,6 @@
 import { projectRoot } from "@weborigami/language";
 
-export default projectRoot;
+export default async function project() {
+  console.warn("Origami.project has been renamed to Origami.projectRoot");
+  return projectRoot();
+}

package/src/origami/projectRoot.js

@@ -0,0 +1,3 @@
+import { projectRoot } from "@weborigami/language";
+
+export default projectRoot;

package/src/server/constructResponse.js

@@ -28,7 +28,7 @@ export default async function constructResponse(request, resource) {
   }
 
   // Determine media type, what data we'll send, and encoding.
-  const url = new URL(request.url ?? "", `https://${request.headers.host}`);
+  const url = new URL(request?.url ?? "", `https://${request?.headers.host}`);
 
   if (!url.pathname.endsWith("/") && Tree.isMaplike(resource)) {
     // Maplike resource: redirect to its index page.
@@ -89,6 +89,7 @@ export default async function constructResponse(request, resource) {
     const text = toString(resource);
     if (text) {
       mediaType = maybeHtml(text) ? "text/html" : "text/plain";
+      mediaType += "; charset=utf-8";
       body = text;
     }
   } else if (mediaType && SiteMap.mediaTypeIsText(mediaType)) {
@@ -121,13 +122,16 @@ 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 '<'
   // - followed by a letter
-  // - followed by letters, digits, hyphens, underscores, colons, or periods
+  // - followed maybe by letters, digits, hyphens, underscores, colons, or periods
   // - followed by '>', or
   // - followed by whitespace, anything that's not '>', then a '>'
-  const tagRegex = /^\s*<[a-zA-Z][a-zA-Z0-9-_:\.]+(>|[\s]+[^>]*>)/;
+  const tagRegex = /^\s*<[a-zA-Z][a-zA-Z0-9-_:\.]*(>|[\s]+[^>]*>)/;
   return tagRegex.test(text);
 }

package/src/server/server.js

@@ -80,7 +80,7 @@ export async function handleRequest(request, response, map) {
   }
 }
 
-function keysFromUrl(url) {
+export function keysFromUrl(url) {
   const encodedKeys = keysFromPath(url.pathname);
   const keys = encodedKeys.map((key) => decodeURIComponent(key));
 
@@ -119,7 +119,7 @@ export function requestListener(maplike) {
  * Construct a page in response in the given error, and also show the error in
  * the console.
  */
-function respondWithError(response, error) {
+export function respondWithError(response, error) {
   let message = formatError(error);
   // Remove ANSI escape codes from the message.
   message = message.replace(/\x1b\[[0-9;]*m/g, "");
@@ -138,7 +138,7 @@ ${message}
 </body>
 </html>
 `;
-  response.writeHead(404, { "Content-Type": "text/html" });
+  response.writeHead(500, { "Content-Type": "text/html" });
   response.end(html, "utf-8");
   console.error(message);
 }