@weborigami/language 0.0.48 → 0.0.50

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@weborigami/language",
-  "version": "0.0.48",
+  "version": "0.0.50",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
   "types": "./index.ts",
   "devDependencies": {
-    "@types/node": "20.11.7",
-    "typescript": "5.3.3"
+    "@types/node": "20.12.8",
+    "peggy": "4.0.2",
+    "typescript": "5.4.5"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.48",
-    "@weborigami/types": "0.0.48",
-    "peggy": "4.0.2",
-    "watcher": "2.3.0"
+    "@weborigami/async-tree": "0.0.50",
+    "@weborigami/types": "0.0.50",
+    "watcher": "2.3.1"
   },
   "scripts": {
     "build": "peggy --allowed-start-rules=\"*\" --format es src/compiler/origami.pegjs --output src/compiler/parse.js",

package/src/compiler/origami.pegjs

@@ -114,9 +114,10 @@ escapedChar "backslash-escaped character"
 expr
   = pipeline
 
-// Top-level Origami expression, possible leading/trailing whitepsace.
+// Top-level Origami expression, possible shebang directive and leading/trailing
+// whitepsace.
 expression "Origami expression"
-  = __ @expr __
+  = shebang? __ @expr __
 
 float "floating-point number"
   = sign? digits? "." digits {
@@ -147,7 +148,7 @@ identifier "identifier"
   = chars:identifierChar+ { return chars.join(""); }
 
 identifierChar
-  = [^(){}\[\]<>\-=,/:\`"'\\# →⇒\t\n\r] // No unescaped whitespace or special chars
+  = [^(){}\[\]<>\-=,/:\`"'\\ →⇒\t\n\r] // No unescaped whitespace or special chars
   / @'-' !'>' // Accept a hyphen but not in a single arrow combination
   / escapedChar
 
@@ -254,6 +255,7 @@ protocol "protocol"
 reservedProtocol "reserved protocol"
   = "https" { return ops.https; }
   / "http" { return ops.http; }
+  / "new" { return ops.constructor; }
   / "package" { return [ops.scope, "@package"] } // Alias
   / "treehttps" { return ops.treeHttps; }
   / "treehttp" { return ops.treeHttp; }
@@ -268,14 +270,16 @@ separator
   = __ "," __
   / whitespaceWithNewLine
 
+shebang
+  = "#!" [^\n\r]* { return null; }
+
 sign
   = [+\-]
 
 singleArrow = "→" / "->"
 
 singleLineComment
-  = "#" [^\n\r]* { return null; }
-  / "//" [^\n\r]* { return null; }
+  = "//" [^\n\r]* { return null; }
 
 singleQuoteString "single quote string"
   = "'" chars:singleQuoteStringChar* "'" { return chars.join(""); }
@@ -322,7 +326,7 @@ templateDocument "template"
 
 // Template documents can contain backticks at the top level.
 templateDocumentChar
-  = !("{{" / "${") @textChar
+  = !("${") @textChar
 
 // The contents of a template document containing plain text and substitutions
 templateDocumentContents
@@ -338,7 +342,7 @@ templateLiteral "template literal"
   = "`" @templateLiteralContents "`"
 
 templateLiteralChar
-  = !("`" / "{{" / "${") @textChar
+  = !("`" / "${") @textChar
 
 // The contents of a template literal containing plain text and substitutions
 templateLiteralContents
@@ -350,10 +354,9 @@ templateLiteralContents
 templateLiteralText
   = chars:templateLiteralChar+ { return chars.join(""); }
 
-// A substitution in a template literal: `{{ fn() }}`
+// A substitution in a template literal: `${x}`
 templateSubstitution "template substitution"
-  = "{{" @expression "}}"
-  / "${" @expression "}"
+  = "${" @expression "}"
 
 textChar
   = escapedChar / .

package/src/compiler/parse.js

@@ -193,7 +193,7 @@ function peg$parse(input, options) {
   var peg$FAILED = {};
   var peg$source = options.grammarSource;
 
-  var peg$startRuleFunctions = { __: peg$parse__, absoluteFilePath: peg$parseabsoluteFilePath, args: peg$parseargs, array: peg$parsearray, assignment: peg$parseassignment, assignmentOrShorthand: peg$parseassignmentOrShorthand, callTarget: peg$parsecallTarget, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParen: peg$parseclosingParen, comment: peg$parsecomment, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, escapedChar: peg$parseescapedChar, expr: peg$parseexpr, expression: peg$parseexpression, float: peg$parsefloat, functionComposition: peg$parsefunctionComposition, group: peg$parsegroup, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParensArgs: peg$parseimplicitParensArgs, inlineSpace: peg$parseinlineSpace, integer: peg$parseinteger, lambda: peg$parselambda, leadingSlashPath: peg$parseleadingSlashPath, list: peg$parselist, multiLineComment: peg$parsemultiLineComment, newLine: peg$parsenewLine, number: peg$parsenumber, object: peg$parseobject, objectProperties: peg$parseobjectProperties, objectProperty: peg$parseobjectProperty, objectPropertyOrShorthand: peg$parseobjectPropertyOrShorthand, parameterizedLambda: peg$parseparameterizedLambda, parensArgs: peg$parseparensArgs, pipeline: peg$parsepipeline, path: peg$parsepath, pathKey: peg$parsepathKey, protocolCall: peg$parseprotocolCall, protocol: peg$parseprotocol, reservedProtocol: peg$parsereservedProtocol, scopeReference: peg$parsescopeReference, separator: peg$parseseparator, sign: peg$parsesign, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, step: peg$parsestep, start: peg$parsestart, string: peg$parsestring, templateDocument: peg$parsetemplateDocument, templateDocumentChar: peg$parsetemplateDocumentChar, templateDocumentContents: peg$parsetemplateDocumentContents, templateDocumentText: peg$parsetemplateDocumentText, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralContents: peg$parsetemplateLiteralContents, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, tree: peg$parsetree, treeAssignments: peg$parsetreeAssignments, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
+  var peg$startRuleFunctions = { __: peg$parse__, absoluteFilePath: peg$parseabsoluteFilePath, args: peg$parseargs, array: peg$parsearray, assignment: peg$parseassignment, assignmentOrShorthand: peg$parseassignmentOrShorthand, callTarget: peg$parsecallTarget, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParen: peg$parseclosingParen, comment: peg$parsecomment, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, escapedChar: peg$parseescapedChar, expr: peg$parseexpr, expression: peg$parseexpression, float: peg$parsefloat, functionComposition: peg$parsefunctionComposition, group: peg$parsegroup, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParensArgs: peg$parseimplicitParensArgs, inlineSpace: peg$parseinlineSpace, integer: peg$parseinteger, lambda: peg$parselambda, leadingSlashPath: peg$parseleadingSlashPath, list: peg$parselist, multiLineComment: peg$parsemultiLineComment, newLine: peg$parsenewLine, number: peg$parsenumber, object: peg$parseobject, objectProperties: peg$parseobjectProperties, objectProperty: peg$parseobjectProperty, objectPropertyOrShorthand: peg$parseobjectPropertyOrShorthand, parameterizedLambda: peg$parseparameterizedLambda, parensArgs: peg$parseparensArgs, pipeline: peg$parsepipeline, path: peg$parsepath, pathKey: peg$parsepathKey, protocolCall: peg$parseprotocolCall, protocol: peg$parseprotocol, reservedProtocol: peg$parsereservedProtocol, scopeReference: peg$parsescopeReference, separator: peg$parseseparator, shebang: peg$parseshebang, sign: peg$parsesign, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, step: peg$parsestep, start: peg$parsestart, string: peg$parsestring, templateDocument: peg$parsetemplateDocument, templateDocumentChar: peg$parsetemplateDocumentChar, templateDocumentContents: peg$parsetemplateDocumentContents, templateDocumentText: peg$parsetemplateDocumentText, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralContents: peg$parsetemplateLiteralContents, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, tree: peg$parsetree, treeAssignments: peg$parsetreeAssignments, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
   var peg$startRuleFunction = peg$parse__;
 
   var peg$c0 = "//";
@@ -220,25 +220,24 @@ function peg$parse(input, options) {
   var peg$c21 = "{";
   var peg$c22 = "https";
   var peg$c23 = "http";
-  var peg$c24 = "package";
-  var peg$c25 = "treehttps";
-  var peg$c26 = "treehttp";
-  var peg$c27 = "tree";
-  var peg$c28 = ",";
-  var peg$c29 = "\u2192";
-  var peg$c30 = "->";
-  var peg$c31 = "#";
-  var peg$c32 = "'";
-  var peg$c33 = "{{";
+  var peg$c24 = "new";
+  var peg$c25 = "package";
+  var peg$c26 = "treehttps";
+  var peg$c27 = "treehttp";
+  var peg$c28 = "tree";
+  var peg$c29 = ",";
+  var peg$c30 = "#!";
+  var peg$c31 = "\u2192";
+  var peg$c32 = "->";
+  var peg$c33 = "'";
   var peg$c34 = "${";
   var peg$c35 = "`";
-  var peg$c36 = "}}";
 
   var peg$r0 = /^[0-9]/;
-  var peg$r1 = /^[^(){}[\]<>\-=,\/:`"'\\# \u2192\u21D2\t\n\r]/;
+  var peg$r1 = /^[^(){}[\]<>\-=,\/:`"'\\ \u2192\u21D2\t\n\r]/;
   var peg$r2 = /^[ \t]/;
-  var peg$r3 = /^[+\-]/;
-  var peg$r4 = /^[^\n\r]/;
+  var peg$r3 = /^[^\n\r]/;
+  var peg$r4 = /^[+\-]/;
 
   var peg$e0 = peg$otherExpectation("absolute file path");
   var peg$e1 = peg$literalExpectation("//", false);
@@ -269,7 +268,7 @@ function peg$parse(input, options) {
   var peg$e26 = peg$otherExpectation("HTTP/HTTPS host");
   var peg$e27 = peg$literalExpectation(":", false);
   var peg$e28 = peg$otherExpectation("identifier");
-  var peg$e29 = peg$classExpectation(["(", ")", "{", "}", "[", "]", "<", ">", "-", "=", ",", "/", ":", "`", "\"", "'", "\\", "#", " ", "\u2192", "\u21D2", "\t", "\n", "\r"], true, false);
+  var peg$e29 = peg$classExpectation(["(", ")", "{", "}", "[", "]", "<", ">", "-", "=", ",", "/", ":", "`", "\"", "'", "\\", " ", "\u2192", "\u21D2", "\t", "\n", "\r"], true, false);
   var peg$e30 = peg$literalExpectation("-", false);
   var peg$e31 = peg$literalExpectation(">", false);
   var peg$e32 = peg$otherExpectation("arguments with implicit parentheses");
@@ -296,29 +295,28 @@ function peg$parse(input, options) {
   var peg$e53 = peg$otherExpectation("reserved protocol");
   var peg$e54 = peg$literalExpectation("https", false);
   var peg$e55 = peg$literalExpectation("http", false);
-  var peg$e56 = peg$literalExpectation("package", false);
-  var peg$e57 = peg$literalExpectation("treehttps", false);
-  var peg$e58 = peg$literalExpectation("treehttp", false);
-  var peg$e59 = peg$literalExpectation("tree", false);
-  var peg$e60 = peg$otherExpectation("scope reference");
-  var peg$e61 = peg$literalExpectation(",", false);
-  var peg$e62 = peg$classExpectation(["+", "-"], false, false);
-  var peg$e63 = peg$literalExpectation("\u2192", false);
-  var peg$e64 = peg$literalExpectation("->", false);
-  var peg$e65 = peg$literalExpectation("#", false);
-  var peg$e66 = peg$classExpectation(["\n", "\r"], true, false);
-  var peg$e67 = peg$otherExpectation("single quote string");
-  var peg$e68 = peg$literalExpectation("'", false);
-  var peg$e69 = peg$otherExpectation("string");
-  var peg$e70 = peg$otherExpectation("template");
-  var peg$e71 = peg$literalExpectation("{{", false);
+  var peg$e56 = peg$literalExpectation("new", false);
+  var peg$e57 = peg$literalExpectation("package", false);
+  var peg$e58 = peg$literalExpectation("treehttps", false);
+  var peg$e59 = peg$literalExpectation("treehttp", false);
+  var peg$e60 = peg$literalExpectation("tree", false);
+  var peg$e61 = peg$otherExpectation("scope reference");
+  var peg$e62 = peg$literalExpectation(",", false);
+  var peg$e63 = peg$literalExpectation("#!", false);
+  var peg$e64 = peg$classExpectation(["\n", "\r"], true, false);
+  var peg$e65 = peg$classExpectation(["+", "-"], false, false);
+  var peg$e66 = peg$literalExpectation("\u2192", false);
+  var peg$e67 = peg$literalExpectation("->", false);
+  var peg$e68 = peg$otherExpectation("single quote string");
+  var peg$e69 = peg$literalExpectation("'", false);
+  var peg$e70 = peg$otherExpectation("string");
+  var peg$e71 = peg$otherExpectation("template");
   var peg$e72 = peg$literalExpectation("${", false);
   var peg$e73 = peg$otherExpectation("template text");
   var peg$e74 = peg$otherExpectation("template literal");
   var peg$e75 = peg$literalExpectation("`", false);
   var peg$e76 = peg$otherExpectation("template substitution");
-  var peg$e77 = peg$literalExpectation("}}", false);
-  var peg$e78 = peg$otherExpectation("tree literal");
+  var peg$e77 = peg$otherExpectation("tree literal");
 
   var peg$f0 = function() { return ""; };
   var peg$f1 = function(path) {
@@ -383,28 +381,29 @@ function peg$parse(input, options) {
     };
   var peg$f24 = function() { return ops.https; };
   var peg$f25 = function() { return ops.http; };
-  var peg$f26 = function() { return [ops.scope, "@package"] };
-  var peg$f27 = function() { return ops.treeHttps; };
-  var peg$f28 = function() { return ops.treeHttp; };
-  var peg$f29 = function() { return ops.treeHttps; };
-  var peg$f30 = function(key) {
+  var peg$f26 = function() { return ops.constructor; };
+  var peg$f27 = function() { return [ops.scope, "@package"] };
+  var peg$f28 = function() { return ops.treeHttps; };
+  var peg$f29 = function() { return ops.treeHttp; };
+  var peg$f30 = function() { return ops.treeHttps; };
+  var peg$f31 = function(key) {
       return annotate([ops.scope, key], location());
     };
-  var peg$f31 = function() { return null; };
   var peg$f32 = function() { return null; };
-  var peg$f33 = function(chars) { return chars.join(""); };
-  var peg$f34 = function(contents) {
+  var peg$f33 = function() { return null; };
+  var peg$f34 = function(chars) { return chars.join(""); };
+  var peg$f35 = function(contents) {
       return annotate([ops.lambda, null, contents], location());
     };
-  var peg$f35 = function(parts) {
+  var peg$f36 = function(parts) {
       return annotate(makeTemplate(parts), location());
     };
-  var peg$f36 = function(chars) { return chars.join(""); };
-  var peg$f37 = function(parts) {
+  var peg$f37 = function(chars) { return chars.join(""); };
+  var peg$f38 = function(parts) {
       return annotate(makeTemplate(parts), location());
     };
-  var peg$f38 = function(chars) { return chars.join(""); };
-  var peg$f39 = function(assignments) {
+  var peg$f39 = function(chars) { return chars.join(""); };
+  var peg$f40 = function(assignments) {
       return annotate([ops.tree, ...(assignments ?? [])], location());
     };
   var peg$currPos = options.peg$currPos | 0;
@@ -1099,15 +1098,19 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexpression() {
-    var s0, s1, s2, s3;
+    var s0, s1, s2, s3, s4;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = peg$parse__();
-    s2 = peg$parsepipeline();
-    if (s2 !== peg$FAILED) {
-      s3 = peg$parse__();
-      s0 = s2;
+    s1 = peg$parseshebang();
+    if (s1 === peg$FAILED) {
+      s1 = null;
+    }
+    s2 = peg$parse__();
+    s3 = peg$parsepipeline();
+    if (s3 !== peg$FAILED) {
+      s4 = peg$parse__();
+      s0 = s3;
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2246,9 +2249,9 @@ function peg$parse(input, options) {
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 7) === peg$c24) {
+        if (input.substr(peg$currPos, 3) === peg$c24) {
           s1 = peg$c24;
-          peg$currPos += 7;
+          peg$currPos += 3;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) { peg$fail(peg$e56); }
@@ -2260,9 +2263,9 @@ function peg$parse(input, options) {
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 9) === peg$c25) {
+          if (input.substr(peg$currPos, 7) === peg$c25) {
             s1 = peg$c25;
-            peg$currPos += 9;
+            peg$currPos += 7;
           } else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) { peg$fail(peg$e57); }
@@ -2274,9 +2277,9 @@ function peg$parse(input, options) {
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 8) === peg$c26) {
+            if (input.substr(peg$currPos, 9) === peg$c26) {
               s1 = peg$c26;
-              peg$currPos += 8;
+              peg$currPos += 9;
             } else {
               s1 = peg$FAILED;
               if (peg$silentFails === 0) { peg$fail(peg$e58); }
@@ -2288,9 +2291,9 @@ function peg$parse(input, options) {
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.substr(peg$currPos, 4) === peg$c27) {
+              if (input.substr(peg$currPos, 8) === peg$c27) {
                 s1 = peg$c27;
-                peg$currPos += 4;
+                peg$currPos += 8;
               } else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) { peg$fail(peg$e59); }
@@ -2300,6 +2303,21 @@ function peg$parse(input, options) {
                 s1 = peg$f29();
               }
               s0 = s1;
+              if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.substr(peg$currPos, 4) === peg$c28) {
+                  s1 = peg$c28;
+                  peg$currPos += 4;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e60); }
+                }
+                if (s1 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$f30();
+                }
+                s0 = s1;
+              }
             }
           }
         }
@@ -2322,13 +2340,13 @@ function peg$parse(input, options) {
     s1 = peg$parseidentifier();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f30(s1);
+      s1 = peg$f31(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      if (peg$silentFails === 0) { peg$fail(peg$e61); }
     }
 
     return s0;
@@ -2340,11 +2358,11 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse__();
     if (input.charCodeAt(peg$currPos) === 44) {
-      s2 = peg$c28;
+      s2 = peg$c29;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parse__();
@@ -2361,15 +2379,55 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parseshebang() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c30) {
+      s1 = peg$c30;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = input.charAt(peg$currPos);
+      if (peg$r3.test(s3)) {
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = input.charAt(peg$currPos);
+        if (peg$r3.test(s3)) {
+          peg$currPos++;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e64); }
+        }
+      }
+      peg$savedPos = s0;
+      s0 = peg$f32();
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
   function peg$parsesign() {
     var s0;
 
     s0 = input.charAt(peg$currPos);
-    if (peg$r3.test(s0)) {
+    if (peg$r4.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
 
     return s0;
@@ -2379,19 +2437,19 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 8594) {
-      s0 = peg$c29;
+      s0 = peg$c31;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
     if (s0 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c30) {
-        s0 = peg$c30;
+      if (input.substr(peg$currPos, 2) === peg$c32) {
+        s0 = peg$c32;
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
+        if (peg$silentFails === 0) { peg$fail(peg$e67); }
       }
     }
 
@@ -2402,73 +2460,38 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 35) {
-      s1 = peg$c31;
-      peg$currPos++;
+    if (input.substr(peg$currPos, 2) === peg$c0) {
+      s1 = peg$c0;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+      if (peg$silentFails === 0) { peg$fail(peg$e1); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = input.charAt(peg$currPos);
-      if (peg$r4.test(s3)) {
+      if (peg$r3.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+        if (peg$silentFails === 0) { peg$fail(peg$e64); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
         s3 = input.charAt(peg$currPos);
-        if (peg$r4.test(s3)) {
+        if (peg$r3.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e66); }
+          if (peg$silentFails === 0) { peg$fail(peg$e64); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f31();
+      s0 = peg$f33();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c0) {
-        s1 = peg$c0;
-        peg$currPos += 2;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e1); }
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = [];
-        s3 = input.charAt(peg$currPos);
-        if (peg$r4.test(s3)) {
-          peg$currPos++;
-        } else {
-          s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e66); }
-        }
-        while (s3 !== peg$FAILED) {
-          s2.push(s3);
-          s3 = input.charAt(peg$currPos);
-          if (peg$r4.test(s3)) {
-            peg$currPos++;
-          } else {
-            s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e66); }
-          }
-        }
-        peg$savedPos = s0;
-        s0 = peg$f32();
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
 
     return s0;
   }
@@ -2479,11 +2502,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s1 = peg$c32;
+      s1 = peg$c33;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -2493,15 +2516,15 @@ function peg$parse(input, options) {
         s3 = peg$parsesingleQuoteStringChar();
       }
       if (input.charCodeAt(peg$currPos) === 39) {
-        s3 = peg$c32;
+        s3 = peg$c33;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e68); }
+        if (peg$silentFails === 0) { peg$fail(peg$e69); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f33(s2);
+        s0 = peg$f34(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2513,7 +2536,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
 
     return s0;
@@ -2526,11 +2549,11 @@ function peg$parse(input, options) {
     s1 = peg$currPos;
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s2 = peg$c32;
+      s2 = peg$c33;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -2621,7 +2644,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+      if (peg$silentFails === 0) { peg$fail(peg$e70); }
     }
 
     return s0;
@@ -2634,11 +2657,11 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parsetemplateDocumentContents();
     peg$savedPos = s0;
-    s1 = peg$f34(s1);
+    s1 = peg$f35(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e70); }
+    if (peg$silentFails === 0) { peg$fail(peg$e71); }
 
     return s0;
   }
@@ -2649,21 +2672,12 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     peg$silentFails++;
-    if (input.substr(peg$currPos, 2) === peg$c33) {
-      s2 = peg$c33;
+    if (input.substr(peg$currPos, 2) === peg$c34) {
+      s2 = peg$c34;
       peg$currPos += 2;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e71); }
-    }
-    if (s2 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c34) {
-        s2 = peg$c34;
-        peg$currPos += 2;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e72); }
-      }
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
     }
     peg$silentFails--;
     if (s2 === peg$FAILED) {
@@ -2705,7 +2719,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f35(s1);
+    s1 = peg$f36(s1);
     s0 = s1;
 
     return s0;
@@ -2728,7 +2742,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f36(s1);
+      s1 = peg$f37(s1);
     }
     s0 = s1;
     peg$silentFails--;
@@ -2794,21 +2808,12 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
     if (s2 === peg$FAILED) {
-      if (input.substr(peg$currPos, 2) === peg$c33) {
-        s2 = peg$c33;
+      if (input.substr(peg$currPos, 2) === peg$c34) {
+        s2 = peg$c34;
         peg$currPos += 2;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
-      }
-      if (s2 === peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c34) {
-          s2 = peg$c34;
-          peg$currPos += 2;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e72); }
-        }
+        if (peg$silentFails === 0) { peg$fail(peg$e72); }
       }
     }
     peg$silentFails--;
@@ -2851,7 +2856,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f37(s1);
+    s1 = peg$f38(s1);
     s0 = s1;
 
     return s0;
@@ -2873,7 +2878,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f38(s1);
+      s1 = peg$f39(s1);
     }
     s0 = s1;
 
@@ -2885,22 +2890,22 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c33) {
-      s1 = peg$c33;
+    if (input.substr(peg$currPos, 2) === peg$c34) {
+      s1 = peg$c34;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseexpression();
       if (s2 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c36) {
-          s3 = peg$c36;
-          peg$currPos += 2;
+        if (input.charCodeAt(peg$currPos) === 125) {
+          s3 = peg$c3;
+          peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e77); }
+          if (peg$silentFails === 0) { peg$fail(peg$e8); }
         }
         if (s3 !== peg$FAILED) {
           s0 = s2;
@@ -2916,40 +2921,6 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c34) {
-        s1 = peg$c34;
-        peg$currPos += 2;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e72); }
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$parseexpression();
-        if (s2 !== peg$FAILED) {
-          if (input.charCodeAt(peg$currPos) === 125) {
-            s3 = peg$c3;
-            peg$currPos++;
-          } else {
-            s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e8); }
-          }
-          if (s3 !== peg$FAILED) {
-            s0 = s2;
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
@@ -2998,7 +2969,7 @@ function peg$parse(input, options) {
       s5 = peg$parseclosingBrace();
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f39(s3);
+        s0 = peg$f40(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3010,7 +2981,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
 
     return s0;
@@ -3163,6 +3134,7 @@ const peg$allowedStartRules = [
   "reservedProtocol",
   "scopeReference",
   "separator",
+  "shebang",
   "sign",
   "singleArrow",
   "singleLineComment",

package/src/runtime/concatTreeValues.js

@@ -37,8 +37,8 @@ async function getText(value, scope) {
   // Convert to text, preferring .toString but avoiding dumb Object.toString.
   // Exception: if the result is an array, we'll concatenate the values.
   let text;
-  if (!value) {
-    // Treat falsy values as the empty string.
+  if (value == null || value === false) {
+    // Treat falsy values (but not zero) as the empty string.
     text = "";
   } else if (typeof value === "string") {
     text = value;
@@ -47,7 +47,7 @@ async function getText(value, scope) {
     text = textDecoder.decode(value);
   } else if (
     !(value instanceof Array) &&
-    value.toString !== getRealmObjectPrototype(value).toString
+    value.toString !== getRealmObjectPrototype(value)?.toString
   ) {
     text = value.toString();
   } else {

package/src/runtime/extname.js

@@ -14,7 +14,7 @@ export default function extname(path) {
   // We want at least one character before the dot, then a dot, then a non-empty
   // sequence of characters after the dot that aren't slahes or dots.
   const extnameRegex = /[^/](?<ext>\.[^/\.]+)$/;
-  const match = path.match(extnameRegex);
+  const match = String(path).match(extnameRegex);
   const extension = match?.groups?.ext.toLowerCase() ?? "";
   return extension;
 }

package/src/runtime/functionResultsMap.js

@@ -4,11 +4,9 @@ import Scope from "./Scope.js";
 /**
  * When using `get` to retrieve a value from a tree, if the value is a
  * function, invoke it and return the result.
- *
- * @type {import("@weborigami/async-tree").TreeTransform}
  */
-export default function functionResultsMap(tree) {
-  return map({
+export default function functionResultsMap(treelike) {
+  return map(treelike, {
     description: "functionResultsMap",
 
     value: async (sourceValue, sourceKey, tree) => {
@@ -24,5 +22,5 @@ export default function functionResultsMap(tree) {
       }
       return resultValue;
     },
-  })(tree);
+  });
 }

package/src/runtime/ops.js

@@ -58,6 +58,20 @@ function constructHref(protocol, host, ...keys) {
   return href;
 }
 
+/**
+ * Find the indicated constructor in scope, then return a function which invokes
+ * it with `new`.
+ *
+ * @this {AsyncTree}
+ * @param  {...any} keys
+ */
+export async function constructor(...keys) {
+  const scope = this;
+  const constructor = await Tree.traverseOrThrow(scope, ...keys);
+  return (...args) => new constructor(...args);
+}
+constructor.toString = () => "«ops.constructor»";
+
 /**
  * Fetch the resource at the given href.
  *

package/test/compiler/parse.test.js

@@ -273,6 +273,13 @@ describe("Origami parser", () => {
     assertParse("multiLineComment", "/*\nHello, world!\n*/", null);
   });
 
+  test("new", () => {
+    assertParse("expression", "new:@js/Date('2025-01-01')", [
+      [ops.constructor, "@js", "Date"],
+      "2025-01-01",
+    ]);
+  });
+
   test("number", () => {
     assertParse("number", "123", 123);
     assertParse("number", "-456", -456);
@@ -385,11 +392,17 @@ describe("Origami parser", () => {
     ]);
   });
 
-  test("singleLineComment", () => {
-    assertParse("singleLineComment", "# Hello, world!", null);
+  test("shebang", () => {
+    assertParse(
+      "expression",
+      `#!/usr/bin/env ori @invoke
+'Hello'
+`,
+      "Hello"
+    );
   });
 
-  test("singleLineComment (JS)", () => {
+  test("singleLineComment", () => {
     assertParse("singleLineComment", "// Hello, world!", null);
   });
 
@@ -421,14 +434,14 @@ describe("Origami parser", () => {
 
   test("templateLiteral", () => {
     assertParse("templateLiteral", "`Hello, world.`", "Hello, world.");
-    assertParse("templateLiteral", "`foo {{x}} bar`", [
+    assertParse("templateLiteral", "`foo ${x} bar`", [
       ops.concat,
       "foo ",
       [ops.scope, "x"],
       " bar",
     ]);
-    assertParse("templateLiteral", "`{{`nested`}}`", "nested");
-    assertParse("templateLiteral", "`{{map(people, =`{{name}}`)}}`", [
+    assertParse("templateLiteral", "`${`nested`}`", "nested");
+    assertParse("templateLiteral", "`${map(people, =`${name}`)}`", [
       ops.concat,
       [
         [ops.scope, "map"],
@@ -457,11 +470,7 @@ describe("Origami parser", () => {
     ]);
   });
 
-  test("templateSubstitution", () => {
-    assertParse("templateSubstitution", "{{foo}}", [ops.scope, "foo"]);
-  });
-
-  test("templateSubtitution (JS)", () => {
+  test("templateSubtitution", () => {
     assertParse("templateSubstitution", "${foo}", [ops.scope, "foo"]);
   });
 
@@ -482,8 +491,8 @@ describe("Origami parser", () => {
     assertParse(
       "__",
       `  
-  # First line of comment
-  # Second line of comment
+  // First comment
+  // Second comment
      `,
       ""
     );

package/test/runtime/ops.test.js

@@ -121,4 +121,16 @@ describe("ops", () => {
     const result = await evaluate.call(b.scope, code);
     assert.equal(result, 1);
   });
+
+  test("returns a constructor", async () => {
+    const scope = new ObjectTree({
+      "@js": {
+        Number: Number,
+      },
+    });
+    const fn = await ops.constructor.call(scope, "@js", "Number");
+    const number = fn("1");
+    assert(number instanceof Number);
+    assert.equal(number, 1);
+  });
 });