@weborigami/language 0.0.62 → 0.0.64-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.0.62",
+  "version": "0.0.64-beta.1",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
@@ -11,8 +11,8 @@
     "typescript": "5.5.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.62",
-    "@weborigami/types": "0.0.62",
+    "@weborigami/async-tree": "0.0.64-beta.1",
+    "@weborigami/types": "0.0.64-beta.1",
     "watcher": "2.3.1"
   },
   "scripts": {

package/src/compiler/origami.pegjs

@@ -63,9 +63,8 @@ callTarget "function call"
   / group
   / scopeReference
 
-// Required closing curly brace. We use this for the `tree` term: it's the last
-// term in the `step` parser that starts with a curly brace, so if that parser
-// sees a left curly brace, here we must see a right curly brace.
+// Required closing curly brace. We use this for the `object` term: if the
+// parser sees a left curly brace, here we must see a right curly brace.
 closingBrace
   = "}"
   / .? {
@@ -207,7 +206,7 @@ number "number"
 
 // An object literal: `{foo: 1, bar: 2}`
 object "object literal"
-  = "{" __ entries:objectEntries? __ "}" {
+  = "{" __ entries:objectEntries? __ closingBrace {
       return annotate(makeObject(entries ?? [], ops.object), location());
     }
 
@@ -223,7 +222,7 @@ objectEntry
 
 // A getter definition inside an object literal: `foo = 1`
 objectGetter "object getter"
-  = key:identifierOrString __ "=" __ value:expr {
+  = key:objectKey __ "=" __ value:expr {
     return annotate([key, [ops.getter, value]], location());
   }
 
@@ -233,9 +232,13 @@ objectIdentifier "object identifier"
       return annotate([key, [ops.inherited, key]], location());
     }
 
+objectKey "object key"
+  = hiddenKey:("(" identifierOrString ")") { return hiddenKey.join(""); }
+  / identifierOrString
+
 // A property definition in an object literal: `x: 1`
 objectProperty "object property"
-  = @identifierOrString __ ":" __ @expr
+  = @objectKey __ ":" __ @expr
 
 parameterizedLambda
   = "(" __ parameters:identifierList? __ ")" __ doubleArrow __ expr:expr {

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, 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, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, 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, objectGetter: peg$parseobjectGetter, objectIdentifier: peg$parseobjectIdentifier, 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, 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, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, 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, objectGetter: peg$parseobjectGetter, objectIdentifier: peg$parseobjectIdentifier, objectKey: peg$parseobjectKey, 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, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
   var peg$startRuleFunction = peg$parse__;
 
   var peg$c0 = "//";
@@ -297,37 +297,38 @@ function peg$parse(input, options) {
   var peg$e50 = peg$literalExpectation("{", false);
   var peg$e51 = peg$otherExpectation("object getter");
   var peg$e52 = peg$otherExpectation("object identifier");
-  var peg$e53 = peg$otherExpectation("object property");
-  var peg$e54 = peg$otherExpectation("function arguments in parentheses");
-  var peg$e55 = peg$otherExpectation("slash-separated path");
-  var peg$e56 = peg$otherExpectation("path element");
-  var peg$e57 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", ":", "/", "\\", " ", "\t", "\n", "\r"], true, false);
-  var peg$e58 = peg$otherExpectation("function call using protocol: syntax");
-  var peg$e59 = peg$otherExpectation("protocol");
-  var peg$e60 = peg$otherExpectation("reserved protocol");
-  var peg$e61 = peg$literalExpectation("https", false);
-  var peg$e62 = peg$literalExpectation("http", false);
-  var peg$e63 = peg$literalExpectation("new", false);
-  var peg$e64 = peg$literalExpectation("package", false);
-  var peg$e65 = peg$literalExpectation("treehttps", false);
-  var peg$e66 = peg$literalExpectation("treehttp", false);
-  var peg$e67 = peg$literalExpectation("tree", false);
-  var peg$e68 = peg$otherExpectation("scope reference");
-  var peg$e69 = peg$literalExpectation(",", false);
-  var peg$e70 = peg$literalExpectation("#!", false);
-  var peg$e71 = peg$classExpectation(["\n", "\r"], true, false);
-  var peg$e72 = peg$classExpectation(["+", "-"], false, false);
-  var peg$e73 = peg$literalExpectation("\u2192", false);
-  var peg$e74 = peg$literalExpectation("->", false);
-  var peg$e75 = peg$otherExpectation("single quote string");
-  var peg$e76 = peg$literalExpectation("'", false);
-  var peg$e77 = peg$otherExpectation("string");
-  var peg$e78 = peg$otherExpectation("template");
-  var peg$e79 = peg$literalExpectation("${", false);
-  var peg$e80 = peg$otherExpectation("template text");
-  var peg$e81 = peg$otherExpectation("template literal");
-  var peg$e82 = peg$literalExpectation("`", false);
-  var peg$e83 = peg$otherExpectation("template substitution");
+  var peg$e53 = peg$otherExpectation("object key");
+  var peg$e54 = peg$otherExpectation("object property");
+  var peg$e55 = peg$otherExpectation("function arguments in parentheses");
+  var peg$e56 = peg$otherExpectation("slash-separated path");
+  var peg$e57 = peg$otherExpectation("path element");
+  var peg$e58 = peg$classExpectation(["(", ")", "{", "}", "[", "]", ",", ":", "/", "\\", " ", "\t", "\n", "\r"], true, false);
+  var peg$e59 = peg$otherExpectation("function call using protocol: syntax");
+  var peg$e60 = peg$otherExpectation("protocol");
+  var peg$e61 = peg$otherExpectation("reserved protocol");
+  var peg$e62 = peg$literalExpectation("https", false);
+  var peg$e63 = peg$literalExpectation("http", false);
+  var peg$e64 = peg$literalExpectation("new", false);
+  var peg$e65 = peg$literalExpectation("package", false);
+  var peg$e66 = peg$literalExpectation("treehttps", false);
+  var peg$e67 = peg$literalExpectation("treehttp", false);
+  var peg$e68 = peg$literalExpectation("tree", false);
+  var peg$e69 = peg$otherExpectation("scope reference");
+  var peg$e70 = peg$literalExpectation(",", false);
+  var peg$e71 = peg$literalExpectation("#!", false);
+  var peg$e72 = peg$classExpectation(["\n", "\r"], true, false);
+  var peg$e73 = peg$classExpectation(["+", "-"], false, false);
+  var peg$e74 = peg$literalExpectation("\u2192", false);
+  var peg$e75 = peg$literalExpectation("->", false);
+  var peg$e76 = peg$otherExpectation("single quote string");
+  var peg$e77 = peg$literalExpectation("'", false);
+  var peg$e78 = peg$otherExpectation("string");
+  var peg$e79 = peg$otherExpectation("template");
+  var peg$e80 = peg$literalExpectation("${", false);
+  var peg$e81 = peg$otherExpectation("template text");
+  var peg$e82 = peg$otherExpectation("template literal");
+  var peg$e83 = peg$literalExpectation("`", false);
+  var peg$e84 = peg$otherExpectation("template substitution");
 
   var peg$f0 = function() { return ""; };
   var peg$f1 = function(path) {
@@ -378,44 +379,45 @@ function peg$parse(input, options) {
   var peg$f19 = function(key) {
       return annotate([key, [ops.inherited, key]], location());
     };
-  var peg$f20 = function(parameters, expr) {
+  var peg$f20 = function(hiddenKey) { return hiddenKey.join(""); };
+  var peg$f21 = function(parameters, expr) {
     return annotate([ops.lambda, parameters ?? [], expr], location());
   };
-  var peg$f21 = function(list) {
+  var peg$f22 = function(list) {
       return list ?? annotate([undefined], location());
     };
-  var peg$f22 = function(steps) {
+  var peg$f23 = function(steps) {
       return annotate(makePipeline(steps), location());
     };
-  var peg$f23 = function(chars) { return chars.join(""); };
-  var peg$f24 = function(protocol, host, path) {
+  var peg$f24 = function(chars) { return chars.join(""); };
+  var peg$f25 = function(protocol, host, path) {
       return annotate([protocol, host, ...(path ?? [])], location());
     };
-  var peg$f25 = function() { return ops.https; };
-  var peg$f26 = function() { return ops.http; };
-  var peg$f27 = function() { return ops.constructor; };
-  var peg$f28 = function() { return [ops.scope, "@package"] };
-  var peg$f29 = function() { return ops.treeHttps; };
-  var peg$f30 = function() { return ops.treeHttp; };
-  var peg$f31 = function() { return ops.treeHttps; };
-  var peg$f32 = function(key) {
+  var peg$f26 = function() { return ops.https; };
+  var peg$f27 = function() { return ops.http; };
+  var peg$f28 = function() { return ops.constructor; };
+  var peg$f29 = function() { return [ops.scope, "@package"] };
+  var peg$f30 = function() { return ops.treeHttps; };
+  var peg$f31 = function() { return ops.treeHttp; };
+  var peg$f32 = function() { return ops.treeHttps; };
+  var peg$f33 = function(key) {
       return annotate([ops.scope, key], location());
     };
-  var peg$f33 = function() { return null; };
   var peg$f34 = function() { return null; };
-  var peg$f35 = function(chars) { return chars.join(""); };
-  var peg$f36 = function(expr) { return [ops.spread, expr]; };
-  var peg$f37 = function(contents) {
+  var peg$f35 = function() { return null; };
+  var peg$f36 = function(chars) { return chars.join(""); };
+  var peg$f37 = function(expr) { return [ops.spread, expr]; };
+  var peg$f38 = function(contents) {
       return annotate([ops.lambda, null, contents], location());
     };
-  var peg$f38 = function(parts) {
+  var peg$f39 = function(parts) {
       return annotate(makeTemplate(parts), location());
     };
-  var peg$f39 = function(chars) { return chars.join(""); };
-  var peg$f40 = function(parts) {
+  var peg$f40 = function(chars) { return chars.join(""); };
+  var peg$f41 = function(parts) {
       return annotate(makeTemplate(parts), location());
     };
-  var peg$f41 = function(chars) { return chars.join(""); };
+  var peg$f42 = function(chars) { return chars.join(""); };
   var peg$currPos = options.peg$currPos | 0;
   var peg$savedPos = peg$currPos;
   var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -1942,13 +1944,7 @@ function peg$parse(input, options) {
         s3 = null;
       }
       s4 = peg$parse__();
-      if (input.charCodeAt(peg$currPos) === 125) {
-        s5 = peg$c2;
-        peg$currPos++;
-      } else {
-        s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e6); }
-      }
+      s5 = peg$parseclosingBrace();
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
         s0 = peg$f17(s3);
@@ -2034,7 +2030,7 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = peg$parseidentifierOrString();
+    s1 = peg$parseobjectKey();
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 61) {
@@ -2091,12 +2087,67 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parseobjectKey() {
+    var s0, s1, s2, s3, s4;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 40) {
+      s2 = peg$c12;
+      peg$currPos++;
+    } else {
+      s2 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+    }
+    if (s2 !== peg$FAILED) {
+      s3 = peg$parseidentifierOrString();
+      if (s3 !== peg$FAILED) {
+        if (input.charCodeAt(peg$currPos) === 41) {
+          s4 = peg$c4;
+          peg$currPos++;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e9); }
+        }
+        if (s4 !== peg$FAILED) {
+          s2 = [s2, s3, s4];
+          s1 = s2;
+        } else {
+          peg$currPos = s1;
+          s1 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s1;
+        s1 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f20(s1);
+    }
+    s0 = s1;
+    if (s0 === peg$FAILED) {
+      s0 = peg$parseidentifierOrString();
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e53); }
+    }
+
+    return s0;
+  }
+
   function peg$parseobjectProperty() {
     var s0, s1, s2, s3, s4, s5;
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = peg$parseidentifierOrString();
+    s1 = peg$parseobjectKey();
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 58) {
@@ -2126,7 +2177,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;
@@ -2165,7 +2216,7 @@ function peg$parse(input, options) {
           s9 = peg$parsepipeline();
           if (s9 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f20(s3, s9);
+            s0 = peg$f21(s3, s9);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -2214,7 +2265,7 @@ function peg$parse(input, options) {
       }
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f21(s3);
+        s0 = peg$f22(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2226,7 +2277,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;
@@ -2280,7 +2331,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f22(s1);
+      s1 = peg$f23(s1);
     }
     s0 = s1;
 
@@ -2319,7 +2370,7 @@ function peg$parse(input, options) {
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e55); }
+    if (peg$silentFails === 0) { peg$fail(peg$e56); }
 
     return s0;
   }
@@ -2336,11 +2387,11 @@ function peg$parse(input, options) {
       s2 = peg$parsepathKeyChar();
     }
     peg$savedPos = s0;
-    s1 = peg$f23(s1);
+    s1 = peg$f24(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e56); }
+    if (peg$silentFails === 0) { peg$fail(peg$e57); }
 
     return s0;
   }
@@ -2353,7 +2404,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e57); }
+      if (peg$silentFails === 0) { peg$fail(peg$e58); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$parseescapedChar();
@@ -2406,7 +2457,7 @@ function peg$parse(input, options) {
             s5 = null;
           }
           peg$savedPos = s0;
-          s0 = peg$f24(s1, s4, s5);
+          s0 = peg$f25(s1, s4, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2422,7 +2473,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e58); }
+      if (peg$silentFails === 0) { peg$fail(peg$e59); }
     }
 
     return s0;
@@ -2439,7 +2490,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
 
     return s0;
@@ -2455,11 +2506,11 @@ function peg$parse(input, options) {
       peg$currPos += 5;
     } 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;
-      s1 = peg$f25();
+      s1 = peg$f26();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -2469,11 +2520,11 @@ function peg$parse(input, options) {
         peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e62); }
+        if (peg$silentFails === 0) { peg$fail(peg$e63); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f26();
+        s1 = peg$f27();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -2483,11 +2534,11 @@ function peg$parse(input, options) {
           peg$currPos += 3;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e63); }
+          if (peg$silentFails === 0) { peg$fail(peg$e64); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f27();
+          s1 = peg$f28();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
@@ -2497,11 +2548,11 @@ function peg$parse(input, options) {
             peg$currPos += 7;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e64); }
+            if (peg$silentFails === 0) { peg$fail(peg$e65); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f28();
+            s1 = peg$f29();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
@@ -2511,11 +2562,11 @@ function peg$parse(input, options) {
               peg$currPos += 9;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e65); }
+              if (peg$silentFails === 0) { peg$fail(peg$e66); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f29();
+              s1 = peg$f30();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
@@ -2525,11 +2576,11 @@ function peg$parse(input, options) {
                 peg$currPos += 8;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e66); }
+                if (peg$silentFails === 0) { peg$fail(peg$e67); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f30();
+                s1 = peg$f31();
               }
               s0 = s1;
               if (s0 === peg$FAILED) {
@@ -2539,11 +2590,11 @@ function peg$parse(input, options) {
                   peg$currPos += 4;
                 } else {
                   s1 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e67); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e68); }
                 }
                 if (s1 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$f31();
+                  s1 = peg$f32();
                 }
                 s0 = s1;
               }
@@ -2555,7 +2606,7 @@ function peg$parse(input, options) {
     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;
@@ -2569,13 +2620,13 @@ function peg$parse(input, options) {
     s1 = peg$parseidentifier();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f32(s1);
+      s1 = peg$f33(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
 
     return s0;
@@ -2591,7 +2642,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+      if (peg$silentFails === 0) { peg$fail(peg$e70); }
     }
     if (s2 !== peg$FAILED) {
       s3 = peg$parse__();
@@ -2617,7 +2668,7 @@ function peg$parse(input, options) {
       peg$currPos += 2;
     } 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 = [];
@@ -2626,7 +2677,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+        if (peg$silentFails === 0) { peg$fail(peg$e72); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -2635,11 +2686,11 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e71); }
+          if (peg$silentFails === 0) { peg$fail(peg$e72); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f33();
+      s0 = peg$f34();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2656,7 +2707,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
+      if (peg$silentFails === 0) { peg$fail(peg$e73); }
     }
 
     return s0;
@@ -2670,7 +2721,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
     }
     if (s0 === peg$FAILED) {
       if (input.substr(peg$currPos, 2) === peg$c36) {
@@ -2678,7 +2729,7 @@ function peg$parse(input, options) {
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e74); }
+        if (peg$silentFails === 0) { peg$fail(peg$e75); }
       }
     }
 
@@ -2703,7 +2754,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+        if (peg$silentFails === 0) { peg$fail(peg$e72); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -2712,11 +2763,11 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e71); }
+          if (peg$silentFails === 0) { peg$fail(peg$e72); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f34();
+      s0 = peg$f35();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2735,7 +2786,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 = [];
@@ -2749,11 +2800,11 @@ 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) {
         peg$savedPos = s0;
-        s0 = peg$f35(s2);
+        s0 = peg$f36(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2765,7 +2816,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;
@@ -2782,7 +2833,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) {
       s2 = peg$parsenewLine();
@@ -2819,7 +2870,7 @@ function peg$parse(input, options) {
       s2 = peg$parsepipeline();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f36(s2);
+        s0 = peg$f37(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2895,7 +2946,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;
@@ -2908,11 +2959,11 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parsetemplateDocumentContents();
     peg$savedPos = s0;
-    s1 = peg$f37(s1);
+    s1 = peg$f38(s1);
     s0 = s1;
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e78); }
+    if (peg$silentFails === 0) { peg$fail(peg$e79); }
 
     return s0;
   }
@@ -2928,7 +2979,7 @@ function peg$parse(input, options) {
       peg$currPos += 2;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
     }
     peg$silentFails--;
     if (s2 === peg$FAILED) {
@@ -2970,7 +3021,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f38(s1);
+    s1 = peg$f39(s1);
     s0 = s1;
 
     return s0;
@@ -2993,13 +3044,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f39(s1);
+      s1 = peg$f40(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
     }
 
     return s0;
@@ -3015,7 +3066,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsetemplateLiteralContents();
@@ -3024,7 +3075,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e82); }
+        if (peg$silentFails === 0) { peg$fail(peg$e83); }
       }
       if (s3 !== peg$FAILED) {
         s0 = s2;
@@ -3039,7 +3090,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
+      if (peg$silentFails === 0) { peg$fail(peg$e82); }
     }
 
     return s0;
@@ -3056,7 +3107,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
     }
     if (s2 === peg$FAILED) {
       if (input.substr(peg$currPos, 2) === peg$c38) {
@@ -3064,7 +3115,7 @@ function peg$parse(input, options) {
         peg$currPos += 2;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e79); }
+        if (peg$silentFails === 0) { peg$fail(peg$e80); }
       }
     }
     peg$silentFails--;
@@ -3107,7 +3158,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f40(s1);
+    s1 = peg$f41(s1);
     s0 = s1;
 
     return s0;
@@ -3129,7 +3180,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f41(s1);
+      s1 = peg$f42(s1);
     }
     s0 = s1;
 
@@ -3146,7 +3197,7 @@ function peg$parse(input, options) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
@@ -3177,7 +3228,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
 
     return s0;
@@ -3299,6 +3350,7 @@ const peg$allowedStartRules = [
   "objectEntry",
   "objectGetter",
   "objectIdentifier",
+  "objectKey",
   "objectProperty",
   "parameterizedLambda",
   "parensArgs",

package/src/runtime/expressionObject.js

@@ -23,10 +23,10 @@ export default async function expressionObject(entries, parent) {
   // Create the object and set its parent
   const object = {};
   Object.defineProperty(object, symbols.parent, {
-    value: parent,
-    writable: true,
     configurable: true,
     enumerable: false,
+    value: parent,
+    writable: true,
   });
 
   let tree;
@@ -50,9 +50,21 @@ export default async function expressionObject(entries, parent) {
       defineProperty = false;
     }
 
+    let enumerable = true;
+    if (key[0] === "(" && key[key.length - 1] === ")") {
+      key = key.slice(1, -1);
+      enumerable = false;
+    }
+
     if (defineProperty) {
       // Define simple property
-      object[key] = value;
+      // object[key] = value;
+      Object.defineProperty(object, key, {
+        configurable: true,
+        enumerable,
+        value,
+        writable: true,
+      });
     } else {
       // Property getter
       let code;
@@ -81,7 +93,7 @@ export default async function expressionObject(entries, parent) {
 
       Object.defineProperty(object, key, {
         configurable: true,
-        enumerable: true,
+        enumerable,
         get,
       });
     }
@@ -91,9 +103,11 @@ export default async function expressionObject(entries, parent) {
   // and overwrite the property getter with the actual value.
   for (const key of immediateProperties) {
     const value = await object[key];
+    // @ts-ignore Unclear why TS thinks `object` might be undefined here
+    const enumerable = Object.getOwnPropertyDescriptor(object, key).enumerable;
     Object.defineProperty(object, key, {
       configurable: true,
-      enumerable: true,
+      enumerable,
       value,
       writable: true,
     });

package/test/compiler/parse.test.js

@@ -308,6 +308,7 @@ describe("Origami parser", () => {
       [ops.object, ["a", 1]],
       [ops.scope, "b"],
     ]);
+    assertParse("object", "{ (a): 1 }", [ops.object, ["(a)", 1]]);
   });
 
   test("objectEntry", () => {

package/test/runtime/expressionObject.test.js

@@ -63,4 +63,14 @@ describe("expressionObject", () => {
     const json = await dataJson.unpack();
     assert.deepEqual(json, { a: 1 });
   });
+
+  test("a key declared with parentheses is not enumerable", async () => {
+    const entries = [
+      ["(hidden)", "shh"],
+      ["visible", "hey"],
+    ];
+    const object = await expressionObject(entries, null);
+    assert.deepEqual(Object.keys(object), ["visible"]);
+    assert.equal(object["hidden"], "shh");
+  });
 });