@weborigami/language 0.0.66-beta.2 → 0.0.67-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.0.66-beta.2",
+  "version": "0.0.67-beta.1",
   "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.66-beta.2",
-    "@weborigami/types": "0.0.66-beta.2",
+    "@weborigami/async-tree": "0.0.67-beta.1",
+    "@weborigami/types": "0.0.67-beta.1",
     "watcher": "2.3.1"
   },
   "scripts": {

package/src/compiler/origami.pegjs

@@ -336,14 +336,14 @@ protocol "protocol"
   / scopeReference
 
 reservedProtocol "reserved protocol"
-  = "haskeys" { return ops.openSite; }
+  = "explore" { return ops.explorableSite; }
   / "https" { return ops.https; } // Must come before "http"
   / "http" { return ops.http; }
   / "new" { return ops.constructor; }
   / "package" { return [ops.scope, "@package"] } // Alias
-  / "tree" { return ops.treeHttps; } // Alias
-  / "treehttp" { return ops.treeHttp; }
-  / "treehttps" { return ops.treeHttps; }
+  / "treehttps" { return ops.treeHttps; } // Must come before `treehttp`
+  / "treehttp" { return ops.treeHttp; } // Must come before `tree`
+  / "tree" { return ops.treeHttps; }
 
 scopeReference "scope reference"
   = key:identifier {

package/src/compiler/parse.js

@@ -227,14 +227,14 @@ function peg$parse(input, options) {
   var peg$c30 = "\r\n";
   var peg$c31 = "\r";
   var peg$c32 = "{";
-  var peg$c33 = "haskeys";
+  var peg$c33 = "explore";
   var peg$c34 = "https";
   var peg$c35 = "http";
   var peg$c36 = "new";
   var peg$c37 = "package";
-  var peg$c38 = "tree";
+  var peg$c38 = "treehttps";
   var peg$c39 = "treehttp";
-  var peg$c40 = "treehttps";
+  var peg$c40 = "tree";
   var peg$c41 = ",";
   var peg$c42 = "#!";
   var peg$c43 = "\u2192";
@@ -318,14 +318,14 @@ function peg$parse(input, options) {
   var peg$e65 = peg$otherExpectation("function call using protocol: syntax");
   var peg$e66 = peg$otherExpectation("protocol");
   var peg$e67 = peg$otherExpectation("reserved protocol");
-  var peg$e68 = peg$literalExpectation("haskeys", false);
+  var peg$e68 = peg$literalExpectation("explore", false);
   var peg$e69 = peg$literalExpectation("https", false);
   var peg$e70 = peg$literalExpectation("http", false);
   var peg$e71 = peg$literalExpectation("new", false);
   var peg$e72 = peg$literalExpectation("package", false);
-  var peg$e73 = peg$literalExpectation("tree", false);
+  var peg$e73 = peg$literalExpectation("treehttps", false);
   var peg$e74 = peg$literalExpectation("treehttp", false);
-  var peg$e75 = peg$literalExpectation("treehttps", false);
+  var peg$e75 = peg$literalExpectation("tree", false);
   var peg$e76 = peg$otherExpectation("scope reference");
   var peg$e77 = peg$literalExpectation(",", false);
   var peg$e78 = peg$literalExpectation("#!", false);
@@ -465,7 +465,7 @@ function peg$parse(input, options) {
   var peg$f43 = function(protocol, host, path) {
       return annotate([protocol, host, ...(path ?? [])], location());
     };
-  var peg$f44 = function() { return ops.openSite; };
+  var peg$f44 = function() { return ops.explorableSite; };
   var peg$f45 = function() { return ops.https; };
   var peg$f46 = function() { return ops.http; };
   var peg$f47 = function() { return ops.constructor; };
@@ -2811,9 +2811,9 @@ function peg$parse(input, options) {
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.substr(peg$currPos, 4) === peg$c38) {
+              if (input.substr(peg$currPos, 9) === peg$c38) {
                 s1 = peg$c38;
-                peg$currPos += 4;
+                peg$currPos += 9;
               } else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) { peg$fail(peg$e73); }
@@ -2839,9 +2839,9 @@ function peg$parse(input, options) {
                 s0 = s1;
                 if (s0 === peg$FAILED) {
                   s0 = peg$currPos;
-                  if (input.substr(peg$currPos, 9) === peg$c40) {
+                  if (input.substr(peg$currPos, 4) === peg$c40) {
                     s1 = peg$c40;
-                    peg$currPos += 9;
+                    peg$currPos += 4;
                   } else {
                     s1 = peg$FAILED;
                     if (peg$silentFails === 0) { peg$fail(peg$e75); }

package/src/runtime/ops.js

@@ -4,8 +4,8 @@
  */
 
 import {
+  ExplorableSiteTree,
   ObjectTree,
-  OpenSiteTree,
   SiteTree,
   Tree,
   isUnpackable,
@@ -285,16 +285,16 @@ export async function object(...entries) {
 object.toString = () => "«ops.object»";
 
 /**
- * An open tree with JSON Keys via HTTPS.
+ * A site tree with JSON Keys via HTTPS.
  *
  * @this {AsyncTree|null}
  * @param {string} host
  * @param  {...string|Symbol} keys
  */
-export function openSite(host, ...keys) {
-  return constructSiteTree("https:", OpenSiteTree, this, host, ...keys);
+export function explorableSite(host, ...keys) {
+  return constructSiteTree("https:", ExplorableSiteTree, this, host, ...keys);
 }
-openSite.toString = () => "«ops.openSite»";
+explorableSite.toString = () => "«ops.explorableSite»";
 
 /**
  * Look up the given key in the scope for the current tree.