@observablehq/notebook-kit 1.7.2 → 1.7.4

package/dist/package.json

@@ -5,7 +5,7 @@
         "type": "git",
         "url": "git+https://github.com/observablehq/notebook-kit.git"
     },
-    "version": "1.7.2",
+    "version": "1.7.4",
     "type": "module",
     "scripts": {
         "test": "vitest",

package/dist/src/runtime/stdlib/duckdb.js

@@ -39,6 +39,10 @@ const bundles = {
 };
 const bundle = duckdb.selectBundle(bundles);
 const logger = new duckdb.ConsoleLogger(duckdb.LogLevel.WARNING);
+const mainWorkerUrl = bundle.then(({ mainWorker }) => {
+    const source = `importScripts(${JSON.stringify(mainWorker)});`;
+    return URL.createObjectURL(new Blob([source], { type: "text/javascript" }));
+});
 // let db;
 // let inserts = [];
 // const sources = new Map();
@@ -316,10 +320,9 @@ async function insertArray(database, name, array, options) {
     return await insertArrowTable(database, name, table, options);
 }
 async function createDuckDB() {
-    const { mainWorker, mainModule } = await bundle;
-    const worker = await duckdb.createWorker(mainWorker);
+    const worker = new Worker(await mainWorkerUrl);
     const db = new duckdb.AsyncDuckDB(logger, worker);
-    await db.instantiate(mainModule);
+    await db.instantiate((await bundle).mainModule);
     return db;
 }
 // https://duckdb.org/docs/sql/data_types/overview

package/dist/src/runtime/stdlib/require.js

@@ -21,7 +21,7 @@ function resolve(_specifier) {
     if (isProtocol(specifier) || isLocal(specifier))
         return specifier;
     const { name, range, path } = parseNpmSpecifier(specifier);
-    return `https://cdn.jsdelivr.net/npm/${name}${range}${path + (isFile(path) || isDirectory(path) ? "" : "/+esm")}`;
+    return `https://cdn.jsdelivr.net/npm/${name}${range}${path + ((isFile(path) && !isJavaScript(path)) || isDirectory(path) ? "" : "/+esm")}`;
 }
 /** Promote exclusive default export to module. */
 function defaultify(module) {
@@ -46,10 +46,14 @@ function isLocal(specifier) {
     return /^(\.\/|\.\.\/|\/)/.test(specifier);
 }
 /** Returns true for e.g. foo/bar.js */
+function isJavaScript(specifier) {
+    return /\.js$/i.test(specifier);
+}
+/** Returns true for e.g. foo/bar.txt */
 function isFile(specifier) {
-    return /(\.\w*)$/.test(specifier);
+    return /\.\w*$/.test(specifier);
 }
 /** Returns true for e.g. foo/bar/ */
 function isDirectory(specifier) {
-    return /(\/)$/.test(specifier);
+    return /\/$/.test(specifier);
 }

package/package.json

@@ -5,7 +5,7 @@
     "type": "git",
     "url": "git+https://github.com/observablehq/notebook-kit.git"
   },
-  "version": "1.7.2",
+  "version": "1.7.4",
   "type": "module",
   "scripts": {
     "test": "vitest",