@weborigami/language 0.3.4-jse.8 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.3.4-jse.8",
+  "version": "0.4.0",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
@@ -11,8 +11,8 @@
     "typescript": "5.8.2"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.3.4-jse.8",
-    "@weborigami/types": "0.3.4-jse.8",
+    "@weborigami/async-tree": "0.4.0",
+    "@weborigami/types": "0.4.0",
     "watcher": "2.3.1",
     "yaml": "2.7.0"
   },

package/src/compiler/optimize.js

@@ -56,7 +56,7 @@ export default function optimize(code, options = {}) {
 
     case ops.object:
       const entries = args;
-      const keys = entries.map(entryKey);
+      const keys = entries.map((entry) => entryKey(entry));
       locals.push(keys);
       break;
   }
@@ -70,13 +70,16 @@ export default function optimize(code, options = {}) {
       } else if (op === ops.object && index > 0) {
         const [key, value] = child;
         const adjustedLocals = avoidLocalRecursion(locals, key);
-        return [
-          key,
-          optimize(/** @type {AnnotatedCode} */ (value), {
-            ...options,
-            locals: adjustedLocals,
-          }),
-        ];
+        return annotate(
+          [
+            key,
+            optimize(/** @type {AnnotatedCode} */ (value), {
+              ...options,
+              locals: adjustedLocals,
+            }),
+          ],
+          child.location
+        );
       } else if (Array.isArray(child) && "location" in child) {
         // Review: Aside from ops.object (above), what non-instruction arrays
         // does this descend into?
@@ -191,6 +194,7 @@ function inlineLiteral(code) {
 function localReference(key, locals, location) {
   const normalized = trailingSlash.remove(key);
   const depth = getLocalReferenceDepth(locals, normalized);
+  /** @type {any[]} */
   const context = [ops.context];
   if (depth > 0) {
     context.push(depth);
@@ -310,6 +314,7 @@ function resolvePath(code, globals, locals, cache) {
 
 function scopeCall(locals, location) {
   const depth = locals.length;
+  /** @type {any[]} */
   const code = [ops.scope];
   if (depth > 0) {
     // Add context for appropriate depth to scope call

package/src/compiler/origami.pegjs

@@ -651,6 +651,9 @@ primary
 program "Origami program"
   = shebang? @expression
 
+programMode
+  = &{ return options.mode === "program" }
+
 propertyAccess
   = __ "." __ property:identifierLiteral {
     return annotate([markers.property, property], location());
@@ -709,7 +712,10 @@ shiftOperator
 // A shorthand lambda expression: `=foo(_)`
 shorthandFunction "lambda function"
   // Avoid a following equal sign (for an equality)
-  = shellMode "=" !"=" __ definition:implicitParenthesesCallExpression {
+  = (shellMode / programMode) "=" !"=" __ definition:implicitParenthesesCallExpression {
+      if (options.mode === "program") {
+        console.warn("Warning: the shorthand function syntax is deprecated in Origami programs. Use arrow syntax instead.");
+      }
       const lambdaParameters = annotate(
         [annotate([ops.literal, "_"], location())],
         location()
@@ -866,8 +872,8 @@ uriKey
 // A single character in a URI key
 uriKeyChar
   // Accept anything that doesn't end the URI key or path
-  // Note: Peggy doesn't support `/s` so we list space and tab explicitly.
-  = [^/,\)\]\} \t]
+  // Reject whitespace; see notes for `whitespace` term
+  = char:[^/,\)\]\}] !&{ return /\s/.test(char); } { return char; }
   / escapedChar
 
 // A slash-separated path of keys: `a/b/c`
@@ -890,10 +896,12 @@ unaryOperator
   / minus
 
 whitespace
+  = (whitespaceChar / comment)+
+
+whitespaceChar
   // JavaScript considers a large number of characters whitespace so we use the
   // `/s` definition to avoid missing any.
   = char:. &{ return /\s/.test(char); } { return char; }
-  / comment
 
 whitespaceWithNewLine
   = inlineSpace* comment? newLine __

package/src/compiler/parse.js

@@ -205,7 +205,7 @@ function peg$parse(input, options) {
   var peg$FAILED = {};
   var peg$source = options.grammarSource;
 
-  var peg$startRuleFunctions = { __: peg$parse__, additiveExpression: peg$parseadditiveExpression, additiveOperator: peg$parseadditiveOperator, angleBracketLiteral: peg$parseangleBracketLiteral, angleBracketPath: peg$parseangleBracketPath, angleBracketKey: peg$parseangleBracketKey, angleBracketPathChar: peg$parseangleBracketPathChar, arguments: peg$parsearguments, arrayLiteral: peg$parsearrayLiteral, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, arrowFunction: peg$parsearrowFunction, bitwiseAndExpression: peg$parsebitwiseAndExpression, bitwiseAndOperator: peg$parsebitwiseAndOperator, bitwiseOrExpression: peg$parsebitwiseOrExpression, bitwiseOrOperator: peg$parsebitwiseOrOperator, bitwiseXorExpression: peg$parsebitwiseXorExpression, bitwiseXorOperator: peg$parsebitwiseXorOperator, callExpression: peg$parsecallExpression, commaExpression: peg$parsecommaExpression, comment: peg$parsecomment, computedPropertyAccess: peg$parsecomputedPropertyAccess, computedPropertySpace: peg$parsecomputedPropertySpace, conditionalExpression: peg$parseconditionalExpression, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, ellipsis: peg$parseellipsis, equalityExpression: peg$parseequalityExpression, equalityOperator: peg$parseequalityOperator, escapedChar: peg$parseescapedChar, expectBacktick: peg$parseexpectBacktick, expectClosingBrace: peg$parseexpectClosingBrace, expectClosingBracket: peg$parseexpectClosingBracket, expectClosingParenthesis: peg$parseexpectClosingParenthesis, expectDoubleQuote: peg$parseexpectDoubleQuote, expectExpression: peg$parseexpectExpression, expectFrontDelimiter: peg$parseexpectFrontDelimiter, expectGuillemet: peg$parseexpectGuillemet, expectSingleQuote: peg$parseexpectSingleQuote, expectPipelineExpression: peg$parseexpectPipelineExpression, expectUnaryExpression: peg$parseexpectUnaryExpression, exponentiationExpression: peg$parseexponentiationExpression, expression: peg$parseexpression, floatLiteral: peg$parsefloatLiteral, frontDelimiter: peg$parsefrontDelimiter, frontMatterExpression: peg$parsefrontMatterExpression, frontMatterText: peg$parsefrontMatterText, frontMatterYaml: peg$parsefrontMatterYaml, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, host: peg$parsehost, hostname: peg$parsehostname, identifier: peg$parseidentifier, identifierLiteral: peg$parseidentifierLiteral, identifierPart: peg$parseidentifierPart, identifierStart: peg$parseidentifierStart, implicitParenthesesCallExpression: peg$parseimplicitParenthesesCallExpression, implicitParensthesesArguments: peg$parseimplicitParensthesesArguments, inlineSpace: peg$parseinlineSpace, integerLiteral: peg$parseintegerLiteral, key: peg$parsekey, keyChar: peg$parsekeyChar, keyCharStart: peg$parsekeyCharStart, list: peg$parselist, logicalAndExpression: peg$parselogicalAndExpression, logicalOrExpression: peg$parselogicalOrExpression, minus: peg$parseminus, multiLineComment: peg$parsemultiLineComment, multiplicativeExpression: peg$parsemultiplicativeExpression, multiplicativeOperator: peg$parsemultiplicativeOperator, newExpression: peg$parsenewExpression, newLine: peg$parsenewLine, numericLiteral: peg$parsenumericLiteral, nullishCoalescingExpression: peg$parsenullishCoalescingExpression, objectLiteral: peg$parseobjectLiteral, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectGetter: peg$parseobjectGetter, objectHiddenKey: peg$parseobjectHiddenKey, objectKey: peg$parseobjectKey, objectProperty: peg$parseobjectProperty, objectShorthandProperty: peg$parseobjectShorthandProperty, objectPublicKey: peg$parseobjectPublicKey, optionalChaining: peg$parseoptionalChaining, parameter: peg$parseparameter, parameterList: peg$parseparameterList, parameterSingleton: peg$parseparameterSingleton, parenthesesArguments: peg$parseparenthesesArguments, pathArguments: peg$parsepathArguments, pathKeys: peg$parsepathKeys, pathLiteral: peg$parsepathLiteral, pathSegment: peg$parsepathSegment, pipelineExpression: peg$parsepipelineExpression, primary: peg$parseprimary, program: peg$parseprogram, propertyAccess: peg$parsepropertyAccess, regexFlags: peg$parseregexFlags, regexLiteral: peg$parseregexLiteral, regexLiteralChar: peg$parseregexLiteralChar, relationalExpression: peg$parserelationalExpression, relationalOperator: peg$parserelationalOperator, separator: peg$parseseparator, shebang: peg$parseshebang, shellMode: peg$parseshellMode, shiftExpression: peg$parseshiftExpression, shiftOperator: peg$parseshiftOperator, shorthandFunction: peg$parseshorthandFunction, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, slash: peg$parseslash, slashes: peg$parseslashes, slashFollows: peg$parseslashFollows, spreadElement: peg$parsespreadElement, stringLiteral: peg$parsestringLiteral, templateBody: peg$parsetemplateBody, templateBodyChar: peg$parsetemplateBodyChar, templateBodyText: peg$parsetemplateBodyText, templateDocument: peg$parsetemplateDocument, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, unaryExpression: peg$parseunaryExpression, uri: peg$parseuri, uriExpression: peg$parseuriExpression, uriKey: peg$parseuriKey, uriKeyChar: peg$parseuriKeyChar, uriPath: peg$parseuriPath, uriScheme: peg$parseuriScheme, unaryOperator: peg$parseunaryOperator, whitespace: peg$parsewhitespace, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
+  var peg$startRuleFunctions = { __: peg$parse__, additiveExpression: peg$parseadditiveExpression, additiveOperator: peg$parseadditiveOperator, angleBracketLiteral: peg$parseangleBracketLiteral, angleBracketPath: peg$parseangleBracketPath, angleBracketKey: peg$parseangleBracketKey, angleBracketPathChar: peg$parseangleBracketPathChar, arguments: peg$parsearguments, arrayLiteral: peg$parsearrayLiteral, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, arrowFunction: peg$parsearrowFunction, bitwiseAndExpression: peg$parsebitwiseAndExpression, bitwiseAndOperator: peg$parsebitwiseAndOperator, bitwiseOrExpression: peg$parsebitwiseOrExpression, bitwiseOrOperator: peg$parsebitwiseOrOperator, bitwiseXorExpression: peg$parsebitwiseXorExpression, bitwiseXorOperator: peg$parsebitwiseXorOperator, callExpression: peg$parsecallExpression, commaExpression: peg$parsecommaExpression, comment: peg$parsecomment, computedPropertyAccess: peg$parsecomputedPropertyAccess, computedPropertySpace: peg$parsecomputedPropertySpace, conditionalExpression: peg$parseconditionalExpression, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, ellipsis: peg$parseellipsis, equalityExpression: peg$parseequalityExpression, equalityOperator: peg$parseequalityOperator, escapedChar: peg$parseescapedChar, expectBacktick: peg$parseexpectBacktick, expectClosingBrace: peg$parseexpectClosingBrace, expectClosingBracket: peg$parseexpectClosingBracket, expectClosingParenthesis: peg$parseexpectClosingParenthesis, expectDoubleQuote: peg$parseexpectDoubleQuote, expectExpression: peg$parseexpectExpression, expectFrontDelimiter: peg$parseexpectFrontDelimiter, expectGuillemet: peg$parseexpectGuillemet, expectSingleQuote: peg$parseexpectSingleQuote, expectPipelineExpression: peg$parseexpectPipelineExpression, expectUnaryExpression: peg$parseexpectUnaryExpression, exponentiationExpression: peg$parseexponentiationExpression, expression: peg$parseexpression, floatLiteral: peg$parsefloatLiteral, frontDelimiter: peg$parsefrontDelimiter, frontMatterExpression: peg$parsefrontMatterExpression, frontMatterText: peg$parsefrontMatterText, frontMatterYaml: peg$parsefrontMatterYaml, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, host: peg$parsehost, hostname: peg$parsehostname, identifier: peg$parseidentifier, identifierLiteral: peg$parseidentifierLiteral, identifierPart: peg$parseidentifierPart, identifierStart: peg$parseidentifierStart, implicitParenthesesCallExpression: peg$parseimplicitParenthesesCallExpression, implicitParensthesesArguments: peg$parseimplicitParensthesesArguments, inlineSpace: peg$parseinlineSpace, integerLiteral: peg$parseintegerLiteral, key: peg$parsekey, keyChar: peg$parsekeyChar, keyCharStart: peg$parsekeyCharStart, list: peg$parselist, logicalAndExpression: peg$parselogicalAndExpression, logicalOrExpression: peg$parselogicalOrExpression, minus: peg$parseminus, multiLineComment: peg$parsemultiLineComment, multiplicativeExpression: peg$parsemultiplicativeExpression, multiplicativeOperator: peg$parsemultiplicativeOperator, newExpression: peg$parsenewExpression, newLine: peg$parsenewLine, numericLiteral: peg$parsenumericLiteral, nullishCoalescingExpression: peg$parsenullishCoalescingExpression, objectLiteral: peg$parseobjectLiteral, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectGetter: peg$parseobjectGetter, objectHiddenKey: peg$parseobjectHiddenKey, objectKey: peg$parseobjectKey, objectProperty: peg$parseobjectProperty, objectShorthandProperty: peg$parseobjectShorthandProperty, objectPublicKey: peg$parseobjectPublicKey, optionalChaining: peg$parseoptionalChaining, parameter: peg$parseparameter, parameterList: peg$parseparameterList, parameterSingleton: peg$parseparameterSingleton, parenthesesArguments: peg$parseparenthesesArguments, pathArguments: peg$parsepathArguments, pathKeys: peg$parsepathKeys, pathLiteral: peg$parsepathLiteral, pathSegment: peg$parsepathSegment, pipelineExpression: peg$parsepipelineExpression, primary: peg$parseprimary, program: peg$parseprogram, programMode: peg$parseprogramMode, propertyAccess: peg$parsepropertyAccess, regexFlags: peg$parseregexFlags, regexLiteral: peg$parseregexLiteral, regexLiteralChar: peg$parseregexLiteralChar, relationalExpression: peg$parserelationalExpression, relationalOperator: peg$parserelationalOperator, separator: peg$parseseparator, shebang: peg$parseshebang, shellMode: peg$parseshellMode, shiftExpression: peg$parseshiftExpression, shiftOperator: peg$parseshiftOperator, shorthandFunction: peg$parseshorthandFunction, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, slash: peg$parseslash, slashes: peg$parseslashes, slashFollows: peg$parseslashFollows, spreadElement: peg$parsespreadElement, stringLiteral: peg$parsestringLiteral, templateBody: peg$parsetemplateBody, templateBodyChar: peg$parsetemplateBodyChar, templateBodyText: peg$parsetemplateBodyText, templateDocument: peg$parsetemplateDocument, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, unaryExpression: peg$parseunaryExpression, uri: peg$parseuri, uriExpression: peg$parseuriExpression, uriKey: peg$parseuriKey, uriKeyChar: peg$parseuriKeyChar, uriPath: peg$parseuriPath, uriScheme: peg$parseuriScheme, unaryOperator: peg$parseunaryOperator, whitespace: peg$parsewhitespace, whitespaceChar: peg$parsewhitespaceChar, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
   var peg$startRuleFunction = peg$parse__;
 
   var peg$c0 = "+";
@@ -285,7 +285,7 @@ function peg$parse(input, options) {
   var peg$r7 = /^[gimuy]/;
   var peg$r8 = /^[^\/\n\r]/;
   var peg$r9 = /^[^\n\r]/;
-  var peg$r10 = /^[^\/,)\]} \t]/;
+  var peg$r10 = /^[^\/,)\]}]/;
   var peg$r11 = /^[a-z]/;
   var peg$r12 = /^[a-z0-9+-.]/;
   var peg$r13 = /^[:]/;
@@ -399,7 +399,7 @@ function peg$parse(input, options) {
   var peg$e105 = peg$otherExpectation("template document");
   var peg$e106 = peg$otherExpectation("template literal");
   var peg$e107 = peg$otherExpectation("template substitution");
-  var peg$e108 = peg$classExpectation(["/", ",", ")", "]", "}", " ", "\t"], true, false);
+  var peg$e108 = peg$classExpectation(["/", ",", ")", "]", "}"], true, false);
   var peg$e109 = peg$otherExpectation("slash-separated path");
   var peg$e110 = peg$classExpectation([["a", "z"]], false, false);
   var peg$e111 = peg$classExpectation([["a", "z"], ["0", "9"], ["+", "."]], false, false);
@@ -684,54 +684,58 @@ function peg$parse(input, options) {
         location()
       );
     };
-  var peg$f83 = function(property) {
+  var peg$f83 = function() { return options.mode === "program" };
+  var peg$f84 = function(property) {
     return annotate([markers.property, property], location());
   };
-  var peg$f84 = function(flags) {
+  var peg$f85 = function(flags) {
       return flags.join("");
     };
-  var peg$f85 = function(chars, flags) {
+  var peg$f86 = function(chars, flags) {
       const regex = new RegExp(chars.join(""), flags);
       return annotate([ops.literal, regex], location());
     };
-  var peg$f86 = function(head, tail) {
+  var peg$f87 = function(head, tail) {
       return tail.reduce(makeBinaryOperation, head);
     };
-  var peg$f87 = function() { return null; };
-  var peg$f88 = function() { return options.mode === "shell" };
-  var peg$f89 = function(head, tail) {
+  var peg$f88 = function() { return null; };
+  var peg$f89 = function() { return options.mode === "shell" };
+  var peg$f90 = function(head, tail) {
       return tail.reduce(makeBinaryOperation, head);
     };
-  var peg$f90 = function(definition) {
+  var peg$f91 = function(definition) {
+      if (options.mode === "program") {
+        console.warn("Warning: the shorthand function syntax is deprecated in Origami programs. Use arrow syntax instead.");
+      }
       const lambdaParameters = annotate(
         [annotate([ops.literal, "_"], location())],
         location()
       );
       return annotate([ops.lambda, lambdaParameters, definition], location());
     };
-  var peg$f91 = function() { return null; };
-  var peg$f92 = function(chars) {
+  var peg$f92 = function() { return null; };
+  var peg$f93 = function(chars) {
     return annotate([ops.literal, chars.join("")], location());
   };
-  var peg$f93 = function() {
+  var peg$f94 = function() {
     return annotate([ops.literal, "/"], location());
   };
-  var peg$f94 = function() {
+  var peg$f95 = function() {
       return annotate([ops.literal, "/"], location());
     };
-  var peg$f95 = function() {
+  var peg$f96 = function() {
       return true;
     };
-  var peg$f96 = function(value) {
+  var peg$f97 = function(value) {
       return annotate([ops.spread, value], location());
     };
-  var peg$f97 = function(head, tail) {
+  var peg$f98 = function(head, tail) {
       return makeTemplate(ops.templateIndent, head, tail, location());
     };
-  var peg$f98 = function(chars) {
+  var peg$f99 = function(chars) {
       return annotate([ops.literal, chars.join("")], location());
     };
-  var peg$f99 = function(front, body) {
+  var peg$f100 = function(front, body) {
       // TODO: Deprecate @template
       const macroName = text().includes("@template") ? "@template" : "_template";
       if (macroName === "@template") {
@@ -740,10 +744,10 @@ function peg$parse(input, options) {
       }
       return annotate(applyMacro(front, macroName, body), location());
     };
-  var peg$f100 = function(front, body) {
+  var peg$f101 = function(front, body) {
       return makeDocument(front, body, location());
     };
-  var peg$f101 = function(body) {
+  var peg$f102 = function(body) {
       if (options.front) {
         return makeDocument(options.front, body, location());
       }
@@ -753,41 +757,43 @@ function peg$parse(input, options) {
       );
       return annotate([ops.lambda, lambdaParameters, body], location());
     };
-  var peg$f102 = function(head, tail) {
+  var peg$f103 = function(head, tail) {
       return makeTemplate(ops.templateTree, head, tail, location());
     };
-  var peg$f103 = function(chars) {
+  var peg$f104 = function(chars) {
       return annotate([ops.literal, chars.join("")], location());
     };
-  var peg$f104 = function(expression) {
+  var peg$f105 = function(expression) {
       return annotate(expression, location());
     };
-  var peg$f105 = function(operator, expression) {
+  var peg$f106 = function(operator, expression) {
       return makeUnaryOperation(operator, expression, location());
     };
-  var peg$f106 = function(scheme, host, path) {
+  var peg$f107 = function(scheme, host, path) {
       const rest = path ? path[1] : [];
       const keys = annotate([host, ...rest], location());
       return makeCall(scheme, keys, location());
     };
-  var peg$f107 = function(scheme, keys) {
+  var peg$f108 = function(scheme, keys) {
       return makeCall(scheme, keys, location());
     };
-  var peg$f108 = function(chars) {
+  var peg$f109 = function(chars) {
       return annotate([ops.literal, text()], location());
     };
-  var peg$f109 = function() {
+  var peg$f110 = function() {
     // A single slash is a path key
     return annotate([ops.literal, ""], location());
     };
-  var peg$f110 = function(keys) {
+  var peg$f111 = function(char) { return /\s/.test(char); };
+  var peg$f112 = function(char) { return char; };
+  var peg$f113 = function(keys) {
       return annotate(keys, location());
     };
-  var peg$f111 = function() {
+  var peg$f114 = function() {
       return annotate([markers.global, text()], location());
     };
-  var peg$f112 = function(char) { return /\s/.test(char); };
-  var peg$f113 = function(char) { return char; };
+  var peg$f115 = function(char) { return /\s/.test(char); };
+  var peg$f116 = function(char) { return char; };
   var peg$currPos = options.peg$currPos | 0;
   var peg$savedPos = peg$currPos;
   var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -4828,6 +4834,20 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parseprogramMode() {
+    var s0;
+
+    peg$savedPos = peg$currPos;
+    s0 = peg$f83();
+    if (s0) {
+      s0 = undefined;
+    } else {
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
   function peg$parsepropertyAccess() {
     var s0, s1, s2, s3, s4;
 
@@ -4845,7 +4865,7 @@ function peg$parse(input, options) {
       s4 = peg$parseidentifierLiteral();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f83(s4);
+        s0 = peg$f84(s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4881,7 +4901,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f84(s1);
+    s1 = peg$f85(s1);
     s0 = s1;
 
     return s0;
@@ -4915,7 +4935,7 @@ function peg$parse(input, options) {
       if (s3 !== peg$FAILED) {
         s4 = peg$parseregexFlags();
         peg$savedPos = s0;
-        s0 = peg$f85(s2, s4);
+        s0 = peg$f86(s2, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4998,7 +5018,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f86(s1, s2);
+      s0 = peg$f87(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -5113,7 +5133,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f87();
+      s0 = peg$f88();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -5126,7 +5146,7 @@ function peg$parse(input, options) {
     var s0;
 
     peg$savedPos = peg$currPos;
-    s0 = peg$f88();
+    s0 = peg$f89();
     if (s0) {
       s0 = undefined;
     } else {
@@ -5179,7 +5199,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f89(s1, s2);
+      s0 = peg$f90(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -5226,6 +5246,9 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     s1 = peg$parseshellMode();
+    if (s1 === peg$FAILED) {
+      s1 = peg$parseprogramMode();
+    }
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 61) {
         s2 = peg$c54;
@@ -5256,7 +5279,7 @@ function peg$parse(input, options) {
           s5 = peg$parseimplicitParenthesesCallExpression();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f90(s5);
+            s0 = peg$f91(s5);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -5339,7 +5362,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f91();
+      s0 = peg$f92();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -5370,7 +5393,7 @@ function peg$parse(input, options) {
       s3 = peg$parseexpectSingleQuote();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f92(s2);
+        s0 = peg$f93(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5434,7 +5457,7 @@ function peg$parse(input, options) {
     s1 = peg$parseslashFollows();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f93();
+      s1 = peg$f94();
     }
     s0 = s1;
 
@@ -5469,7 +5492,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f94();
+      s1 = peg$f95();
     }
     s0 = s1;
 
@@ -5498,7 +5521,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f95();
+      s1 = peg$f96();
     }
     s0 = s1;
 
@@ -5515,7 +5538,7 @@ function peg$parse(input, options) {
       s3 = peg$parseexpectPipelineExpression();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f96(s3);
+        s0 = peg$f97(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5592,7 +5615,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s0 = peg$f97(s1, s2);
+    s0 = peg$f98(s1, s2);
     peg$silentFails--;
     s1 = peg$FAILED;
     if (peg$silentFails === 0) { peg$fail(peg$e102); }
@@ -5648,7 +5671,7 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateBodyChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f98(s1);
+    s1 = peg$f99(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
@@ -5667,7 +5690,7 @@ function peg$parse(input, options) {
       s2 = peg$parse__();
       s3 = peg$parsetemplateBody();
       peg$savedPos = s0;
-      s0 = peg$f99(s1, s3);
+      s0 = peg$f100(s1, s3);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -5678,7 +5701,7 @@ function peg$parse(input, options) {
       if (s1 !== peg$FAILED) {
         s2 = peg$parsetemplateBody();
         peg$savedPos = s0;
-        s0 = peg$f100(s1, s2);
+        s0 = peg$f101(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5687,7 +5710,7 @@ function peg$parse(input, options) {
         s0 = peg$currPos;
         s1 = peg$parsetemplateBody();
         peg$savedPos = s0;
-        s1 = peg$f101(s1);
+        s1 = peg$f102(s1);
         s0 = s1;
       }
     }
@@ -5741,7 +5764,7 @@ function peg$parse(input, options) {
       s4 = peg$parseexpectBacktick();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f102(s2, s3);
+        s0 = peg$f103(s2, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5815,7 +5838,7 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateLiteralChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f103(s1);
+    s1 = peg$f104(s1);
     s0 = s1;
 
     return s0;
@@ -5845,7 +5868,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f104(s2);
+          s0 = peg$f105(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5894,7 +5917,7 @@ function peg$parse(input, options) {
       s3 = peg$parseexpectUnaryExpression();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f105(s1, s3);
+        s0 = peg$f106(s1, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5951,7 +5974,7 @@ function peg$parse(input, options) {
             s4 = null;
           }
           peg$savedPos = s0;
-          s0 = peg$f106(s1, s3, s4);
+          s0 = peg$f107(s1, s3, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5971,7 +5994,7 @@ function peg$parse(input, options) {
         s2 = peg$parsepathKeys();
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f107(s1, s2);
+          s0 = peg$f108(s1, s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -6025,7 +6048,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f108(s1);
+      s0 = peg$f109(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -6041,7 +6064,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f109();
+        s1 = peg$f110();
       }
       s0 = s1;
     }
@@ -6050,15 +6073,44 @@ function peg$parse(input, options) {
   }
 
   function peg$parseuriKeyChar() {
-    var s0;
+    var s0, s1, s2, s3;
 
-    s0 = input.charAt(peg$currPos);
-    if (peg$r10.test(s0)) {
+    s0 = peg$currPos;
+    s1 = input.charAt(peg$currPos);
+    if (peg$r10.test(s1)) {
       peg$currPos++;
     } else {
-      s0 = peg$FAILED;
+      s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e108); }
     }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      peg$savedPos = peg$currPos;
+      s3 = peg$f111(s1);
+      if (s3) {
+        s3 = undefined;
+      } else {
+        s3 = peg$FAILED;
+      }
+      peg$silentFails--;
+      if (s3 === peg$FAILED) {
+        s2 = undefined;
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f112(s1);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
     if (s0 === peg$FAILED) {
       s0 = peg$parseescapedChar();
     }
@@ -6086,7 +6138,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f110(s1);
+      s1 = peg$f113(s1);
     }
     s0 = s1;
     peg$silentFails--;
@@ -6137,7 +6189,7 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f111();
+        s0 = peg$f114();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -6205,6 +6257,29 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewhitespace() {
+    var s0, s1;
+
+    s0 = [];
+    s1 = peg$parsewhitespaceChar();
+    if (s1 === peg$FAILED) {
+      s1 = peg$parsecomment();
+    }
+    if (s1 !== peg$FAILED) {
+      while (s1 !== peg$FAILED) {
+        s0.push(s1);
+        s1 = peg$parsewhitespaceChar();
+        if (s1 === peg$FAILED) {
+          s1 = peg$parsecomment();
+        }
+      }
+    } else {
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsewhitespaceChar() {
     var s0, s1, s2;
 
     s0 = peg$currPos;
@@ -6217,7 +6292,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = peg$currPos;
-      s2 = peg$f112(s1);
+      s2 = peg$f115(s1);
       if (s2) {
         s2 = undefined;
       } else {
@@ -6225,7 +6300,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f113(s1);
+        s0 = peg$f116(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -6234,9 +6309,6 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$parsecomment();
-    }
 
     return s0;
   }
@@ -6395,6 +6467,7 @@ const peg$allowedStartRules = [
   "pipelineExpression",
   "primary",
   "program",
+  "programMode",
   "propertyAccess",
   "regexFlags",
   "regexLiteral",
@@ -6434,6 +6507,7 @@ const peg$allowedStartRules = [
   "uriScheme",
   "unaryOperator",
   "whitespace",
+  "whitespaceChar",
   "whitespaceWithNewLine"
 ];
 

package/src/compiler/parserHelpers.js

@@ -28,7 +28,7 @@ export const markers = {
  * If a parse result is an object that will be evaluated at runtime, attach the
  * location of the source code that produced it for debugging and error messages.
  *
- * @param {Code[]} code
+ * @param {any[]} code
  * @param {CodeLocation} location
  */
 export function annotate(code, location) {
@@ -375,11 +375,12 @@ export function makePath(keys) {
   const reference = annotate([markers.reference, headKey], head.location);
 
   let code = [markers.traverse, reference, ...tail];
-  code.location = spanLocations(code);
+  const location = spanLocations(code);
+  code = annotate(code, location);
 
   // Last key has trailing slash implies unpack operation
   if (trailingSlash.has(args.at(-1)[1])) {
-    code = annotate([ops.unpack, code], code.location);
+    code = annotate([ops.unpack, code], location);
   }
 
   return code;

package/src/runtime/getHandlers.js

@@ -6,5 +6,5 @@ export default function getHandlers(tree) {
     return null;
   }
   const root = Tree.root(tree);
-  return root.handlers;
+  return /** @type {any} */ (root).handlers;
 }

package/src/runtime/jsGlobals.js

@@ -12,22 +12,46 @@ import path from "node:path";
  * Fetch API
  * URL API
  */
-export default {
+const globals = {
+  AbortController,
+  AbortSignal,
   AggregateError,
   Array,
   ArrayBuffer,
+  // @ts-ignore this exists despite what TypeScript thinks
+  AsyncDisposableStack,
   Atomics,
   BigInt,
   BigInt64Array,
   BigUint64Array,
+  Blob,
   Boolean,
+  BroadcastChannel,
+  Buffer,
+  ByteLengthQueuingStrategy,
+  CloseEvent,
+  CompressionStream,
+  CountQueuingStrategy,
+  Crypto,
+  CryptoKey,
+  CustomEvent,
+  DOMException,
   DataView,
   Date,
+  DecompressionStream,
+  // @ts-ignore this exists despite what TypeScript thinks
+  DisposableStack,
   Error,
   EvalError,
+  Event,
+  EventTarget,
+  File,
   FinalizationRegistry,
+  // @ts-ignore this exists despite what TypeScript thinks
+  Float16Array,
   Float32Array,
   Float64Array,
+  FormData,
   Function,
   Headers,
   Infinity,
@@ -35,17 +59,33 @@ export default {
   Int32Array,
   Int8Array,
   Intl,
-  // @ts-ignore Iterator does exist despite what TypeScript thinks
+  // @ts-ignore this exists despite what TypeScript thinks
   Iterator,
   JSON,
   Map,
   Math,
+  MessageChannel,
+  MessageEvent,
+  MessagePort,
   NaN,
   Number,
   Object,
+  Performance,
+  PerformanceEntry,
+  PerformanceMark,
+  PerformanceMeasure,
+  PerformanceObserver,
+  PerformanceObserverEntryList,
+  PerformanceResourceTiming,
   Promise,
   Proxy,
   RangeError,
+  ReadableByteStreamController,
+  ReadableStream,
+  ReadableStreamBYOBReader,
+  ReadableStreamBYOBRequest,
+  ReadableStreamDefaultController,
+  ReadableStreamDefaultReader,
   ReferenceError,
   Reflect,
   RegExp,
@@ -54,10 +94,23 @@ export default {
   Set,
   SharedArrayBuffer,
   String,
+  SubtleCrypto,
+  // @ts-ignore this exists despite what TypeScript thinks
+  SuppressedError,
   Symbol,
   SyntaxError,
+  TextDecoder,
+  TextDecoderStream,
+  TextEncoder,
+  TextEncoderStream,
+  TransformStream,
+  TransformStreamDefaultController,
   TypeError,
   URIError,
+  URL,
+  // @ts-ignore this exists despite what TypeScript thinks
+  URLPattern,
+  URLSearchParams,
   Uint16Array,
   Uint32Array,
   Uint8Array,
@@ -65,24 +118,58 @@ export default {
   WeakMap,
   WeakRef,
   WeakSet,
+  WebAssembly,
+  WebSocket,
+  WritableStream,
+  WritableStreamDefaultController,
+  WritableStreamDefaultWriter,
+  atob,
+  btoa,
+  clearImmediate,
+  clearInterval,
+  clearTimeout,
+  console,
+  crypto,
   decodeURI,
   decodeURIComponent,
   encodeURI,
   encodeURIComponent,
+  escape,
   eval,
-  false: false, // treat like a global
-  fetch: fetchWrapper, // special case
+  // fetch -- special case, see below
   globalThis,
-  import: importWrapper, // not a function in JS but acts like one
   isFinite,
   isNaN,
-  null: null, // treat like a global
   parseFloat,
   parseInt,
-  true: true, // treat like a global
+  performance,
+  process,
+  queueMicrotask,
+  setImmediate,
+  setInterval,
+  setTimeout,
+  structuredClone,
   undefined,
+  unescape,
+
+  // Treat these like globals
+  false: false,
+  null: null,
+  true: true,
+
+  // Special cases
+  fetch: fetchWrapper,
+  import: importWrapper,
 };
 
+// Give access to our own custom globals as `globalThis`
+Object.defineProperty(globals, "globalThis", {
+  enumerable: true,
+  value: globals,
+});
+
+export default globals;
+
 async function fetchWrapper(resource, options) {
   const response = await fetch(resource, options);
   return response.ok ? await response.arrayBuffer() : undefined;

package/src/runtime/ops.js

@@ -99,13 +99,18 @@ cache.unevaluatedArgs = true;
 /**
  * JavaScript comma operator, returns the last argument.
  *
- * @param  {...any} args
- * @returns
+ * @this {AsyncTree|null}
+ * @param  {...AnnotatedCode} args
  */
-export function comma(...args) {
-  return args.at(-1);
+export async function comma(...args) {
+  let result;
+  for (const arg of args) {
+    result = await evaluate.call(this, arg);
+  }
+  return result;
 }
 addOpLabel(comma, "«ops.comma»");
+comma.unevaluatedArgs = true;
 
 /**
  * Concatenate the given arguments.
@@ -204,7 +209,7 @@ addOpLabel(greaterThanOrEqual, "«ops.greaterThanOrEqual»");
 export async function homeDirectory(...keys) {
   const tree = new OrigamiFiles(os.homedir());
   // Use the same handlers as the current tree
-  tree.handlers = getHandlers(this);
+  /** @type {any} */ (tree).handlers = getHandlers(this);
   return keys.length > 0 ? Tree.traverse(tree, ...keys) : tree;
 }
 addOpLabel(homeDirectory, "«ops.homeDirectory»");
@@ -424,7 +429,7 @@ addOpLabel(remainder, "«ops.remainder»");
 export async function rootDirectory(...keys) {
   const tree = new OrigamiFiles("/");
   // Use the same handlers as the current tree
-  tree.handlers = getHandlers(this);
+  /** @type {any} */ (tree).handlers = getHandlers(this);
   return keys.length > 0 ? Tree.traverse(tree, ...keys) : tree;
 }
 addOpLabel(rootDirectory, "«ops.rootDirectory»");

package/test/compiler/codeHelpers.js

@@ -7,6 +7,15 @@ export function assertCodeEqual(actual, expected) {
   assert.deepStrictEqual(actualStripped, expectedStripped);
 }
 
+export function assertCodeLocations(code) {
+  assert(code.location, "no location");
+  for (const item of code) {
+    if (Array.isArray(item)) {
+      assertCodeLocations(item);
+    }
+  }
+}
+
 /**
  * Adds a fake source to code.
  *

package/test/compiler/optimize.test.js

@@ -4,7 +4,11 @@ import * as compile from "../../src/compiler/compile.js";
 import optimize from "../../src/compiler/optimize.js";
 import { markers } from "../../src/compiler/parserHelpers.js";
 import { ops } from "../../src/runtime/internal.js";
-import { assertCodeEqual, createCode } from "./codeHelpers.js";
+import {
+  assertCodeEqual,
+  assertCodeLocations,
+  createCode,
+} from "./codeHelpers.js";
 
 describe("optimize", () => {
   test("change local references to context references", () => {
@@ -277,5 +281,6 @@ function assertCompile(expression, expected, mode = "shell") {
   const globals = new ObjectTree({});
   const fn = compile.expression(expression, { globals, mode, parent });
   const actual = fn.code;
+  assertCodeLocations(actual);
   assertCodeEqual(actual, expected);
 }

package/test/compiler/parse.test.js

@@ -3,7 +3,7 @@ import { describe, test } from "node:test";
 import { parse } from "../../src/compiler/parse.js";
 import { markers } from "../../src/compiler/parserHelpers.js";
 import * as ops from "../../src/runtime/ops.js";
-import { assertCodeEqual } from "./codeHelpers.js";
+import { assertCodeEqual, assertCodeLocations } from "./codeHelpers.js";
 
 describe("Origami parser", () => {
   test("additiveExpression", () => {
@@ -1537,19 +1537,6 @@ Body text`,
     assertParse("uriScheme", "https:", [markers.global, "https:"]);
   });
 
-  test("whitespace block", () => {
-    assertParse(
-      "__",
-      `  
-  // First comment
-  // Second comment
-     `,
-      null,
-      "jse",
-      false
-    );
-  });
-
   test("unaryExpression", () => {
     assertParse("unaryExpression", "!true", [
       ops.logicalNot,
@@ -1566,6 +1553,19 @@ Body text`,
     assertParse("unaryOperator", "-", "-");
     assertParse("unaryOperator", "~", "~");
   });
+
+  test("whitespace block", () => {
+    assertParse(
+      "__",
+      `  
+  // First comment
+  // Second comment
+     `,
+      null,
+      "jse",
+      false
+    );
+  });
 });
 
 function assertParse(
@@ -1596,16 +1596,8 @@ function assertParse(
   assertCodeEqual(code, expected);
 }
 
-function assertCodeLocations(code) {
-  assert(code.location, "no location");
-  for (const item of code) {
-    if (Array.isArray(item)) {
-      assertCodeLocations(item);
-    }
-  }
-}
-
 function assertThrows(startRule, source, message, position, mode = "shell") {
+  // @ts-ignore We declare this so we can inspect it in debugger
   let code;
   try {
     code = parse(source, {

package/test/runtime/expressionObject.test.js

@@ -54,7 +54,7 @@ describe("expressionObject", () => {
   test("returned object values can be unpacked", async () => {
     const entries = [["data.json", `{ "a": 1 }`]];
     const parent = new ObjectTree({});
-    parent.handlers = {
+    /** @type {any} */ (parent).handlers = {
       "json.handler": {
         unpack: JSON.parse,
       },

package/test/runtime/ops.test.js

@@ -358,7 +358,7 @@ describe("ops", () => {
       const a = await tree.get("a");
       const b = await a.get("b");
       const scope = await ops.scope.call(b);
-      assert.equal(await scope.get("c"), 1);
+      assert.equal(await scope?.get("c"), 1);
     });
 
     test("accepts an optional context", async () => {
@@ -372,7 +372,7 @@ describe("ops", () => {
       const a = await tree.get("a");
       const b = await a.get("b");
       const scope = await ops.scope.call(b, tree);
-      assert.equal(await scope.get("c"), 1);
+      assert.equal(await scope?.get("c"), 1);
     });
   });