@weborigami/language 0.6.9 → 0.6.10

package/test/compiler/compile.test.js

@@ -1,4 +1,3 @@
-import { Tree } from "@weborigami/async-tree";
 import assert from "node:assert";
 import { describe, test } from "node:test";
 import * as compile from "../../src/compiler/compile.js";
@@ -10,89 +9,13 @@ const globals = {
   name: "Alice",
 };
 
+/**
+ * More complex tests for the compile() function
+ *
+ * The evaluate2.test.js file contains more basic tests, covering more language
+ * features, which compare the output of evaluate2() against an expected result.
+ */
 describe("compile", () => {
-  test("array", async () => {
-    await assertCompile("[]", []);
-    await assertCompile("[ 1, 2, 3, ]", [1, 2, 3]);
-    await assertCompile("[\n'a'\n'b'\n'c'\n]", ["a", "b", "c"]);
-  });
-
-  test("functionComposition", async () => {
-    await assertCompile("greet()", "Hello, undefined!");
-    await assertCompile("greet(name)", "Hello, Alice!");
-    await assertCompile("greet 'world'", "Hello, world!", { mode: "shell" });
-  });
-
-  test("function call with spread", async () => {
-    await assertCompile(
-      `concat("Hello", ...[", ", name], "!")`,
-      "Hello, Alice!"
-    );
-  });
-
-  test("angle bracket path", async () => {
-    await assertCompile("<data>", "Bob", {
-      target: {
-        data: "Bob",
-      },
-    });
-  });
-
-  test("object literal", async () => {
-    await assertCompile("{ message = greet(name) }", {
-      message: "Hello, Alice!",
-    });
-    await assertCompile(
-      "{ message = greet(name) }",
-      {
-        message: "Hello, Alice!",
-      },
-      { mode: "shell" }
-    );
-  });
-
-  test("object with computed property key", async () => {
-    await assertCompile("{ [name] = greet(name) }", {
-      Alice: "Hello, Alice!",
-    });
-  });
-
-  test("merge", async () => {
-    {
-      const globals = {
-        more: {
-          b: 2,
-        },
-      };
-      const fn = compile.expression(
-        `
-        {
-          a: 1
-          ...more
-          c: a
-        }
-      `,
-        { globals }
-      );
-      const result = await fn();
-      assert.deepEqual(await Tree.plain(result), {
-        a: 1,
-        b: 2,
-        c: 1,
-      });
-    }
-  });
-
-  test("number", async () => {
-    await assertCompile("1", 1);
-    await assertCompile("3.14159", 3.14159);
-    await assertCompile("-1", -1);
-  });
-
-  test("sync object", async () => {
-    await assertCompile("{a:1, b:2}", { a: 1, b: 2 });
-    await assertCompile("{ a: { b: { c: 0 } } }", { a: { b: { c: 0 } } });
-  });
 
   test("async object", async () => {
     const fn = compile.expression("{ a: { b = name }}", { globals });
@@ -141,21 +64,13 @@ describe("compile", () => {
 
   test("templateDocument", async () => {
     const defineTemplateFn = compile.templateDocument(
-      "Documents can contain ` backticks"
+      "Documents can contain ` backticks",
     );
     const templateFn = await defineTemplateFn();
     const value = await templateFn();
     assert.deepEqual(value, "Documents can contain ` backticks");
   });
 
-  test("templateLiteral", async () => {
-    await assertCompile("`Hello, ${name}!`", "Hello, Alice!");
-    await assertCompile(
-      "`escape characters with \\`backslash\\``",
-      "escape characters with `backslash`"
-    );
-  });
-
   test("tagged template string array is identical across calls", async () => {
     let saved;
     const globals = {
@@ -177,14 +92,3 @@ describe("compile", () => {
     assert.equal(bob, "Hello, Bob!");
   });
 });
-
-async function assertCompile(text, expected, options = {}) {
-  const mode = options.mode ?? "program";
-  const parent = options.target ?? null;
-  const fn = compile.expression(text, { globals, mode, parent });
-  let result = await fn();
-  if (Tree.isMaplike(result)) {
-    result = await Tree.plain(result);
-  }
-  assert.deepEqual(result, expected);
-}

package/test/compiler/parse.test.js

@@ -31,7 +31,7 @@ describe("Origami parser", () => {
         [
           markers.traverse,
           [markers.external, "Path with spaces (and parens).html"],
-        ]
+        ],
       );
       assertParse("angleBracketLiteral", "<foo/bar/baz>", [
         markers.traverse,
@@ -113,7 +113,7 @@ describe("Origami parser", () => {
         2
         3
       ]`,
-      [ops.array, [ops.literal, 1], [ops.literal, 2], [ops.literal, 3]]
+      [ops.array, [ops.literal, 1], [ops.literal, 2], [ops.literal, 3]],
     );
   });
 
@@ -270,7 +270,7 @@ describe("Origami parser", () => {
       assertThrows(
         "arrowFunction",
         "([a, a]) => a",
-        `Duplicate parameter name "a"`
+        `Duplicate parameter name "a"`,
       );
     });
 
@@ -321,7 +321,7 @@ describe("Origami parser", () => {
       assertThrows(
         "arrowFunction",
         "({ a: c, b: c }) => c",
-        `Duplicate parameter name "c"`
+        `Duplicate parameter name "c"`,
       );
     });
 
@@ -739,7 +739,7 @@ describe("Origami parser", () => {
 ---
 Body`,
       'Expected "---"',
-      { line: 2, column: 14 }
+      { line: 2, column: 14 },
     );
   });
 
@@ -752,10 +752,15 @@ a : 1
 ---
 Body`,
       "Unexpected flow-map-end token",
-      { line: 3, column: 1 }
+      { line: 3, column: 1 },
     );
   });
 
+  test("escapedChar", () => {
+    assertParse("escapedChar", String.raw`\n`, "\n");
+    assertParse("escapedChar", String.raw`\\`, `\\`);
+  });
+
   test("exponentiationExpression", () => {
     assertParse("exponentiationExpression", "2 ** 2 ** 3", [
       ops.exponentiation,
@@ -848,7 +853,7 @@ Body`,
         "x //comment",
         [markers.traverse, [markers.reference, "x"]],
         "program",
-        false
+        false,
       );
     });
 
@@ -940,7 +945,7 @@ Body`,
       assertParse("expression", "tag`Hello, ${name}!`", [
         [markers.traverse, [markers.reference, "tag"]],
         [ops.literal, ["Hello, ", "!"]],
-        [ops.concat, [markers.traverse, [markers.reference, "name"]]],
+        [ops.deepText, [markers.traverse, [markers.reference, "name"]]],
       ]);
       assertParse("expression", "=tag`Hello, ${_}!`", [
         ops.lambda,
@@ -949,7 +954,7 @@ Body`,
         [
           [markers.traverse, [markers.reference, "tag"]],
           [ops.literal, ["Hello, ", "!"]],
-          [ops.concat, [markers.traverse, [markers.reference, "_"]]],
+          [ops.deepText, [markers.traverse, [markers.reference, "_"]]],
         ],
       ]);
       assertParse("expression", "(post, slug) => fn.js(post, slug)", [
@@ -1013,7 +1018,7 @@ Body`,
               ],
             ],
           ],
-        ]
+        ],
       );
     });
   });
@@ -1032,7 +1037,7 @@ Body`,
         [[markers.traverse, [markers.reference, "_template"]]],
       ],
       "program",
-      false
+      false,
     );
   });
 
@@ -1065,17 +1070,17 @@ Body`,
     assertThrows(
       "identifier",
       "1stCharacterIsNumber",
-      "Expected JavaScript identifier start"
+      "Expected JavaScript identifier start",
     );
     assertThrows(
       "identifier",
       "has space",
-      "Expected JavaScript identifier continuation"
+      "Expected JavaScript identifier continuation",
     );
     assertThrows(
       "identifier",
       "foo.bar",
-      "Expected JavaScript identifier continuation"
+      "Expected JavaScript identifier continuation",
     );
   });
 
@@ -1108,7 +1113,7 @@ Body`,
         [markers.traverse, [markers.reference, "tree/"], [ops.literal, "key"]],
         [markers.traverse, [markers.reference, "arg"]],
       ],
-      "shell"
+      "shell",
     );
     assertParse("implicitParenthesesCallExpression", "foo.js bar.ori 'arg'", [
       [markers.traverse, [markers.reference, "foo.js"]],
@@ -1133,7 +1138,7 @@ Body`,
           [markers.traverse, [markers.reference, "b.json"]],
           [ops.array, [markers.traverse, [markers.reference, "c.json"]]],
         ],
-      ]
+      ],
     );
   });
 
@@ -1183,7 +1188,7 @@ Body`,
       "/*\nHello, world!\n*/",
       null,
       "program",
-      false
+      false,
     );
   });
 
@@ -1286,7 +1291,7 @@ Body`,
           ops.object,
           ["a", [ops.getter, [markers.traverse, [markers.reference, "b"]]]],
           ["b", [ops.literal, 2]],
-        ]
+        ],
       );
       assertParse("objectLiteral", "{ a: { b: 1 } }", [
         ops.object,
@@ -1544,7 +1549,7 @@ Body`,
       "tree/",
       [[ops.literal, "tree/"]],
       undefined,
-      false
+      false,
     );
     assertParse(
       "pathKeys",
@@ -1554,7 +1559,7 @@ Body`,
         [ops.literal, "12"],
       ],
       undefined,
-      false
+      false,
     );
     assertParse(
       "pathKeys",
@@ -1565,7 +1570,7 @@ Body`,
         [ops.literal, "bar"],
       ],
       undefined,
-      false
+      false,
     );
     assertParse(
       "pathKeys",
@@ -1577,7 +1582,7 @@ Body`,
         [ops.literal, "b"],
       ],
       undefined,
-      false
+      false,
     );
   });
 
@@ -1674,12 +1679,14 @@ Body`,
 `,
       [ops.literal, "Hello"],
       "program",
-      false
+      false,
     );
   });
 
   test("regexLiteral", () => {
     assertParse("regexLiteral", "/abc+/g", [ops.literal, /abc+/g]);
+    assertParse("regexLiteral", String.raw`/\//`, [ops.literal, /\//]);
+    assertParse("regexLiteral", String.raw`/\d+/`, [ops.literal, /\d+/]);
   });
 
   test("relationalExpression", () => {
@@ -1757,7 +1764,7 @@ Body`,
       "// Hello, world!",
       null,
       "program",
-      false
+      false,
     );
   });
 
@@ -1815,7 +1822,7 @@ Body text`,
         ops.object,
         ["title", [ops.literal, "Title goes here"]],
         ["_body", [ops.templateIndent, [ops.literal, ["Body text"]]]],
-      ]
+      ],
     );
   });
 
@@ -1842,7 +1849,7 @@ Body text`,
           ],
         ],
       ],
-      "shell"
+      "shell",
     );
   });
 
@@ -1891,7 +1898,7 @@ Body text`,
       "${foo}",
       [markers.traverse, [markers.reference, "foo"]],
       "shell",
-      false
+      false,
     );
   });
 
@@ -1965,7 +1972,7 @@ Body text`,
      `,
       null,
       "program",
-      false
+      false,
     );
   });
 });
@@ -1975,7 +1982,7 @@ function assertParse(
   source,
   expected,
   mode = "shell",
-  checkLocation = true
+  checkLocation = true,
 ) {
   const code = parse(source, {
     grammarSource: { text: source },
@@ -1990,7 +1997,7 @@ function assertParse(
     assertCodeLocations(code);
     const resultSource = code.location.source.text.slice(
       code.location.start.offset,
-      code.location.end.offset
+      code.location.end.offset,
     );
     assert.equal(resultSource, source);
   }
@@ -2010,7 +2017,7 @@ function assertThrows(startRule, source, message, position, mode = "program") {
   } catch (/** @type {any} */ error) {
     assert(
       error.message.includes(message),
-      `Error message incorrect:\n  expected: "${message}"\n  actual: "${error.message}"`
+      `Error message incorrect:\n  expected: "${message}"\n  actual: "${error.message}"`,
     );
     if (position) {
       assert.equal(error.location.start.line, position.line);

package/test/project/fixtures/withPackageJson/subfolder/README.md

@@ -0,0 +1 @@
+This file exists to force creation of the containing folder.