@weborigami/language 0.3.3 → 0.3.4-jse.4

package/test/compiler/parse.test.js

@@ -1,7 +1,7 @@
 import assert from "node:assert";
 import { describe, test } from "node:test";
 import { parse } from "../../src/compiler/parse.js";
-import { undetermined } from "../../src/compiler/parserHelpers.js";
+import { markers } from "../../src/compiler/parserHelpers.js";
 import * as ops from "../../src/runtime/ops.js";
 import { assertCodeEqual } from "./codeHelpers.js";
 
@@ -19,6 +19,72 @@ describe("Origami parser", () => {
     ]);
   });
 
+  describe("angleBracketLiteral", () => {
+    test("with path", () => {
+      assertParse("angleBracketLiteral", "<index.html>", [
+        markers.traverse,
+        [markers.external, "index.html"],
+      ]);
+      assertParse(
+        "angleBracketLiteral",
+        "<Path with spaces (and parens).html>",
+        [
+          markers.traverse,
+          [markers.external, "Path with spaces (and parens).html"],
+        ]
+      );
+      assertParse("angleBracketLiteral", "<foo/bar/baz>", [
+        markers.traverse,
+        [markers.external, "foo/"],
+        [ops.literal, "bar/"],
+        [ops.literal, "baz"],
+      ]);
+    });
+
+    test("root directory", () => {
+      assertParse("angleBracketLiteral", "</>", [
+        markers.traverse,
+        [markers.external, "/"],
+      ]);
+      assertParse("angleBracketLiteral", "</etc/passwd>", [
+        markers.traverse,
+        [markers.external, "/"],
+        [ops.literal, "etc/"],
+        [ops.literal, "passwd"],
+      ]);
+    });
+
+    test("home directory", () => {
+      assertParse("angleBracketLiteral", "<~>", [
+        markers.traverse,
+        [markers.external, "~"],
+      ]);
+      assertParse("angleBracketLiteral", "<~/.bash_profile>", [
+        markers.traverse,
+        [markers.external, "~/"],
+        [ops.literal, ".bash_profile"],
+      ]);
+    });
+
+    test("with protocol URL", () => {
+      assertParse("angleBracketLiteral", "<files:src/assets>", [
+        [markers.global, "files:"],
+        [ops.literal, "src/"],
+        [ops.literal, "assets"],
+      ]);
+      assertParse(
+        "angleBracketLiteral",
+        "<https://example.com/data.yaml>",
+        [
+          [markers.global, "https:"],
+          [ops.literal, "example.com/"],
+          [ops.literal, "data.yaml"],
+        ],
+        "jse"
+      );
+    });
+  });
+
   test("arrayLiteral", () => {
     assertParse("arrayLiteral", "[]", [ops.array]);
     assertParse("arrayLiteral", "[1, 2, 3]", [
@@ -41,7 +107,7 @@ describe("Origami parser", () => {
       [ops.literal, 4],
     ]);
     assertParse("arrayLiteral", "[ 1, ...[2, 3]]", [
-      ops.merge,
+      ops.flat,
       [ops.array, [ops.literal, 1]],
       [ops.array, [ops.literal, 2], [ops.literal, 3]],
     ]);
@@ -60,12 +126,12 @@ describe("Origami parser", () => {
     assertParse("arrowFunction", "() => foo", [
       ops.lambda,
       [],
-      [ops.scope, "foo"],
+      [markers.traverse, [markers.reference, "foo"]],
     ]);
     assertParse("arrowFunction", "x => y", [
       ops.lambda,
       [[ops.literal, "x"]],
-      [ops.scope, "y"],
+      [markers.traverse, [markers.reference, "y"]],
     ]);
     assertParse("arrowFunction", "(a, b, c) ⇒ fn(a, b, c)", [
       ops.lambda,
@@ -75,10 +141,10 @@ describe("Origami parser", () => {
         [ops.literal, "c"],
       ],
       [
-        [ops.builtin, "fn"],
-        [ops.scope, "a"],
-        [ops.scope, "b"],
-        [ops.scope, "c"],
+        [markers.traverse, [markers.reference, "fn"]],
+        [markers.traverse, [markers.reference, "a"]],
+        [markers.traverse, [markers.reference, "b"]],
+        [markers.traverse, [markers.reference, "c"]],
       ],
     ]);
     assertParse("arrowFunction", "a => b => fn(a, b)", [
@@ -88,9 +154,9 @@ describe("Origami parser", () => {
         ops.lambda,
         [[ops.literal, "b"]],
         [
-          [ops.builtin, "fn"],
-          [ops.scope, "a"],
-          [ops.scope, "b"],
+          [markers.traverse, [markers.reference, "fn"]],
+          [markers.traverse, [markers.reference, "a"]],
+          [markers.traverse, [markers.reference, "b"]],
         ],
       ],
     ]);
@@ -120,147 +186,149 @@ describe("Origami parser", () => {
     ]);
   });
 
-  test("callExpression", () => {
-    assertParse("callExpression", "fn()", [[ops.builtin, "fn"], undefined]);
-    assertParse("callExpression", "foo.js(arg)", [
-      [ops.scope, "foo.js"],
-      [ops.scope, "arg"],
-    ]);
-    assertParse("callExpression", "fn(a, b)", [
-      [ops.builtin, "fn"],
-      [ops.scope, "a"],
-      [ops.scope, "b"],
-    ]);
-    assertParse("callExpression", "foo.js( a , b )", [
-      [ops.scope, "foo.js"],
-      [ops.scope, "a"],
-      [ops.scope, "b"],
-    ]);
-    assertParse("callExpression", "fn()(arg)", [
-      [[ops.builtin, "fn"], undefined],
-      [ops.scope, "arg"],
-    ]);
-    assertParse("callExpression", "tree/", [ops.unpack, [ops.scope, "tree/"]]);
-    assertParse("callExpression", "tree/foo/bar", [
-      ops.traverse,
-      [ops.scope, "tree/"],
-      [ops.literal, "foo/"],
-      [ops.literal, "bar"],
-    ]);
-    assertParse("callExpression", "tree/foo/bar/", [
-      ops.traverse,
-      [ops.scope, "tree/"],
-      [ops.literal, "foo/"],
-      [ops.literal, "bar/"],
-    ]);
-    assertParse("callExpression", "/foo/bar", [
-      ops.traverse,
-      [ops.rootDirectory, [ops.literal, "foo/"]],
-      [ops.literal, "bar"],
-    ]);
-    assertParse("callExpression", "foo.js()/key", [
-      ops.traverse,
-      [[ops.scope, "foo.js"], undefined],
-      [ops.literal, "key"],
-    ]);
-    assertParse("callExpression", "tree/key()", [
-      [ops.traverse, [ops.scope, "tree/"], [ops.literal, "key"]],
-      undefined,
-    ]);
-    assertParse("callExpression", "(tree)/", [ops.unpack, [ops.scope, "tree"]]);
-    assertParse("callExpression", "fn()/key()", [
-      [ops.traverse, [[ops.builtin, "fn"], undefined], [ops.literal, "key"]],
-      undefined,
-    ]);
-    assertParse("callExpression", "(foo.js())('arg')", [
-      [[ops.scope, "foo.js"], undefined],
-      [ops.literal, "arg"],
-    ]);
-    assertParse("callExpression", "fn('a')('b')", [
-      [
-        [ops.builtin, "fn"],
-        [ops.literal, "a"],
-      ],
-      [ops.literal, "b"],
-    ]);
-    assertParse("callExpression", "(foo.js())(a, b)", [
-      [[ops.scope, "foo.js"], undefined],
-      [ops.scope, "a"],
-      [ops.scope, "b"],
-    ]);
-    assertParse("callExpression", "{ a: 1, b: 2}/b", [
-      ops.traverse,
-      [ops.object, ["a", [ops.literal, 1]], ["b", [ops.literal, 2]]],
-      [ops.literal, "b"],
-    ]);
-    assertParse("callExpression", "indent`hello`", [
-      [ops.builtin, "indent"],
-      [ops.literal, ["hello"]],
-    ]);
-    assertParse("callExpression", "fn.js`Hello, world.`", [
-      [ops.scope, "fn.js"],
-      [ops.literal, ["Hello, world."]],
-    ]);
-    assertParse("callExpression", "files:src/assets", [
-      ops.traverse,
-      [
-        [ops.builtin, "files:"],
-        [ops.literal, "src/"],
-      ],
-      [ops.literal, "assets"],
-    ]);
-    assertParse("callExpression", "new:(js:Date, '2025-01-01')", [
-      [ops.builtin, "new:"],
-      [
-        [ops.builtin, "js:"],
-        [ops.literal, "Date"],
-      ],
-      [ops.literal, "2025-01-01"],
-    ]);
-    assertParse("callExpression", "map(markdown, mdHtml)", [
-      [ops.builtin, "map"],
-      [ops.scope, "markdown"],
-      [ops.scope, "mdHtml"],
-    ]);
-    assertParse("callExpression", "package:@weborigami/dropbox/auth(creds)", [
-      [
-        ops.traverse,
+  describe("callExpression", () => {
+    test("with parentheses arguments", () => {
+      assertParse("callExpression", "fn()", [
+        [markers.traverse, [markers.reference, "fn"]],
+        undefined,
+      ]);
+      assertParse("callExpression", "foo.js(arg)", [
+        [markers.traverse, [markers.reference, "foo.js"]],
+        [markers.traverse, [markers.reference, "arg"]],
+      ]);
+      assertParse("callExpression", "fn(a, b)", [
+        [markers.traverse, [markers.reference, "fn"]],
+        [markers.traverse, [markers.reference, "a"]],
+        [markers.traverse, [markers.reference, "b"]],
+      ]);
+      assertParse("callExpression", "foo.js( a , b )", [
+        [markers.traverse, [markers.reference, "foo.js"]],
+        [markers.traverse, [markers.reference, "a"]],
+        [markers.traverse, [markers.reference, "b"]],
+      ]);
+      assertParse("callExpression", "fn()(arg)", [
+        [[markers.traverse, [markers.reference, "fn"]], undefined],
+        [markers.traverse, [markers.reference, "arg"]],
+      ]);
+    });
+
+    test("call chains", () => {
+      assertParse("callExpression", "(foo.js())('arg')", [
+        [[markers.traverse, [markers.reference, "foo.js"]], undefined],
+        [ops.literal, "arg"],
+      ]);
+      assertParse("callExpression", "fn('a')('b')", [
         [
-          [ops.builtin, "package:"],
+          [markers.traverse, [markers.reference, "fn"]],
+          [ops.literal, "a"],
+        ],
+        [ops.literal, "b"],
+      ]);
+      assertParse("callExpression", "(foo.js())(a, b)", [
+        [[markers.traverse, [markers.reference, "foo.js"]], undefined],
+        [markers.traverse, [markers.reference, "a"]],
+        [markers.traverse, [markers.reference, "b"]],
+      ]);
+    });
+
+    test("with paths", () => {
+      assertParse("callExpression", "tree/", [
+        ops.unpack,
+        [markers.traverse, [markers.reference, "tree/"]],
+      ]);
+      assertParse("callExpression", "tree/foo/bar", [
+        markers.traverse,
+        [markers.reference, "tree/"],
+        [ops.literal, "foo/"],
+        [ops.literal, "bar"],
+      ]);
+      assertParse("callExpression", "tree/foo/bar/", [
+        ops.unpack,
+        [
+          markers.traverse,
+          [markers.reference, "tree/"],
+          [ops.literal, "foo/"],
+          [ops.literal, "bar/"],
+        ],
+      ]);
+      // Consecutive slahes in a path are removed
+      assertParse("callExpression", "tree//key", [
+        markers.traverse,
+        [markers.reference, "tree/"],
+        [ops.literal, "key"],
+      ]);
+      assertParse("callExpression", "{ a: 1, b: 2}/b", [
+        [ops.object, ["a", [ops.literal, 1]], ["b", [ops.literal, 2]]],
+        [ops.literal, "b"],
+      ]);
+      assertParse("callExpression", "files:foo/bar", [
+        [markers.global, "files:"],
+        [ops.literal, "foo/"],
+        [ops.literal, "bar"],
+      ]);
+    });
+
+    test("path and parentheses chains", () => {
+      assertParse("callExpression", "foo.js()/key", [
+        [[markers.traverse, [markers.reference, "foo.js"]], undefined],
+        [ops.literal, "key"],
+      ]);
+      assertParse("callExpression", "tree/key()", [
+        [markers.traverse, [markers.reference, "tree/"], [ops.literal, "key"]],
+        undefined,
+      ]);
+      assertParse("callExpression", "fn()/key()", [
+        [
+          [[markers.traverse, [markers.reference, "fn"]], undefined],
+          [ops.literal, "key"],
+        ],
+        undefined,
+      ]);
+      assertParse("callExpression", "package:@weborigami/dropbox/auth(creds)", [
+        [
+          [markers.global, "package:"],
           [ops.literal, "@weborigami/"],
+          [ops.literal, "dropbox/"],
+          [ops.literal, "auth"],
         ],
-        [ops.literal, "dropbox/"],
-        [ops.literal, "auth"],
-      ],
-      [ops.scope, "creds"],
-    ]);
-  });
+        [markers.traverse, [markers.reference, "creds"]],
+      ]);
+    });
 
-  test("callExpression using property acccess", () => {
-    assertParse("callExpression", "(foo).bar", [
-      ops.traverse,
-      [ops.scope, "foo"],
-      [ops.literal, "bar"],
-    ]);
-    assertParse("callExpression", "(foo).bar.baz", [
-      ops.traverse,
-      [ops.traverse, [ops.scope, "foo"], [ops.literal, "bar"]],
-      [ops.literal, "baz"],
-    ]);
-    assertParse("callExpression", "foo[bar]", [
-      ops.traverse,
-      [ops.scope, "foo/"],
-      [ops.scope, "bar"],
-    ]);
+    test("tagged templates", () => {
+      assertParse("callExpression", "indent`hello`", [
+        [markers.traverse, [markers.reference, "indent"]],
+        [ops.literal, ["hello"]],
+      ]);
+      assertParse("callExpression", "fn.js`Hello, world.`", [
+        [markers.traverse, [markers.reference, "fn.js"]],
+        [ops.literal, ["Hello, world."]],
+      ]);
+    });
+
+    test("protocols", () => {
+      assertParse("callExpression", "files:src/assets", [
+        [markers.global, "files:"],
+        [ops.literal, "src/"],
+        [ops.literal, "assets"],
+      ]);
+      assertParse("callExpression", "<node:process>.env", [
+        [
+          [markers.global, "node:"],
+          [ops.literal, "process"],
+        ],
+        [ops.literal, "env"],
+      ]);
+    });
   });
 
   test("commaExpression", () => {
     assertParse("commaExpression", "1", [ops.literal, 1]);
     assertParse("commaExpression", "a, b, c", [
       ops.comma,
-      [ops.scope, "a"],
-      [ops.scope, "b"],
-      [ops.scope, "c"],
+      [markers.traverse, [markers.reference, "a"]],
+      [markers.traverse, [markers.reference, "b"]],
+      [markers.traverse, [markers.reference, "c"]],
     ]);
   });
 
@@ -268,19 +336,19 @@ describe("Origami parser", () => {
     assertParse("conditionalExpression", "1", [ops.literal, 1]);
     assertParse("conditionalExpression", "true ? 1 : 0", [
       ops.conditional,
-      [ops.scope, "true"],
+      [markers.traverse, [markers.reference, "true"]],
       [ops.literal, 1],
       [ops.literal, 0],
     ]);
     assertParse("conditionalExpression", "false ? () => 1 : 0", [
       ops.conditional,
-      [ops.scope, "false"],
+      [markers.traverse, [markers.reference, "false"]],
       [ops.lambda, [], [ops.lambda, [], [ops.literal, 1]]],
       [ops.literal, 0],
     ]);
     assertParse("conditionalExpression", "false ? =1 : 0", [
       ops.conditional,
-      [ops.scope, "false"],
+      [markers.traverse, [markers.reference, "false"]],
       [ops.lambda, [], [ops.lambda, [[ops.literal, "_"]], [ops.literal, 1]]],
       [ops.literal, 0],
     ]);
@@ -294,8 +362,12 @@ describe("Origami parser", () => {
     ]);
     assertParse("equalityExpression", "a === b === c", [
       ops.strictEqual,
-      [ops.strictEqual, [undetermined, "a"], [undetermined, "b"]],
-      [undetermined, "c"],
+      [
+        ops.strictEqual,
+        [markers.traverse, [markers.reference, "a"]],
+        [markers.traverse, [markers.reference, "b"]],
+      ],
+      [markers.traverse, [markers.reference, "c"]],
     ]);
     assertParse("equalityExpression", "1 !== 1", [
       ops.notStrictEqual,
@@ -349,260 +421,357 @@ Body`,
     ]);
   });
 
-  test("expression", () => {
-    assertParse(
-      "expression",
-      `{
+  describe("expression", () => {
+    test("slash with and without spaces", () => {
+      assertParse("expression", "x/y", [
+        markers.traverse,
+        [markers.reference, "x/"],
+        [ops.literal, "y"],
+      ]);
+      assertParse("expression", "x / y", [
+        ops.division,
+        [markers.traverse, [markers.reference, "x"]],
+        [markers.traverse, [markers.reference, "y"]],
+      ]);
+      // Parses as a call, not a path
+      assertParse("expression", "(x)/y", [
+        [markers.traverse, [markers.reference, "x"]],
+        [ops.literal, "y"],
+      ]);
+    });
+
+    test("operators with spaces = math", () => {
+      assertParse("expression", "a + b", [
+        ops.addition,
+        [markers.traverse, [markers.reference, "a"]],
+        [markers.traverse, [markers.reference, "b"]],
+      ]);
+      assertParse("expression", "a - b", [
+        ops.subtraction,
+        [markers.traverse, [markers.reference, "a"]],
+        [markers.traverse, [markers.reference, "b"]],
+      ]);
+      assertParse("expression", "a & b", [
+        ops.bitwiseAnd,
+        [markers.traverse, [markers.reference, "a"]],
+        [markers.traverse, [markers.reference, "b"]],
+      ]);
+    });
+
+    test("operators without spaces = reference", () => {
+      assertParse("expression", "a+b", [
+        markers.traverse,
+        [markers.reference, "a+b"],
+      ]);
+      assertParse("expression", "a-b", [
+        markers.traverse,
+        [markers.reference, "a-b"],
+      ]);
+      assertParse("expression", "a&b", [
+        markers.traverse,
+        [markers.reference, "a&b"],
+      ]);
+    });
+
+    test("property acccess", () => {
+      assertParse("expression", "(foo).bar", [
+        [markers.traverse, [markers.reference, "foo"]],
+        [ops.literal, "bar"],
+      ]);
+      assertParse("expression", "(foo).bar.baz", [
+        [
+          [markers.traverse, [markers.reference, "foo"]],
+          [ops.literal, "bar"],
+        ],
+        [ops.literal, "baz"],
+      ]);
+      assertParse("expression", "foo[bar]", [
+        [markers.traverse, [markers.reference, "foo"]],
+        [markers.traverse, [markers.reference, "bar"]],
+      ]);
+      assertParse("expression", "Tree.map", [
+        markers.traverse,
+        [markers.reference, "Tree.map"],
+      ]);
+    });
+
+    test("consecutive slashes at start of something = comment", () => {
+      assertParse(
+        "expression",
+        "x //comment",
+        [markers.traverse, [markers.reference, "x"]],
+        "jse",
+        false
+      );
+    });
+
+    test("complex expressions", () => {
+      assertParse("expression", "page.ori(mdHtml(about.md))", [
+        [markers.traverse, [markers.reference, "page.ori"]],
+        [
+          [markers.traverse, [markers.reference, "mdHtml"]],
+          [markers.traverse, [markers.reference, "about.md"]],
+        ],
+      ]);
+
+      assertParse("expression", "keys(</>)", [
+        [markers.traverse, [markers.reference, "keys"]],
+        [markers.traverse, [markers.external, "/"]],
+      ]);
+
+      assertParse("expression", "'Hello' -> test.ori.html", [
+        [markers.traverse, [markers.reference, "test.ori.html"]],
+        [ops.literal, "Hello"],
+      ]);
+      assertParse("expression", "obj.json", [
+        markers.traverse,
+        [markers.reference, "obj.json"],
+      ]);
+      assertParse("expression", "(fn a, b, c)", [
+        [markers.traverse, [markers.reference, "fn"]],
+        [markers.traverse, [markers.reference, "a"]],
+        [markers.traverse, [markers.reference, "b"]],
+        [markers.traverse, [markers.reference, "c"]],
+      ]);
+      assertParse("expression", "foo.bar('hello', 'world')", [
+        [markers.traverse, [markers.reference, "foo.bar"]],
+        [ops.literal, "hello"],
+        [ops.literal, "world"],
+      ]);
+      assertParse("expression", "(key)('a')", [
+        [markers.traverse, [markers.reference, "key"]],
+        [ops.literal, "a"],
+      ]);
+      assertParse("expression", "1", [ops.literal, 1]);
+      assertParse("expression", "{ a: 1, b: 2 }", [
+        ops.object,
+        ["a", [ops.literal, 1]],
+        ["b", [ops.literal, 2]],
+      ]);
+      assertParse("expression", "serve { index.html: 'hello' }", [
+        [markers.traverse, [markers.reference, "serve"]],
+        [ops.object, ["index.html", [ops.literal, "hello"]]],
+      ]);
+      assertParse("expression", "fn =`x`", [
+        [markers.traverse, [markers.reference, "fn"]],
+        [
+          ops.lambda,
+          [[ops.literal, "_"]],
+          [ops.templateTree, [ops.literal, ["x"]]],
+        ],
+      ]);
+      assertParse("expression", "copy app.js(formulas), files:snapshot", [
+        [markers.traverse, [markers.reference, "copy"]],
+        [
+          [markers.traverse, [markers.reference, "app.js"]],
+          [markers.traverse, [markers.reference, "formulas"]],
+        ],
+        [
+          [markers.global, "files:"],
+          [ops.literal, "snapshot"],
+        ],
+      ]);
+      assertParse("expression", "map =`<li>${_}</li>`", [
+        [markers.traverse, [markers.reference, "map"]],
+        [
+          ops.lambda,
+          [[ops.literal, "_"]],
+          [
+            ops.templateTree,
+            [ops.literal, ["<li>", "</li>"]],
+            [markers.traverse, [markers.reference, "_"]],
+          ],
+        ],
+      ]);
+      assertParse("expression", `https://example.com/about/`, [
+        [markers.global, "https:"],
+        [ops.literal, "example.com/"],
+        [ops.literal, "about/"],
+      ]);
+      assertParse("expression", "tag`Hello, ${name}!`", [
+        [markers.traverse, [markers.reference, "tag"]],
+        [ops.literal, ["Hello, ", "!"]],
+        [ops.concat, [markers.traverse, [markers.reference, "name"]]],
+      ]);
+      assertParse("expression", "=tag`Hello, ${_}!`", [
+        ops.lambda,
+        [[ops.literal, "_"]],
+        [
+          [markers.traverse, [markers.reference, "tag"]],
+          [ops.literal, ["Hello, ", "!"]],
+          [ops.concat, [markers.traverse, [markers.reference, "_"]]],
+        ],
+      ]);
+      assertParse("expression", "(post, slug) => fn.js(post, slug)", [
+        ops.lambda,
+        [
+          [ops.literal, "post"],
+          [ops.literal, "slug"],
+        ],
+        [
+          [markers.traverse, [markers.reference, "fn.js"]],
+          [markers.traverse, [markers.reference, "post"]],
+          [markers.traverse, [markers.reference, "slug"]],
+        ],
+      ]);
+      assertParse("expression", "keys(<~>)", [
+        [markers.traverse, [markers.reference, "keys"]],
+        [markers.traverse, [markers.external, "~"]],
+      ]);
+    });
+
+    test("complex object", () => {
+      assertParse(
+        "expression",
+        `{
         index.html = index.ori(teamData.yaml)
         thumbnails = map(images, { value: thumbnail.js })
       }`,
-      [
-        ops.object,
         [
-          "index.html",
+          ops.object,
           [
-            ops.getter,
+            "index.html",
             [
-              [ops.scope, "index.ori"],
-              [ops.scope, "teamData.yaml"],
+              ops.getter,
+              [
+                [markers.traverse, [markers.reference, "index.ori"]],
+                [markers.traverse, [markers.reference, "teamData.yaml"]],
+              ],
             ],
           ],
-        ],
-        [
-          "thumbnails",
           [
-            ops.getter,
+            "thumbnails",
             [
-              [ops.builtin, "map"],
-              [ops.scope, "images"],
-              [ops.object, ["value", [ops.scope, "thumbnail.js"]]],
+              ops.getter,
+              [
+                [markers.traverse, [markers.reference, "map"]],
+                [markers.traverse, [markers.reference, "images"]],
+                [
+                  ops.object,
+                  [
+                    "value",
+                    [markers.traverse, [markers.reference, "thumbnail.js"]],
+                  ],
+                ],
+              ],
             ],
           ],
-        ],
-      ]
-    );
-
-    // Builtin on its own is the function itself, not a function call
-    assertParse("expression", "mdHtml:", [ops.builtin, "mdHtml:"]);
-
-    // Consecutive slahes in a path are removed
-    assertParse("expression", "path//key", [
-      ops.traverse,
-      [ops.scope, "path/"],
-      [ops.literal, "key"],
-    ]);
-
-    // Single slash at start of something = absolute file path
-    assertParse("expression", "/path", [
-      ops.rootDirectory,
-      [ops.literal, "path"],
-    ]);
-
-    // Consecutive slashes at start of something = comment
-    assertParse("expression", "path //comment", [ops.scope, "path"], false);
-    assertParse("expression", "page.ori(mdHtml:(about.md))", [
-      [ops.scope, "page.ori"],
-      [
-        [ops.builtin, "mdHtml:"],
-        [ops.scope, "about.md"],
-      ],
-    ]);
-
-    // Slash on its own is the root folder
-    assertParse("expression", "keys /", [
-      [ops.builtin, "keys"],
-      [ops.rootDirectory],
-    ]);
+        ]
+      );
+    });
+  });
 
-    assertParse("expression", "'Hello' -> test.orit", [
-      [ops.scope, "test.orit"],
-      [ops.literal, "Hello"],
-    ]);
-    assertParse("expression", "obj.json", [ops.scope, "obj.json"]);
-    assertParse("expression", "(fn a, b, c)", [
-      [ops.builtin, "fn"],
-      [undetermined, "a"],
-      [undetermined, "b"],
-      [undetermined, "c"],
-    ]);
-    assertParse("expression", "foo.bar('hello', 'world')", [
-      [ops.scope, "foo.bar"],
-      [ops.literal, "hello"],
-      [ops.literal, "world"],
-    ]);
-    assertParse("expression", "(key)('a')", [
-      [ops.scope, "key"],
-      [ops.literal, "a"],
-    ]);
-    assertParse("expression", "1", [ops.literal, 1]);
-    assertParse("expression", "{ a: 1, b: 2 }", [
-      ops.object,
-      ["a", [ops.literal, 1]],
-      ["b", [ops.literal, 2]],
-    ]);
-    assertParse("expression", "serve { index.html: 'hello' }", [
-      [ops.builtin, "serve"],
-      [ops.object, ["index.html", [ops.literal, "hello"]]],
-    ]);
-    assertParse("expression", "fn =`x`", [
-      [ops.builtin, "fn"],
-      [ops.lambda, [[ops.literal, "_"]], [ops.template, [ops.literal, ["x"]]]],
-    ]);
-    assertParse("expression", "copy app.js(formulas), files:snapshot", [
-      [ops.builtin, "copy"],
-      [
-        [ops.scope, "app.js"],
-        [ops.scope, "formulas"],
-      ],
-      [
-        [ops.builtin, "files:"],
-        [ops.literal, "snapshot"],
-      ],
-    ]);
-    assertParse("expression", "map =`<li>${_}</li>`", [
-      [ops.builtin, "map"],
+  test("frontMatterExpression", () => {
+    assertParse(
+      "frontMatterExpression",
+      `---
+(name) => _template()
+---
+`,
       [
         ops.lambda,
-        [[ops.literal, "_"]],
-        [ops.template, [ops.literal, ["<li>", "</li>"]], [ops.scope, "_"]],
+        [[ops.literal, "name"]],
+        [[markers.traverse, [markers.reference, "_template"]], undefined],
       ],
-    ]);
-    assertParse("expression", `https://example.com/about/`, [
-      [ops.builtin, "https:"],
-      [ops.literal, "example.com/"],
-      [ops.literal, "about/"],
-    ]);
-    assertParse("expression", "tag`Hello, ${name}!`", [
-      [ops.builtin, "tag"],
-      [ops.literal, ["Hello, ", "!"]],
-      [ops.concat, [ops.scope, "name"]],
-    ]);
-    assertParse("expression", "(post, slug) => fn.js(post, slug)", [
-      ops.lambda,
-      [
-        [ops.literal, "post"],
-        [ops.literal, "slug"],
-      ],
-      [
-        [ops.scope, "fn.js"],
-        [ops.scope, "post"],
-        [ops.scope, "slug"],
-      ],
-    ]);
-    assertParse("expression", "keys ~", [
-      [ops.builtin, "keys"],
-      [ops.homeDirectory],
-    ]);
-    assertParse("expression", "keys /Users/alice", [
-      [ops.builtin, "keys"],
-      [
-        ops.traverse,
-        [ops.rootDirectory, [ops.literal, "Users/"]],
-        [ops.literal, "alice"],
-      ],
-    ]);
+      "jse",
+      false
+    );
+  });
 
-    // Verify parser treatment of identifiers containing operators
-    assertParse("expression", "a + b", [
-      ops.addition,
-      [undetermined, "a"],
-      [undetermined, "b"],
+  test("group", () => {
+    assertParse("group", "(hello)", [
+      markers.traverse,
+      [markers.reference, "hello"],
     ]);
-    assertParse("expression", "a+b", [ops.scope, "a+b"]);
-    assertParse("expression", "a - b", [
-      ops.subtraction,
-      [undetermined, "a"],
-      [undetermined, "b"],
+    assertParse("group", "(((nested)))", [
+      markers.traverse,
+      [markers.reference, "nested"],
     ]);
-    assertParse("expression", "a-b", [ops.scope, "a-b"]);
-    assertParse("expression", "a&b", [ops.scope, "a&b"]);
-    assertParse("expression", "a & b", [
-      ops.bitwiseAnd,
-      [undetermined, "a"],
-      [undetermined, "b"],
+    assertParse("group", "(fn())", [
+      [markers.traverse, [markers.reference, "fn"]],
+      undefined,
     ]);
-  });
-
-  test("group", () => {
-    assertParse("group", "(hello)", [ops.scope, "hello"]);
-    assertParse("group", "(((nested)))", [ops.scope, "nested"]);
-    assertParse("group", "(fn())", [[ops.builtin, "fn"], undefined]);
     assertParse("group", "(a -> b)", [
-      [ops.builtin, "b"],
-      [ops.scope, "a"],
+      [markers.traverse, [markers.reference, "b"]],
+      [markers.traverse, [markers.reference, "a"]],
     ]);
   });
 
-  test("homeDirectory", () => {
-    assertParse("homeDirectory", "~", [ops.homeDirectory]);
-  });
-
   test("host", () => {
     assertParse("host", "abc", [ops.literal, "abc"]);
     assertParse("host", "abc:123", [ops.literal, "abc:123"]);
-    assertParse("host", "foo\\ bar", [ops.literal, "foo bar"]);
   });
 
   test("identifier", () => {
-    assertParse("identifier", "abc", "abc", false);
-    assertParse("identifier", "index.html", "index.html", false);
-    assertParse("identifier", "foo\\ bar", "foo bar", false);
-    assertParse("identifier", "x-y-z", "x-y-z", false);
+    assertParse("identifier", "foo", "foo", "jse", false);
+    assertParse("identifier", "$Δelta", "$Δelta", "jse", false);
+    assertThrows(
+      "identifier",
+      "1stCharacterIsNumber",
+      "Expected JavaScript identifier start"
+    );
+    assertThrows(
+      "identifier",
+      "has space",
+      "Expected JavaScript identifier continuation"
+    );
+    assertThrows(
+      "identifier",
+      "foo.bar",
+      "Expected JavaScript identifier continuation"
+    );
   });
 
   test("implicitParenthesesCallExpression", () => {
     assertParse("implicitParenthesesCallExpression", "fn arg", [
-      [ops.builtin, "fn"],
-      [undetermined, "arg"],
+      [markers.traverse, [markers.reference, "fn"]],
+      [markers.traverse, [markers.reference, "arg"]],
     ]);
     assertParse("implicitParenthesesCallExpression", "page.ori 'a', 'b'", [
-      [ops.scope, "page.ori"],
+      [markers.traverse, [markers.reference, "page.ori"]],
       [ops.literal, "a"],
       [ops.literal, "b"],
     ]);
     assertParse("implicitParenthesesCallExpression", "fn a(b), c", [
-      [ops.builtin, "fn"],
+      [markers.traverse, [markers.reference, "fn"]],
       [
-        [ops.builtin, "a"],
-        [ops.scope, "b"],
+        [markers.traverse, [markers.reference, "a"]],
+        [markers.traverse, [markers.reference, "b"]],
       ],
-      [undetermined, "c"],
+      [markers.traverse, [markers.reference, "c"]],
     ]);
     assertParse("implicitParenthesesCallExpression", "(fn()) 'arg'", [
-      [[ops.builtin, "fn"], undefined],
+      [[markers.traverse, [markers.reference, "fn"]], undefined],
       [ops.literal, "arg"],
     ]);
-    assertParse("implicitParenthesesCallExpression", "tree/key arg", [
-      [ops.traverse, [ops.scope, "tree/"], [ops.literal, "key"]],
-      [undetermined, "arg"],
-    ]);
+    assertParse(
+      "implicitParenthesesCallExpression",
+      "tree/key arg",
+      [
+        [markers.traverse, [markers.reference, "tree/"], [ops.literal, "key"]],
+        [markers.traverse, [markers.reference, "arg"]],
+      ],
+      "shell"
+    );
     assertParse("implicitParenthesesCallExpression", "foo.js bar.ori 'arg'", [
-      [ops.scope, "foo.js"],
+      [markers.traverse, [markers.reference, "foo.js"]],
       [
-        [ops.scope, "bar.ori"],
+        [markers.traverse, [markers.reference, "bar.ori"]],
         [ops.literal, "arg"],
       ],
     ]);
   });
 
-  test("jsIdentifier", () => {
-    assertParse("jsIdentifier", "foo", "foo", false);
-    assertParse("jsIdentifier", "$Δelta", "$Δelta", false);
-    assertThrows(
-      "jsIdentifier",
-      "1stCharacterIsNumber",
-      "Expected JavaScript identifier start"
-    );
-    assertThrows(
-      "jsIdentifier",
-      "has space",
-      "Expected JavaScript identifier continuation"
-    );
-    assertThrows(
-      "jsIdentifier",
-      "foo.bar",
-      "Expected JavaScript identifier continuation"
-    );
+  test("key", () => {
+    assertParse("key", "a", "a");
+    assertParse("key", "_b", "_b");
+    assertParse("key", ".ssh", ".ssh");
+    assertParse("key", "index.html", "index.html");
+    assertParse("key", "404.html", "404.html");
+    assertParse("key", "1a2b3c", "1a2b3c");
+    assertParse("key", "a~b", "a~b");
+    assertParse("key", "foo-bar", "foo-bar");
+    assertParse("key", "package-lock.json", "package-lock.json");
   });
 
   test("list", () => {
@@ -637,8 +806,8 @@ Body`,
   test("logicalAndExpression", () => {
     assertParse("logicalAndExpression", "true && false", [
       ops.logicalAnd,
-      [ops.scope, "true"],
-      [ops.lambda, [], [undetermined, "false"]],
+      [markers.traverse, [markers.reference, "true"]],
+      [ops.lambda, [], [markers.traverse, [markers.reference, "false"]]],
     ]);
   });
 
@@ -650,9 +819,9 @@ Body`,
     ]);
     assertParse("logicalOrExpression", "false || false || true", [
       ops.logicalOr,
-      [ops.scope, "false"],
-      [ops.lambda, [], [undetermined, "false"]],
-      [ops.lambda, [], [undetermined, "true"]],
+      [markers.traverse, [markers.reference, "false"]],
+      [ops.lambda, [], [markers.traverse, [markers.reference, "false"]]],
+      [ops.lambda, [], [markers.traverse, [markers.reference, "true"]]],
     ]);
     assertParse("logicalOrExpression", "1 || 2 && 0", [
       ops.logicalOr,
@@ -662,7 +831,13 @@ Body`,
   });
 
   test("multiLineComment", () => {
-    assertParse("multiLineComment", "/*\nHello, world!\n*/", null, false);
+    assertParse(
+      "multiLineComment",
+      "/*\nHello, world!\n*/",
+      null,
+      "jse",
+      false
+    );
   });
 
   test("multiplicativeExpression", () => {
@@ -683,21 +858,28 @@ Body`,
     ]);
   });
 
-  test("namespace", () => {
-    assertParse("namespace", "js:", [ops.builtin, "js:"]);
+  test("newExpression", () => {
+    assertParse("newExpression", "new Foo()", [
+      ops.construct,
+      [markers.traverse, [markers.reference, "Foo"]],
+    ]);
+    assertParse("newExpression", "new:Foo()", [
+      ops.construct,
+      [markers.traverse, [markers.reference, "Foo"]],
+    ]);
   });
 
   test("nullishCoalescingExpression", () => {
     assertParse("nullishCoalescingExpression", "a ?? b", [
       ops.nullishCoalescing,
-      [ops.scope, "a"],
-      [ops.lambda, [], [undetermined, "b"]],
+      [markers.traverse, [markers.reference, "a"]],
+      [ops.lambda, [], [markers.traverse, [markers.reference, "b"]]],
     ]);
     assertParse("nullishCoalescingExpression", "a ?? b ?? c", [
       ops.nullishCoalescing,
-      [ops.scope, "a"],
-      [ops.lambda, [], [undetermined, "b"]],
-      [ops.lambda, [], [undetermined, "c"]],
+      [markers.traverse, [markers.reference, "a"]],
+      [ops.lambda, [], [markers.traverse, [markers.reference, "b"]]],
+      [ops.lambda, [], [markers.traverse, [markers.reference, "c"]]],
     ]);
   });
 
@@ -712,7 +894,7 @@ Body`,
     assertParse("objectLiteral", "{ a: 1, b }", [
       ops.object,
       ["a", [ops.literal, 1]],
-      ["b", [ops.inherited, "b"]],
+      ["b", [markers.traverse, [markers.reference, "b"]]],
     ]);
     assertParse("objectLiteral", "{ sub: { a: 1 } }", [
       ops.object,
@@ -729,7 +911,7 @@ Body`,
     ]);
     assertParse("objectLiteral", "{ a = b, b = 2 }", [
       ops.object,
-      ["a", [ops.getter, [ops.scope, "b"]]],
+      ["a", [ops.getter, [markers.traverse, [markers.reference, "b"]]]],
       ["b", [ops.literal, 2]],
     ]);
     assertParse(
@@ -740,7 +922,7 @@ Body`,
       }`,
       [
         ops.object,
-        ["a", [ops.getter, [ops.scope, "b"]]],
+        ["a", [ops.getter, [markers.traverse, [markers.reference, "b"]]]],
         ["b", [ops.literal, 2]],
       ]
     );
@@ -756,7 +938,16 @@ Body`,
       ops.object,
       [
         "a",
-        [ops.object, ["b", [ops.getter, [[ops.builtin, "fn"], undefined]]]],
+        [
+          ops.object,
+          [
+            "b",
+            [
+              ops.getter,
+              [[markers.traverse, [markers.reference, "fn"]], undefined],
+            ],
+          ],
+        ],
       ],
     ]);
     assertParse("objectLiteral", "{ x = fn.js('a') }", [
@@ -766,16 +957,28 @@ Body`,
         [
           ops.getter,
           [
-            [ops.scope, "fn.js"],
+            [markers.traverse, [markers.reference, "fn.js"]],
             [ops.literal, "a"],
           ],
         ],
       ],
     ]);
-    assertParse("objectLiteral", "{ a: 1, ...b }", [
-      ops.merge,
-      [ops.object, ["a", [ops.literal, 1]]],
-      [ops.scope, "b"],
+    assertParse("objectLiteral", "{ a: 1, ...more, c: a }", [
+      [
+        ops.object,
+        ["a", [ops.literal, 1]],
+        ["c", [markers.traverse, [markers.reference, "a"]]],
+        [
+          "_result",
+          [
+            ops.merge,
+            [ops.object, ["a", [ops.getter, [[ops.context, 1], "a"]]]],
+            [markers.traverse, [markers.reference, "more"]],
+            [ops.object, ["c", [ops.getter, [[ops.context, 1], "c"]]]],
+          ],
+        ],
+      ],
+      "_result",
     ]);
     assertParse("objectLiteral", "{ a: 1, ...{ b: 2 } }", [
       ops.object,
@@ -786,22 +989,66 @@ Body`,
       ops.object,
       ["(a)", [ops.literal, 1]],
     ]);
+    assertParse(
+      "objectLiteral",
+      "{ <path/to/file.txt> }",
+      [
+        ops.object,
+        [
+          "file.txt",
+          [
+            markers.traverse,
+            [markers.external, "path/"],
+            [ops.literal, "to/"],
+            [ops.literal, "file.txt"],
+          ],
+        ],
+      ],
+      "jse"
+    );
   });
 
   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"]]);
+    assertParse("objectEntry", "foo", [
+      "foo",
+      [markers.traverse, [markers.reference, "foo"]],
+    ]);
+    assertParse("objectEntry", "index.html: x", [
+      "index.html",
+      [markers.traverse, [markers.reference, "x"]],
+    ]);
+    assertParse("objectEntry", "a: a", [
+      "a",
+      [markers.traverse, [markers.reference, "a"]],
+    ]);
+    assertParse(
+      "objectEntry",
+      "<path/to/file.txt>",
+      [
+        "file.txt",
+        [
+          markers.traverse,
+          [markers.external, "path/"],
+          [ops.literal, "to/"],
+          [ops.literal, "file.txt"],
+        ],
+      ],
+      "jse"
+    );
     assertParse("objectEntry", "a: (a) => a", [
       "a",
-      [ops.lambda, [[ops.literal, "a"]], [ops.scope, "a"]],
+      [
+        ops.lambda,
+        [[ops.literal, "a"]],
+        [markers.traverse, [markers.reference, "a"]],
+      ],
     ]);
     assertParse("objectEntry", "posts/: map(posts, post.ori)", [
       "posts/",
       [
-        [ops.builtin, "map"],
-        [ops.inherited, "posts"],
-        [ops.scope, "post.ori"],
+        [markers.traverse, [markers.reference, "map"]],
+        [markers.traverse, [markers.reference, "posts"]],
+        [markers.traverse, [markers.reference, "post.ori"]],
       ],
     ]);
   });
@@ -809,15 +1056,15 @@ Body`,
   test("objectGetter", () => {
     assertParse("objectGetter", "data = obj.json", [
       "data",
-      [ops.getter, [ops.scope, "obj.json"]],
+      [ops.getter, [markers.traverse, [markers.reference, "obj.json"]]],
     ]);
-    assertParse("objectGetter", "foo = page.ori 'bar'", [
-      "foo",
+    assertParse("objectGetter", "index.html = index.ori(teamData.yaml)", [
+      "index.html",
       [
         ops.getter,
         [
-          [ops.scope, "page.ori"],
-          [ops.literal, "bar"],
+          [markers.traverse, [markers.reference, "index.ori"]],
+          [markers.traverse, [markers.reference, "teamData.yaml"]],
         ],
       ],
     ]);
@@ -825,92 +1072,171 @@ Body`,
 
   test("objectProperty", () => {
     assertParse("objectProperty", "a: 1", ["a", [ops.literal, 1]]);
-    assertParse("objectProperty", "name: 'Alice'", [
-      "name",
+    assertParse("objectProperty", "data.json: 'Alice'", [
+      "data.json",
       [ops.literal, "Alice"],
     ]);
     assertParse("objectProperty", "x: fn('a')", [
       "x",
       [
-        [ops.builtin, "fn"],
+        [markers.traverse, [markers.reference, "fn"]],
         [ops.literal, "a"],
       ],
     ]);
   });
 
   test("objectPublicKey", () => {
-    assertParse("objectPublicKey", "a", "a", false);
-    assertParse("objectPublicKey", "markdown/", "markdown/", false);
-    assertParse("objectPublicKey", "foo\\ bar", "foo bar", false);
+    assertParse("objectPublicKey", "a", "a", "shell", false);
+    assertParse("objectPublicKey", "index.html", "index.html", "shell", false);
+    assertParse("objectPublicKey", "markdown/", "markdown/", "shell", false);
+    assertParse("objectPublicKey", `"foo bar"`, "foo bar", "shell", false);
+  });
+
+  test.skip("optionalChaining", () => {
+    assertParse("optionalChaining", "?.key", [
+      ops.optionalTraverse,
+      [ops.literal, "key"],
+    ]);
   });
 
   test("parenthesesArguments", () => {
     assertParse("parenthesesArguments", "()", [undefined]);
     assertParse("parenthesesArguments", "(a, b, c)", [
-      [ops.scope, "a"],
-      [ops.scope, "b"],
-      [ops.scope, "c"],
+      [markers.traverse, [markers.reference, "a"]],
+      [markers.traverse, [markers.reference, "b"]],
+      [markers.traverse, [markers.reference, "c"]],
     ]);
   });
 
-  test("path", () => {
-    assertParse("path", "/tree/", [[ops.literal, "tree/"]]);
-    assertParse("path", "/month/12", [
-      [ops.literal, "month/"],
-      [ops.literal, "12"],
-    ]);
-    assertParse("path", "/tree/foo/bar", [
-      [ops.literal, "tree/"],
-      [ops.literal, "foo/"],
-      [ops.literal, "bar"],
-    ]);
-    assertParse("path", "/a///b", [
-      [ops.literal, "a/"],
-      [ops.literal, "b"],
-    ]);
+  test("pathKeys", () => {
+    assertParse(
+      "pathKeys",
+      "tree/",
+      [[ops.literal, "tree/"]],
+      undefined,
+      false
+    );
+    assertParse(
+      "pathKeys",
+      "month/12",
+      [
+        [ops.literal, "month/"],
+        [ops.literal, "12"],
+      ],
+      undefined,
+      false
+    );
+    assertParse(
+      "pathKeys",
+      "tree/foo/bar",
+      [
+        [ops.literal, "tree/"],
+        [ops.literal, "foo/"],
+        [ops.literal, "bar"],
+      ],
+      undefined,
+      false
+    );
+    assertParse(
+      "pathKeys",
+      "a///b",
+      [
+        [ops.literal, "a/"],
+        [ops.literal, "/"],
+        [ops.literal, "/"],
+        [ops.literal, "b"],
+      ],
+      undefined,
+      false
+    );
   });
 
   test("pathArguments", () => {
-    assertParse("pathArguments", "/", [ops.traverse]);
+    assertParse("pathArguments", "/", [markers.traverse]);
     assertParse("pathArguments", "/tree", [
-      ops.traverse,
+      markers.traverse,
       [ops.literal, "tree"],
     ]);
     assertParse("pathArguments", "/tree/", [
-      ops.traverse,
+      markers.traverse,
       [ops.literal, "tree/"],
     ]);
   });
 
+  test("pathLiteral", () => {
+    assertParse("pathLiteral", "tree", [
+      markers.traverse,
+      [markers.reference, "tree"],
+    ]);
+    assertParse("pathLiteral", "tree/", [
+      ops.unpack,
+      [markers.traverse, [markers.reference, "tree/"]],
+    ]);
+    assertParse("pathLiteral", "month/12", [
+      markers.traverse,
+      [markers.reference, "month/"],
+      [ops.literal, "12"],
+    ]);
+    assertParse("pathLiteral", "a/b/c/", [
+      ops.unpack,
+      [
+        markers.traverse,
+        [markers.reference, "a/"],
+        [ops.literal, "b/"],
+        [ops.literal, "c/"],
+      ],
+    ]);
+    assertParse("pathLiteral", "~/.cshrc", [
+      markers.traverse,
+      [markers.reference, "~/"],
+      [ops.literal, ".cshrc"],
+    ]);
+  });
+
   test("pipelineExpression", () => {
-    assertParse("pipelineExpression", "foo", [ops.scope, "foo"]);
+    assertParse("pipelineExpression", "foo", [
+      markers.traverse,
+      [markers.reference, "foo"],
+    ]);
     assertParse("pipelineExpression", "a -> b", [
-      [ops.builtin, "b"],
-      [ops.scope, "a"],
+      [markers.traverse, [markers.reference, "b"]],
+      [markers.traverse, [markers.reference, "a"]],
     ]);
     assertParse("pipelineExpression", "input → one.js → two.js", [
-      [ops.scope, "two.js"],
+      [markers.traverse, [markers.reference, "two.js"]],
       [
-        [ops.scope, "one.js"],
-        [ops.scope, "input"],
+        [markers.traverse, [markers.reference, "one.js"]],
+        [markers.traverse, [markers.reference, "input"]],
       ],
     ]);
     assertParse("pipelineExpression", "fn a -> b", [
-      [ops.builtin, "b"],
+      [markers.traverse, [markers.reference, "b"]],
       [
-        [ops.builtin, "fn"],
-        [undetermined, "a"],
+        [markers.traverse, [markers.reference, "fn"]],
+        [markers.traverse, [markers.reference, "a"]],
       ],
     ]);
   });
 
   test("primary", () => {
-    assertParse("primary", "foo.js", [ops.scope, "foo.js"]);
+    assertParse("primary", "123", [ops.literal, 123]);
+    assertParse("primary", "123.html", [
+      markers.traverse,
+      [markers.reference, "123.html"],
+    ]);
+    assertParse("primary", "foo.js", [
+      markers.traverse,
+      [markers.reference, "foo.js"],
+    ]);
     assertParse("primary", "[1, 2]", [
       ops.array,
       [ops.literal, 1],
       [ops.literal, 2],
     ]);
+    assertParse("primary", "<index.html>", [
+      markers.traverse,
+      [markers.external, "index.html"],
+    ]);
   });
 
   test("program", () => {
@@ -920,48 +1246,13 @@ Body`,
 'Hello'
 `,
       [ops.literal, "Hello"],
+      "jse",
       false
     );
   });
 
-  test("protocolExpression", () => {
-    assertParse("protocolExpression", "foo://bar", [
-      [ops.builtin, "foo:"],
-      [ops.literal, "bar"],
-    ]);
-    assertParse("protocolExpression", "http://example.com", [
-      [ops.builtin, "http:"],
-      [ops.literal, "example.com"],
-    ]);
-    assertParse("protocolExpression", "https://example.com/about/", [
-      [ops.builtin, "https:"],
-      [ops.literal, "example.com/"],
-      [ops.literal, "about/"],
-    ]);
-    assertParse("protocolExpression", "https://example.com/about/index.html", [
-      [ops.builtin, "https:"],
-      [ops.literal, "example.com/"],
-      [ops.literal, "about/"],
-      [ops.literal, "index.html"],
-    ]);
-    assertParse("protocolExpression", "http://localhost:5000/foo", [
-      [ops.builtin, "http:"],
-      [ops.literal, "localhost:5000/"],
-      [ops.literal, "foo"],
-    ]);
-    assertParse("protocolExpression", "files:///foo/bar.txt", [
-      [ops.builtin, "files:"],
-      [ops.literal, "/"],
-      [ops.literal, "foo/"],
-      [ops.literal, "bar.txt"],
-    ]);
-  });
-
-  test("qualifiedReference", () => {
-    assertParse("qualifiedReference", "js:Date", [
-      [ops.builtin, "js:"],
-      [ops.literal, "Date"],
-    ]);
+  test("regexLiteral", () => {
+    assertParse("regexLiteral", "/abc+/g", [ops.literal, /abc+/g]);
   });
 
   test("relationalExpression", () => {
@@ -987,17 +1278,6 @@ Body`,
     ]);
   });
 
-  test("rootDirectory", () => {
-    assertParse("rootDirectory", "/", [ops.rootDirectory]);
-  });
-
-  test("scopeReference", () => {
-    assertParse("scopeReference", "keys", [undetermined, "keys"]);
-    assertParse("scopeReference", "greet.js", [ops.scope, "greet.js"]);
-    // scopeReference checks whether a slash follows; hard to test in isolation
-    // assertParse("scopeReference", "markdown/", [ops.scope, "markdown"]);
-  });
-
   test("shiftExpression", () => {
     assertParse("shiftExpression", "1 << 2", [
       ops.shiftLeft,
@@ -1020,30 +1300,40 @@ Body`,
     assertParse("shorthandFunction", "=message", [
       ops.lambda,
       [[ops.literal, "_"]],
-      [undetermined, "message"],
+      [markers.traverse, [markers.reference, "message"]],
     ]);
     assertParse("shorthandFunction", "=`Hello, ${name}.`", [
       ops.lambda,
       [[ops.literal, "_"]],
-      [ops.template, [ops.literal, ["Hello, ", "."]], [ops.scope, "name"]],
+      [
+        ops.templateTree,
+        [ops.literal, ["Hello, ", "."]],
+        [markers.traverse, [markers.reference, "name"]],
+      ],
     ]);
     assertParse("shorthandFunction", "=indent`hello`", [
       ops.lambda,
       [[ops.literal, "_"]],
       [
-        [ops.builtin, "indent"],
+        [markers.traverse, [markers.reference, "indent"]],
         [ops.literal, ["hello"]],
       ],
     ]);
   });
 
   test("singleLineComment", () => {
-    assertParse("singleLineComment", "// Hello, world!", null, false);
+    assertParse("singleLineComment", "// Hello, world!", null, "jse", false);
   });
 
   test("spreadElement", () => {
-    assertParse("spreadElement", "...a", [ops.spread, [ops.scope, "a"]]);
-    assertParse("spreadElement", "…a", [ops.spread, [ops.scope, "a"]]);
+    assertParse("spreadElement", "...a", [
+      ops.spread,
+      [markers.traverse, [markers.reference, "a"]],
+    ]);
+    assertParse("spreadElement", "…a", [
+      ops.spread,
+      [markers.traverse, [markers.reference, "a"]],
+    ]);
   });
 
   test("stringLiteral", () => {
@@ -1062,21 +1352,13 @@ Body`,
 
   test("templateBody", () => {
     assertParse("templateBody", "hello${foo}world", [
-      ops.lambda,
-      [[ops.literal, "_"]],
-      [
-        ops.templateIndent,
-        [ops.literal, ["hello", "world"]],
-        [ops.scope, "foo"],
-      ],
+      ops.templateIndent,
+      [ops.literal, ["hello", "world"]],
+      [markers.traverse, [markers.reference, "foo"]],
     ]);
     assertParse("templateBody", "Documents can contain ` backticks", [
-      ops.lambda,
-      [[ops.literal, "_"]],
-      [
-        ops.templateIndent,
-        [ops.literal, ["Documents can contain ` backticks"]],
-      ],
+      ops.templateIndent,
+      [ops.literal, ["Documents can contain ` backticks"]],
     ]);
   });
 
@@ -1096,13 +1378,10 @@ title: Title goes here
 ---
 Body text`,
       [
-        ops.document,
-        [ops.literal, { title: "Title goes here" }],
-        [
-          ops.lambda,
-          [[ops.literal, "_"]],
-          [ops.templateIndent, [ops.literal, ["Body text"]]],
-        ],
+        ops.object,
+        ["title", [ops.literal, "Title goes here"]],
+        ["(@text)", [ops.templateIndent, [ops.literal, ["Body text"]]]],
+        ["_body", [ops.templateIndent, [ops.literal, ["Body text"]]]],
       ]
     );
   });
@@ -1124,54 +1403,132 @@ Body text`,
         [
           "@text",
           [
-            [
-              ops.lambda,
-              [[ops.literal, "_"]],
-              [
-                ops.templateIndent,
-                [ops.literal, ["<h1>", "</h1>\n"]],
-                [ops.scope, "title"],
-              ],
-            ],
-            undefined,
+            ops.templateIndent,
+            [ops.literal, ["<h1>", "</h1>\n"]],
+            [markers.traverse, [markers.reference, "title"]],
           ],
         ],
-      ]
+      ],
+      "shell"
+    );
+  });
+
+  test.skip("templateDocument with Origami front matter", () => {
+    assertParse(
+      "templateDocument",
+      `---
+{
+  title: "Title"
+  _body: _template()
+}
+---
+<h1>\${ title }</h1>
+`,
+      [
+        ops.object,
+        ["title", [ops.literal, "Title"]],
+        [
+          "_body",
+          [
+            ops.templateIndent,
+            [ops.literal, ["<h1>", "</h1>\n"]],
+            [markers.traverse, [markers.reference, "title"]],
+          ],
+        ],
+      ],
+      "jse"
     );
   });
 
   test("templateLiteral", () => {
     assertParse("templateLiteral", "`Hello, world.`", [
-      ops.template,
+      ops.templateTree,
       [ops.literal, ["Hello, world."]],
     ]);
+    assertParse(
+      "templateLiteral",
+      "`Hello, world.`",
+      [ops.templateTree, [ops.literal, ["Hello, world."]]],
+      "jse"
+    );
     assertParse("templateLiteral", "`foo ${x} bar`", [
-      ops.template,
+      ops.templateTree,
       [ops.literal, ["foo ", " bar"]],
-      [ops.scope, "x"],
+      [markers.traverse, [markers.reference, "x"]],
     ]);
     assertParse("templateLiteral", "`${`nested`}`", [
-      ops.template,
+      ops.templateTree,
       [ops.literal, ["", ""]],
-      [ops.template, [ops.literal, ["nested"]]],
+      [ops.templateTree, [ops.literal, ["nested"]]],
     ]);
-    assertParse("templateLiteral", "`${ map:(people, =`${name}`) }`", [
-      ops.template,
+    assertParse("templateLiteral", "`${ map(people, =`${name}`) }`", [
+      ops.templateTree,
       [ops.literal, ["", ""]],
       [
-        [ops.builtin, "map:"],
-        [ops.scope, "people"],
+        [markers.traverse, [markers.reference, "map"]],
+        [markers.traverse, [markers.reference, "people"]],
         [
           ops.lambda,
           [[ops.literal, "_"]],
-          [ops.template, [ops.literal, ["", ""]], [ops.scope, "name"]],
+          [
+            ops.templateTree,
+            [ops.literal, ["", ""]],
+            [markers.traverse, [markers.reference, "name"]],
+          ],
         ],
       ],
     ]);
   });
 
   test("templateSubtitution", () => {
-    assertParse("templateSubstitution", "${foo}", [ops.scope, "foo"], false);
+    assertParse(
+      "templateSubstitution",
+      "${foo}",
+      [markers.traverse, [markers.reference, "foo"]],
+      "shell",
+      false
+    );
+  });
+
+  describe("uri", () => {
+    test("with double slashes after colon", () => {
+      assertParse("uri", "foo://bar/baz", [
+        [markers.global, "foo:"],
+        [ops.literal, "bar/"],
+        [ops.literal, "baz"],
+      ]);
+      assertParse("uri", "http://example.com", [
+        [markers.global, "http:"],
+        [ops.literal, "example.com"],
+      ]);
+      assertParse("uri", "https://example.com/about/", [
+        [markers.global, "https:"],
+        [ops.literal, "example.com/"],
+        [ops.literal, "about/"],
+      ]);
+      assertParse("uri", "https://example.com/about/index.html", [
+        [markers.global, "https:"],
+        [ops.literal, "example.com/"],
+        [ops.literal, "about/"],
+        [ops.literal, "index.html"],
+      ]);
+      assertParse("uri", "http://localhost:5000/foo", [
+        [markers.global, "http:"],
+        [ops.literal, "localhost:5000/"],
+        [ops.literal, "foo"],
+      ]);
+    });
+
+    test("without double slashes after colon", () => {
+      assertParse("uri", "files:build", [
+        [markers.global, "files:"],
+        [ops.literal, "build"],
+      ]);
+    });
+  });
+
+  test("uriScheme", () => {
+    assertParse("uriScheme", "https:", [markers.global, "https:"]);
   });
 
   test("whitespace block", () => {
@@ -1182,6 +1539,7 @@ Body text`,
   // Second comment
      `,
       null,
+      "jse",
       false
     );
   });
@@ -1189,24 +1547,38 @@ Body text`,
   test("unaryExpression", () => {
     assertParse("unaryExpression", "!true", [
       ops.logicalNot,
-      [undetermined, "true"],
+      [markers.traverse, [markers.reference, "true"]],
     ]);
     assertParse("unaryExpression", "+1", [ops.unaryPlus, [ops.literal, 1]]);
     assertParse("unaryExpression", "-2", [ops.unaryMinus, [ops.literal, 2]]);
     assertParse("unaryExpression", "~3", [ops.bitwiseNot, [ops.literal, 3]]);
   });
+
+  test("unaryOperator", () => {
+    assertParse("unaryOperator", "!", "!");
+    assertParse("unaryOperator", "+", "+");
+    assertParse("unaryOperator", "-", "-");
+    assertParse("unaryOperator", "~", "~");
+  });
 });
 
-function assertParse(startRule, source, expected, checkLocation = true) {
+function assertParse(
+  startRule,
+  source,
+  expected,
+  mode = "shell",
+  checkLocation = true
+) {
   const code = parse(source, {
     grammarSource: { text: source },
+    mode,
     startRule,
   });
 
   // Verify that the parser returned a `location` property and that it spans the
   // entire source. We skip this check in cases where the source starts or ends
   // with a comment; the parser will strip those.
-  if (checkLocation) {
+  if (typeof code === "object" && checkLocation) {
     assertCodeLocations(code);
     const resultSource = code.location.source.text.slice(
       code.location.start.offset,
@@ -1227,10 +1599,12 @@ function assertCodeLocations(code) {
   }
 }
 
-function assertThrows(startRule, source, message, position) {
+function assertThrows(startRule, source, message, position, mode = "shell") {
+  let code;
   try {
-    parse(source, {
+    code = parse(source, {
       grammarSource: { text: source },
+      mode,
       startRule,
     });
   } catch (/** @type {any} */ error) {