@weborigami/language 0.3.3-jse.2 → 0.3.3-jse.3

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,44 +19,61 @@ describe("Origami parser", () => {
     ]);
   });
 
-  test("angleBracketLiteral", () => {
-    assertParse(
-      "angleBracketLiteral",
-      "<index.html>",
-      [ops.scope, "index.html"],
-      "jse",
-      false
-    );
-    assertParse(
-      "angleBracketLiteral",
-      "<foo/bar/baz>",
-      [
-        ops.traverse,
-        [ops.scope, "foo/"],
-        [ops.literal, "bar/"],
-        [ops.literal, "baz"],
-      ],
-      "jse",
-      false
-    );
-    assertParse("angleBracketLiteral", "<files:src/assets>", [
-      ops.traverse,
-      [
-        [ops.builtin, "files:"],
+  describe("angleBracketLiteral", () => {
+    test("with path", () => {
+      assertParse(
+        "angleBracketLiteral",
+        "<index.html>",
+        [[ops.scope], [ops.literal, "index.html"]],
+        "jse"
+      );
+      assertParse(
+        "angleBracketLiteral",
+        "<foo/bar/baz>",
+        [
+          [ops.scope],
+          [ops.literal, "foo/"],
+          [ops.literal, "bar/"],
+          [ops.literal, "baz"],
+        ],
+        "jse"
+      );
+    });
+
+    test("root directory", () => {
+      assertParse("angleBracketLiteral", "</>", [ops.rootDirectory]);
+      assertParse("angleBracketLiteral", "</etc/passwd>", [
+        [ops.rootDirectory],
+        [ops.literal, "etc/"],
+        [ops.literal, "passwd"],
+      ]);
+    });
+
+    test("home directory", () => {
+      assertParse("angleBracketLiteral", "<~>", [ops.homeDirectory]);
+      assertParse("angleBracketLiteral", "<~/.bash_profile>", [
+        [ops.homeDirectory],
+        [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/>",
-      [
-        [ops.builtin, "https:"],
-        [ops.literal, "example.com/"],
-      ],
-      "jse",
-      false
-    );
+        [ops.literal, "assets"],
+      ]);
+      assertParse(
+        "angleBracketLiteral",
+        "<https://example.com/data.yaml>",
+        [
+          [markers.global, "https:"],
+          [ops.literal, "example.com/"],
+          [ops.literal, "data.yaml"],
+        ],
+        "jse"
+      );
+    });
   });
 
   test("arrayLiteral", () => {
@@ -81,7 +98,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]],
     ]);
@@ -100,12 +117,12 @@ describe("Origami parser", () => {
     assertParse("arrowFunction", "() => foo", [
       ops.lambda,
       [],
-      [ops.scope, "foo"],
+      [markers.reference, [ops.literal, "foo"]],
     ]);
     assertParse("arrowFunction", "x => y", [
       ops.lambda,
       [[ops.literal, "x"]],
-      [ops.scope, "y"],
+      [markers.reference, [ops.literal, "y"]],
     ]);
     assertParse("arrowFunction", "(a, b, c) ⇒ fn(a, b, c)", [
       ops.lambda,
@@ -115,10 +132,10 @@ describe("Origami parser", () => {
         [ops.literal, "c"],
       ],
       [
-        [ops.builtin, "fn"],
-        [ops.scope, "a"],
-        [ops.scope, "b"],
-        [ops.scope, "c"],
+        [markers.global, "fn"],
+        [markers.reference, [ops.literal, "a"]],
+        [markers.reference, [ops.literal, "b"]],
+        [markers.reference, [ops.literal, "c"]],
       ],
     ]);
     assertParse("arrowFunction", "a => b => fn(a, b)", [
@@ -128,9 +145,9 @@ describe("Origami parser", () => {
         ops.lambda,
         [[ops.literal, "b"]],
         [
-          [ops.builtin, "fn"],
-          [ops.scope, "a"],
-          [ops.scope, "b"],
+          [markers.global, "fn"],
+          [markers.reference, [ops.literal, "a"]],
+          [markers.reference, [ops.literal, "b"]],
         ],
       ],
     ]);
@@ -160,147 +177,177 @@ 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.global, "fn"],
+        undefined,
+      ]);
+      assertParse("callExpression", "foo.js(arg)", [
+        [markers.reference, [ops.literal, "foo.js"]],
+        [markers.reference, [ops.literal, "arg"]],
+      ]);
+      assertParse("callExpression", "fn(a, b)", [
+        [markers.global, "fn"],
+        [markers.reference, [ops.literal, "a"]],
+        [markers.reference, [ops.literal, "b"]],
+      ]);
+      assertParse("callExpression", "foo.js( a , b )", [
+        [markers.reference, [ops.literal, "foo.js"]],
+        [markers.reference, [ops.literal, "a"]],
+        [markers.reference, [ops.literal, "b"]],
+      ]);
+      assertParse("callExpression", "fn()(arg)", [
+        [[markers.global, "fn"], undefined],
+        [markers.reference, [ops.literal, "arg"]],
+      ]);
+    });
+    test("call chains", () => {
+      assertParse("callExpression", "(foo.js())('arg')", [
+        [[markers.reference, [ops.literal, "foo.js"]], undefined],
+        [ops.literal, "arg"],
+      ]);
+      assertParse("callExpression", "fn('a')('b')", [
+        [
+          [markers.global, "fn"],
+          [ops.literal, "a"],
+        ],
+        [ops.literal, "b"],
+      ]);
+      assertParse("callExpression", "(foo.js())(a, b)", [
+        [[markers.reference, [ops.literal, "foo.js"]], undefined],
+        [markers.reference, [ops.literal, "a"]],
+        [markers.reference, [ops.literal, "b"]],
+      ]);
+    });
+    test("with paths", () => {
+      assertParse("callExpression", "/", [ops.rootDirectory]);
+      assertParse("callExpression", "tree/", [
+        ops.unpack,
+        [markers.reference, [ops.literal, "tree/"]],
+      ]);
+      assertParse("callExpression", "tree/foo/bar", [
+        markers.reference,
+        [ops.literal, "tree/"],
+        [ops.literal, "foo/"],
+        [ops.literal, "bar"],
+      ]);
+      assertParse("callExpression", "tree/foo/bar/", [
+        markers.reference,
+        [ops.literal, "tree/"],
+        [ops.literal, "foo/"],
+        [ops.literal, "bar/"],
+      ]);
+      // Consecutive slahes in a path are removed
+      assertParse("callExpression", "path//key", [
+        markers.reference,
+        [ops.literal, "path/"],
+        [ops.literal, "key"],
+      ]);
+      assertParse("callExpression", "/foo/bar", [
+        [ops.rootDirectory],
+        [ops.literal, "foo/"],
+        [ops.literal, "bar"],
+      ]);
+      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.reference, [ops.literal, "foo.js"]], undefined],
+        [ops.literal, "key"],
+      ]);
+      assertParse("callExpression", "tree/key()", [
+        [markers.reference, [ops.literal, "tree/"], [ops.literal, "key"]],
+        undefined,
+      ]);
+      assertParse("callExpression", "(tree)/", [
+        ops.unpack,
+        [markers.reference, [ops.literal, "tree/"]],
+      ]);
+      assertParse("callExpression", "fn()/key()", [
+        [
+          [[markers.global, "fn"], undefined],
+          [ops.literal, "key"],
+        ],
+        undefined,
+      ]);
+      assertParse("callExpression", "package:@weborigami/dropbox/auth(creds)", [
         [
-          [ops.builtin, "package:"],
+          [markers.global, "package:"],
           [ops.literal, "@weborigami/"],
+          [ops.literal, "dropbox/"],
+          [ops.literal, "auth"],
         ],
-        [ops.literal, "dropbox/"],
-        [ops.literal, "auth"],
-      ],
-      [ops.scope, "creds"],
-    ]);
+        [markers.reference, [ops.literal, "creds"]],
+      ]);
+    });
+    test("tagged templates", () => {
+      assertParse("callExpression", "indent`hello`", [
+        [markers.global, "indent"],
+        [ops.literal, ["hello"]],
+      ]);
+      assertParse("callExpression", "fn.js`Hello, world.`", [
+        [markers.reference, [ops.literal, "fn.js"]],
+        [ops.literal, ["Hello, world."]],
+      ]);
+    });
+    test("protocols", () => {
+      assertParse("callExpression", "files:src/assets", [
+        [markers.global, "files:"],
+        [ops.literal, "src/"],
+        [ops.literal, "assets"],
+      ]);
+      assertParse("callExpression", "new:(js:Date, '2025-01-01')", [
+        [markers.global, "new:"],
+        [
+          [markers.global, "js:"],
+          [ops.literal, "Date"],
+        ],
+        [ops.literal, "2025-01-01"],
+      ]);
+    });
   });
 
   test("callExpression using property acccess", () => {
     assertParse("callExpression", "(foo).bar", [
-      ops.traverse,
-      [ops.scope, "foo"],
+      markers.reference,
+      [ops.literal, "foo/"],
       [ops.literal, "bar"],
     ]);
     assertParse("callExpression", "(foo).bar.baz", [
-      ops.traverse,
-      [ops.traverse, [ops.scope, "foo"], [ops.literal, "bar"]],
+      markers.reference,
+      [ops.literal, "foo/"],
+      [ops.literal, "bar/"],
       [ops.literal, "baz"],
     ]);
     assertParse("callExpression", "foo[bar]", [
-      ops.traverse,
-      [ops.scope, "foo/"],
-      [ops.scope, "bar"],
+      markers.reference,
+      [ops.literal, "foo/"],
+      [markers.reference, [ops.literal, "bar"]],
     ]);
+    assertParse(
+      "callExpression",
+      "Tree.map",
+      [markers.reference, [ops.literal, "Tree/"], [ops.literal, "map"]],
+      "jse"
+    );
   });
 
   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.reference, [ops.literal, "a"]],
+      [markers.reference, [ops.literal, "b"]],
+      [markers.reference, [ops.literal, "c"]],
     ]);
   });
 
@@ -308,19 +355,19 @@ describe("Origami parser", () => {
     assertParse("conditionalExpression", "1", [ops.literal, 1]);
     assertParse("conditionalExpression", "true ? 1 : 0", [
       ops.conditional,
-      [ops.scope, "true"],
+      [markers.reference, [ops.literal, "true"]],
       [ops.literal, 1],
       [ops.literal, 0],
     ]);
     assertParse("conditionalExpression", "false ? () => 1 : 0", [
       ops.conditional,
-      [ops.scope, "false"],
+      [markers.reference, [ops.literal, "false"]],
       [ops.lambda, [], [ops.lambda, [], [ops.literal, 1]]],
       [ops.literal, 0],
     ]);
     assertParse("conditionalExpression", "false ? =1 : 0", [
       ops.conditional,
-      [ops.scope, "false"],
+      [markers.reference, [ops.literal, "false"]],
       [ops.lambda, [], [ops.lambda, [[ops.literal, "_"]], [ops.literal, 1]]],
       [ops.literal, 0],
     ]);
@@ -334,8 +381,12 @@ describe("Origami parser", () => {
     ]);
     assertParse("equalityExpression", "a === b === c", [
       ops.strictEqual,
-      [ops.strictEqual, [undetermined, "a"], [undetermined, "b"]],
-      [undetermined, "c"],
+      [
+        ops.strictEqual,
+        [markers.reference, [ops.literal, "a"]],
+        [markers.reference, [ops.literal, "b"]],
+      ],
+      [markers.reference, [ops.literal, "c"]],
     ]);
     assertParse("equalityExpression", "1 !== 1", [
       ops.notStrictEqual,
@@ -403,8 +454,8 @@ Body`,
           [
             ops.getter,
             [
-              [ops.scope, "index.ori"],
-              [ops.scope, "teamData.yaml"],
+              [markers.reference, [ops.literal, "index.ori"]],
+              [markers.reference, [ops.literal, "teamData.yaml"]],
             ],
           ],
         ],
@@ -413,9 +464,12 @@ Body`,
           [
             ops.getter,
             [
-              [ops.builtin, "map"],
-              [ops.scope, "images"],
-              [ops.object, ["value", [ops.scope, "thumbnail.js"]]],
+              [markers.global, "map"],
+              [markers.reference, [ops.literal, "images"]],
+              [
+                ops.object,
+                ["value", [markers.reference, [ops.literal, "thumbnail.js"]]],
+              ],
             ],
           ],
         ],
@@ -423,58 +477,54 @@ Body`,
     );
 
     // 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"],
-    ]);
+    assertParse("expression", "mdHtml:", [markers.global, "mdHtml:"]);
 
     // Consecutive slashes at start of something = comment
-    assertParse("expression", "x //comment", [ops.scope, "x"], "jse", false);
+    assertParse(
+      "expression",
+      "x //comment",
+      [markers.reference, [ops.literal, "x"]],
+      "jse",
+      false
+    );
 
     assertParse("expression", "page.ori(mdHtml:(about.md))", [
-      [ops.scope, "page.ori"],
+      [markers.reference, [ops.literal, "page.ori"]],
       [
-        [ops.builtin, "mdHtml:"],
-        [ops.scope, "about.md"],
+        [markers.global, "mdHtml:"],
+        [markers.reference, [ops.literal, "about.md"]],
       ],
     ]);
 
     // Slash on its own is the root folder
     assertParse("expression", "keys /", [
-      [ops.builtin, "keys"],
+      [markers.global, "keys"],
       [ops.rootDirectory],
     ]);
 
     assertParse("expression", "'Hello' -> test.orit", [
-      [ops.scope, "test.orit"],
+      [markers.reference, [ops.literal, "test.orit"]],
       [ops.literal, "Hello"],
     ]);
-    assertParse("expression", "obj.json", [ops.scope, "obj.json"]);
+    assertParse("expression", "obj.json", [
+      markers.reference,
+      [ops.literal, "obj.json"],
+    ]);
     assertParse("expression", "(fn a, b, c)", [
-      [ops.builtin, "fn"],
-      [undetermined, "a"],
-      [undetermined, "b"],
-      [undetermined, "c"],
+      [markers.global, "fn"],
+      [markers.reference, [ops.literal, "a"]],
+      [markers.reference, [ops.literal, "b"]],
+      [markers.reference, [ops.literal, "c"]],
     ]);
     assertParse("expression", "foo.bar('hello', 'world')", [
-      [ops.scope, "foo.bar"],
+      [markers.reference, [ops.literal, "foo.bar"]],
       [ops.literal, "hello"],
       [ops.literal, "world"],
     ]);
-    assertParse("expression", "(key)('a')", [
-      [ops.scope, "key"],
-      [ops.literal, "a"],
-    ]);
+    // assertParse("expression", "(key)('a')", [
+    //   [markers.reference, [ops.literal, "key"]],
+    //   [ops.literal, "a"],
+    // ]);
     assertParse("expression", "1", [ops.literal, 1]);
     assertParse("expression", "{ a: 1, b: 2 }", [
       ops.object,
@@ -482,11 +532,11 @@ Body`,
       ["b", [ops.literal, 2]],
     ]);
     assertParse("expression", "serve { index.html: 'hello' }", [
-      [ops.builtin, "serve"],
+      [markers.global, "serve"],
       [ops.object, ["index.html", [ops.literal, "hello"]]],
     ]);
     assertParse("expression", "fn =`x`", [
-      [ops.builtin, "fn"],
+      [markers.global, "fn"],
       [
         ops.lambda,
         [[ops.literal, "_"]],
@@ -494,33 +544,37 @@ Body`,
       ],
     ]);
     assertParse("expression", "copy app.js(formulas), files:snapshot", [
-      [ops.builtin, "copy"],
+      [markers.global, "copy"],
       [
-        [ops.scope, "app.js"],
-        [ops.scope, "formulas"],
+        [markers.reference, [ops.literal, "app.js"]],
+        [markers.reference, [ops.literal, "formulas"]],
       ],
       [
-        [ops.builtin, "files:"],
+        [markers.global, "files:"],
         [ops.literal, "snapshot"],
       ],
     ]);
     assertParse("expression", "map =`<li>${_}</li>`", [
-      [ops.builtin, "map"],
+      [markers.global, "map"],
       [
         ops.lambda,
         [[ops.literal, "_"]],
-        [ops.templateTree, [ops.literal, ["<li>", "</li>"]], [ops.scope, "_"]],
+        [
+          ops.templateTree,
+          [ops.literal, ["<li>", "</li>"]],
+          [markers.reference, [ops.literal, "_"]],
+        ],
       ],
     ]);
     assertParse("expression", `https://example.com/about/`, [
-      [ops.builtin, "https:"],
+      [markers.global, "https:"],
       [ops.literal, "example.com/"],
       [ops.literal, "about/"],
     ]);
     assertParse("expression", "tag`Hello, ${name}!`", [
-      [ops.builtin, "tag"],
+      [markers.global, "tag"],
       [ops.literal, ["Hello, ", "!"]],
-      [ops.concat, [ops.scope, "name"]],
+      [ops.concat, [markers.reference, [ops.literal, "name"]]],
     ]);
     assertParse("expression", "(post, slug) => fn.js(post, slug)", [
       ops.lambda,
@@ -529,42 +583,38 @@ Body`,
         [ops.literal, "slug"],
       ],
       [
-        [ops.scope, "fn.js"],
-        [ops.scope, "post"],
-        [ops.scope, "slug"],
+        [markers.reference, [ops.literal, "fn.js"]],
+        [markers.reference, [ops.literal, "post"]],
+        [markers.reference, [ops.literal, "slug"]],
       ],
     ]);
     assertParse("expression", "keys ~", [
-      [ops.builtin, "keys"],
+      [markers.global, "keys"],
       [ops.homeDirectory],
     ]);
     assertParse("expression", "keys /Users/alice", [
-      [ops.builtin, "keys"],
-      [
-        ops.traverse,
-        [ops.rootDirectory, [ops.literal, "Users/"]],
-        [ops.literal, "alice"],
-      ],
+      [markers.global, "keys"],
+      [[ops.rootDirectory], [ops.literal, "Users/"], [ops.literal, "alice"]],
     ]);
 
     // Verify parser treatment of identifiers containing operators
     assertParse("expression", "a + b", [
       ops.addition,
-      [undetermined, "a"],
-      [undetermined, "b"],
+      [markers.reference, [ops.literal, "a"]],
+      [markers.reference, [ops.literal, "b"]],
     ]);
-    assertParse("expression", "a+b", [ops.scope, "a+b"]);
+    assertParse("expression", "a+b", [markers.reference, [ops.literal, "a+b"]]);
     assertParse("expression", "a - b", [
       ops.subtraction,
-      [undetermined, "a"],
-      [undetermined, "b"],
+      [markers.reference, [ops.literal, "a"]],
+      [markers.reference, [ops.literal, "b"]],
     ]);
-    assertParse("expression", "a-b", [ops.scope, "a-b"]);
-    assertParse("expression", "a&b", [ops.scope, "a&b"]);
+    assertParse("expression", "a-b", [markers.reference, [ops.literal, "a-b"]]);
+    assertParse("expression", "a&b", [markers.reference, [ops.literal, "a&b"]]);
     assertParse("expression", "a & b", [
       ops.bitwiseAnd,
-      [undetermined, "a"],
-      [undetermined, "b"],
+      [markers.reference, [ops.literal, "a"]],
+      [markers.reference, [ops.literal, "b"]],
     ]);
   });
 
@@ -578,7 +628,7 @@ Body`,
       [
         ops.lambda,
         [[ops.literal, "name"]],
-        [[ops.scope, "_template"], undefined],
+        [[markers.reference, [ops.literal, "_template"]], undefined],
       ],
       "jse",
       false
@@ -586,12 +636,18 @@ Body`,
   });
 
   test("group", () => {
-    assertParse("group", "(hello)", [ops.scope, "hello"]);
-    assertParse("group", "(((nested)))", [ops.scope, "nested"]);
-    assertParse("group", "(fn())", [[ops.builtin, "fn"], undefined]);
+    assertParse("group", "(hello)", [
+      markers.reference,
+      [ops.literal, "hello"],
+    ]);
+    assertParse("group", "(((nested)))", [
+      markers.reference,
+      [ops.literal, "nested"],
+    ]);
+    assertParse("group", "(fn())", [[markers.global, "fn"], undefined]);
     assertParse("group", "(a -> b)", [
-      [ops.builtin, "b"],
-      [ops.scope, "a"],
+      [markers.global, "b"],
+      [markers.reference, [ops.literal, "a"]],
     ]);
   });
 
@@ -614,42 +670,42 @@ Body`,
 
   test("implicitParenthesesCallExpression", () => {
     assertParse("implicitParenthesesCallExpression", "fn arg", [
-      [ops.builtin, "fn"],
-      [undetermined, "arg"],
+      [markers.global, "fn"],
+      [markers.reference, [ops.literal, "arg"]],
     ]);
     assertParse("implicitParenthesesCallExpression", "page.ori 'a', 'b'", [
-      [ops.scope, "page.ori"],
+      [markers.reference, [ops.literal, "page.ori"]],
       [ops.literal, "a"],
       [ops.literal, "b"],
     ]);
     assertParse("implicitParenthesesCallExpression", "fn a(b), c", [
-      [ops.builtin, "fn"],
+      [markers.global, "fn"],
       [
-        [ops.builtin, "a"],
-        [ops.scope, "b"],
+        [markers.global, "a"],
+        [markers.reference, [ops.literal, "b"]],
       ],
-      [undetermined, "c"],
+      [markers.reference, [ops.literal, "c"]],
     ]);
     assertParse("implicitParenthesesCallExpression", "(fn()) 'arg'", [
-      [[ops.builtin, "fn"], undefined],
+      [[markers.global, "fn"], undefined],
       [ops.literal, "arg"],
     ]);
     assertParse("implicitParenthesesCallExpression", "tree/key arg", [
-      [ops.traverse, [ops.scope, "tree/"], [ops.literal, "key"]],
-      [undetermined, "arg"],
+      [markers.reference, [ops.literal, "tree/"], [ops.literal, "key"]],
+      [markers.reference, [ops.literal, "arg"]],
     ]);
     assertParse("implicitParenthesesCallExpression", "foo.js bar.ori 'arg'", [
-      [ops.scope, "foo.js"],
+      [markers.reference, [ops.literal, "foo.js"]],
       [
-        [ops.scope, "bar.ori"],
+        [markers.reference, [ops.literal, "bar.ori"]],
         [ops.literal, "arg"],
       ],
     ]);
   });
 
   test("jsIdentifier", () => {
-    assertParse("jsIdentifier", "foo", "foo", "jse", false);
-    assertParse("jsIdentifier", "$Δelta", "$Δelta", "jse", false);
+    assertParse("jsIdentifier", "foo", [ops.literal, "foo"], "jse");
+    assertParse("jsIdentifier", "$Δelta", [ops.literal, "$Δelta"], "jse");
     assertThrows(
       "jsIdentifier",
       "1stCharacterIsNumber",
@@ -689,7 +745,6 @@ Body`,
       [ops.literal, 2],
       [ops.literal, 3],
     ]);
-    assertThrows("list", "1\n2\n3", `but "\\n" found`, 0, "jse");
     assertParse("list", "'a' , 'b' , 'c'", [
       [ops.literal, "a"],
       [ops.literal, "b"],
@@ -700,8 +755,8 @@ Body`,
   test("logicalAndExpression", () => {
     assertParse("logicalAndExpression", "true && false", [
       ops.logicalAnd,
-      [ops.scope, "true"],
-      [ops.lambda, [], [undetermined, "false"]],
+      [markers.reference, [ops.literal, "true"]],
+      [ops.lambda, [], [markers.reference, [ops.literal, "false"]]],
     ]);
   });
 
@@ -713,9 +768,9 @@ Body`,
     ]);
     assertParse("logicalOrExpression", "false || false || true", [
       ops.logicalOr,
-      [ops.scope, "false"],
-      [ops.lambda, [], [undetermined, "false"]],
-      [ops.lambda, [], [undetermined, "true"]],
+      [markers.reference, [ops.literal, "false"]],
+      [ops.lambda, [], [markers.reference, [ops.literal, "false"]]],
+      [ops.lambda, [], [markers.reference, [ops.literal, "true"]]],
     ]);
     assertParse("logicalOrExpression", "1 || 2 && 0", [
       ops.logicalOr,
@@ -753,27 +808,31 @@ Body`,
   });
 
   test("namespace", () => {
-    assertParse("namespace", "js:", [ops.builtin, "js:"]);
+    assertParse("namespace", "js:", [markers.global, "js:"]);
   });
 
   test("newExpression", () => {
     assertParse("newExpression", "new Foo()", [
       ops.construct,
-      [ops.scope, "Foo"],
+      [markers.reference, [ops.literal, "Foo"]],
+    ]);
+    assertParse("newExpression", "new:Foo()", [
+      ops.construct,
+      [markers.reference, [ops.literal, "Foo"]],
     ]);
   });
 
   test("nullishCoalescingExpression", () => {
     assertParse("nullishCoalescingExpression", "a ?? b", [
       ops.nullishCoalescing,
-      [ops.scope, "a"],
-      [ops.lambda, [], [undetermined, "b"]],
+      [markers.reference, [ops.literal, "a"]],
+      [ops.lambda, [], [markers.reference, [ops.literal, "b"]]],
     ]);
     assertParse("nullishCoalescingExpression", "a ?? b ?? c", [
       ops.nullishCoalescing,
-      [ops.scope, "a"],
-      [ops.lambda, [], [undetermined, "b"]],
-      [ops.lambda, [], [undetermined, "c"]],
+      [markers.reference, [ops.literal, "a"]],
+      [ops.lambda, [], [markers.reference, [ops.literal, "b"]]],
+      [ops.lambda, [], [markers.reference, [ops.literal, "c"]]],
     ]);
   });
 
@@ -788,7 +847,7 @@ Body`,
     assertParse("objectLiteral", "{ a: 1, b }", [
       ops.object,
       ["a", [ops.literal, 1]],
-      ["b", [ops.inherited, "b"]],
+      ["b", [markers.reference, "b"]],
     ]);
     assertParse("objectLiteral", "{ sub: { a: 1 } }", [
       ops.object,
@@ -805,7 +864,7 @@ Body`,
     ]);
     assertParse("objectLiteral", "{ a = b, b = 2 }", [
       ops.object,
-      ["a", [ops.getter, [ops.scope, "b"]]],
+      ["a", [ops.getter, [markers.reference, [ops.literal, "b"]]]],
       ["b", [ops.literal, 2]],
     ]);
     assertParse(
@@ -816,7 +875,7 @@ Body`,
       }`,
       [
         ops.object,
-        ["a", [ops.getter, [ops.scope, "b"]]],
+        ["a", [ops.getter, [markers.reference, [ops.literal, "b"]]]],
         ["b", [ops.literal, 2]],
       ]
     );
@@ -832,7 +891,7 @@ Body`,
       ops.object,
       [
         "a",
-        [ops.object, ["b", [ops.getter, [[ops.builtin, "fn"], undefined]]]],
+        [ops.object, ["b", [ops.getter, [[markers.global, "fn"], undefined]]]],
       ],
     ]);
     assertParse("objectLiteral", "{ x = fn.js('a') }", [
@@ -842,16 +901,28 @@ Body`,
         [
           ops.getter,
           [
-            [ops.scope, "fn.js"],
+            [markers.reference, [ops.literal, "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.reference, [ops.literal, "a"]]],
+        [
+          "_result",
+          [
+            ops.merge,
+            [ops.object, ["a", [ops.getter, [[ops.context, 1], "a"]]]],
+            [markers.reference, [ops.literal, "more"]],
+            [ops.object, ["c", [ops.getter, [[ops.context, 1], "c"]]]],
+          ],
+        ],
+      ],
+      "_result",
     ]);
     assertParse("objectLiteral", "{ a: 1, ...{ b: 2 } }", [
       ops.object,
@@ -862,22 +933,63 @@ Body`,
       ops.object,
       ["(a)", [ops.literal, 1]],
     ]);
+    assertParse(
+      "objectLiteral",
+      "{ <path/to/file.txt> }",
+      [
+        ops.object,
+        [
+          "file.txt",
+          [
+            [ops.scope],
+            [ops.literal, "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.reference, "foo"]]);
+    assertParse("objectEntry", "x: y", [
+      "x",
+      [markers.reference, [ops.literal, "y"]],
+    ]);
+    assertParse("objectEntry", "a: a", [
+      "a",
+      [markers.reference, [ops.literal, "a"]],
+    ]);
+    assertParse(
+      "objectEntry",
+      "<path/to/file.txt>",
+      [
+        "file.txt",
+        [
+          [ops.scope],
+          [ops.literal, "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.reference, [ops.literal, "a"]],
+      ],
     ]);
     assertParse("objectEntry", "posts/: map(posts, post.ori)", [
       "posts/",
       [
-        [ops.builtin, "map"],
-        [ops.inherited, "posts"],
-        [ops.scope, "post.ori"],
+        [markers.global, "map"],
+        [markers.reference, [ops.literal, "posts"]],
+        [markers.reference, [ops.literal, "post.ori"]],
       ],
     ]);
   });
@@ -885,14 +997,14 @@ Body`,
   test("objectGetter", () => {
     assertParse("objectGetter", "data = obj.json", [
       "data",
-      [ops.getter, [ops.scope, "obj.json"]],
+      [ops.getter, [markers.reference, [ops.literal, "obj.json"]]],
     ]);
     assertParse("objectGetter", "foo = page.ori 'bar'", [
       "foo",
       [
         ops.getter,
         [
-          [ops.scope, "page.ori"],
+          [markers.reference, [ops.literal, "page.ori"]],
           [ops.literal, "bar"],
         ],
       ],
@@ -908,7 +1020,7 @@ Body`,
     assertParse("objectProperty", "x: fn('a')", [
       "x",
       [
-        [ops.builtin, "fn"],
+        [markers.global, "fn"],
         [ops.literal, "a"],
       ],
     ]);
@@ -930,9 +1042,9 @@ Body`,
   test("parenthesesArguments", () => {
     assertParse("parenthesesArguments", "()", [undefined]);
     assertParse("parenthesesArguments", "(a, b, c)", [
-      [ops.scope, "a"],
-      [ops.scope, "b"],
-      [ops.scope, "c"],
+      [markers.reference, [ops.literal, "a"]],
+      [markers.reference, [ops.literal, "b"]],
+      [markers.reference, [ops.literal, "c"]],
     ]);
   });
 
@@ -954,41 +1066,47 @@ Body`,
   });
 
   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("pipelineExpression", () => {
-    assertParse("pipelineExpression", "foo", [ops.scope, "foo"]);
+    assertParse("pipelineExpression", "foo", [
+      markers.reference,
+      [ops.literal, "foo"],
+    ]);
     assertParse("pipelineExpression", "a -> b", [
-      [ops.builtin, "b"],
-      [ops.scope, "a"],
+      [markers.global, "b"],
+      [markers.reference, [ops.literal, "a"]],
     ]);
     assertParse("pipelineExpression", "input → one.js → two.js", [
-      [ops.scope, "two.js"],
+      [markers.reference, [ops.literal, "two.js"]],
       [
-        [ops.scope, "one.js"],
-        [ops.scope, "input"],
+        [markers.reference, [ops.literal, "one.js"]],
+        [markers.reference, [ops.literal, "input"]],
       ],
     ]);
     assertParse("pipelineExpression", "fn a -> b", [
-      [ops.builtin, "b"],
+      [markers.global, "b"],
       [
-        [ops.builtin, "fn"],
-        [undetermined, "a"],
+        [markers.global, "fn"],
+        [markers.reference, [ops.literal, "a"]],
       ],
     ]);
   });
 
   test("primary", () => {
-    assertParse("primary", "foo.js", [ops.scope, "foo.js"]);
+    assertParse("primary", "foo.js", [
+      markers.reference,
+      [ops.literal, "foo.js"],
+    ]);
     assertParse("primary", "[1, 2]", [
       ops.array,
       [ops.literal, 1],
@@ -998,7 +1116,7 @@ Body`,
     assertParse(
       "primary",
       "<index.html>",
-      [ops.scope, "index.html"],
+      [[ops.scope], [ops.literal, "index.html"]],
       "jse",
       false
     );
@@ -1018,32 +1136,33 @@ Body`,
   });
 
   test("protocolExpression", () => {
-    assertParse("protocolExpression", "foo://bar", [
-      [ops.builtin, "foo:"],
-      [ops.literal, "bar"],
+    assertParse("protocolExpression", "foo://bar/baz", [
+      [markers.global, "foo:"],
+      [ops.literal, "bar/"],
+      [ops.literal, "baz"],
     ]);
     assertParse("protocolExpression", "http://example.com", [
-      [ops.builtin, "http:"],
+      [markers.global, "http:"],
       [ops.literal, "example.com"],
     ]);
     assertParse("protocolExpression", "https://example.com/about/", [
-      [ops.builtin, "https:"],
+      [markers.global, "https:"],
       [ops.literal, "example.com/"],
       [ops.literal, "about/"],
     ]);
     assertParse("protocolExpression", "https://example.com/about/index.html", [
-      [ops.builtin, "https:"],
+      [markers.global, "https:"],
       [ops.literal, "example.com/"],
       [ops.literal, "about/"],
       [ops.literal, "index.html"],
     ]);
     assertParse("protocolExpression", "http://localhost:5000/foo", [
-      [ops.builtin, "http:"],
+      [markers.global, "http:"],
       [ops.literal, "localhost:5000/"],
       [ops.literal, "foo"],
     ]);
     assertParse("protocolExpression", "files:///foo/bar.txt", [
-      [ops.builtin, "files:"],
+      [markers.global, "files:"],
       [ops.literal, "/"],
       [ops.literal, "foo/"],
       [ops.literal, "bar.txt"],
@@ -1052,7 +1171,7 @@ Body`,
 
   test("qualifiedReference", () => {
     assertParse("qualifiedReference", "js:Date", [
-      [ops.builtin, "js:"],
+      [markers.global, "js:"],
       [ops.literal, "Date"],
     ]);
   });
@@ -1084,15 +1203,15 @@ 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"]);
+    assertParse("scopeReference", "keys", [
+      markers.reference,
+      [ops.literal, "keys"],
+    ]);
+    assertParse("scopeReference", "greet.js", [
+      markers.reference,
+      [ops.literal, "greet.js"],
+    ]);
   });
 
   test("shiftExpression", () => {
@@ -1117,18 +1236,22 @@ Body`,
     assertParse("shorthandFunction", "=message", [
       ops.lambda,
       [[ops.literal, "_"]],
-      [undetermined, "message"],
+      [markers.reference, [ops.literal, "message"]],
     ]);
     assertParse("shorthandFunction", "=`Hello, ${name}.`", [
       ops.lambda,
       [[ops.literal, "_"]],
-      [ops.templateTree, [ops.literal, ["Hello, ", "."]], [ops.scope, "name"]],
+      [
+        ops.templateTree,
+        [ops.literal, ["Hello, ", "."]],
+        [markers.reference, [ops.literal, "name"]],
+      ],
     ]);
     assertParse("shorthandFunction", "=indent`hello`", [
       ops.lambda,
       [[ops.literal, "_"]],
       [
-        [ops.builtin, "indent"],
+        [markers.global, "indent"],
         [ops.literal, ["hello"]],
       ],
     ]);
@@ -1139,8 +1262,14 @@ Body`,
   });
 
   test("spreadElement", () => {
-    assertParse("spreadElement", "...a", [ops.spread, [ops.scope, "a"]]);
-    assertParse("spreadElement", "…a", [ops.spread, [ops.scope, "a"]]);
+    assertParse("spreadElement", "...a", [
+      ops.spread,
+      [markers.reference, [ops.literal, "a"]],
+    ]);
+    assertParse("spreadElement", "…a", [
+      ops.spread,
+      [markers.reference, [ops.literal, "a"]],
+    ]);
   });
 
   test("stringLiteral", () => {
@@ -1159,21 +1288,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.reference, [ops.literal, "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"]],
     ]);
   });
 
@@ -1193,13 +1314,9 @@ 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"]]]],
       ]
     );
   });
@@ -1221,16 +1338,9 @@ 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.reference, [ops.literal, "title"]],
           ],
         ],
       ]
@@ -1251,7 +1361,7 @@ Body text`,
     assertParse("templateLiteral", "`foo ${x} bar`", [
       ops.templateTree,
       [ops.literal, ["foo ", " bar"]],
-      [ops.scope, "x"],
+      [markers.reference, [ops.literal, "x"]],
     ]);
     assertParse("templateLiteral", "`${`nested`}`", [
       ops.templateTree,
@@ -1262,12 +1372,16 @@ Body text`,
       ops.templateTree,
       [ops.literal, ["", ""]],
       [
-        [ops.builtin, "map:"],
-        [ops.scope, "people"],
+        [markers.global, "map:"],
+        [markers.reference, [ops.literal, "people"]],
         [
           ops.lambda,
           [[ops.literal, "_"]],
-          [ops.templateTree, [ops.literal, ["", ""]], [ops.scope, "name"]],
+          [
+            ops.templateTree,
+            [ops.literal, ["", ""]],
+            [markers.reference, [ops.literal, "name"]],
+          ],
         ],
       ],
     ]);
@@ -1277,7 +1391,7 @@ Body text`,
     assertParse(
       "templateSubstitution",
       "${foo}",
-      [ops.scope, "foo"],
+      [markers.reference, [ops.literal, "foo"]],
       "shell",
       false
     );
@@ -1299,7 +1413,7 @@ Body text`,
   test("unaryExpression", () => {
     assertParse("unaryExpression", "!true", [
       ops.logicalNot,
-      [undetermined, "true"],
+      [markers.reference, [ops.literal, "true"]],
     ]);
     assertParse("unaryExpression", "+1", [ops.unaryPlus, [ops.literal, 1]]);
     assertParse("unaryExpression", "-2", [ops.unaryMinus, [ops.literal, 2]]);