tidy duckdb manifest; no top-level await

mbostock · mbostock · commit 27bc864f326a · 2024-11-01T19:47:44.000-07:00
diff --git a/src/client/stdlib/duckdb.js b/src/client/stdlib/duckdb.js
@@ -1,3 +1,4 @@
+/* global DUCKDB_MANIFEST */
 import * as duckdb from "npm:@duckdb/duckdb-wasm";
 
 // Adapted from https://observablehq.com/@cmudig/duckdb-client
@@ -29,25 +30,21 @@ import * as duckdb from "npm:@duckdb/duckdb-wasm";
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-// Baked-in manifest.
-// eslint-disable-next-line no-undef
-const manifest = DUCKDB_MANIFEST;
-const candidates = {
-  ...(manifest.bundles.includes("mvp") && {
-    mvp: {
-      mainModule: import.meta.resolve("npm:@duckdb/duckdb-wasm/dist/duckdb-mvp.wasm"),
-      mainWorker: import.meta.resolve("npm:@duckdb/duckdb-wasm/dist/duckdb-browser-mvp.worker.js")
-    }
-  }),
-  ...(manifest.bundles.includes("eh") && {
-    eh: {
-      mainModule: import.meta.resolve("npm:@duckdb/duckdb-wasm/dist/duckdb-eh.wasm"),
-      mainWorker: import.meta.resolve("npm:@duckdb/duckdb-wasm/dist/duckdb-browser-eh.worker.js")
-    }
-  })
+const bundles = {
+  mvp: DUCKDB_MANIFEST.platforms.mvp
+    ? {
+        mainModule: import.meta.resolve("npm:@duckdb/duckdb-wasm/dist/duckdb-mvp.wasm"),
+        mainWorker: import.meta.resolve("npm:@duckdb/duckdb-wasm/dist/duckdb-browser-mvp.worker.js")
+      }
+    : undefined,
+  eh: DUCKDB_MANIFEST.platforms.eh
+    ? {
+        mainModule: import.meta.resolve("npm:@duckdb/duckdb-wasm/dist/duckdb-eh.wasm"),
+        mainWorker: import.meta.resolve("npm:@duckdb/duckdb-wasm/dist/duckdb-browser-eh.worker.js")
+      }
+    : undefined
 };
-const bundle = await duckdb.selectBundle(candidates);
-const activePlatform = manifest.bundles.find((key) => bundle.mainModule === candidates[key].mainModule);
+const bundle = duckdb.selectBundle(bundles);
 const logger = new duckdb.ConsoleLogger(duckdb.LogLevel.WARNING);
 
 let db;
@@ -190,10 +187,12 @@ export class DuckDBClient {
 Object.defineProperty(DuckDBClient.prototype, "dialect", {value: "duckdb"});
 
 async function registerExtensions(db, extensions) {
+  const {mainModule} = await bundle;
+  const platform = Object.keys(bundles).find((platform) => mainModule === bundles[platform].mainModule);
   const con = await db.connect();
   try {
     await Promise.all(
-      manifest.extensions.map(([name, {[activePlatform]: ref, load}]) =>
+      Object.entries(DUCKDB_MANIFEST.extensions).map(([name, {load, [platform]: ref}]) =>
         con
           .query(`INSTALL "${name}" FROM '${import.meta.resolve(ref)}'`)
           .then(() => (extensions === undefined ? load : extensions.includes(name)) && con.query(`LOAD "${name}"`))
@@ -328,9 +327,10 @@ async function insertArray(database, name, array, options) {
 }
 
 async function createDuckDB() {
-  const worker = await duckdb.createWorker(bundle.mainWorker);
+  const {mainWorker, mainModule} = await bundle;
+  const worker = await duckdb.createWorker(mainWorker);
   const db = new duckdb.AsyncDuckDB(logger, worker);
-  await db.instantiate(bundle.mainModule);
+  await db.instantiate(mainModule);
   return db;
 }
 
diff --git a/src/config.ts b/src/config.ts
@@ -8,7 +8,7 @@ import {pathToFileURL} from "node:url";
 import he from "he";
 import type MarkdownIt from "markdown-it";
 import wrapAnsi from "wrap-ansi";
-import {DUCKDB_BUNDLES, DUCKDB_CORE_EXTENSIONS} from "./duckdb.js";
+import {DUCKDB_CORE_EXTENSIONS, DUCKDB_PLATFORMS} from "./duckdb.js";
 import {visitFiles} from "./files.js";
 import {formatIsoDate, formatLocaleDate} from "./format.js";
 import type {FrontMatter} from "./frontMatter.js";
@@ -78,7 +78,7 @@ export interface SearchConfigSpec {
 }
 
 export interface DuckDBConfig {
-  bundles: string[];
+  platforms: Record<string, true>;
   extensions: {[name: string]: DuckDBExtensionConfig};
 }
 
@@ -522,7 +522,7 @@ export function stringOrNull(spec: unknown): string | null {
   return spec == null || spec === false ? null : String(spec);
 }
 
-// TODO configure bundles?
+// TODO configure platforms?
 function normalizeDuckDB(spec: unknown): DuckDBConfig {
   const extensions: {[name: string]: DuckDBExtensionConfig} = {};
   let extspec: Record<string, unknown> = spec?.["extensions"] ?? {};
@@ -548,7 +548,7 @@ function normalizeDuckDB(spec: unknown): DuckDBConfig {
       load: Boolean(load)
     };
   }
-  return {bundles: DUCKDB_BUNDLES, extensions};
+  return {platforms: DUCKDB_PLATFORMS, extensions};
 }
 
 function normalizeDuckDBSource(source: string): string {
diff --git a/src/duckdb.ts b/src/duckdb.ts
@@ -8,7 +8,7 @@ const downloadRequests = new Map<string, Promise<string>>();
 
 export const DUCKDB_WASM_VERSION = "1.29.0";
 export const DUCKDB_VERSION = "1.1.1";
-export const DUCKDB_BUNDLES = ["eh", "mvp"];
+export const DUCKDB_PLATFORMS: DuckDBConfig["platforms"] = {eh: true, mvp: true};
 
 // https://duckdb.org/docs/extensions/core_extensions.html
 export const DUCKDB_CORE_EXTENSIONS: [name: string, autoload: boolean][] = [
@@ -37,30 +37,32 @@ export const DUCKDB_CORE_EXTENSIONS: [name: string, autoload: boolean][] = [
 ];
 
 export async function getDuckDBManifest(
-  duckdb: DuckDBConfig,
+  {platforms, extensions}: DuckDBConfig,
   {root, aliases}: {root: string; aliases?: Map<string, string>}
 ) {
   return {
-    bundles: duckdb.bundles,
-    extensions: await Promise.all(
-      Array.from(Object.entries(duckdb.extensions), ([name, {install, load, source}]) =>
-        (async () => [
-          name,
-          {
-            install,
-            load,
-            ...Object.fromEntries(
-              await Promise.all(
-                duckdb.bundles.map(async (platform) => [
-                  platform,
-                  install
-                    ? await getDuckDBExtension(root, resolveDuckDBExtension(source, platform, name), aliases)
-                    : source
-                ])
+    platforms,
+    extensions: Object.fromEntries(
+      await Promise.all(
+        Object.entries(extensions).map(([name, {install, load, source}]) =>
+          (async () => [
+            name,
+            {
+              install,
+              load,
+              ...Object.fromEntries(
+                await Promise.all(
+                  Object.keys(platforms).map(async (platform) => [
+                    platform,
+                    install
+                      ? await getDuckDBExtension(root, resolveDuckDBExtension(source, platform, name), aliases)
+                      : source
+                  ])
+                )
               )
-            )
-          }
-        ])()
+            }
+          ])()
+        )
       )
     )
   };
diff --git a/src/libraries.ts b/src/libraries.ts
@@ -85,7 +85,7 @@ export function getImplicitDownloads(imports: Iterable<string>, duckdb?: DuckDBC
     implicits.add("npm:@duckdb/duckdb-wasm/dist/duckdb-browser-eh.worker.js");
     if (!duckdb) throw new Error("Implementation error: missing duckdb configuration");
     for (const [name, {source}] of Object.entries(duckdb.extensions)) {
-      for (const platform of duckdb.bundles) {
+      for (const platform in duckdb.platforms) {
         implicits.add(`duckdb:${resolveDuckDBExtension(source, platform, name)}`);
       }
     }
diff --git a/test/libraries-test.ts b/test/libraries-test.ts
@@ -53,7 +53,7 @@ describe("getImplicitStylesheets(imports)", () => {
 describe("getImplicitDownloads(imports)", () => {
   it("supports known imports", () => {
     assert.deepStrictEqual(
-      getImplicitDownloads(["npm:@observablehq/duckdb"], {extensions: {}, bundles: []}),
+      getImplicitDownloads(["npm:@observablehq/duckdb"]),
       new Set([
         "npm:@duckdb/duckdb-wasm/dist/duckdb-mvp.wasm",
         "npm:@duckdb/duckdb-wasm/dist/duckdb-browser-mvp.worker.js",

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import {pathToFileURL} from "node:url";`
`8`	`8`	`import he from "he";`
`9`	`9`	`import type MarkdownIt from "markdown-it";`
`10`	`10`	`import wrapAnsi from "wrap-ansi";`
`11`		`-import {DUCKDB_BUNDLES, DUCKDB_CORE_EXTENSIONS} from "./duckdb.js";`
	`11`	`+import {DUCKDB_CORE_EXTENSIONS, DUCKDB_PLATFORMS} from "./duckdb.js";`
`12`	`12`	`import {visitFiles} from "./files.js";`
`13`	`13`	`import {formatIsoDate, formatLocaleDate} from "./format.js";`
`14`	`14`	`import type {FrontMatter} from "./frontMatter.js";`
`@@ -78,7 +78,7 @@ export interface SearchConfigSpec {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`export interface DuckDBConfig {`
`81`		`- bundles: string[];`
	`81`	`+ platforms: Record<string, true>;`
`82`	`82`	`extensions: {[name: string]: DuckDBExtensionConfig};`
`83`	`83`	`}`
`84`	`84`
`@@ -522,7 +522,7 @@ export function stringOrNull(spec: unknown): string \| null {`
`522`	`522`	`return spec == null \|\| spec === false ? null : String(spec);`
`523`	`523`	`}`
`524`	`524`
`525`		`-// TODO configure bundles?`
	`525`	`+// TODO configure platforms?`
`526`	`526`	`function normalizeDuckDB(spec: unknown): DuckDBConfig {`
`527`	`527`	`const extensions: {[name: string]: DuckDBExtensionConfig} = {};`
`528`	`528`	`let extspec: Record<string, unknown> = spec?.["extensions"] ?? {};`
`@@ -548,7 +548,7 @@ function normalizeDuckDB(spec: unknown): DuckDBConfig {`
`548`	`548`	`load: Boolean(load)`
`549`	`549`	`};`
`550`	`550`	`}`
`551`		`- return {bundles: DUCKDB_BUNDLES, extensions};`
	`551`	`+ return {platforms: DUCKDB_PLATFORMS, extensions};`
`552`	`552`	`}`
`553`	`553`
`554`	`554`	`function normalizeDuckDBSource(source: string): string {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ export function getImplicitDownloads(imports: Iterable<string>, duckdb?: DuckDBC`
`85`	`85`	`implicits.add("npm:@duckdb/duckdb-wasm/dist/duckdb-browser-eh.worker.js");`
`86`	`86`	`if (!duckdb) throw new Error("Implementation error: missing duckdb configuration");`
`87`	`87`	`for (const [name, {source}] of Object.entries(duckdb.extensions)) {`
`88`		`- for (const platform of duckdb.bundles) {`
	`88`	`+ for (const platform in duckdb.platforms) {`
`89`	`89`	implicits.add(`duckdb:${resolveDuckDBExtension(source, platform, name)}`);
`90`	`90`	`}`
`91`	`91`	`}`