don’t masquerade as sql.js

Author: mbostock

src/client/stdlib/recommendedLibraries.js

@@ -12,7 +12,7 @@ export const Inputs = () => import("npm:@observablehq/inputs");
 export const L = () => import("npm:leaflet");
 export const mermaid = () => import("observablehq:stdlib/mermaid").then((mermaid) => mermaid.default);
 export const Plot = () => import("npm:@observablehq/plot");
-export const SQLite = () => import("observablehq:stdlib/sql").then((sql) => sql.default);
+export const SQLite = () => import("observablehq:stdlib/sqlite").then((sqlite) => sqlite.default);
 export const SQLiteDatabaseClient = () => import("observablehq:stdlib/sqlite").then((sqlite) => sqlite.SQLiteDatabaseClient); // prettier-ignore
 export const tex = () => import("observablehq:stdlib/tex").then((tex) => tex.default);
 export const topojson = () => import("npm:topojson-client");

src/client/stdlib/sql.js

@@ -1,4 +1,12 @@
-import SQLite from "observablehq:stdlib/sql";
+// https://github.com/sql-js/sql.js/issues/284
+const SQLite = await (async () => {
+  const exports = {};
+  const response = await fetch("https://cdn.jsdelivr.net/npm/sql.js/dist/sql-wasm.js");
+  new Function("exports", await response.text())(exports);
+  return exports.Module({locateFile: (name) => `https://cdn.jsdelivr.net/npm/sql.js/dist/${name}`});
+})();
+
+export default SQLite;
 
 export class SQLiteDatabaseClient {
   constructor(db) {

src/client/stdlib/sqlite.js

@@ -221,19 +221,17 @@ export function createImportResolver(root: string, base: "." | "_import" = "."):
       : specifier === "npm:@observablehq/stdlib"
       ? resolveBuiltin(base, path, "stdlib.js")
       : specifier === "npm:@observablehq/dot"
-      ? resolveBuiltin(base, path, "stdlib/dot.js")
+      ? resolveBuiltin(base, path, "stdlib/dot.js") // TODO publish to npm
       : specifier === "npm:@observablehq/duckdb"
-      ? resolveBuiltin(base, path, "stdlib/duckdb.js")
+      ? resolveBuiltin(base, path, "stdlib/duckdb.js") // TODO publish to npm
       : specifier === "npm:@observablehq/mermaid"
-      ? resolveBuiltin(base, path, "stdlib/mermaid.js")
+      ? resolveBuiltin(base, path, "stdlib/mermaid.js") // TODO publish to npm
       : specifier === "npm:@observablehq/tex"
-      ? resolveBuiltin(base, path, "stdlib/tex.js")
-      : specifier === "npm:sql.js"
-      ? resolveBuiltin(base, path, "stdlib/sql.js")
+      ? resolveBuiltin(base, path, "stdlib/tex.js") // TODO publish to npm
       : specifier === "npm:@observablehq/sqlite"
-      ? resolveBuiltin(base, path, "stdlib/sqlite.js")
+      ? resolveBuiltin(base, path, "stdlib/sqlite.js") // TODO publish to npm
       : specifier === "npm:@observablehq/xslx"
-      ? resolveBuiltin(base, path, "stdlib/xslx.js")
+      ? resolveBuiltin(base, path, "stdlib/xslx.js") // TODO publish to npm
       : specifier.startsWith("npm:")
       ? `https://cdn.jsdelivr.net/npm/${specifier.slice("npm:".length)}/+esm`
       : specifier;

src/javascript/imports.ts

@@ -15,8 +15,7 @@ export function addImplicitSpecifiers(specifiers: Set<string>, inputs: Set<strin
   if (inputs.has("Arrow")) specifiers.add("npm:apache-arrow");
   if (inputs.has("L")) specifiers.add("npm:leaflet");
   if (inputs.has("mermaid")) specifiers.add("npm:@observablehq/mermaid").add("npm:mermaid").add("npm:d3");
-  if (inputs.has("SQLite") || inputs.has("SQLiteDatabaseClient")) specifiers.add("npm:sql.js");
-  if (inputs.has("SQLiteDatabaseClient")) specifiers.add("npm:@observablehq/sqlite");
+  if (inputs.has("SQLite") || inputs.has("SQLiteDatabaseClient")) specifiers.add("npm:@observablehq/sqlite");
   if (inputs.has("tex")) specifiers.add("npm:@observablehq/tex").add("npm:katex");
   if (inputs.has("topojson")) specifiers.add("npm:topojson-client");
   return specifiers;