@weborigami/language 0.5.2-test.1 → 0.5.3

package/index.ts

@@ -1,4 +1,4 @@
-import { Packed } from "@weborigami/async-tree";
+import { UnpackFunction } from "@weborigami/async-tree";
 
 export * from "./main.js";
 
@@ -64,8 +64,3 @@ export type Source = {
   text: string;
   url?: URL;
 }
-
-/**
- * A function that converts a value from a persistent form into a live value.
- */
-export type UnpackFunction = (input: Packed, options?: any) => any;

package/package.json

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

package/src/compiler/origami.pegjs

@@ -106,7 +106,7 @@ arrayEntry
     }
 
 arrowFunction
-  = "(" __ parameters:parameterList? __ ")" __ doubleArrow __ pipeline:expectPipelineExpression {
+  = ("async" __)? "(" __ parameters:parameterList? __ ")" __ doubleArrow __ pipeline:expectPipelineExpression {
       const lambdaParameters = parameters ?? annotate([], location());
       return annotate([ops.lambda, lambdaParameters, pipeline], location());
     }
@@ -417,21 +417,21 @@ keyChar
   = keyCharStart
   // Also allow some math operators (not slash)
   / "!"
-  / "+"
-  / minus
-  / "*"
   / "%"
   / "&"
-  / "|"
+  / "*"
+  / "+"
   / "^"
+  / "|"
+  / minus
 
 // First character in a key
 keyCharStart
   // All JS identifier characters
   = char:. &{ return char.match(/[$_\p{ID_Continue}]/u) }
   / "."
-  / "~"
   / "@"
+  / "~"
 
 // A separated list of values
 list "list"
@@ -549,23 +549,24 @@ objectProperty "object property"
 
 // A shorthand reference inside an object literal: `foo`
 objectShorthandProperty "object identifier"
-  = key:objectPublicKey {
-      const reference = annotate([markers.reference, key], location());
-      const traverse = annotate([markers.traverse, reference], location());
-      return annotate([key, traverse], location());
+  = path:pathLiteral {
+      const lastKey = path[0] === ops.unpack
+        // [ops.unpack, [markers.traverse, [markers.reference, lastKey]]]
+        ? path[1][1][1]
+        // [markers.traverse, ..., [markers.reference, lastKey]
+        : path.at(-1)[1];
+      return annotate([lastKey, path], location());
     }
   / path:angleBracketLiteral {
-    let lastKey = path.at(-1);
-    if (lastKey instanceof Array) {
-      lastKey = lastKey[1]; // get scope identifier or literal
+      // [markers.traverse, ..., [markers.reference, lastKey]]
+      const lastKey = path.at(-1)[1];
+      return annotate([lastKey, path], location());
     }
-    return annotate([lastKey, path], location());
-  }
 
 objectPublicKey
   = key:key slash:"/"? {
-    return text();
-  }
+      return text();
+    }
   / string:stringLiteral {
       // Remove `ops.literal` from the string code
       return string[1];
@@ -573,8 +574,8 @@ objectPublicKey
 
 optionalChaining
   = __ "?." __ property:identifier {
-    return annotate([ops.optionalTraverse, property], location());
-  }
+      return annotate([ops.optionalTraverse, property], location());
+    }
 
 // Name of a unction parameter
 parameter
@@ -838,6 +839,15 @@ unaryExpression
     }
   / callExpression
 
+unaryOperator
+  = "!"
+  / "+"
+  / @"~" ![\/\)\]\}]  // don't match `~/` or end of term
+  / minus
+  / @"await" &whitespaceOrParenthesis
+  / @"typeof" &whitespaceOrParenthesis
+  / @"void" &whitespaceOrParenthesis
+
 // URI
 uri
   // Double slashes after colon: `https://example.com/index.html`
@@ -887,12 +897,6 @@ uriScheme
       return annotate([markers.global, text()], location());
     }
 
-unaryOperator
-  = "!"
-  / "+"
-  / @"~" ![\/\)\]\}]  // don't match `~/` or end of term
-  / minus
-
 whitespace
   = (whitespaceChar / comment)+
 
@@ -907,5 +911,9 @@ whitespaceOptionalForProgram
   = programMode __
   / shellMode
 
+whitespaceOrParenthesis
+  = whitespace
+  / "("
+
 whitespaceWithNewLine
   = inlineSpace* comment? newLine __