@weborigami/language 0.0.58 → 0.0.59

package/main.js

@@ -13,7 +13,6 @@ export { default as OrigamiTree } from "./src/runtime/OrigamiTree.js";
 export { default as Scope } from "./src/runtime/Scope.js";
 export { default as TreeEvent } from "./src/runtime/TreeEvent.js";
 export { default as WatchFilesMixin } from "./src/runtime/WatchFilesMixin.js";
-export { default as concatTreeValues } from "./src/runtime/concatTreeValues.js";
 export { default as evaluate } from "./src/runtime/evaluate.js";
 export * as expressionFunction from "./src/runtime/expressionFunction.js";
 export { default as extname } from "./src/runtime/extname.js";

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@weborigami/language",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
   "types": "./index.ts",
   "devDependencies": {
-    "@types/node": "20.12.8",
-    "peggy": "4.0.2",
-    "typescript": "5.4.5"
+    "@types/node": "20.14.9",
+    "peggy": "4.0.3",
+    "typescript": "5.5.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.58",
-    "@weborigami/types": "0.0.58",
+    "@weborigami/async-tree": "0.0.59",
+    "@weborigami/types": "0.0.59",
     "watcher": "2.3.1"
   },
   "scripts": {

package/src/compiler/origami.pegjs

@@ -160,7 +160,9 @@ identifierOrString
   / string
 
 implicitParensArgs "arguments with implicit parentheses"
-  = inlineSpace+ @list
+  // Implicit parens args are a separate list of `step`, not `expr`, because
+  // they can't contain a pipeline.
+  = inlineSpace+ @step|1.., separator| separator?
 
 inlineSpace
   = [ \t]
@@ -244,7 +246,14 @@ path "slash-separated path"
 
 // A single key in a slash-separated path
 pathKey "path element"
-  = key:identifierChar* { return key.join(""); }
+  = chars:pathKeyChar* { return chars.join(""); }
+
+// A single character in a slash-separated path.
+pathKeyChar
+  // This is more permissive than an identifier. It allows some characters like
+  // brackets or quotes that are not allowed in identifiers.
+  = [^(){}\[\],:/\\ \t\n\r]
+  / escapedChar
 
 // Parse a protocol call like `fn://foo/bar`.
 // There can be zero, one, or two slashes after the colon.
@@ -364,7 +373,7 @@ templateLiteralText
 
 // A substitution in a template literal: `${x}`
 templateSubstitution "template substitution"
-  = "${" @expression "}"
+  = "${" __ @expr __ "}"
 
 textChar
   = escapedChar / .

package/src/compiler/parse.js

@@ -1,4 +1,4 @@
-// @generated by Peggy 4.0.2.
+// @generated by Peggy 4.0.3.
 //
 // https://peggyjs.org/
 
@@ -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, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, 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, ellipsis: peg$parseellipsis, 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, identifierOrString: peg$parseidentifierOrString, 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, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectProperty: peg$parseobjectProperty, 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, spread: peg$parsespread, 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, treeAssignment: peg$parsetreeAssignment, treeEntries: peg$parsetreeEntries, treeEntry: peg$parsetreeEntry, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
+  var peg$startRuleFunctions = { __: peg$parse__, absoluteFilePath: peg$parseabsoluteFilePath, args: peg$parseargs, array: peg$parsearray, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, 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, ellipsis: peg$parseellipsis, 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, identifierOrString: peg$parseidentifierOrString, 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, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectProperty: peg$parseobjectProperty, parameterizedLambda: peg$parseparameterizedLambda, parensArgs: peg$parseparensArgs, pipeline: peg$parsepipeline, path: peg$parsepath, pathKey: peg$parsepathKey, pathKeyChar: peg$parsepathKeyChar, 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, spread: peg$parsespread, 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, treeAssignment: peg$parsetreeAssignment, treeEntries: peg$parsetreeEntries, treeEntry: peg$parsetreeEntry, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
   var peg$startRuleFunction = peg$parse__;
 
   var peg$c0 = "//";
@@ -238,8 +238,9 @@ function peg$parse(input, options) {
   var peg$r0 = /^[0-9]/;
   var peg$r1 = /^[^(){}[\]<>\-=,\/:`"'\\ \u2192\u21D2\t\n\r]/;
   var peg$r2 = /^[ \t]/;
-  var peg$r3 = /^[^\n\r]/;
-  var peg$r4 = /^[+\-]/;
+  var peg$r3 = /^[^(){}[\],:\/\\ \t\n\r]/;
+  var peg$r4 = /^[^\n\r]/;
+  var peg$r5 = /^[+\-]/;
 
   var peg$e0 = peg$otherExpectation("absolute file path");
   var peg$e1 = peg$literalExpectation("//", false);
@@ -293,34 +294,35 @@ function peg$parse(input, options) {
   var peg$e49 = peg$otherExpectation("function arguments in parentheses");
   var peg$e50 = peg$otherExpectation("slash-separated path");
   var peg$e51 = peg$otherExpectation("path element");
-  var peg$e52 = peg$otherExpectation("function call using protocol: syntax");
-  var peg$e53 = peg$otherExpectation("protocol");
-  var peg$e54 = peg$otherExpectation("reserved protocol");
-  var peg$e55 = peg$literalExpectation("https", false);
-  var peg$e56 = peg$literalExpectation("http", false);
-  var peg$e57 = peg$literalExpectation("new", false);
-  var peg$e58 = peg$literalExpectation("package", false);
-  var peg$e59 = peg$literalExpectation("treehttps", false);
-  var peg$e60 = peg$literalExpectation("treehttp", false);
-  var peg$e61 = peg$literalExpectation("tree", false);
-  var peg$e62 = peg$otherExpectation("scope reference");
-  var peg$e63 = peg$literalExpectation(",", false);
-  var peg$e64 = peg$literalExpectation("#!", false);
-  var peg$e65 = peg$classExpectation(["\n", "\r"], true, false);
-  var peg$e66 = peg$classExpectation(["+", "-"], false, false);
-  var peg$e67 = peg$literalExpectation("\u2192", false);
-  var peg$e68 = peg$literalExpectation("->", false);
-  var peg$e69 = peg$otherExpectation("single quote string");
-  var peg$e70 = peg$literalExpectation("'", false);
-  var peg$e71 = peg$otherExpectation("string");
-  var peg$e72 = peg$otherExpectation("template");
-  var peg$e73 = peg$literalExpectation("${", false);
-  var peg$e74 = peg$otherExpectation("template text");
-  var peg$e75 = peg$otherExpectation("template literal");
-  var peg$e76 = peg$literalExpectation("`", false);
-  var peg$e77 = peg$otherExpectation("template substitution");
-  var peg$e78 = peg$otherExpectation("tree literal");
-  var peg$e79 = peg$otherExpectation("tree assignment");
+  var peg$e52 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", ":", "/", "\\", " ", "\t", "\n", "\r"], true, false);
+  var peg$e53 = peg$otherExpectation("function call using protocol: syntax");
+  var peg$e54 = peg$otherExpectation("protocol");
+  var peg$e55 = peg$otherExpectation("reserved protocol");
+  var peg$e56 = peg$literalExpectation("https", false);
+  var peg$e57 = peg$literalExpectation("http", false);
+  var peg$e58 = peg$literalExpectation("new", false);
+  var peg$e59 = peg$literalExpectation("package", false);
+  var peg$e60 = peg$literalExpectation("treehttps", false);
+  var peg$e61 = peg$literalExpectation("treehttp", false);
+  var peg$e62 = peg$literalExpectation("tree", false);
+  var peg$e63 = peg$otherExpectation("scope reference");
+  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$classExpectation(["+", "-"], false, false);
+  var peg$e68 = peg$literalExpectation("\u2192", false);
+  var peg$e69 = peg$literalExpectation("->", false);
+  var peg$e70 = peg$otherExpectation("single quote string");
+  var peg$e71 = peg$literalExpectation("'", false);
+  var peg$e72 = peg$otherExpectation("string");
+  var peg$e73 = peg$otherExpectation("template");
+  var peg$e74 = peg$literalExpectation("${", false);
+  var peg$e75 = peg$otherExpectation("template text");
+  var peg$e76 = peg$otherExpectation("template literal");
+  var peg$e77 = peg$literalExpectation("`", false);
+  var peg$e78 = peg$otherExpectation("template substitution");
+  var peg$e79 = peg$otherExpectation("tree literal");
+  var peg$e80 = peg$otherExpectation("tree assignment");
 
   var peg$f0 = function() { return ""; };
   var peg$f1 = function(path) {
@@ -376,7 +378,7 @@ function peg$parse(input, options) {
   var peg$f20 = function(steps) {
       return annotate(makePipeline(steps), location());
     };
-  var peg$f21 = function(key) { return key.join(""); };
+  var peg$f21 = function(chars) { return chars.join(""); };
   var peg$f22 = function(protocol, host, path) {
       return annotate([protocol, host, ...(path ?? [])], location());
     };
@@ -1447,7 +1449,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseimplicitParensArgs() {
-    var s0, s1, s2;
+    var s0, s1, s2, s3, s4, s5;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1462,8 +1464,36 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$parselist();
+      s2 = peg$currPos;
+      s3 = [];
+      s4 = peg$parsestep();
+      while (s4 !== peg$FAILED) {
+        s3.push(s4);
+        s4 = peg$currPos;
+        s5 = peg$parseseparator();
+        if (s5 !== peg$FAILED) {
+          s5 = peg$parsestep();
+          if (s5 === peg$FAILED) {
+            peg$currPos = s4;
+            s4 = peg$FAILED;
+          } else {
+            s4 = s5;
+          }
+        } else {
+          s4 = s5;
+        }
+      }
+      if (s3.length < 1) {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      } else {
+        s2 = s3;
+      }
       if (s2 !== peg$FAILED) {
+        s3 = peg$parseseparator();
+        if (s3 === peg$FAILED) {
+          s3 = null;
+        }
         s0 = s2;
       } else {
         peg$currPos = s0;
@@ -2156,10 +2186,10 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     s1 = [];
-    s2 = peg$parseidentifierChar();
+    s2 = peg$parsepathKeyChar();
     while (s2 !== peg$FAILED) {
       s1.push(s2);
-      s2 = peg$parseidentifierChar();
+      s2 = peg$parsepathKeyChar();
     }
     peg$savedPos = s0;
     s1 = peg$f21(s1);
@@ -2171,6 +2201,23 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsepathKeyChar() {
+    var s0;
+
+    s0 = input.charAt(peg$currPos);
+    if (peg$r3.test(s0)) {
+      peg$currPos++;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$parseescapedChar();
+    }
+
+    return s0;
+  }
+
   function peg$parseprotocolCall() {
     var s0, s1, s2, s3, s4, s5;
 
@@ -2231,7 +2278,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e52); }
+      if (peg$silentFails === 0) { peg$fail(peg$e53); }
     }
 
     return s0;
@@ -2248,7 +2295,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e53); }
+      if (peg$silentFails === 0) { peg$fail(peg$e54); }
     }
 
     return s0;
@@ -2264,7 +2311,7 @@ function peg$parse(input, options) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e55); }
+      if (peg$silentFails === 0) { peg$fail(peg$e56); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -2278,7 +2325,7 @@ function peg$parse(input, options) {
         peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e56); }
+        if (peg$silentFails === 0) { peg$fail(peg$e57); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -2292,7 +2339,7 @@ function peg$parse(input, options) {
           peg$currPos += 3;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e57); }
+          if (peg$silentFails === 0) { peg$fail(peg$e58); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
@@ -2306,7 +2353,7 @@ function peg$parse(input, options) {
             peg$currPos += 7;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e58); }
+            if (peg$silentFails === 0) { peg$fail(peg$e59); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
@@ -2320,7 +2367,7 @@ function peg$parse(input, options) {
               peg$currPos += 9;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e59); }
+              if (peg$silentFails === 0) { peg$fail(peg$e60); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
@@ -2334,7 +2381,7 @@ function peg$parse(input, options) {
                 peg$currPos += 8;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e60); }
+                if (peg$silentFails === 0) { peg$fail(peg$e61); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
@@ -2348,7 +2395,7 @@ function peg$parse(input, options) {
                   peg$currPos += 4;
                 } else {
                   s1 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e61); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e62); }
                 }
                 if (s1 !== peg$FAILED) {
                   peg$savedPos = s0;
@@ -2364,7 +2411,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e54); }
+      if (peg$silentFails === 0) { peg$fail(peg$e55); }
     }
 
     return s0;
@@ -2384,7 +2431,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
 
     return s0;
@@ -2400,7 +2447,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parse__();
@@ -2426,25 +2473,25 @@ function peg$parse(input, options) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e64); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = input.charAt(peg$currPos);
-      if (peg$r3.test(s3)) {
+      if (peg$r4.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e65); }
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
         s3 = input.charAt(peg$currPos);
-        if (peg$r3.test(s3)) {
+        if (peg$r4.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e65); }
+          if (peg$silentFails === 0) { peg$fail(peg$e66); }
         }
       }
       peg$savedPos = s0;
@@ -2461,11 +2508,11 @@ function peg$parse(input, options) {
     var s0;
 
     s0 = input.charAt(peg$currPos);
-    if (peg$r4.test(s0)) {
+    if (peg$r5.test(s0)) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
     }
 
     return s0;
@@ -2479,7 +2526,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
     if (s0 === peg$FAILED) {
       if (input.substr(peg$currPos, 2) === peg$c34) {
@@ -2487,7 +2534,7 @@ function peg$parse(input, options) {
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e68); }
+        if (peg$silentFails === 0) { peg$fail(peg$e69); }
       }
     }
 
@@ -2508,20 +2555,20 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = input.charAt(peg$currPos);
-      if (peg$r3.test(s3)) {
+      if (peg$r4.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e65); }
+        if (peg$silentFails === 0) { peg$fail(peg$e66); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
         s3 = input.charAt(peg$currPos);
-        if (peg$r3.test(s3)) {
+        if (peg$r4.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e65); }
+          if (peg$silentFails === 0) { peg$fail(peg$e66); }
         }
       }
       peg$savedPos = s0;
@@ -2544,7 +2591,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e71); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -2558,7 +2605,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e70); }
+        if (peg$silentFails === 0) { peg$fail(peg$e71); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -2574,7 +2621,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;
@@ -2591,7 +2638,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e71); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$parsenewLine();
@@ -2704,7 +2751,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
     }
 
     return s0;
@@ -2721,7 +2768,7 @@ function peg$parse(input, options) {
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e72); }
+    if (peg$silentFails === 0) { peg$fail(peg$e73); }
 
     return s0;
   }
@@ -2737,7 +2784,7 @@ function peg$parse(input, options) {
       peg$currPos += 2;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
     }
     peg$silentFails--;
     if (s2 === peg$FAILED) {
@@ -2808,7 +2855,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
 
     return s0;
@@ -2824,7 +2871,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsetemplateLiteralContents();
@@ -2833,7 +2880,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e76); }
+        if (peg$silentFails === 0) { peg$fail(peg$e77); }
       }
       if (s3 !== peg$FAILED) {
         s0 = s2;
@@ -2848,7 +2895,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e75); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
 
     return s0;
@@ -2865,7 +2912,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
     if (s2 === peg$FAILED) {
       if (input.substr(peg$currPos, 2) === peg$c36) {
@@ -2873,7 +2920,7 @@ function peg$parse(input, options) {
         peg$currPos += 2;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e73); }
+        if (peg$silentFails === 0) { peg$fail(peg$e74); }
       }
     }
     peg$silentFails--;
@@ -2946,7 +2993,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetemplateSubstitution() {
-    var s0, s1, s2, s3;
+    var s0, s1, s2, s3, s4, s5;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -2955,20 +3002,22 @@ function peg$parse(input, options) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$parseexpression();
-      if (s2 !== peg$FAILED) {
+      s2 = peg$parse__();
+      s3 = peg$parsepipeline();
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parse__();
         if (input.charCodeAt(peg$currPos) === 125) {
-          s3 = peg$c2;
+          s5 = peg$c2;
           peg$currPos++;
         } else {
-          s3 = peg$FAILED;
+          s5 = peg$FAILED;
           if (peg$silentFails === 0) { peg$fail(peg$e6); }
         }
-        if (s3 !== peg$FAILED) {
-          s0 = s2;
+        if (s5 !== peg$FAILED) {
+          s0 = s3;
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2984,7 +3033,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
 
     return s0;
@@ -3041,7 +3090,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$e79); }
     }
 
     return s0;
@@ -3082,7 +3131,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
     }
 
     return s0;
@@ -3252,6 +3301,7 @@ const peg$allowedStartRules = [
   "pipeline",
   "path",
   "pathKey",
+  "pathKeyChar",
   "protocolCall",
   "protocol",
   "reservedProtocol",

package/src/runtime/ops.js

@@ -8,11 +8,11 @@ import {
   SiteTree,
   Tree,
   isUnpackable,
+  concat as treeConcat,
 } from "@weborigami/async-tree";
 import HandleExtensionsTransform from "./HandleExtensionsTransform.js";
 import OrigamiFiles from "./OrigamiFiles.js";
 import Scope from "./Scope.js";
-import concatTreeValues from "./concatTreeValues.js";
 import handleExtension from "./handleExtension.js";
 import { OrigamiTree, evaluate, expressionFunction } from "./internal.js";
 import mergeTrees from "./mergeTrees.js";
@@ -42,7 +42,7 @@ export const assign = "«ops.assign»";
  * @param {any[]} args
  */
 export async function concat(...args) {
-  return concatTreeValues.call(this, args);
+  return treeConcat.call(this, args);
 }
 concat.toString = () => "«ops.concat»";
 

package/test/compiler/parse.test.js

@@ -383,6 +383,13 @@ describe("Origami parser", () => {
         [ops.scope, "input"],
       ],
     ]);
+    assertParse("pipeline", "fn a -> b", [
+      [ops.scope, "b"],
+      [
+        [ops.scope, "fn"],
+        [ops.scope, "a"],
+      ],
+    ]);
   });
 
   test("protocolCall", () => {

package/test/runtime/mergeTrees.test.js

@@ -1,7 +1,11 @@
 import { Tree } from "@weborigami/async-tree";
-import { ExpressionTree, expressionFunction, ops } from "@weborigami/language";
 import assert from "node:assert";
 import { describe, test } from "node:test";
+import {
+  ExpressionTree,
+  expressionFunction,
+  ops,
+} from "../../src/runtime/internal.js";
 import mergeTrees from "../../src/runtime/mergeTrees.js";
 
 describe("mergeTrees", () => {

package/src/runtime/concatTreeValues.js

@@ -1,59 +0,0 @@
-import { Tree, getRealmObjectPrototype } from "@weborigami/async-tree";
-
-const textDecoder = new TextDecoder();
-const TypedArray = Object.getPrototypeOf(Uint8Array);
-
-/**
- * Concatenate the text values in a tree.
- *
- * This is a map-reduce operation: convert everything to strings, then
- * concatenate the strings.
- *
- * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
- *
- * @this {AsyncTree|null}
- * @param {import("@weborigami/async-tree").Treelike} treelike
- */
-export default async function concatTreeValues(treelike) {
-  const scope = this;
-  const mapFn = async (value) => getText(value, scope);
-  const reduceFn = (values) => values.join("");
-  return Tree.mapReduce(treelike, mapFn, reduceFn);
-}
-
-async function getText(value, scope) {
-  // If the value is a function (e.g., a lambda), call it and use its result.
-  if (typeof value === "function") {
-    value = await value.call(scope);
-  }
-
-  if (Tree.isTreelike(value)) {
-    // The mapReduce operation above only implicit casts its top-level input to
-    // a tree. If we're asked for the text of a treelike value, we need to
-    // explicitly recurse.
-    return concatTreeValues.call(scope, value);
-  }
-
-  // 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 == null || value === false) {
-    // Treat falsy values (but not zero) as the empty string.
-    text = "";
-  } else if (typeof value === "string") {
-    text = value;
-  } else if (value instanceof ArrayBuffer || value instanceof TypedArray) {
-    // Serialize data as UTF-8.
-    text = textDecoder.decode(value);
-  } else if (
-    !(value instanceof Array) &&
-    value.toString !== getRealmObjectPrototype(value)?.toString
-  ) {
-    text = value.toString();
-  } else {
-    // Anything else maps to the empty string.
-    text = "";
-  }
-
-  return text;
-}

package/test/runtime/concatTreeValues.test.js

@@ -1,33 +0,0 @@
-import { FunctionTree, Tree } from "@weborigami/async-tree";
-import assert from "node:assert";
-import { describe, test } from "node:test";
-import concatTreeValues from "../../src/runtime/concatTreeValues.js";
-
-describe("concatTreeValues", () => {
-  test("concatenates deep tree values", async () => {
-    const tree = Tree.from({
-      a: "A",
-      b: "B",
-      c: "C",
-      more: {
-        d: "D",
-        e: "E",
-      },
-    });
-    const result = await concatTreeValues.call(null, tree);
-    assert.equal(result, "ABCDE");
-  });
-
-  test("concatenates deep tree-like values", async () => {
-    const letters = ["a", "b", "c"];
-    const specimens = new FunctionTree(
-      (letter) => ({
-        lowercase: letter,
-        uppercase: letter.toUpperCase(),
-      }),
-      letters
-    );
-    const result = await concatTreeValues.call(null, specimens);
-    assert.equal(result, "aAbBcC");
-  });
-});