@weborigami/language 0.0.65-beta.1 → 0.0.65

package/test/runtime/evaluate.test.js

@@ -7,7 +7,7 @@ import evaluate from "../../src/runtime/evaluate.js";
 
 describe("evaluate", () => {
   test("can retrieve values from scope", async () => {
-    const code = [ops.scope, "message"];
+    const code = createCode([ops.scope, "message"]);
     const parent = new ObjectTree({
       message: "Hello",
     });
@@ -19,10 +19,10 @@ describe("evaluate", () => {
 
   test("can invoke functions in scope", async () => {
     // Match the array representation of code generated by the parser.
-    const code = [
+    const code = createCode([
       [ops.scope, "greet"],
       [ops.scope, "name"],
-    ];
+    ]);
 
     const tree = new ObjectTree({
       async greet(name) {
@@ -36,7 +36,7 @@ describe("evaluate", () => {
   });
 
   test("passes context to invoked functions", async () => {
-    const code = [ops.scope, "fn"];
+    const code = createCode([ops.scope, "fn"]);
     const tree = new ObjectTree({
       async fn() {
         assert.equal(this, tree);
@@ -49,7 +49,7 @@ describe("evaluate", () => {
     const fn = (x, y) => ({
       c: `${x}${y}c`,
     });
-    const code = [ops.traverse, fn, "a", "b", "c"];
+    const code = createCode([ops.traverse, fn, "a", "b", "c"]);
     assert.equal(await evaluate.call(null, code), "abc");
   });
 
@@ -57,16 +57,29 @@ describe("evaluate", () => {
     const fn = (...args) => args.join(",");
     const packed = new String();
     /** @type {any} */ (packed).unpack = async () => fn;
-    const code = [packed, "a", "b", "c"];
+    const code = createCode([packed, "a", "b", "c"]);
     const result = await evaluate.call(null, code);
     assert.equal(result, "a,b,c");
   });
 
   test("by defalut sets the parent of a returned tree to the current tree", async () => {
     const fn = () => new ObjectTree({});
-    const code = [fn];
+    const code = createCode([fn]);
     const tree = new ObjectTree({});
     const result = await evaluate.call(tree, code);
     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/ops.test.js

@@ -10,7 +10,7 @@ describe("ops", () => {
       name: "world",
     });
 
-    const code = [ops.concat, "Hello, ", [ops.scope, "name"], "."];
+    const code = createCode([ops.concat, "Hello, ", [ops.scope, "name"], "."]);
 
     const result = await evaluate.call(scope, code);
     assert.equal(result, "Hello, world.");
@@ -21,7 +21,7 @@ describe("ops", () => {
       message: "Hello",
     });
 
-    const code = [ops.lambda, null, [ops.scope, "message"]];
+    const code = createCode([ops.lambda, null, [ops.scope, "message"]]);
 
     const fn = await evaluate.call(scope, code);
     const result = await fn.call(scope);
@@ -29,25 +29,25 @@ describe("ops", () => {
   });
 
   test("lambda adds input to scope as `_`", async () => {
-    const code = [ops.lambda, null, [ops.scope, "_"]];
+    const code = createCode([ops.lambda, null, [ops.scope, "_"]]);
     const fn = await evaluate.call(null, code);
     const result = await fn("Hello");
     assert.equal(result, "Hello");
   });
 
   test("parameterized lambda adds input args to scope", async () => {
-    const code = [
+    const code = createCode([
       ops.lambda,
       ["a", "b"],
       [ops.concat, [ops.scope, "b"], [ops.scope, "a"]],
-    ];
+    ]);
     const fn = await evaluate.call(null, code);
     const result = await fn("x", "y");
     assert.equal(result, "yx");
   });
 
   test("a lambda can reference itself with @recurse", async () => {
-    const code = [ops.lambda, null, [ops.scope, "@recurse"]];
+    const code = createCode([ops.lambda, null, [ops.scope, "@recurse"]]);
     const fn = await evaluate.call(null, code);
     const result = await fn();
     // We're expecting the function to return itself, but testing recursion is
@@ -60,11 +60,11 @@ describe("ops", () => {
       upper: (s) => s.toUpperCase(),
     });
 
-    const code = [
+    const code = createCode([
       ops.object,
       ["hello", [[ops.scope, "upper"], "hello"]],
       ["world", [[ops.scope, "upper"], "world"]],
-    ];
+    ]);
 
     const result = await evaluate.call(scope, code);
     assert.equal(result.hello, "HELLO");
@@ -75,7 +75,12 @@ describe("ops", () => {
     const scope = new ObjectTree({
       upper: (s) => s.toUpperCase(),
     });
-    const code = [ops.array, "Hello", 1, [[ops.scope, "upper"], "world"]];
+    const code = createCode([
+      ops.array,
+      "Hello",
+      1,
+      [[ops.scope, "upper"], "world"],
+    ]);
     const result = await evaluate.call(scope, code);
     assert.deepEqual(result, ["Hello", 1, "WORLD"]);
   });
@@ -89,7 +94,7 @@ describe("ops", () => {
       a: 2, // Should be ignored
     });
     child.parent = parent;
-    const code = [ops.inherited, "a"];
+    const code = createCode([ops.inherited, "a"]);
     const result = await evaluate.call(child, code);
     assert.equal(result, 1);
   });
@@ -106,3 +111,16 @@ describe("ops", () => {
     assert.equal(number, 1);
   });
 });
+
+/**
+ * @returns {import("../../index.ts").Code}
+ */
+function createCode(array) {
+  const code = array;
+  /** @type {any} */ (code).location = {
+    source: {
+      text: "",
+    },
+  };
+  return code;
+}