@tlockney/cdp-kernel 0.12.0 → 0.12.1

package/dist/browser/mod.d.ts

@@ -15,6 +15,22 @@ export declare const CHART_MODULES: {
     readonly vegaLite: "npm:vega-lite@6";
     readonly linkedom: "npm:linkedom@0.18";
 };
+/**
+ * What `jupyter.sql` loads, as it writes them: map them in `modules` to
+ * copies the page serves, and SQL runs offline. `duckdb` is an ES module
+ * that exports what @duckdb/duckdb-wasm does; the others are that
+ * package's own dist files, served as they are. A page may map only the
+ * `eh` pair (every current browser runs it); a variant left unmapped
+ * loads from jsDelivr. Same as runtime/sql.mjs's DUCKDB_WASM and
+ * DUCKDB_FILES.
+ */
+export declare const SQL_MODULES: {
+    readonly duckdb: "npm:@duckdb/duckdb-wasm@1.29.0";
+    readonly ehWasm: "npm:@duckdb/duckdb-wasm@1.29.0/dist/duckdb-eh.wasm";
+    readonly ehWorker: "npm:@duckdb/duckdb-wasm@1.29.0/dist/duckdb-browser-eh.worker.js";
+    readonly mvpWasm: "npm:@duckdb/duckdb-wasm@1.29.0/dist/duckdb-mvp.wasm";
+    readonly mvpWorker: "npm:@duckdb/duckdb-wasm@1.29.0/dist/duckdb-browser-mvp.worker.js";
+};
 export interface BrowserKernelOptions extends BrowserTargetOptions {
     /** What strips cells' types; sucrase by default, since esbuild's native binary can't run in a page. */
     typeStrip?: TypeStripperName | TypeStripper;

package/dist/browser/mod.js

@@ -26,6 +26,22 @@ export const CHART_MODULES = {
     vegaLite: "npm:vega-lite@6",
     linkedom: "npm:linkedom@0.18",
 };
+/**
+ * What `jupyter.sql` loads, as it writes them: map them in `modules` to
+ * copies the page serves, and SQL runs offline. `duckdb` is an ES module
+ * that exports what @duckdb/duckdb-wasm does; the others are that
+ * package's own dist files, served as they are. A page may map only the
+ * `eh` pair (every current browser runs it); a variant left unmapped
+ * loads from jsDelivr. Same as runtime/sql.mjs's DUCKDB_WASM and
+ * DUCKDB_FILES.
+ */
+export const SQL_MODULES = {
+    duckdb: "npm:@duckdb/duckdb-wasm@1.29.0",
+    ehWasm: "npm:@duckdb/duckdb-wasm@1.29.0/dist/duckdb-eh.wasm",
+    ehWorker: "npm:@duckdb/duckdb-wasm@1.29.0/dist/duckdb-browser-eh.worker.js",
+    mvpWasm: "npm:@duckdb/duckdb-wasm@1.29.0/dist/duckdb-mvp.wasm",
+    mvpWorker: "npm:@duckdb/duckdb-wasm@1.29.0/dist/duckdb-browser-mvp.worker.js",
+};
 export function startBrowserKernel(options) {
     const channels = new PageChannels();
     const log = options.log ?? ((text) => console.debug(`[cdp-kernel] ${text}`));

package/dist/browser/target.d.ts

@@ -26,8 +26,8 @@ export interface BrowserTargetOptions {
      * Specifiers, as written, mapped to URLs the page serves (resolved
      * against `base`), which win over `cdn`: a cell's imports and the
      * libraries `jupyter.chart` and `jupyter.sql` import load from there.
-     * Mapping `CHART_MODULES` makes charts draw offline; `jupyter.sql` still
-     * loads DuckDB's worker and .wasm from jsDelivr.
+     * Mapping `CHART_MODULES` makes charts draw offline, and mapping
+     * `SQL_MODULES` does the same for `jupyter.sql`.
      */
     modules?: {
         readonly [specifier: string]: string;

package/dist/browser/worker.js

@@ -797,6 +797,20 @@ function tableBundle(source, options = {}) {
 // runtime/sql.mjs
 var NODE_API = "npm:@duckdb/node-api@1.5.6-r.2";
 var DUCKDB_WASM = "npm:@duckdb/duckdb-wasm@1.29.0";
+var DUCKDB_FILES = {
+  mvp: { mainModule: `${DUCKDB_WASM}/dist/duckdb-mvp.wasm`, mainWorker: `${DUCKDB_WASM}/dist/duckdb-browser-mvp.worker.js` },
+  eh: { mainModule: `${DUCKDB_WASM}/dist/duckdb-eh.wasm`, mainWorker: `${DUCKDB_WASM}/dist/duckdb-browser-eh.worker.js` }
+};
+function duckdbBundles(jsDelivr, mapped) {
+  const bundles = { ...jsDelivr };
+  if (!mapped) return bundles;
+  for (const [variant, files] of Object.entries(DUCKDB_FILES)) {
+    const mainModule = mapped(files.mainModule);
+    const mainWorker = mapped(files.mainWorker);
+    if (mainModule && mainWorker) bundles[variant] = { mainModule, mainWorker, pthreadWorker: null };
+  }
+  return bundles;
+}
 var $display = /* @__PURE__ */ Symbol.for("Jupyter.display");
 var RAW = /* @__PURE__ */ Symbol("cdpk.sql.raw");
 function jsValue(value, declared) {
@@ -924,9 +938,9 @@ var DUCK_TYPES = {
   object: "JSON",
   duration: "VARCHAR"
 };
-function createSql({ importModule, signal, openEngine }) {
+function createSql({ importModule, mapped, signal, openEngine }) {
   let engine = null;
-  const open = () => engine ??= (openEngine ?? (() => defaultEngine(importModule)))().catch((err) => {
+  const open = () => engine ??= (openEngine ?? (() => defaultEngine(importModule, mapped)))().catch((err) => {
     engine = null;
     throw err;
   });
@@ -1024,9 +1038,9 @@ function inWorker() {
 function hasNativeRuntime() {
   return typeof globalThis.Deno?.version?.deno === "string" || typeof globalThis.Bun?.version === "string" || typeof globalThis.process?.versions?.node === "string" && !inWorker();
 }
-async function defaultEngine(importModule) {
+async function defaultEngine(importModule, mapped) {
   if (hasNativeRuntime()) return nativeEngine(importModule);
-  if (inWorker() && typeof Worker === "function") return wasmEngine(importModule);
+  if (inWorker() && typeof Worker === "function") return wasmEngine(importModule, mapped);
   throw new Error("jupyter.sql needs Node, Deno, Bun or the browser target; workerd and celld have no DuckDB");
 }
 async function nativeEngine(importModule) {
@@ -1054,9 +1068,9 @@ async function nativeEngine(importModule) {
     }
   };
 }
-async function wasmEngine(importModule) {
+async function wasmEngine(importModule, mapped) {
   const duckdb = await importModule(DUCKDB_WASM);
-  const bundle = await duckdb.selectBundle(duckdb.getJsDelivrBundles());
+  const bundle = await duckdb.selectBundle(duckdbBundles(duckdb.getJsDelivrBundles(), mapped));
   const loader = URL.createObjectURL(new Blob([`importScripts(${JSON.stringify(bundle.mainWorker)});`], { type: "text/javascript" }));
   const worker = new Worker(loader);
   const db = new duckdb.AsyncDuckDB(new duckdb.VoidLogger(), worker);
@@ -1846,7 +1860,11 @@ function createJupyter(host2) {
     if (typeof load !== "function") return Promise.reject(new Error(`${what}: no module loader in this runtime`));
     return load(specifier);
   };
-  const sql = createSql({ importModule: cellImport("jupyter.sql"), signal: () => current.signal });
+  const sql = createSql({
+    importModule: cellImport("jupyter.sql"),
+    mapped: (specifier) => globalThis.__cdpk?.mapped?.(specifier) ?? null,
+    signal: () => current.signal
+  });
   const chart = createChart({ importModule: cellImport("jupyter.chart"), summarizeSpec: summarizeChart });
   const comms = createComms((msgType, content, metadata, buffers) => host2.send(msgType, content, metadata, buffers));
   pager = createTablePager(comms.api);
@@ -2327,6 +2345,9 @@ function install({ base, cdn: cdnBase, modules: moduleMap, params }) {
   globalThis.__cdpk = {
     import: (specifier, options) => import(resolveSpecifier(specifier, url, cdn, modules)),
     meta: { url, resolve: (specifier) => resolveSpecifier(specifier, url, cdn, modules) },
+    // The URL `modules` maps a specifier to, or null: jupyter.sql's DuckDB
+    // files load from the page this way.
+    mapped: (specifier) => modules && Object.hasOwn(modules, specifier) ? new URL(modules[specifier], url).href : null,
     // inspect_request (#10): by descriptor, so nothing runs.
     describeForInspect: (value, detail) => describeValue(value, { inspect: (v) => inspect(v, { depth: 2 }), detail }),
     inspectPath: (path, detail) => inspectPath(path, { inspect: (v) => inspect(v, { depth: 2 }), detail }),