mocha (#295)

* mocha

* drop Node 12.x from CI

Author: mbostock

.eslintrc.json

@@ -2,17 +2,19 @@
   "extends": "eslint:recommended",
   "parserOptions": {
     "sourceType": "module",
-    "ecmaVersion": 8
+    "ecmaVersion": 2020
   },
   "env": {
-    "browser": true,
     "es6": true,
-    "node": true
+    "node": true,
+    "browser": true
   },
   "rules": {
-    "semi": 2,
-    "no-process-env": 2,
     "no-cond-assign": 0,
-    "no-redeclare": 0
+    "no-constant-condition": 0,
+    "no-sparse-arrays": 0,
+    "no-unexpected-multiline": 0,
+    "comma-dangle": ["error", "never"],
+    "semi": [2, "always"]
   }
 }

.github/workflows/nodejs.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x]
 
     runs-on: ${{ matrix.os }}
 

.prettierrc

@@ -1,3 +1,4 @@
 {
-  "bracketSpacing": false
+  "bracketSpacing": false,
+  "trailingComma": "none"
 }

package.json

@@ -3,7 +3,7 @@
   "version": "3.19.5",
   "license": "ISC",
   "main": "dist/stdlib.js",
-  "module": "src/index.js",
+  "module": "src/index.mjs",
   "author": {
     "name": "Observable, Inc.",
     "url": "https://observablehq.com"
@@ -13,25 +13,25 @@
     "url": "https://github.com/observablehq/stdlib.git"
   },
   "scripts": {
-    "test": "tap 'test/**/*-test.js' --reporter classic",
+    "test": "mocha 'test/**/*-test.mjs' && eslint src test --ext mjs",
     "prepublishOnly": "rollup -c",
     "postpublish": "git push && git push --tags"
   },
   "files": [
-    "src/**/*.js",
+    "src/**/*.mjs",
     "dist/**/*.js"
   ],
   "dependencies": {
     "d3-dsv": "^2.0.0",
     "d3-require": "^1.3.0"
   },
   "devDependencies": {
-    "eslint": "^7.18.0",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "eslint": "^8.18.0",
     "exceljs": "^4.3.0",
+    "mocha": "^10.0.0",
     "node-fetch": "^2.6.1",
     "rollup": "^2.37.1",
-    "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "tap": "^14.11.0"
+    "rollup-plugin-terser": "^7.0.2"
   }
 }

rollup.config.js

@@ -1,12 +1,12 @@
-import node from "rollup-plugin-node-resolve";
+import node from "@rollup/plugin-node-resolve";
 import {terser} from "rollup-plugin-terser";
 import * as meta from "./package.json";
 
 const copyright = `// @observablehq/stdlib v${meta.version} Copyright ${(new Date).getFullYear()} Observable, Inc.`;
 
 export default [
   {
-    input: "src/index.js",
+    input: "src/index.mjs",
     plugins: [
       node(),
       terser({

src/dependencies.js renamed to src/dependencies.mjs

@@ -1,4 +1,4 @@
-import dependency from "./dependency.js";
+import dependency from "./dependency.mjs";
 export const d3 = dependency("d3", "7.5.0", "dist/d3.min.js");
 export const inputs = dependency("@observablehq/inputs", "0.10.4", "dist/inputs.min.js");
 export const plot = dependency("@observablehq/plot", "0.5.1", "dist/plot.umd.min.js");

src/dependency.js renamed to src/dependency.mjs

@@ -0,0 +1,23 @@
+import canvas from "./canvas.mjs";
+import context2d from "./context2d.mjs";
+import download from "./download.mjs";
+import element from "./element.mjs";
+import input from "./input.mjs";
+import range from "./range.mjs";
+import select from "./select.mjs";
+import svg from "./svg.mjs";
+import text from "./text.mjs";
+import uid from "./uid.mjs";
+
+export default {
+  canvas: canvas,
+  context2d: context2d,
+  download: download,
+  element: element,
+  input: input,
+  range: range,
+  select: select,
+  svg: svg,
+  text: text,
+  uid: uid
+};

src/dom/canvas.js renamed to src/dom/canvas.mjs

@@ -1,8 +1,8 @@
 import {autoType, csvParse, csvParseRows, tsvParse, tsvParseRows} from "d3-dsv";
-import {arrow, jszip, exceljs} from "./dependencies.js";
-import {requireDefault} from "./require.js";
-import {SQLiteDatabaseClient} from "./sqlite.js";
-import {Workbook} from "./xlsx.js";
+import {arrow, jszip, exceljs} from "./dependencies.mjs";
+import {requireDefault} from "./require.mjs";
+import {SQLiteDatabaseClient} from "./sqlite.mjs";
+import {Workbook} from "./xlsx.mjs";
 
 async function remote_fetch(file) {
   const response = await fetch(await file.url());

src/dom/context2d.js renamed to src/dom/context2d.mjs

@@ -0,0 +1,9 @@
+import buffer from "./buffer.mjs";
+import text from "./text.mjs";
+import url from "./url.mjs";
+
+export default {
+  buffer: buffer,
+  text: text,
+  url: url
+};

src/dom/download.js renamed to src/dom/download.mjs

@@ -1,4 +1,4 @@
-import that from "../that.js";
+import that from "../that.mjs";
 
 export default function disposable(value, dispose) {
   let done = false;

src/dom/element.js renamed to src/dom/element.mjs

@@ -0,0 +1,21 @@
+import disposable from "./disposable.mjs";
+import filter from "./filter.mjs";
+import input from "./input.mjs";
+import map from "./map.mjs";
+import observe from "./observe.mjs";
+import queue from "./queue.mjs";
+import range from "./range.mjs";
+import valueAt from "./valueAt.mjs";
+import worker from "./worker.mjs";
+
+export default {
+  disposable: disposable,
+  filter: filter,
+  input: input,
+  map: map,
+  observe: observe,
+  queue: queue,
+  range: range,
+  valueAt: valueAt,
+  worker: worker
+};

src/dom/index.js

@@ -1,4 +1,4 @@
-import observe from "./observe.js";
+import observe from "./observe.mjs";
 
 export default function(input) {
   return observe(function(change) {

src/dom/index.mjs

@@ -1,4 +1,4 @@
-import that from "../that.js";
+import that from "../that.mjs";
 
 export default function(initialize) {
   let stale = false;

src/dom/input.js renamed to src/dom/input.mjs

@@ -1,4 +1,4 @@
-import that from "../that.js";
+import that from "../that.mjs";
 
 export default function(initialize) {
   let resolve;

src/dom/range.js renamed to src/dom/range.mjs

@@ -1,4 +1,4 @@
-import disposable from "./disposable.js";
+import disposable from "./disposable.mjs";
 
 export default function worker(source) {
   const url = URL.createObjectURL(new Blob([source], {type: "text/javascript"}));

src/dom/select.js renamed to src/dom/select.mjs

@@ -1,4 +1,4 @@
-import template from "./template.js";
+import template from "./template.mjs";
 
 export default template(function(string) {
   var template = document.createElement("template");

src/dom/svg.js renamed to src/dom/svg.mjs

@@ -0,0 +1,2 @@
+export {default as FileAttachments, AbstractFile} from "./fileAttachment.mjs";
+export {default as Library} from "./library.mjs";

src/dom/text.js renamed to src/dom/text.mjs

@@ -1,4 +1,4 @@
-import {leaflet as ll} from "./dependencies.js";
+import {leaflet as ll} from "./dependencies.mjs";
 
 export default async function leaflet(require) {
   const L = await require(ll.resolve());

src/dom/uid.js renamed to src/dom/uid.mjs

@@ -1,23 +1,23 @@
 import {requireFrom, resolveFrom} from "d3-require";
-import DOM from "./dom/index.js";
-import Files from "./files/index.js";
-import {AbstractFile, FileAttachment, NoFileAttachments} from "./fileAttachment.js";
-import Generators from "./generators/index.js";
-import html from "./html.js";
-import leaflet from "./leaflet.js";
-import md from "./md.js";
-import mermaid from "./mermaid.js";
-import Mutable from "./mutable.js";
-import now from "./now.js";
-import Promises from "./promises/index.js";
-import resolve from "./resolve.js";
-import requirer, {requireDefault, setDefaultRequire} from "./require.js";
-import SQLite, {SQLiteDatabaseClient} from "./sqlite.js";
-import svg from "./svg.js";
-import tex from "./tex.js";
-import vegalite from "./vegalite.js";
-import width from "./width.js";
-import {arquero, arrow, d3, graphviz, htl, inputs, lodash, plot, topojson} from "./dependencies.js";
+import DOM from "./dom/index.mjs";
+import Files from "./files/index.mjs";
+import {AbstractFile, FileAttachment, NoFileAttachments} from "./fileAttachment.mjs";
+import Generators from "./generators/index.mjs";
+import html from "./html.mjs";
+import leaflet from "./leaflet.mjs";
+import md from "./md.mjs";
+import mermaid from "./mermaid.mjs";
+import Mutable from "./mutable.mjs";
+import now from "./now.mjs";
+import Promises from "./promises/index.mjs";
+import resolve from "./resolve.mjs";
+import requirer, {requireDefault, setDefaultRequire} from "./require.mjs";
+import SQLite, {SQLiteDatabaseClient} from "./sqlite.mjs";
+import svg from "./svg.mjs";
+import tex from "./tex.mjs";
+import vegalite from "./vegalite.mjs";
+import width from "./width.mjs";
+import {arquero, arrow, d3, graphviz, htl, inputs, lodash, plot, topojson} from "./dependencies.mjs";
 
 export default Object.assign(Object.defineProperties(function Library(resolver) {
   const require = requirer(resolver);

src/fileAttachment.js renamed to src/fileAttachment.mjs

@@ -1,5 +1,5 @@
-import {highlight, marked} from "./dependencies.js";
-import template from "./template.js";
+import {highlight, marked} from "./dependencies.mjs";
+import template from "./template.mjs";
 
 export default function(require) {
   return require(marked.resolve()).then(function(marked) {

src/files/buffer.js renamed to src/files/buffer.mjs

@@ -1,5 +1,5 @@
-import {mermaid as merd} from "./dependencies.js";
-import uid from "./dom/uid.js";
+import {mermaid as merd} from "./dependencies.mjs";
+import uid from "./dom/uid.mjs";
 
 export default async function mermaid(require) {
   const mer = await require(merd.resolve());

src/files/index.js

@@ -1,4 +1,4 @@
-import observe from "./generators/observe.js";
+import observe from "./generators/observe.mjs";
 
 export default function Mutable(value) {
   let change;

src/files/index.mjs

@@ -0,0 +1,9 @@
+import delay from "./delay.mjs";
+import tick from "./tick.mjs";
+import when from "./when.mjs";
+
+export default {
+  delay: delay,
+  tick: tick,
+  when: when
+};

src/files/text.js renamed to src/files/text.mjs

@@ -1,4 +1,4 @@
-import when from "./when.js";
+import when from "./when.mjs";
 
 export default function(duration, value) {
   return when(Math.ceil((Date.now() + 1) / duration) * duration, value);

src/files/url.js renamed to src/files/url.mjs

@@ -1,5 +1,5 @@
-import {sql} from "./dependencies.js";
-import {requireDefault} from "./require.js";
+import {sql} from "./dependencies.mjs";
+import {requireDefault} from "./require.mjs";
 
 export default async function sqlite(require) {
   const [init, dist] = await Promise.all([require(sql.resolve()), require.resolve(sql.resolve("dist/"))]);

src/generators/disposable.js renamed to src/generators/disposable.mjs

@@ -1,4 +1,4 @@
-import template from "./template.js";
+import template from "./template.mjs";
 
 export default template(function(string) {
   var root = document.createElementNS("http://www.w3.org/2000/svg", "g");

src/generators/filter.js renamed to src/generators/filter.mjs

@@ -1,4 +1,4 @@
-import {katex} from "./dependencies.js";
+import {katex} from "./dependencies.mjs";
 
 var raw = String.raw;
 

src/generators/index.js

@@ -1,4 +1,4 @@
-import {vega, vegalite, vegaliteApi} from "./dependencies.js";
+import {vega, vegalite, vegaliteApi} from "./dependencies.mjs";
 
 export default async function vl(require) {
   const [v, vl, api] = await Promise.all([vega, vegalite, vegaliteApi].map(d => require(d.resolve())));

src/generators/index.mjs

@@ -1,4 +1,4 @@
-import observe from "./generators/observe.js";
+import observe from "./generators/observe.mjs";
 
 export default function() {
   return observe(function(change) {