@weborigami/language 0.0.40 → 0.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
@@ -10,8 +10,8 @@
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.40",
-    "@weborigami/types": "0.0.40",
+    "@weborigami/async-tree": "0.0.41",
+    "@weborigami/types": "0.0.41",
     "peggy": "3.0.2",
     "watcher": "2.3.0"
   },

package/src/compiler/origami.pegjs

@@ -18,9 +18,9 @@ __
 absoluteFilePath "absolute file path"
   = path:leadingSlashPath { return [[ops.filesRoot], ...path]; }
 
-// A chain of arguments: `(arg1)(arg2)(arg3)`
-argsChain "function arguments"
-  = parts:(parensArgs / leadingSlashPath)+ { return parts; }
+args "function arguments"
+  = parensArgs
+  / path:leadingSlashPath { return [ops.traverse, ...path]; }
 
 // An assignment statement: `foo = 1`
 assignment "tree assignment"
@@ -41,6 +41,7 @@ callTarget "function call"
   / object
   / tree
   / lambda
+  / parameterizedLambda
   / protocolCall
   / group
   / scopeReference
@@ -73,8 +74,9 @@ expr "expression"
   / array
   / object
   / tree
-  / lambda
   / templateLiteral
+  / lambda
+  / parameterizedLambda
   / group
   / string
   / number
@@ -95,7 +97,8 @@ float "floating-point number"
 // Parse a function and its arguments, e.g. `fn(arg)`, possibly part of a chain
 // of function calls, like `fn(arg1)(arg2)(arg3)`.
 functionComposition "function composition"
-  = target:callTarget chain:argsChain { return makeFunctionCall(target, chain); }
+  // = target:callTarget chain:argsChain { return makeFunctionCall(target, chain); }
+  = target:callTarget chain:args+ { return makeFunctionCall(target, chain); }
 
 // An expression in parentheses: `(foo)`
 group "parenthetical group"
@@ -105,9 +108,14 @@ identifier "identifier"
   = chars:identifierChar+ { return chars.join(""); }
 
 identifierChar
-  = [^(){}\[\],/:=\`"'\\# \t\n\r] // No unescaped whitespace or special chars
+  = [^(){}\[\]<>,/:=\`"'\\# \t\n\r] // No unescaped whitespace or special chars
   / escapedChar
 
+identifierList
+  = head:identifier tail:(separator @identifier)* separator? {
+    return [head].concat(tail);
+  }
+
 // A function call with implicit parentheses: `fn 1, 2, 3`
 implicitParensCall "function call with implicit parentheses"
   = target:(functionComposition / callTarget) inlineSpace+ args:list {
@@ -130,7 +138,7 @@ integer "integer"
 
 // A lambda expression: `=foo()`
 lambda "lambda function"
-  = "=" __ expr:expr { return [ops.lambda, expr]; }
+  = "=" __ expr:expr { return [ops.lambda, null, expr]; }
 
 // A path that begins with a slash: `/foo/bar`
 leadingSlashPath "path with a leading slash"
@@ -172,6 +180,11 @@ objectPropertyOrShorthand
   = objectProperty
   / key:identifier { return [key, [ops.scope, key]]; }
 
+parameterizedLambda
+  = "(" __ parameters:identifierList? ")" __ ("=>"/"⇒") __ expr:expr {
+    return [ops.lambda, parameters ?? [], expr];
+  }
+
 // Function arguments in parentheses
 parensArgs "function arguments in parentheses"
   = "(" __ list:list? ")" { return list ?? [undefined]; }
@@ -230,7 +243,7 @@ string "string"
 // A top-level document defining a template. This is the same as a template
 // literal, but can contain backticks at the top level.
 templateDocument "template"
-  = contents:templateDocumentContents { return [ops.lambda, contents]; }
+  = contents:templateDocumentContents { return [ops.lambda, null, contents]; }
 
 // Template documents can contain backticks at the top level.
 templateDocumentChar