@weborigami/language 0.3.0 → 0.3.2

package/package.json

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

package/src/compiler/origami.pegjs

@@ -20,6 +20,7 @@ import {
   makeBinaryOperation,
   makeCall,
   makeDeferredArguments,
+  makeJsPropertyAccess,
   makeObject,
   makePipeline,
   makeProperty,
@@ -50,6 +51,8 @@ additiveOperator
 arguments "function arguments"
   = parenthesesArguments
   / pathArguments
+  / jsPropertyAccess
+  / computedPropertyAccess
   / templateLiteral
 
 arrayLiteral "array"
@@ -126,6 +129,11 @@ comment "comment"
   = multiLineComment
   / singleLineComment
 
+computedPropertyAccess
+  = __ "[" expression:expression expectClosingBracket {
+      return annotate([ops.traverse, expression], location());
+    }
+
 conditionalExpression
   = condition:logicalOrExpression tail:(__
     "?" __ @shorthandFunction __
@@ -278,8 +286,8 @@ frontMatterYaml "YAML front matter"
 // An expression in parentheses: `(foo)`
 group "parenthetical group"
   = "(" expression:expression expectClosingParenthesis {
-      return annotate(downgradeReference(expression), location());
-    }
+    return annotate(downgradeReference(expression), location());
+  }
 
 guillemetString "guillemet string"
   = '«' chars:guillemetStringChar* expectGuillemet {
@@ -326,6 +334,13 @@ implicitParensthesesArguments
       return annotate(values, location());
     }
 
+inherited
+  = rootDirectory
+  / homeDirectory
+  / qualifiedReference
+  / namespace
+  / scopeReference
+
 inlineSpace
   = [ \t]
 
@@ -333,7 +348,26 @@ integerLiteral "integer"
   = digits {
       return annotate([ops.literal, parseInt(text())], location());
     }
-    
+
+jsIdentifier
+  = $( jsIdentifierStart jsIdentifierPart* )
+
+// Continuation of a JavaScript identifier
+// https://tc39.es/ecma262/multipage/ecmascript-language-lexical-grammar.html#prod-IdentifierPart
+jsIdentifierPart "JavaScript identifier continuation"
+  = char:. &{ return char.match(/[$_\p{ID_Continue}]/u) }
+
+// Start of a JavaScript identifier
+// https://tc39.es/ecma262/multipage/ecmascript-language-lexical-grammar.html#prod-IdentifierStart
+jsIdentifierStart "JavaScript identifier start"
+  = char:. &{ return char.match(/[$_\p{ID_Start}]/u) }
+
+jsPropertyAccess
+  = __ "." __ property:jsIdentifier {
+    const literal = annotate([ops.literal, property], location());
+    return annotate([ops.traverse, literal], location());
+  }
+
 // A separated list of values
 list "list"
   = values:pipelineExpression|1.., separator| separator? {
@@ -554,13 +588,6 @@ qualifiedReference
       return makeCall(fn, [literal]);
     }
 
-inherited
-  = rootDirectory
-  / homeDirectory
-  / qualifiedReference
-  / namespace
-  / scopeReference
-
 relationalExpression
   = head:shiftExpression tail:(__ @relationalOperator __ @shiftExpression)* {
       return tail.reduce(makeBinaryOperation, head);