@weborigami/language 0.0.53 → 0.0.55

package/package.json

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

package/src/compiler/origami.pegjs

@@ -155,6 +155,10 @@ identifierChar
 identifierList
   = @identifier|1.., separator| separator?
 
+identifierOrString
+  = identifier
+  / string
+
 implicitParensArgs "arguments with implicit parentheses"
   = inlineSpace+ @list
 
@@ -210,13 +214,13 @@ objectEntries
 objectEntry
   = spread
   / objectProperty
-  / key:identifier {
+  / key:identifierOrString {
       return annotate([key, [ops.scope, key]], location());
     }
 
 // A single object property with key and value: `x: 1`
 objectProperty "object property"
-  = @identifier __ ":" __ @expr
+  = @identifierOrString __ ":" __ @expr
 
 parameterizedLambda
   = "(" __ parameters:identifierList? __ ")" __ doubleArrow __ expr:expr {
@@ -373,7 +377,7 @@ tree "tree literal"
 
 // A tree assignment statement: `foo = 1`
 treeAssignment "tree assignment"
-  = @identifier __ "=" __ @expr
+  = @identifierOrString __ "=" __ @expr
 
 // A separated list of assignments or shorthands
 treeEntries
@@ -382,7 +386,7 @@ treeEntries
 treeEntry
   = spread
   / treeAssignment
-  / key:identifier {
+  / key:identifierOrString {
       return annotate([key, [ops.inherited, key]], location());
     }
 

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, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParensArgs: peg$parseimplicitParensArgs, inlineSpace: peg$parseinlineSpace, integer: peg$parseinteger, lambda: peg$parselambda, leadingSlashPath: peg$parseleadingSlashPath, list: peg$parselist, multiLineComment: peg$parsemultiLineComment, newLine: peg$parsenewLine, number: peg$parsenumber, object: peg$parseobject, 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, 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 = "//";
@@ -1435,6 +1435,17 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parseidentifierOrString() {
+    var s0;
+
+    s0 = peg$parseidentifier();
+    if (s0 === peg$FAILED) {
+      s0 = peg$parsestring();
+    }
+
+    return s0;
+  }
+
   function peg$parseimplicitParensArgs() {
     var s0, s1, s2;
 
@@ -1894,7 +1905,7 @@ function peg$parse(input, options) {
       s0 = peg$parseobjectProperty();
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        s1 = peg$parseidentifier();
+        s1 = peg$parseidentifierOrString();
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
           s1 = peg$f17(s1);
@@ -1911,7 +1922,7 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = peg$parseidentifier();
+    s1 = peg$parseidentifierOrString();
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 58) {
@@ -3041,7 +3052,7 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    s1 = peg$parseidentifier();
+    s1 = peg$parseidentifierOrString();
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 61) {
@@ -3128,7 +3139,7 @@ function peg$parse(input, options) {
       s0 = peg$parsetreeAssignment();
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        s1 = peg$parseidentifier();
+        s1 = peg$parseidentifierOrString();
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
           s1 = peg$f41(s1);
@@ -3222,6 +3233,7 @@ const peg$allowedStartRules = [
   "identifier",
   "identifierChar",
   "identifierList",
+  "identifierOrString",
   "implicitParensArgs",
   "inlineSpace",
   "integer",

package/src/runtime/mergeTrees.js

@@ -30,7 +30,7 @@ export default async function mergeTrees(...trees) {
 
   // If all trees are plain objects, return a plain object.
   if (unpacked.every((tree) => isPlainObject(tree))) {
-    return mergeObjects(...unpacked);
+    return Object.assign({}, ...unpacked);
   }
 
   // If all trees are arrays, return an array.
@@ -56,23 +56,3 @@ export default async function mergeTrees(...trees) {
 
   return result;
 }
-
-/**
- * Merge the indicated plain objects. If a key is present in multiple objects,
- * the value from the first object is used.
- *
- * This is similar to calling Object.assign() with the objects in reverse order,
- * but we want to ensure the keys end up in the same order they're encountered
- * in the objects.
- *
- * @param  {...any} objects
- */
-function mergeObjects(...objects) {
-  const result = {};
-  for (const obj of objects) {
-    for (const key of Object.keys(obj)) {
-      result[key] ??= obj[key];
-    }
-  }
-  return result;
-}

package/test/compiler/parse.test.js

@@ -299,6 +299,11 @@ describe("Origami parser", () => {
       ["a", 1],
       ["b", [ops.scope, "b"]],
     ]);
+    assertParse("object", `{ "a": 1, "b": 2 }`, [
+      ops.object,
+      ["a", 1],
+      ["b", 2],
+    ]);
     assertParse("object", "{ a: 1, ...b }", [
       ops.merge,
       [ops.object, ["a", 1]],

package/test/runtime/mergeTrees.test.js

@@ -13,16 +13,15 @@ describe("mergeTrees", () => {
         b: 2,
       },
       {
-        c: 3,
-        d: 4,
+        b: 3,
+        c: 4,
       }
     );
     // @ts-ignore
     assert.deepEqual(await Tree.plain(tree), {
       a: 1,
-      b: 2,
-      c: 3,
-      d: 4,
+      b: 3,
+      c: 4,
     });
   });
 
@@ -55,15 +54,14 @@ describe("mergeTrees", () => {
         b: 2,
       },
       {
-        c: 3,
-        d: 4,
+        b: 3,
+        c: 4,
       }
     );
     assert.deepEqual(result, {
       a: 1,
-      b: 2,
-      c: 3,
-      d: 4,
+      b: 3,
+      c: 4,
     });
   });