@weborigami/language 0.0.67-beta.2 → 0.0.69

package/package.json

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

package/src/compiler/origami.pegjs

@@ -13,6 +13,7 @@ import {
   makeFunctionCall,
   makeObject,
   makePipeline,
+  makeProperty,
   makeTemplate
 } from "./parserHelpers.js";
 
@@ -249,7 +250,7 @@ objectEntry
 // A getter definition inside an object literal: `foo = 1`
 objectGetter "object getter"
   = key:objectKey __ "=" __ value:expr {
-      return annotate([key, [ops.getter, value]], location());
+      return annotate(makeProperty(key, [ops.getter, value]), location());
     }
 
 objectHiddenKey
@@ -262,7 +263,7 @@ objectKey "object key"
 // A property definition in an object literal: `x: 1`
 objectProperty "object property"
   = key:objectKey __ ":" __ value:expr {
-      return annotate([key, value], location());  
+      return annotate(makeProperty(key, value), location());
     }
 
 // A shorthand reference inside an object literal: `foo`

package/src/compiler/parse.js

@@ -18,6 +18,7 @@ import {
   makeFunctionCall,
   makeObject,
   makePipeline,
+  makeProperty,
   makeTemplate
 } from "./parserHelpers.js";
 
@@ -425,11 +426,11 @@ function peg$parse(input, options) {
       return annotate(entries, location());
     };
   var peg$f31 = function(key, value) {
-      return annotate([key, [ops.getter, value]], location());
+      return annotate(makeProperty(key, [ops.getter, value]), location());
     };
   var peg$f32 = function(hiddenKey) { return hiddenKey.join(""); };
   var peg$f33 = function(key, value) {
-      return annotate([key, value], location());  
+      return annotate(makeProperty(key, value), location());
     };
   var peg$f34 = function(key) {
       return annotate([key, [ops.inherited, key]], location());

package/src/compiler/parserHelpers.js

@@ -13,8 +13,28 @@ export function annotate(parseResult, location) {
   return parseResult;
 }
 
+// The indicated code is being used to define a property named by the given key.
+// Rewrite any [ops.scope, key] calls to be [ops.inherited, key] to avoid
+// infinite recursion.
+function avoidRecursivePropertyCalls(code, key) {
+  if (!(code instanceof Array)) {
+    return code;
+  }
+  let modified;
+  if (code[0] === ops.scope && code[1] === key) {
+    // Rewrite to avoid recursion
+    modified = [ops.inherited, key];
+  } else {
+    // Process any nested code
+    modified = code.map((value) => avoidRecursivePropertyCalls(value, key));
+  }
+  // @ts-ignore
+  modified.location = code.location;
+  return modified;
+}
+
 // Return true if the code will generate an async object.
-function isAsyncObject(code) {
+function isCodeForAsyncObject(code) {
   if (!(code instanceof Array)) {
     return false;
   }
@@ -120,28 +140,29 @@ export function makeObject(entries, op) {
 
   for (let [key, value] of entries) {
     if (key === ops.spread) {
-      // Accumulate spread entry
+      // Spread entry; accumulate
       if (currentEntries.length > 0) {
         spreads.push([op, ...currentEntries]);
         currentEntries = [];
       }
       spreads.push(value);
-    } else {
-      if (
-        value instanceof Array &&
-        value[0] === ops.getter &&
-        value[1] instanceof Array &&
-        value[1][0] === ops.primitive
-      ) {
-        // Simplify a getter for a primitive value to a regular property
-        value = value[1];
-      } else if (isAsyncObject(value)) {
-        // Add a trailing slash to key if value is an async object
-        key = key + "/";
-      }
+      continue;
+    }
 
-      currentEntries.push([key, value]);
+    if (
+      value instanceof Array &&
+      value[0] === ops.getter &&
+      value[1] instanceof Array &&
+      value[1][0] === ops.primitive
+    ) {
+      // Simplify a getter for a primitive value to a regular property
+      value = value[1];
+    } else if (isCodeForAsyncObject(value)) {
+      // Add a trailing slash to key to indicate value is a subtree
+      key = key + "/";
     }
+
+    currentEntries.push([key, value]);
   }
 
   // Finish any current entries.
@@ -170,6 +191,12 @@ export function makePipeline(steps) {
   return value;
 }
 
+// Define a property on an object.
+export function makeProperty(key, value) {
+  const modified = avoidRecursivePropertyCalls(value, key);
+  return [key, modified];
+}
+
 export function makeTemplate(parts) {
   // Drop empty/null strings.
   const filtered = parts.filter((part) => part);

package/src/runtime/ops.js

@@ -9,6 +9,7 @@ import {
   SiteTree,
   Tree,
   isUnpackable,
+  pathFromKeys,
   scope as scopeFn,
   trailingSlash,
   concat as treeConcat,
@@ -77,12 +78,11 @@ constructor.toString = () => "«ops.constructor»";
  *
  * @param {string} protocol
  * @param {string} host
- * @param  {...string|Symbol} keys
+ * @param  {string[]} keys
  */
 function constructHref(protocol, host, ...keys) {
-  // Remove trailing slashes
-  const baseKeys = keys.map((key) => trailingSlash.remove(key));
-  let href = [host, ...baseKeys].join("/");
+  const path = pathFromKeys(keys);
+  let href = [host, path].join("/");
   if (!href.startsWith(protocol)) {
     if (!href.startsWith("//")) {
       href = `//${href}`;
@@ -99,7 +99,7 @@ function constructHref(protocol, host, ...keys) {
  * @param {import("../../index.ts").Constructor<AsyncTree>} treeClass
  * @param {AsyncTree|null} parent
  * @param {string} host
- * @param  {...string|Symbol} keys
+ * @param  {string[]} keys
  */
 async function constructSiteTree(protocol, treeClass, parent, host, ...keys) {
   // If the last key doesn't end in a slash, remove it for now.
@@ -165,7 +165,7 @@ export async function filesRoot() {
  *
  * @this {AsyncTree|null}
  * @param {string} host
- * @param  {...string|Symbol} keys
+ * @param  {...string} keys
  */
 export async function http(host, ...keys) {
   const href = constructHref("http:", host, ...keys);
@@ -178,7 +178,7 @@ http.toString = () => "«ops.http»";
  *
  * @this {AsyncTree|null}
  * @param {string} host
- * @param  {...string|Symbol} keys
+ * @param  {...string} keys
  */
 export function https(host, ...keys) {
   const href = constructHref("https:", host, ...keys);
@@ -289,7 +289,7 @@ object.toString = () => "«ops.object»";
  *
  * @this {AsyncTree|null}
  * @param {string} host
- * @param  {...string|Symbol} keys
+ * @param  {...string} keys
  */
 export function explorableSite(host, ...keys) {
   return constructSiteTree("https:", ExplorableSiteTree, this, host, ...keys);
@@ -339,7 +339,7 @@ export const traverse = Tree.traverseOrThrow;
  *
  * @this {AsyncTree|null}
  * @param {string} host
- * @param  {...string|Symbol} keys
+ * @param  {...string} keys
  */
 export function treeHttp(host, ...keys) {
   return constructSiteTree("http:", SiteTree, this, host, ...keys);
@@ -351,7 +351,7 @@ treeHttp.toString = () => "«ops.treeHttp»";
  *
  * @this {AsyncTree|null}
  * @param {string} host
- * @param  {...string|Symbol} keys
+ * @param  {...string} keys
  */
 export function treeHttps(host, ...keys) {
   return constructSiteTree("https:", SiteTree, this, host, ...keys);

package/test/compiler/parse.test.js

@@ -417,6 +417,7 @@ describe("Origami parser", () => {
   test("objectEntry", () => {
     assertParse("objectEntry", "foo", ["foo", [ops.inherited, "foo"]]);
     assertParse("objectEntry", "x: y", ["x", [ops.scope, "y"]]);
+    assertParse("objectEntry", "a: a", ["a", [ops.inherited, "a"]]);
   });
 
   test("objectGetter", () => {