@weborigami/language 0.2.2 → 0.2.4

package/src/compiler/parse.js

@@ -202,7 +202,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, 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, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParenthesis: peg$parseclosingParenthesis, commaExpression: peg$parsecommaExpression, comment: peg$parsecomment, 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, exponentiationExpression: peg$parseexponentiationExpression, expression: peg$parseexpression, floatLiteral: peg$parsefloatLiteral, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, homeDirectory: peg$parsehomeDirectory, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParenthesesCallExpression: peg$parseimplicitParenthesesCallExpression, implicitParensthesesArguments: peg$parseimplicitParensthesesArguments, inlineSpace: peg$parseinlineSpace, integerLiteral: peg$parseintegerLiteral, list: peg$parselist, literal: peg$parseliteral, logicalAndExpression: peg$parselogicalAndExpression, logicalOrExpression: peg$parselogicalOrExpression, multiLineComment: peg$parsemultiLineComment, multiplicativeExpression: peg$parsemultiplicativeExpression, multiplicativeOperator: peg$parsemultiplicativeOperator, namespace: peg$parsenamespace, 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, parenthesesArguments: peg$parseparenthesesArguments, path: peg$parsepath, pathArguments: peg$parsepathArguments, pathKey: peg$parsepathKey, pathSegment: peg$parsepathSegment, pathSegmentChar: peg$parsepathSegmentChar, pipelineExpression: peg$parsepipelineExpression, primary: peg$parseprimary, program: peg$parseprogram, protocolExpression: peg$parseprotocolExpression, qualifiedReference: peg$parsequalifiedReference, reference: peg$parsereference, relationalExpression: peg$parserelationalExpression, relationalOperator: peg$parserelationalOperator, rootDirectory: peg$parserootDirectory, scopeReference: peg$parsescopeReference, separator: peg$parseseparator, slashFollows: peg$parseslashFollows, shebang: peg$parseshebang, shiftExpression: peg$parseshiftExpression, shiftOperator: peg$parseshiftOperator, shorthandFunction: peg$parseshorthandFunction, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, spreadElement: peg$parsespreadElement, stringLiteral: peg$parsestringLiteral, 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, unaryExpression: peg$parseunaryExpression, unaryOperator: peg$parseunaryOperator, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
+  var peg$startRuleFunctions = { __: peg$parse__, additiveExpression: peg$parseadditiveExpression, additiveOperator: peg$parseadditiveOperator, 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, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParenthesis: peg$parseclosingParenthesis, commaExpression: peg$parsecommaExpression, comment: peg$parsecomment, 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, exponentiationExpression: peg$parseexponentiationExpression, expression: peg$parseexpression, floatLiteral: peg$parsefloatLiteral, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, homeDirectory: peg$parsehomeDirectory, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParenthesesCallExpression: peg$parseimplicitParenthesesCallExpression, implicitParensthesesArguments: peg$parseimplicitParensthesesArguments, inlineSpace: peg$parseinlineSpace, integerLiteral: peg$parseintegerLiteral, list: peg$parselist, literal: peg$parseliteral, logicalAndExpression: peg$parselogicalAndExpression, logicalOrExpression: peg$parselogicalOrExpression, multiLineComment: peg$parsemultiLineComment, multiplicativeExpression: peg$parsemultiplicativeExpression, multiplicativeOperator: peg$parsemultiplicativeOperator, namespace: peg$parsenamespace, 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, parenthesesArguments: peg$parseparenthesesArguments, path: peg$parsepath, pathArguments: peg$parsepathArguments, pathKey: peg$parsepathKey, pathSegment: peg$parsepathSegment, pathSegmentChar: peg$parsepathSegmentChar, pipelineExpression: peg$parsepipelineExpression, primary: peg$parseprimary, program: peg$parseprogram, protocolExpression: peg$parseprotocolExpression, qualifiedReference: peg$parsequalifiedReference, reference: peg$parsereference, relationalExpression: peg$parserelationalExpression, relationalOperator: peg$parserelationalOperator, rootDirectory: peg$parserootDirectory, scopeReference: peg$parsescopeReference, separator: peg$parseseparator, slashFollows: peg$parseslashFollows, shebang: peg$parseshebang, shiftExpression: peg$parseshiftExpression, shiftOperator: peg$parseshiftOperator, shorthandFunction: peg$parseshorthandFunction, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, spreadElement: peg$parsespreadElement, stringLiteral: peg$parsestringLiteral, templateDocument: peg$parsetemplateDocument, templateDocumentChar: peg$parsetemplateDocumentChar, templateDocumentText: peg$parsetemplateDocumentText, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, unaryExpression: peg$parseunaryExpression, unaryOperator: peg$parseunaryOperator, whitespace: peg$parsewhitespace, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
   var peg$startRuleFunction = peg$parse__;
 
   var peg$c0 = "[";
@@ -603,25 +603,25 @@ function peg$parse(input, options) {
   var peg$f68 = function(value) {
       return annotate([ops.spread, value], location());
     };
-  var peg$f69 = function(contents) {
-      return annotate([ops.lambda, ["_"], contents], location());
-    };
-  var peg$f70 = function(head, tail) {
-      return annotate(makeTemplate(ops.template, head, tail), location());
+  var peg$f69 = function(head, tail) {
+      return annotate(
+        [ops.lambda, ["_"], makeTemplate(ops.templateIndent, head, tail)],
+        location()
+      );
     };
-  var peg$f71 = function(chars) {
+  var peg$f70 = function(chars) {
       return chars.join("");
     };
-  var peg$f72 = function(contents) {
-      return annotate(makeTemplate(ops.template, contents[0], contents[1]), location());
+  var peg$f71 = function(head, tail) {
+      return annotate(makeTemplate(ops.template, head, tail), location());
     };
-  var peg$f73 = function(chars) {
+  var peg$f72 = function(chars) {
       return chars.join("");
     };
-  var peg$f74 = function(expression) {
+  var peg$f73 = function(expression) {
       return annotate(expression, location());
     };
-  var peg$f75 = function(operator, expression) {
+  var peg$f74 = function(operator, expression) {
       return annotate(makeUnaryOperation(operator, expression), location());
     };
   var peg$currPos = options.peg$currPos | 0;
@@ -791,22 +791,10 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = [];
-    s2 = peg$parseinlineSpace();
-    if (s2 === peg$FAILED) {
-      s2 = peg$parsenewLine();
-      if (s2 === peg$FAILED) {
-        s2 = peg$parsecomment();
-      }
-    }
+    s2 = peg$parsewhitespace();
     while (s2 !== peg$FAILED) {
       s1.push(s2);
-      s2 = peg$parseinlineSpace();
-      if (s2 === peg$FAILED) {
-        s2 = peg$parsenewLine();
-        if (s2 === peg$FAILED) {
-          s2 = peg$parsecomment();
-        }
-      }
+      s2 = peg$parsewhitespace();
     }
     peg$savedPos = s0;
     s1 = peg$f0();
@@ -823,13 +811,23 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
-      s4 = peg$parse__();
-      s5 = peg$parseadditiveOperator();
-      if (s5 !== peg$FAILED) {
-        s6 = peg$parse__();
-        s7 = peg$parsemultiplicativeExpression();
-        if (s7 !== peg$FAILED) {
-          s3 = [ s5, s7 ];
+      s4 = peg$parsewhitespace();
+      if (s4 !== peg$FAILED) {
+        s5 = peg$parseadditiveOperator();
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parsewhitespace();
+          if (s6 !== peg$FAILED) {
+            s7 = peg$parsemultiplicativeExpression();
+            if (s7 !== peg$FAILED) {
+              s3 = [ s5, s7 ];
+            } else {
+              peg$currPos = s3;
+              s3 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -841,13 +839,23 @@ function peg$parse(input, options) {
       while (s3 !== peg$FAILED) {
         s2.push(s3);
         s3 = peg$currPos;
-        s4 = peg$parse__();
-        s5 = peg$parseadditiveOperator();
-        if (s5 !== peg$FAILED) {
-          s6 = peg$parse__();
-          s7 = peg$parsemultiplicativeExpression();
-          if (s7 !== peg$FAILED) {
-            s3 = [ s5, s7 ];
+        s4 = peg$parsewhitespace();
+        if (s4 !== peg$FAILED) {
+          s5 = peg$parseadditiveOperator();
+          if (s5 !== peg$FAILED) {
+            s6 = peg$parsewhitespace();
+            if (s6 !== peg$FAILED) {
+              s7 = peg$parsemultiplicativeExpression();
+              if (s7 !== peg$FAILED) {
+                s3 = [ s5, s7 ];
+              } else {
+                peg$currPos = s3;
+                s3 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s3;
+              s3 = peg$FAILED;
+            }
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -1565,7 +1573,7 @@ function peg$parse(input, options) {
       }
       if (s4 !== peg$FAILED) {
         s5 = peg$parse__();
-        s6 = peg$parsepipelineExpression();
+        s6 = peg$parseshorthandFunction();
         if (s6 !== peg$FAILED) {
           s7 = peg$parse__();
           if (input.charCodeAt(peg$currPos) === 58) {
@@ -1577,7 +1585,7 @@ function peg$parse(input, options) {
           }
           if (s8 !== peg$FAILED) {
             s9 = peg$parse__();
-            s10 = peg$parsepipelineExpression();
+            s10 = peg$parseshorthandFunction();
             if (s10 !== peg$FAILED) {
               s2 = [ s6, s10 ];
             } else {
@@ -2863,13 +2871,23 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
-      s4 = peg$parse__();
-      s5 = peg$parsemultiplicativeOperator();
-      if (s5 !== peg$FAILED) {
-        s6 = peg$parse__();
-        s7 = peg$parseexponentiationExpression();
-        if (s7 !== peg$FAILED) {
-          s3 = [ s5, s7 ];
+      s4 = peg$parsewhitespace();
+      if (s4 !== peg$FAILED) {
+        s5 = peg$parsemultiplicativeOperator();
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parsewhitespace();
+          if (s6 !== peg$FAILED) {
+            s7 = peg$parseexponentiationExpression();
+            if (s7 !== peg$FAILED) {
+              s3 = [ s5, s7 ];
+            } else {
+              peg$currPos = s3;
+              s3 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
         } else {
           peg$currPos = s3;
           s3 = peg$FAILED;
@@ -2881,13 +2899,23 @@ function peg$parse(input, options) {
       while (s3 !== peg$FAILED) {
         s2.push(s3);
         s3 = peg$currPos;
-        s4 = peg$parse__();
-        s5 = peg$parsemultiplicativeOperator();
-        if (s5 !== peg$FAILED) {
-          s6 = peg$parse__();
-          s7 = peg$parseexponentiationExpression();
-          if (s7 !== peg$FAILED) {
-            s3 = [ s5, s7 ];
+        s4 = peg$parsewhitespace();
+        if (s4 !== peg$FAILED) {
+          s5 = peg$parsemultiplicativeOperator();
+          if (s5 !== peg$FAILED) {
+            s6 = peg$parsewhitespace();
+            if (s6 !== peg$FAILED) {
+              s7 = peg$parseexponentiationExpression();
+              if (s7 !== peg$FAILED) {
+                s3 = [ s5, s7 ];
+              } else {
+                peg$currPos = s3;
+                s3 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s3;
+              s3 = peg$FAILED;
+            }
           } else {
             peg$currPos = s3;
             s3 = peg$FAILED;
@@ -4358,14 +4386,37 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetemplateDocument() {
-    var s0, s1;
+    var s0, s1, s2, s3, s4, s5;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = peg$parsetemplateDocumentContents();
+    s1 = peg$parsetemplateDocumentText();
+    s2 = [];
+    s3 = peg$currPos;
+    s4 = peg$parsetemplateSubstitution();
+    if (s4 !== peg$FAILED) {
+      s5 = peg$parsetemplateDocumentText();
+      s4 = [s4, s5];
+      s3 = s4;
+    } else {
+      peg$currPos = s3;
+      s3 = peg$FAILED;
+    }
+    while (s3 !== peg$FAILED) {
+      s2.push(s3);
+      s3 = peg$currPos;
+      s4 = peg$parsetemplateSubstitution();
+      if (s4 !== peg$FAILED) {
+        s5 = peg$parsetemplateDocumentText();
+        s4 = [s4, s5];
+        s3 = s4;
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+    }
     peg$savedPos = s0;
-    s1 = peg$f69(s1);
-    s0 = s1;
+    s0 = peg$f69(s1, s2);
     peg$silentFails--;
     s1 = peg$FAILED;
     if (peg$silentFails === 0) { peg$fail(peg$e94); }
@@ -4409,41 +4460,6 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsetemplateDocumentContents() {
-    var s0, s1, s2, s3, s4, s5;
-
-    s0 = peg$currPos;
-    s1 = peg$parsetemplateDocumentText();
-    s2 = [];
-    s3 = peg$currPos;
-    s4 = peg$parsetemplateSubstitution();
-    if (s4 !== peg$FAILED) {
-      s5 = peg$parsetemplateDocumentText();
-      s4 = [s4, s5];
-      s3 = s4;
-    } else {
-      peg$currPos = s3;
-      s3 = peg$FAILED;
-    }
-    while (s3 !== peg$FAILED) {
-      s2.push(s3);
-      s3 = peg$currPos;
-      s4 = peg$parsetemplateSubstitution();
-      if (s4 !== peg$FAILED) {
-        s5 = peg$parsetemplateDocumentText();
-        s4 = [s4, s5];
-        s3 = s4;
-      } else {
-        peg$currPos = s3;
-        s3 = peg$FAILED;
-      }
-    }
-    peg$savedPos = s0;
-    s0 = peg$f70(s1, s2);
-
-    return s0;
-  }
-
   function peg$parsetemplateDocumentText() {
     var s0, s1, s2;
 
@@ -4456,7 +4472,7 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateDocumentChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f71(s1);
+    s1 = peg$f70(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
@@ -4466,7 +4482,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetemplateLiteral() {
-    var s0, s1, s2, s3;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -4478,17 +4494,41 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e98); }
     }
     if (s1 !== peg$FAILED) {
-      s2 = peg$parsetemplateLiteralContents();
+      s2 = peg$parsetemplateLiteralText();
+      s3 = [];
+      s4 = peg$currPos;
+      s5 = peg$parsetemplateSubstitution();
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parsetemplateLiteralText();
+        s5 = [s5, s6];
+        s4 = s5;
+      } else {
+        peg$currPos = s4;
+        s4 = peg$FAILED;
+      }
+      while (s4 !== peg$FAILED) {
+        s3.push(s4);
+        s4 = peg$currPos;
+        s5 = peg$parsetemplateSubstitution();
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parsetemplateLiteralText();
+          s5 = [s5, s6];
+          s4 = s5;
+        } else {
+          peg$currPos = s4;
+          s4 = peg$FAILED;
+        }
+      }
       if (input.charCodeAt(peg$currPos) === 96) {
-        s3 = peg$c59;
+        s4 = peg$c59;
         peg$currPos++;
       } else {
-        s3 = peg$FAILED;
+        s4 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e98); }
       }
-      if (s3 !== peg$FAILED) {
+      if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f72(s2);
+        s0 = peg$f71(s2, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4551,41 +4591,6 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsetemplateLiteralContents() {
-    var s0, s1, s2, s3, s4, s5;
-
-    s0 = peg$currPos;
-    s1 = peg$parsetemplateLiteralText();
-    s2 = [];
-    s3 = peg$currPos;
-    s4 = peg$parsetemplateSubstitution();
-    if (s4 !== peg$FAILED) {
-      s5 = peg$parsetemplateLiteralText();
-      s4 = [s4, s5];
-      s3 = s4;
-    } else {
-      peg$currPos = s3;
-      s3 = peg$FAILED;
-    }
-    while (s3 !== peg$FAILED) {
-      s2.push(s3);
-      s3 = peg$currPos;
-      s4 = peg$parsetemplateSubstitution();
-      if (s4 !== peg$FAILED) {
-        s5 = peg$parsetemplateLiteralText();
-        s4 = [s4, s5];
-        s3 = s4;
-      } else {
-        peg$currPos = s3;
-        s3 = peg$FAILED;
-      }
-    }
-    s1 = [s1, s2];
-    s0 = s1;
-
-    return s0;
-  }
-
   function peg$parsetemplateLiteralText() {
     var s0, s1, s2;
 
@@ -4597,7 +4602,7 @@ function peg$parse(input, options) {
       s2 = peg$parsetemplateLiteralChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f73(s1);
+    s1 = peg$f72(s1);
     s0 = s1;
 
     return s0;
@@ -4627,7 +4632,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f74(s2);
+          s0 = peg$f73(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -4676,7 +4681,7 @@ function peg$parse(input, options) {
       s3 = peg$parseunaryExpression();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f75(s1, s3);
+        s0 = peg$f74(s1, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4706,6 +4711,20 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsewhitespace() {
+    var s0;
+
+    s0 = peg$parseinlineSpace();
+    if (s0 === peg$FAILED) {
+      s0 = peg$parsenewLine();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parsecomment();
+      }
+    }
+
+    return s0;
+  }
+
   function peg$parsewhitespaceWithNewLine() {
     var s0, s1, s2, s3, s4;
 
@@ -4856,16 +4875,15 @@ const peg$allowedStartRules = [
   "stringLiteral",
   "templateDocument",
   "templateDocumentChar",
-  "templateDocumentContents",
   "templateDocumentText",
   "templateLiteral",
   "templateLiteralChar",
-  "templateLiteralContents",
   "templateLiteralText",
   "templateSubstitution",
   "textChar",
   "unaryExpression",
   "unaryOperator",
+  "whitespace",
   "whitespaceWithNewLine"
 ];
 

package/src/compiler/parserHelpers.js

@@ -76,22 +76,6 @@ export function downgradeReference(code) {
   }
 }
 
-// Return true if the code will generate an async object.
-function isCodeForAsyncObject(code) {
-  if (!(code instanceof Array)) {
-    return false;
-  }
-  if (code[0] !== ops.object) {
-    return false;
-  }
-  // Are any of the properties getters?
-  const entries = code.slice(1);
-  const hasGetter = entries.some(([key, value]) => {
-    return value instanceof Array && value[0] === ops.getter;
-  });
-  return hasGetter;
-}
-
 export function makeArray(entries) {
   let currentEntries = [];
   const spreads = [];
@@ -260,17 +244,24 @@ export function makeObject(entries, op) {
       continue;
     }
 
-    if (
-      value instanceof Array &&
-      value[0] === ops.getter &&
-      value[1] instanceof Array &&
-      value[1][0] === ops.literal
-    ) {
-      // Simplify a getter for a primitive value to a regular property
-      value = value[1];
-    } else if (isCodeForAsyncObject(value)) {
-      // Add a trailing slash to key to indicate value is a subtree
-      key = key + "/";
+    if (value instanceof Array) {
+      if (
+        value[0] === ops.getter &&
+        value[1] instanceof Array &&
+        value[1][0] === ops.literal
+      ) {
+        // Optimize a getter for a primitive value to a regular property
+        value = value[1];
+      }
+      // else if (
+      //   value[0] === ops.object ||
+      //   (value[0] === ops.getter &&
+      //     value[1] instanceof Array &&
+      //     (value[1][0] === ops.object || value[1][0] === ops.merge))
+      // ) {
+      //   // Add a trailing slash to key to indicate value is a subtree
+      //   key = trailingSlash.add(key);
+      // }
     }
 
     currentEntries.push([key, value]);

package/src/runtime/expressionObject.js

@@ -1,4 +1,10 @@
-import { extension, ObjectTree, symbols, Tree } from "@weborigami/async-tree";
+import {
+  extension,
+  ObjectTree,
+  symbols,
+  trailingSlash,
+  Tree,
+} from "@weborigami/async-tree";
 import { handleExtension } from "./handlers.js";
 import { evaluate, ops } from "./internal.js";
 
@@ -11,8 +17,8 @@ import { evaluate, ops } from "./internal.js";
  *
  * 1. A primitive value (string, etc.). This will be defined directly as an
  *    object property.
- * 1. An immediate code entry. This will be evaluated during this call and its
- *    result defined as an object property.
+ * 1. An eager (as opposed to lazy) code entry. This will be evaluated during
+ *    this call and its result defined as an object property.
  * 1. A code entry that starts with ops.getter. This will be defined as a
  *    property getter on the object.
  *
@@ -25,15 +31,9 @@ export default async function expressionObject(entries, parent) {
   if (parent !== null && !Tree.isAsyncTree(parent)) {
     throw new TypeError(`Parent must be an AsyncTree or null`);
   }
-  Object.defineProperty(object, symbols.parent, {
-    configurable: true,
-    enumerable: false,
-    value: parent,
-    writable: true,
-  });
 
   let tree;
-  const immediateProperties = [];
+  const eagerProperties = [];
   for (let [key, value] of entries) {
     // Determine if we need to define a getter or a regular property. If the key
     // has an extension, we need to define a getter. If the value is code (an
@@ -61,7 +61,6 @@ export default async function expressionObject(entries, parent) {
 
     if (defineProperty) {
       // Define simple property
-      // object[key] = value;
       Object.defineProperty(object, key, {
         configurable: true,
         enumerable,
@@ -74,7 +73,7 @@ export default async function expressionObject(entries, parent) {
       if (value[0] === ops.getter) {
         code = value[1];
       } else {
-        immediateProperties.push(key);
+        eagerProperties.push(key);
         code = value;
       }
 
@@ -102,9 +101,25 @@ export default async function expressionObject(entries, parent) {
     }
   }
 
+  // Attach a keys method
+  Object.defineProperty(object, symbols.keys, {
+    configurable: true,
+    enumerable: false,
+    value: () => keys(object, eagerProperties, entries),
+    writable: true,
+  });
+
+  // Attach the parent
+  Object.defineProperty(object, symbols.parent, {
+    configurable: true,
+    enumerable: false,
+    value: parent,
+    writable: true,
+  });
+
   // Evaluate any properties that were declared as immediate: get their value
   // and overwrite the property getter with the actual value.
-  for (const key of immediateProperties) {
+  for (const key of eagerProperties) {
     const value = await object[key];
     // @ts-ignore Unclear why TS thinks `object` might be undefined here
     const enumerable = Object.getOwnPropertyDescriptor(object, key).enumerable;
@@ -118,3 +133,31 @@ export default async function expressionObject(entries, parent) {
 
   return object;
 }
+
+function entryKey(object, eagerProperties, entry) {
+  const [key, value] = entry;
+
+  const hasExplicitSlash = trailingSlash.has(key);
+  if (hasExplicitSlash) {
+    // Return key as is
+    return key;
+  }
+
+  // If eager property value is treelike, add slash to the key
+  if (eagerProperties.includes(key) && Tree.isTreelike(object[key])) {
+    return trailingSlash.add(key);
+  }
+
+  // If entry will definitely create a subtree, add a trailing slash
+  const entryCreatesSubtree =
+    value instanceof Array &&
+    (value[0] === ops.object ||
+      (value[0] === ops.getter &&
+        value[1] instanceof Array &&
+        (value[1][0] === ops.object || value[1][0] === ops.merge)));
+  return trailingSlash.toggle(key, entryCreatesSubtree);
+}
+
+function keys(object, eagerProperties, entries) {
+  return entries.map((entry) => entryKey(object, eagerProperties, entry));
+}

package/src/runtime/mergeTrees.js

@@ -1,4 +1,9 @@
-import { isPlainObject, isUnpackable, merge } from "@weborigami/async-tree";
+import {
+  isPlainObject,
+  isUnpackable,
+  merge,
+  Tree,
+} from "@weborigami/async-tree";
 
 /**
  * Create a tree that's the result of merging the given trees.
@@ -28,8 +33,23 @@ export default async function mergeTrees(...trees) {
   );
 
   // If all trees are plain objects, return a plain object.
-  if (unpacked.every((tree) => isPlainObject(tree))) {
-    return Object.assign({}, ...unpacked);
+  if (
+    unpacked.every((tree) => isPlainObject(tree) && !Tree.isAsyncTree(tree))
+  ) {
+    // If we do an Object.assign, we'd evaluate getters.
+    // To avoid that, we'll merge property descriptors.
+    const result = {};
+    for (const obj of unpacked) {
+      const descriptors = Object.getOwnPropertyDescriptors(obj);
+      for (const [key, descriptor] of Object.entries(descriptors)) {
+        if (descriptor.value !== undefined) {
+          result[key] = descriptor.value;
+        } else {
+          Object.defineProperty(result, key, descriptor);
+        }
+      }
+    }
+    return result;
   }
 
   // If all trees are arrays, return an array.