@weborigami/origami 0.6.7 → 0.6.8

package/main.js

@@ -1,7 +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.7",
+  "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.7",
+    "@weborigami/async-tree": "0.6.8",
     "@weborigami/json-feed-to-rss": "1.0.1",
-    "@weborigami/language": "0.6.7",
+    "@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/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/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;
-}