re-enable reference tests

Author: mbostock

package.json

@@ -28,7 +28,7 @@
     "node": ">=14.5.0"
   },
   "scripts": {
-    "test": "mkdir -p test/output && mocha -r module-alias/register 'test/**/parse-test.js' && eslint src test",
+    "test": "mkdir -p test/output && mocha -r module-alias/register 'test/**/*-test.js' && eslint src test",
     "prepublishOnly": "rm -rf dist && rollup -c",
     "postpublish": "git push && git push --tags"
   },

test/references-test.js

@@ -1,114 +1,106 @@
-import {test} from "tap";
-import {parseCell} from "../src/index.js";
+import assert from "assert";
+import {parseCell} from "@observablehq/parser";
+import {Node} from "acorn";
 
-test("finds references in expressions", t => {
-  t.deepEqual(parseCell(`foo + bar`).references, [
-    {type: "Identifier", start: 0, end: 3, name: "foo"},
-    {type: "Identifier", start: 6, end: 9, name: "bar"}
+function node(fields) {
+  return Object.assign(Object.create(Node.prototype), fields);
+}
+
+it("finds references in expressions", () => {
+  assert.deepStrictEqual(parseCell(`foo + bar`).references, [
+    node({type: "Identifier", start: 0, end: 3, name: "foo"}),
+    node({type: "Identifier", start: 6, end: 9, name: "bar"})
   ]);
-  t.end();
 });
 
-test("finds references in blocks", t => {
-  t.deepEqual(parseCell(`{ foo + bar; }`).references, [
-    {type: "Identifier", start: 2, end: 5, name: "foo"},
-    {type: "Identifier", start: 8, end: 11, name: "bar"}
+it("finds references in blocks", () => {
+  assert.deepStrictEqual(parseCell(`{ foo + bar; }`).references, [
+    node({type: "Identifier", start: 2, end: 5, name: "foo"}),
+    node({type: "Identifier", start: 8, end: 11, name: "bar"})
   ]);
-  t.end();
 });
 
-test("finds viewof references", t => {
-  t.deepEqual(parseCell(`viewof foo + bar`).references, [
-    {
+it("finds viewof references", () => {
+  assert.deepStrictEqual(parseCell(`viewof foo + bar`).references, [
+    node({
       type: "ViewExpression",
       start: 0,
       end: 10,
-      id: {type: "Identifier", start: 7, end: 10, name: "foo"}
-    },
-    {type: "Identifier", start: 13, end: 16, name: "bar"}
+      id: node({type: "Identifier", start: 7, end: 10, name: "foo"})
+    }),
+    node({type: "Identifier", start: 13, end: 16, name: "bar"})
   ]);
-  t.end();
 });
 
-test("finds mutable references", t => {
-  t.deepEqual(parseCell(`mutable foo + bar`).references, [
-    {
+it.only("finds mutable references", () => {
+  assert.deepStrictEqual(parseCell(`mutable foo + bar`).references, [
+    node({
       type: "MutableExpression",
       start: 0,
       end: 11,
-      id: {type: "Identifier", start: 8, end: 11, name: "foo"}
-    },
-    {type: "Identifier", start: 14, end: 17, name: "bar"}
+      id: node({type: "Identifier", start: 8, end: 11, name: "foo"})
+    }),
+    node({type: "Identifier", start: 14, end: 17, name: "bar"})
   ]);
-  t.end();
 });
 
-test("finds multiple references", t => {
-  t.deepEqual(parseCell(`cell = {
+it("finds multiple references", () => {
+  assert.deepStrictEqual(parseCell(`cell = {
   const a = b + c;
   const d = c - b;
 }`).references, [
-    {type: "Identifier", start: 21, end: 22, name: "b"},
-    {type: "Identifier", start: 25, end: 26, name: "c"},
-    {type: "Identifier", start: 40, end: 41, name: "c"},
-    {type: "Identifier", start: 44, end: 45, name: "b"}
+    node({type: "Identifier", start: 21, end: 22, name: "b"}),
+    node({type: "Identifier", start: 25, end: 26, name: "c"}),
+    node({type: "Identifier", start: 40, end: 41, name: "c"}),
+    node({type: "Identifier", start: 44, end: 45, name: "b"})
   ]);
-  t.end();
 });
 
-test("doesn’t consider the identifier a reference", t => {
-  t.deepEqual(parseCell(`foo = bar`).references, [
-    {type: "Identifier", start: 6, end: 9, name: "bar"}
+it("doesn’t consider the identifier a reference", () => {
+  assert.deepStrictEqual(parseCell(`foo = bar`).references, [
+    node({type: "Identifier", start: 6, end: 9, name: "bar"})
   ]);
-  t.end();
 });
 
-test("local variables can mask references", t => {
-  t.deepEqual(parseCell(`{ let foo; foo + bar; }`).references, [
-    {type: "Identifier", start: 17, end: 20, name: "bar"}
+it("local variables can mask references", () => {
+  assert.deepStrictEqual(parseCell(`{ let foo; foo + bar; }`).references, [
+    node({type: "Identifier", start: 17, end: 20, name: "bar"})
   ]);
-  t.end();
 });
 
-test("local variables can not mask references", t => {
-  t.deepEqual(parseCell(`{ foo + bar; { let foo; } }`).references, [
-    {type: "Identifier", start: 2, end: 5, name: "foo"},
-    {type: "Identifier", start: 8, end: 11, name: "bar"}
+it("local variables can not mask references", () => {
+  assert.deepStrictEqual(parseCell(`{ foo + bar; { let foo; } }`).references, [
+    node({type: "Identifier", start: 2, end: 5, name: "foo"}),
+    node({type: "Identifier", start: 8, end: 11, name: "bar"})
   ]);
-  t.end();
 });
 
-test("function parameters can mask references", t => {
-  t.deepEqual(parseCell(`foo => foo + bar`).references, [
-    {type: "Identifier", start: 13, end: 16, name: "bar"}
+it("function parameters can mask references", () => {
+  assert.deepStrictEqual(parseCell(`foo => foo + bar`).references, [
+    node({type: "Identifier", start: 13, end: 16, name: "bar"})
   ]);
-  t.end();
 });
 
-test("function rest parameters can mask references", t => {
-  t.deepEqual(parseCell(`(...foo) => foo + bar`).references, [
-    {type: "Identifier", start: 18, end: 21, name: "bar"}
+it("function rest parameters can mask references", () => {
+  assert.deepStrictEqual(parseCell(`(...foo) => foo + bar`).references, [
+    node({type: "Identifier", start: 18, end: 21, name: "bar"})
   ]);
-  t.end();
 });
 
-test("destructured variables can mask references", t => {
-  t.deepEqual(parseCell(`{ let {foo} = null; foo + bar; }`).references, [
-    {type: "Identifier", start: 26, end: 29, name: "bar"}
+it("destructured variables can mask references", () => {
+  assert.deepStrictEqual(parseCell(`{ let {foo} = null; foo + bar; }`).references, [
+    node({type: "Identifier", start: 26, end: 29, name: "bar"})
   ]);
-  t.end();
 });
 
-test("destructured rest variables can mask references", t => {
-  t.deepEqual(parseCell(`{ let {...foo} = null; foo + bar; }`).references, [
-    {type: "Identifier", start: 29, end: 32, name: "bar"}
+it("destructured rest variables can mask references", () => {
+  assert.deepStrictEqual(parseCell(`{ let {...foo} = null; foo + bar; }`).references, [
+    node({type: "Identifier", start: 29, end: 32, name: "bar"})
   ]);
-  t.end();
 });
 
-test("ignores globals", t => {
-  t.deepEqual(parseCell(`foo + bar`, {globals: ["foo"]}).references, [
-    {type: "Identifier", start: 6, end: 9, name: "bar"}
+it("ignores globals", () => {
+  assert.deepStrictEqual(parseCell(`foo + bar`, {globals: ["foo"]}).references, [
+    node({type: "Identifier", start: 6, end: 9, name: "bar"})
   ]);
-  t.end();
 });