Adopt ESM (#316)

* esm

* node 18

* next

* 4.0.0-rc.1

* adopt named exports

* adopt d3-array

Author: mbostock

.eslintrc.json

@@ -2,7 +2,7 @@
   "extends": "eslint:recommended",
   "parserOptions": {
     "sourceType": "module",
-    "ecmaVersion": 2018
+    "ecmaVersion": 2020
   },
   "env": {
     "es6": true,

.github/workflows/nodejs.yml

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

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018-2021 Observable, Inc.
+Copyright 2018-2022 Observable, Inc.
 
 Permission to use, copy, modify, and/or distribute this software for any purpose
 with or without fee is hereby granted, provided that the above copyright notice

README.md

@@ -5,7 +5,7 @@ const extensionRe = /\.[^/]*$/;
 const mains = ["unpkg", "jsdelivr", "browser", "main"];
 
 (async () => {
-  console.log(`import dependency from "./dependency.mjs";`);
+  console.log(`import dependency from "./dependency.js";`);
   {
     const package = await resolve("d3");
     console.log(`export const d3 = dependency("${package.name}", "${package.version}", "${package.export}");`);

bin/resolve-dependencies

@@ -1,37 +1,51 @@
 {
   "name": "@observablehq/stdlib",
-  "version": "3.24.0",
-  "license": "ISC",
-  "main": "dist/stdlib.js",
-  "module": "src/index.mjs",
+  "version": "4.0.0-rc.1",
   "author": {
     "name": "Observable, Inc.",
     "url": "https://observablehq.com"
   },
+  "license": "ISC",
+  "type": "module",
+  "main": "src/index.js",
+  "module": "src/index.js",
+  "jsdelivr": "dist/stdlib.js",
+  "unpkg": "dist/stdlib.js",
+  "exports": {
+    "umd": "./dist/stdlib.js",
+    "default": "./src/index.js"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/observablehq/stdlib.git"
   },
+  "files": [
+    "dist/**/*.js",
+    "src/**/*.js"
+  ],
+  "engines": {
+    "node": ">=14.5.0"
+  },
   "scripts": {
-    "test": "mocha 'test/**/*-test.mjs' && eslint src test --ext mjs",
-    "prepublishOnly": "rollup -c",
+    "test": "mocha 'test/**/*-test.js' && eslint src test",
+    "prepublishOnly": "rm -rf dist && rollup -c",
     "postpublish": "git push && git push --tags"
   },
-  "files": [
-    "src/**/*.mjs",
-    "dist/**/*.js"
-  ],
   "dependencies": {
-    "d3-dsv": "^2.0.0",
+    "d3-array": "^3.2.0",
+    "d3-dsv": "^3.0.1",
     "d3-require": "^1.3.0"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^13.3.0",
-    "eslint": "^8.18.0",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "eslint": "^8.27.0",
     "exceljs": "^4.3.0",
-    "mocha": "^10.0.0",
-    "node-fetch": "^2.6.1",
-    "rollup": "^2.37.1",
+    "mocha": "^10.1.0",
+    "node-fetch": "^3.2.10",
+    "rollup": "^3.2.5",
     "rollup-plugin-terser": "^7.0.2"
+  },
+  "publishConfig": {
+    "tag": "next"
   }
 }

package.json

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

rollup.config.js

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

src/array.mjs

@@ -1,4 +1,4 @@
-export default function dependency(name, version, main) {
+export function dependency(name, version, main) {
   return {
     resolve(path = main) {
       return `${name}@${version}/${path}`;

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

@@ -1,4 +1,4 @@
-export default function(width, height) {
+export function canvas(width, height) {
   var canvas = document.createElement("canvas");
   canvas.width = width;
   canvas.height = height;

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

@@ -1,4 +1,4 @@
-export default function(width, height, dpi) {
+export function context2d(width, height, dpi) {
   if (dpi == null) dpi = devicePixelRatio;
   var canvas = document.createElement("canvas");
   canvas.width = width * dpi;

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

@@ -1,4 +1,4 @@
-export default function(value, name = "untitled", label = "Save") {
+export function download(value, name = "untitled", label = "Save") {
   const a = document.createElement("a");
   const b = a.appendChild(document.createElement("button"));
   b.textContent = label;

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

@@ -7,7 +7,7 @@ var namespaces = {
   xmlns: "http://www.w3.org/2000/xmlns/"
 };
 
-export default function(name, attributes) {
+export function element(name, attributes) {
   var prefix = name += "", i = prefix.indexOf(":"), value;
   if (i >= 0 && (prefix = name.slice(0, i)) !== "xmlns") name = name.slice(i + 1);
   var element = namespaces.hasOwnProperty(prefix) // eslint-disable-line no-prototype-builtins

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

@@ -0,0 +1,10 @@
+export {canvas} from "./canvas.js";
+export {context2d} from "./context2d.js";
+export {download} from "./download.js";
+export {element} from "./element.js";
+export {input} from "./input.js";
+export {range} from "./range.js";
+export {select} from "./select.js";
+export {svg} from "./svg.js";
+export {text} from "./text.js";
+export {uid} from "./uid.js";

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

@@ -1,4 +1,4 @@
-export default function(type) {
+export function input(type) {
   var input = document.createElement("input");
   if (type != null) input.type = type;
   return input;

src/dom/index.js

@@ -1,4 +1,4 @@
-export default function(min, max, step) {
+export function range(min, max, step) {
   if (arguments.length === 1) max = min, min = null;
   var input = document.createElement("input");
   input.min = min = min == null ? 0 : +min;

src/dom/index.mjs

@@ -1,4 +1,4 @@
-export default function(values) {
+export function select(values) {
   var select = document.createElement("select");
   Array.prototype.forEach.call(values, function(value) {
     var option = document.createElement("option");

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

@@ -1,4 +1,4 @@
-export default function(width, height) {
+export function svg(width, height) {
   var svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
   svg.setAttribute("viewBox", [0, 0, width, height]);
   svg.setAttribute("width", width);

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

@@ -1,3 +1,3 @@
-export default function(value) {
+export function text(value) {
   return document.createTextNode(value);
 }

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

@@ -1,6 +1,6 @@
 var count = 0;
 
-export default function(name) {
+export function uid(name) {
   return new Id("O-" + (name == null ? "" : name + "-") + ++count);
 }
 

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

@@ -1,8 +1,8 @@
 import {autoType, csvParse, csvParseRows, tsvParse, tsvParseRows} from "d3-dsv";
-import {arrow, jszip, exceljs} from "./dependencies.mjs";
-import {requireDefault} from "./require.mjs";
-import {SQLiteDatabaseClient} from "./sqlite.mjs";
-import {Workbook} from "./xlsx.mjs";
+import {arrow, jszip, exceljs} from "./dependencies.js";
+import {requireDefault} from "./require.js";
+import {SQLiteDatabaseClient} from "./sqlite.js";
+import {Workbook} from "./xlsx.js";
 
 async function remote_fetch(file) {
   const response = await fetch(await file.url());
@@ -93,7 +93,7 @@ export function NoFileAttachments(name) {
   throw new Error(`File not found: ${name}`);
 }
 
-export default function FileAttachments(resolve) {
+export function FileAttachments(resolve) {
   return Object.assign(
     name => {
       const result = resolve(name += "");

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

@@ -1,4 +1,4 @@
-export default function(file) {
+export function buffer(file) {
   return new Promise(function(resolve, reject) {
     var reader = new FileReader;
     reader.onload = function() { resolve(reader.result); };

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

@@ -0,0 +1,3 @@
+export {buffer} from "./buffer.js";
+export {text} from "./text.js";
+export {url} from "./url.js";

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

@@ -1,4 +1,4 @@
-export default function(file) {
+export function text(file) {
   return new Promise(function(resolve, reject) {
     var reader = new FileReader;
     reader.onload = function() { resolve(reader.result); };

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

@@ -1,4 +1,4 @@
-export default function(file) {
+export function url(file) {
   return new Promise(function(resolve, reject) {
     var reader = new FileReader;
     reader.onload = function() { resolve(reader.result); };

src/files/index.js

@@ -1,6 +1,6 @@
-import that from "../that.mjs";
+import {that} from "../that.js";
 
-export default function disposable(value, dispose) {
+export function disposable(value, dispose) {
   let done = false;
   if (typeof dispose !== "function") {
     throw new Error("dispose is not a function");

src/files/index.mjs

@@ -1,4 +1,4 @@
-export default function*(iterator, test) {
+export function* filter(iterator, test) {
   var result, index = -1;
   while (!(result = iterator.next()).done) {
     if (test(result.value, ++index)) {

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

@@ -0,0 +1,9 @@
+export {disposable} from "./disposable.js";
+export {filter} from "./filter.js";
+export {input} from "./input.js";
+export {map} from "./map.js";
+export {observe} from "./observe.js";
+export {queue} from "./queue.js";
+export {range} from "./range.js";
+export {valueAt} from "./valueAt.js";
+export {worker} from "./worker.js";

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

@@ -1,6 +1,6 @@
-import observe from "./observe.mjs";
+import {observe} from "./observe.js";
 
-export default function(input) {
+export function input(input) {
   return observe(function(change) {
     var event = eventof(input), value = valueof(input);
     function inputted() { change(valueof(input)); }

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

@@ -1,4 +1,4 @@
-export default function*(iterator, transform) {
+export function* map(iterator, transform) {
   var result, index = -1;
   while (!(result = iterator.next()).done) {
     yield transform(result.value, ++index);

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

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

src/generators/index.js

@@ -1,6 +1,6 @@
-import that from "../that.mjs";
+import {that} from "../that.js";
 
-export default function(initialize) {
+export function queue(initialize) {
   let resolve;
   const queue = [];
   const dispose = initialize(push);

src/generators/index.mjs

@@ -1,4 +1,4 @@
-export default function*(start, stop, step) {
+export function* range(start, stop, step) {
   start = +start;
   stop = +stop;
   step = (n = arguments.length) < 2 ? (stop = start, start = 0, 1) : n < 3 ? 1 : +step;

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

@@ -1,4 +1,4 @@
-export default function(iterator, i) {
+export function valueAt(iterator, i) {
   if (!isFinite(i = +i) || i < 0 || i !== i | 0) return;
   var result, index = -1;
   while (!(result = iterator.next()).done) {

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

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