@weborigami/language 0.0.61 → 0.0.63

package/main.js

@@ -1,18 +1,15 @@
 export * from "./src/runtime/internal.js";
 
 export * as compile from "./src/compiler/compile.js";
+export { default as evaluate } from "./src/runtime/evaluate.js";
 export { default as EventTargetMixin } from "./src/runtime/EventTargetMixin.js";
-export { default as ExpressionTree } from "./src/runtime/ExpressionTree.js";
+export * as expressionFunction from "./src/runtime/expressionFunction.js";
+export * from "./src/runtime/extensions.js";
+export { default as formatError } from "./src/runtime/formatError.js";
+export { default as functionResultsMap } from "./src/runtime/functionResultsMap.js";
 export { default as HandleExtensionsTransform } from "./src/runtime/HandleExtensionsTransform.js";
 export { default as ImportModulesMixin } from "./src/runtime/ImportModulesMixin.js";
 export { default as InvokeFunctionsTransform } from "./src/runtime/InvokeFunctionsTransform.js";
 export { default as OrigamiFiles } from "./src/runtime/OrigamiFiles.js";
-export { default as OrigamiTransform } from "./src/runtime/OrigamiTransform.js";
-export { default as OrigamiTree } from "./src/runtime/OrigamiTree.js";
 export { default as TreeEvent } from "./src/runtime/TreeEvent.js";
 export { default as WatchFilesMixin } from "./src/runtime/WatchFilesMixin.js";
-export { default as evaluate } from "./src/runtime/evaluate.js";
-export * as expressionFunction from "./src/runtime/expressionFunction.js";
-export { default as extname } from "./src/runtime/extname.js";
-export { default as formatError } from "./src/runtime/formatError.js";
-export { default as functionResultsMap } from "./src/runtime/functionResultsMap.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.0.61",
+  "version": "0.0.63",
   "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.61",
-    "@weborigami/types": "0.0.61",
+    "@weborigami/async-tree": "0.0.63",
+    "@weborigami/types": "0.0.63",
     "watcher": "2.3.1"
   },
   "scripts": {

package/src/compiler/origami.pegjs

@@ -57,16 +57,14 @@ callTarget "function call"
   = absoluteFilePath
   / array
   / object
-  / tree
   / lambda
   / parameterizedLambda
   / protocolCall
   / 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,11 +205,8 @@ number "number"
   / integer
 
 // An object literal: `{foo: 1, bar: 2}`
-//
-// TODO: Use Object.fromEntries with array of key/value pairs
-//
 object "object literal"
-  = "{" __ entries:objectEntries? __ "}" {
+  = "{" __ entries:objectEntries? __ closingBrace {
       return annotate(makeObject(entries ?? [], ops.object), location());
     }
 
@@ -222,11 +217,22 @@ objectEntries
 objectEntry
   = spread
   / objectProperty
-  / key:identifierOrString {
-      return annotate([key, [ops.scope, key]], location());
+  / objectGetter
+  / objectIdentifier
+
+// A getter definition inside an object literal: `foo = 1`
+objectGetter "object getter"
+  = key:identifierOrString __ "=" __ value:expr {
+    return annotate([key, [ops.getter, value]], location());
+  }
+
+// A standalone reference inside an object literal: `foo`
+objectIdentifier "object identifier"
+  = key:identifierOrString {
+      return annotate([key, [ops.inherited, key]], location());
     }
 
-// A single object property with key and value: `x: 1`
+// A property definition in an object literal: `x: 1`
 objectProperty "object property"
   = @identifierOrString __ ":" __ @expr
 
@@ -322,7 +328,6 @@ step
   / absoluteFilePath
   / array
   / object
-  / tree
   / lambda
   / parameterizedLambda
   / templateLiteral
@@ -385,26 +390,5 @@ templateSubstitution "template substitution"
 textChar
   = escapedChar / .
 
-// A tree literal: `{ index.html = "Hello" }`
-tree "tree literal"
-  = "{" __ entries:treeEntries? __ closingBrace {
-      return annotate(makeObject(entries ?? [], ops.tree), location());
-    }
-
-// A tree assignment statement: `foo = 1`
-treeAssignment "tree assignment"
-  = @identifierOrString __ "=" __ @expr
-
-// A separated list of assignments or shorthands
-treeEntries
-  = @treeEntry|1.., separator| separator?
-
-treeEntry
-  = spread
-  / treeAssignment
-  / key:identifierOrString {
-      return annotate([key, [ops.inherited, key]], location());
-    }
-
 whitespaceWithNewLine
   = inlineSpace* comment? newLine __