fix #94; avoid npm: runtime imports

Author: mbostock

src/runtime/stdlib/dot.ts

@@ -1,4 +1,4 @@
-import {instance} from "npm:@viz-js/viz";
+import {instance} from "https://cdn.jsdelivr.net/npm/@viz-js/viz/+esm";
 import type {RawTemplateRenderer} from "./template.js";
 
 const viz = await instance();

src/runtime/stdlib/duckdb.js

@@ -1,4 +1,4 @@
-import * as duckdb from "npm:@duckdb/duckdb-wasm";
+import * as duckdb from "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/+esm";
 
 // Adapted from https://observablehq.com/@cmudig/duckdb-client
 // Copyright 2021 CMU Data Interaction Group
@@ -32,13 +32,11 @@ import * as duckdb from "npm:@duckdb/duckdb-wasm";
 const bundles = {
   mvp: {
     mainModule: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/dist/duckdb-mvp.wasm",
-    mainWorker:
-      "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/dist/duckdb-browser-mvp.worker.js"
+    mainWorker: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/dist/duckdb-browser-mvp.worker.js" // prettier-ignore
   },
   eh: {
     mainModule: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/dist/duckdb-eh.wasm",
-    mainWorker:
-      "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/dist/duckdb-browser-eh.worker.js"
+    mainWorker: "https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/dist/duckdb-browser-eh.worker.js" // prettier-ignore
   }
 };
 const bundle = duckdb.selectBundle(bundles);
@@ -325,13 +323,13 @@ async function insertArrowTable(database, name, table, options) {
 async function insertArqueroTable(database, name, source) {
   // TODO When we have stdlib versioning and can upgrade Arquero to version 5,
   // we can then call source.toArrow() directly, with insertArrowTable()
-  const arrow = await import("npm:apache-arrow");
+  const arrow = await import("https://cdn.jsdelivr.net/npm/apache-arrow@17.0.0/+esm");
   const table = arrow.tableFromIPC(source.toArrowBuffer());
   return await insertArrowTable(database, name, table);
 }
 
 async function insertArray(database, name, array, options) {
-  const arrow = await import("npm:apache-arrow");
+  const arrow = await import("https://cdn.jsdelivr.net/npm/apache-arrow@17.0.0/+esm");
   const table = arrow.tableFromJSON(array);
   return await insertArrowTable(database, name, table, options);
 }

src/runtime/stdlib/fileAttachment.ts

@@ -124,7 +124,7 @@ export abstract class AbstractFile implements FileAttachment {
     return (await fetchFile(this)).body!;
   }
   async dsv({delimiter = ",", array = false, typed = false} = {}): Promise<DsvResult> {
-    const [text, d3] = await Promise.all([this.text(), import("npm:d3-dsv")]);
+    const [text, d3] = await Promise.all([this.text(), import("https://cdn.jsdelivr.net/npm/d3-dsv/+esm")]); // prettier-ignore
     const format = d3.dsvFormat(delimiter);
     const parse = array ? format.parseRows : format.parse;
     return parse(text, typed && d3.autoType);
@@ -147,18 +147,17 @@ export abstract class AbstractFile implements FileAttachment {
     });
   }
   async arrow(): Promise<any> {
-    const [Arrow, response] = await Promise.all([import("npm:apache-arrow"), fetchFile(this)]);
+    const [Arrow, response] = await Promise.all([import("https://cdn.jsdelivr.net/npm/apache-arrow@17.0.0/+esm"), fetchFile(this)]); // prettier-ignore
     return Arrow.tableFromIPC(response);
   }
   async arquero(options?: any): Promise<any> {
-    let request;
-    let from;
+    let request: Promise<unknown>;
+    let from: string;
     switch (this.mimeType) {
       case "application/json":
         request = this.text();
         from = "fromJSON";
         break;
-      // @ts-expect-error fall through
       case "text/tab-separated-values":
         if (options?.delimiter === undefined) options = {...options, delimiter: "\t"};
       // fall through
@@ -178,11 +177,11 @@ export abstract class AbstractFile implements FileAttachment {
         }
         break;
     }
-    const [aq, body] = await Promise.all([import("npm:arquero"), request]);
+    const [aq, body] = await Promise.all([import("https://cdn.jsdelivr.net/npm/arquero/+esm"), request]); // prettier-ignore
     return aq[from](body, options);
   }
   async parquet() {
-    const [Arrow, Parquet, buffer] = await Promise.all([import("npm:apache-arrow"), import("npm:parquet-wasm").then(async (Parquet) => (await Parquet.default("https://cdn.jsdelivr.net/npm/parquet-wasm/esm/parquet_wasm_bg.wasm"), Parquet)), this.arrayBuffer()]); // prettier-ignore
+    const [Arrow, Parquet, buffer] = await Promise.all([import("https://cdn.jsdelivr.net/npm/apache-arrow@17.0.0/+esm"), import("https://cdn.jsdelivr.net/npm/parquet-wasm/+esm").then(async (Parquet) => (await Parquet.default("https://cdn.jsdelivr.net/npm/parquet-wasm/esm/parquet_wasm_bg.wasm"), Parquet)), this.arrayBuffer()]); // prettier-ignore
     return Arrow.tableFromIPC(Parquet.readParquet(new Uint8Array(buffer)).intoIPCStream());
   }
   async xml(mimeType: DOMParserSupportedType = "application/xml"): Promise<Document> {

src/runtime/stdlib/inputs.ts

@@ -1,3 +1,3 @@
-export * from "npm:@observablehq/inputs";
+export * from "https://cdn.jsdelivr.net/npm/@observablehq/inputs/+esm";
 
 import "./inputs.css";

src/runtime/stdlib/leaflet.ts

@@ -1,6 +1,6 @@
-import {Icon} from "npm:leaflet";
+import {Icon} from "https://cdn.jsdelivr.net/npm/leaflet/+esm";
 
-export * from "npm:leaflet";
+export * from "https://cdn.jsdelivr.net/npm/leaflet/+esm";
 
 Icon.Default.imagePath = "https://cdn.jsdelivr.net/npm/leaflet/dist/images/";
 

src/runtime/stdlib/mapboxgl.ts

@@ -1,4 +1,4 @@
-export {default} from "npm:mapbox-gl";
+export {default} from "https://cdn.jsdelivr.net/npm/mapbox-gl/+esm";
 
 const link = document.createElement("link");
 link.href = "https://cdn.jsdelivr.net/npm/mapbox-gl/dist/mapbox-gl.css";

src/runtime/stdlib/mermaid.ts

@@ -1,4 +1,4 @@
-import mer from "npm:mermaid";
+import mer from "https://cdn.jsdelivr.net/npm/mermaid/+esm";
 import type {AsyncRawTemplateRenderer} from "./template.js";
 
 let nextId = 0;

src/runtime/stdlib/recommendedLibraries.ts

@@ -1,26 +1,26 @@
-export const _ = () => import("npm:lodash").then((_) => _.default);
-export const aq = () => import("npm:arquero");
-export const Arrow = () => import("npm:apache-arrow");
-export const d3 = () => import("npm:d3");
+export const _ = () => import("https://cdn.jsdelivr.net/npm/lodash/+esm").then((_) => _.default);
+export const aq = () => import("https://cdn.jsdelivr.net/npm/arquero/+esm");
+export const Arrow = () => import("https://cdn.jsdelivr.net/npm/apache-arrow@17.0.0/+esm");
+export const d3 = () => import("https://cdn.jsdelivr.net/npm/d3/+esm");
 export const dot = () => import("./dot.js").then((_) => _.dot);
-export const duckdb = () => import("npm:@duckdb/duckdb-wasm");
+export const duckdb = () => import("https://cdn.jsdelivr.net/npm/@duckdb/duckdb-wasm@1.29.0/+esm");
 export const DuckDBClient = () => import("./duckdb.js").then((_) => _.DuckDBClient);
-export const echarts = () => import("npm:echarts");
-export const htl = () => import("npm:htl");
-export const html = () => import("npm:htl").then((_) => _.html);
-export const svg = () => import("npm:htl").then((_) => _.svg);
+export const echarts = () => import("https://cdn.jsdelivr.net/npm/echarts/+esm");
+export const htl = () => import("https://cdn.jsdelivr.net/npm/htl/+esm");
+export const html = () => import("https://cdn.jsdelivr.net/npm/htl/+esm").then((_) => _.html);
+export const svg = () => import("https://cdn.jsdelivr.net/npm/htl/+esm").then((_) => _.svg);
 export const Inputs = () => import("./inputs.js");
 export const L = () => import("./leaflet.js");
 export const mapboxgl = () => import("./mapboxgl.js").then((_) => _.default);
 export const md = () => import("./md.js").then((_) => _.md);
 export const mermaid = () => import("./mermaid.js").then((_) => _.mermaid);
-export const Plot = () => import("npm:@observablehq/plot");
-export const React = () => import("npm:react");
-export const ReactDOM = () => import("npm:react-dom");
+export const Plot = () => import("https://cdn.jsdelivr.net/npm/@observablehq/plot/+esm");
+export const React = () => import("https://cdn.jsdelivr.net/npm/react/+esm");
+export const ReactDOM = () => import("https://cdn.jsdelivr.net/npm/react-dom/+esm");
 // export const sql = () => import("observablehq:stdlib/duckdb").then((_) => _.sql);
 // export const SQLite = () => import("observablehq:stdlib/sqlite").then((_) => _.default);
 // export const SQLiteDatabaseClient = () => import("observablehq:stdlib/sqlite").then((_) => _.SQLiteDatabaseClient);
 export const tex = () => import("./tex.js").then((_) => _.tex);
-export const topojson = () => import("npm:topojson-client");
+export const topojson = () => import("https://cdn.jsdelivr.net/npm/topojson-client/+esm");
 // export const vg = () => import("observablehq:stdlib/vgplot").then((_) => _.default());
 export const vl = () => import("./vega-lite.js").then((_) => _.vl);

src/runtime/stdlib/sampleDatasets.ts

@@ -28,6 +28,6 @@ async function text(url: string) {
 }
 
 async function csv(url: string, typed: boolean) {
-  const [contents, d3] = await Promise.all([text(url), import("npm:d3-dsv")]);
+  const [contents, d3] = await Promise.all([text(url), import("https://cdn.jsdelivr.net/npm/d3-dsv/+esm")]); // prettier-ignore
   return d3.csvParse(contents, typed && d3.autoType);
 }

src/runtime/stdlib/tex.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import katex from "npm:katex";
+import katex from "https://cdn.jsdelivr.net/npm/katex/+esm";
 import type {RawTemplateRenderer} from "./template.js";
 
 const link = document.createElement("link");