@weborigami/language 0.2.7 → 0.2.8

package/test/compiler/parse.test.js

@@ -3,7 +3,7 @@ import { describe, test } from "node:test";
 import { parse } from "../../src/compiler/parse.js";
 import { undetermined } from "../../src/compiler/parserHelpers.js";
 import * as ops from "../../src/runtime/ops.js";
-import { stripCodeLocations } from "./stripCodeLocations.js";
+import { assertCodeEqual } from "./codeHelpers.js";
 
 describe("Origami parser", () => {
   test("additiveExpression", () => {
@@ -247,20 +247,20 @@ describe("Origami parser", () => {
     assertParse("conditionalExpression", "true ? 1 : 0", [
       ops.conditional,
       [ops.scope, "true"],
-      [ops.lambda, [], [ops.literal, "1"]],
-      [ops.lambda, [], [ops.literal, "0"]],
+      [ops.literal, "1"],
+      [ops.literal, "0"],
     ]);
     assertParse("conditionalExpression", "false ? () => 1 : 0", [
       ops.conditional,
       [ops.scope, "false"],
       [ops.lambda, [], [ops.lambda, [], [ops.literal, "1"]]],
-      [ops.lambda, [], [ops.literal, "0"]],
+      [ops.literal, "0"],
     ]);
     assertParse("conditionalExpression", "false ? =1 : 0", [
       ops.conditional,
       [ops.scope, "false"],
       [ops.lambda, [], [ops.lambda, ["_"], [ops.literal, "1"]]],
-      [ops.lambda, [], [ops.literal, "0"]],
+      [ops.literal, "0"],
     ]);
   });
 
@@ -873,6 +873,12 @@ describe("Origami parser", () => {
       [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", () => {
@@ -1076,7 +1082,7 @@ function assertParse(startRule, source, expected, checkLocation = true) {
   // entire source. We skip this check in cases where the source starts or ends
   // with a comment; the parser will strip those.
   if (checkLocation) {
-    assert(code.location, "no location");
+    assertCodeLocations(code);
     const resultSource = code.location.source.text.slice(
       code.location.start.offset,
       code.location.end.offset
@@ -1084,6 +1090,14 @@ function assertParse(startRule, source, expected, checkLocation = true) {
     assert.equal(resultSource, source.trim());
   }
 
-  const actual = stripCodeLocations(code);
-  assert.deepEqual(actual, expected);
+  assertCodeEqual(code, expected);
+}
+
+function assertCodeLocations(code) {
+  assert(code.location, "no location");
+  for (const item of code) {
+    if (Array.isArray(item)) {
+      assertCodeLocations(item);
+    }
+  }
 }

package/test/runtime/OrigamiFiles.test.js

@@ -13,11 +13,9 @@ describe("OrigamiFiles", () => {
     await createTempDirectory();
     const tempFiles = new OrigamiFiles(tempDirectory);
     const changedFileName = await new Promise(async (resolve) => {
-      // @ts-ignore
       tempFiles.addEventListener("change", (event) => {
         resolve(/** @type {any} */ (event).options.key);
       });
-      // @ts-ignore
       await tempFiles.set(
         "foo.txt",
         "This file is left over from testing and can be removed."

package/test/runtime/evaluate.test.js

@@ -4,6 +4,7 @@ import { describe, test } from "node:test";
 import * as ops from "../../src/runtime/ops.js";
 
 import evaluate from "../../src/runtime/evaluate.js";
+import { createCode } from "../compiler/codeHelpers.js";
 
 describe("evaluate", () => {
   test("can retrieve values from scope", async () => {
@@ -70,16 +71,3 @@ describe("evaluate", () => {
     assert.equal(result.parent, tree);
   });
 });
-
-/**
- * @returns {import("../../index.ts").Code}
- */
-function createCode(array) {
-  const code = array;
-  /** @type {any} */ (code).location = {
-    source: {
-      text: "",
-    },
-  };
-  return code;
-}

package/test/runtime/mergeTrees.test.js

@@ -58,7 +58,6 @@ describe("mergeTrees", () => {
         c: 4,
       }
     );
-    // @ts-ignore
     assert.deepEqual(await Tree.plain(tree), {
       a: 1,
       b: 3,

package/test/runtime/ops.test.js

@@ -3,6 +3,7 @@ import assert from "node:assert";
 import { describe, test } from "node:test";
 
 import { evaluate, ops } from "../../src/runtime/internal.js";
+import { createCode } from "../compiler/codeHelpers.js";
 
 describe("ops", () => {
   test("ops.addition adds two numbers", async () => {
@@ -378,19 +379,6 @@ describe("ops", () => {
   });
 });
 
-/**
- * @returns {import("../../index.ts").Code}
- */
-function createCode(array) {
-  const code = array;
-  /** @type {any} */ (code).location = {
-    source: {
-      text: "",
-    },
-  };
-  return code;
-}
-
 function errorFn() {
   throw new Error("This should not be called");
 }