Adopt ESM

bin/resolve-dependencies

@@ -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}");`);

package.json

@@ -1,37 +1,47 @@
 {
   "name": "@observablehq/stdlib",
   "version": "3.24.0",
-  "license": "ISC",
-  "main": "dist/stdlib.js",
-  "module": "src/index.mjs",
   "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-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"
   }
 }

rollup.config.js

@@ -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({

src/dependencies.mjs → src/dependencies.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/dom/index.js

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

src/fileAttachment.mjs → src/fileAttachment.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());

src/files/index.js

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

src/generators/disposable.mjs → src/generators/disposable.js

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

src/generators/index.js

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

src/generators/input.mjs → src/generators/input.js

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

src/generators/observe.mjs → src/generators/observe.js

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

src/generators/queue.mjs → src/generators/queue.js

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

src/generators/worker.mjs → src/generators/worker.js

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

src/html.mjs → src/html.js

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

src/index.mjs → src/index.js

@@ -1,3 +1,3 @@
-export {default as FileAttachments, AbstractFile} from "./fileAttachment.mjs";
-export {default as Library} from "./library.mjs";
-export {makeQueryTemplate, loadDataSource, arrayIsPrimitive, isDataArray, isDatabaseClient} from "./table.mjs";
+export {default as FileAttachments, AbstractFile} from "./fileAttachment.js";
+export {default as Library} from "./library.js";
+export {makeQueryTemplate, loadDataSource, arrayIsPrimitive, isDataArray, isDatabaseClient} from "./table.js";

src/leaflet.mjs → src/leaflet.js

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

src/library.mjs → src/library.js

@@ -1,24 +1,24 @@
 import {requireFrom, resolveFrom} from "d3-require";
-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";
-import {__query} from "./table.mjs";
+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 {__query} from "./table.js";
 
 export default Object.assign(Object.defineProperties(function Library(resolver) {
   const require = requirer(resolver);

src/md.mjs → src/md.js

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

src/mermaid.mjs → src/mermaid.js

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

src/mutable.mjs → src/mutable.js

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

src/promises/index.js

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

src/promises/tick.mjs → src/promises/tick.js

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

src/sqlite.mjs → src/sqlite.js

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

src/svg.mjs → src/svg.js

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

src/table.mjs → src/table.js

@@ -1,5 +1,5 @@
-import {ascending, descending, reverse} from "./array.mjs";
-import {FileAttachment} from "./fileAttachment.mjs";
+import {ascending, descending, reverse} from "./array.js";
+import {FileAttachment} from "./fileAttachment.js";
 
 const nChecks = 20; // number of values to check in each array
 

src/tex.mjs → src/tex.js

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

src/vegalite.mjs → src/vegalite.js

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

src/width.mjs → src/width.js

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