@weborigami/language 0.4.2 → 0.5.0

package/main.js

@@ -16,6 +16,5 @@ export { default as jsGlobals } from "./src/runtime/jsGlobals.js";
 export * as moduleCache from "./src/runtime/moduleCache.js";
 export { default as OrigamiFiles } from "./src/runtime/OrigamiFiles.js";
 export * as symbols from "./src/runtime/symbols.js";
-export { default as taggedTemplateIndent } from "./src/runtime/templateIndent.js";
 export { default as TreeEvent } from "./src/runtime/TreeEvent.js";
 export { default as WatchFilesMixin } from "./src/runtime/WatchFilesMixin.js";

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@weborigami/language",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
   "types": "./index.ts",
   "devDependencies": {
-    "@types/node": "22.13.13",
+    "@types/node": "24.3.0",
     "peggy": "4.2.0.",
-    "typescript": "5.8.2"
+    "typescript": "5.9.2"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.4.2",
-    "@weborigami/types": "0.4.2",
+    "@weborigami/async-tree": "0.5.0",
+    "@weborigami/types": "0.5.0",
     "watcher": "2.3.1",
-    "yaml": "2.7.0"
+    "yaml": "2.8.1"
   },
   "scripts": {
     "build": "peggy --allowed-start-rules=\"*\" --format es src/compiler/origami.pegjs --output src/compiler/parse.js",

package/src/compiler/compile.js

@@ -5,9 +5,8 @@ import { parse } from "./parse.js";
 
 function compile(source, options) {
   const { front, startRule } = options;
-  const mode = options.mode ?? "shell";
+  const mode = options.mode ?? "program";
   const globals = options.globals ?? jsGlobals;
-  const enableCaching = options.enableCaching ?? true;
   if (typeof source === "string") {
     source = { text: source };
   }
@@ -17,11 +16,10 @@ function compile(source, options) {
     mode,
     startRule,
   });
-  const cache = enableCaching ? {} : null;
+  const cache = mode === "program" ? {} : null;
   const optimized = optimize(code, {
     cache,
     globals,
-    mode,
   });
   const fn = createExpressionFunction(optimized);
   return fn;

package/src/compiler/optimize.js

@@ -154,7 +154,7 @@ function compoundReference(key, globals, locals, location) {
   // Process the remaining parts as property accesses
   while (tail.length > 0) {
     const part = tail.shift();
-    result = annotate([result, part], location);
+    result = annotate([ops.property, result, part], location);
   }
 
   return { type, result };
@@ -297,7 +297,12 @@ function resolvePath(code, globals, locals, cache) {
   let { type, result } = reference(head, globals, locals);
 
   if (tail.length > 0) {
-    if (result instanceof Array) {
+    // If the result is a traversal, we can safely extend it
+    const extendResult =
+      result instanceof Array &&
+      result[0] instanceof Array &&
+      (result[0][0] === ops.scope || result[0][0] === ops.context);
+    if (extendResult) {
       result.push(...tail);
     } else {
       result = annotate([result, ...tail], code.location);

package/src/compiler/origami.pegjs

@@ -205,7 +205,11 @@ doubleQuoteString "double quote string"
 doubleQuoteStringChar
   = !('"' / newLine) @textChar
 
-ellipsis = "..." / "…" // Unicode ellipsis
+ellipsis
+  = "..."
+  / "…" {
+    console.warn("The use of the Unicode ellipsis character for an object spread is deprecated; use `...` (three periods) instead.");
+  }
 
 equalityExpression
   = head:relationalExpression tail:(__ @equalityOperator __ @relationalExpression)* {
@@ -655,7 +659,7 @@ programMode
   = &{ return options.mode === "program" }
 
 propertyAccess
-  = __ "." __ property:identifierLiteral {
+  = whitespaceOptionalForProgram "." whitespaceOptionalForProgram property:identifierLiteral {
     return annotate([markers.property, property], location());
   }
 
@@ -786,13 +790,7 @@ templateBodyText "template text"
 
 templateDocument "template document"
   = front:frontMatterExpression __ body:templateBody {
-      // TODO: Deprecate @template
-      const macroName = text().includes("@template") ? "@template" : "_template";
-      if (macroName === "@template") {
-        // If the front matter is a macro, apply it to the body
-        console.warn("Warning: the @template() macro is deprecated. Use _template() instead.");
-      }
-      return annotate(applyMacro(front, macroName, body), location());
+      return annotate(applyMacro(front, "_template", body), location());
     }
   / front:frontMatterYaml body:templateBody {
       return makeDocument(front, body, location());
@@ -903,5 +901,11 @@ whitespaceChar
   // `/s` definition to avoid missing any.
   = char:. &{ return /\s/.test(char); } { return char; }
 
+// In some cases whitespace isn't allowed in shell mode but is allowed in
+// program mode
+whitespaceOptionalForProgram
+  = programMode __
+  / shellMode
+
 whitespaceWithNewLine
   = inlineSpace* comment? newLine __