@observablehq/notebook-kit 1.1.0-rc.3 → 1.1.0-rc.5

package/dist/package.json

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

package/dist/src/databases/duckdb.d.ts

@@ -1,2 +1,2 @@
 import type { DatabaseContext, DuckDBConfig, QueryTemplateFunction } from "./index.js";
-export default function duckdb(_options: DuckDBConfig, context: DatabaseContext): QueryTemplateFunction;
+export default function duckdb({ path, options }: DuckDBConfig, context: DatabaseContext): QueryTemplateFunction;

package/dist/src/databases/duckdb.js

@@ -1,8 +1,12 @@
-import { DuckDBConnection } from "@duckdb/node-api";
+import { DuckDBConnection, DuckDBInstance } from "@duckdb/node-api";
 import { BIGINT, BIT, BLOB, BOOLEAN, DATE, DOUBLE, FLOAT, HUGEINT, INTEGER, INTERVAL, SMALLINT, TIME, TIMESTAMP, TIMESTAMP_MS, TIMESTAMP_NS, TIMESTAMP_S, TIMESTAMPTZ, TINYINT, UBIGINT, UHUGEINT, UINTEGER, USMALLINT, UTINYINT, UUID, VARCHAR, VARINT } from "@duckdb/node-api"; // prettier-ignore
-export default function duckdb(_options, context) {
+import { join } from "node:path";
+export default function duckdb({ path, options }, context) {
+    if (path !== undefined)
+        path = join(context.cwd, path);
     return async (strings, ...params) => {
-        const connection = await DuckDBConnection.create();
+        const instance = await DuckDBInstance.create(path, options);
+        const connection = await DuckDBConnection.create(instance);
         await connection.run(`SET file_search_path=$0`, [context.cwd]);
         const date = new Date();
         let result;
@@ -13,6 +17,7 @@ export default function duckdb(_options, context) {
         }
         finally {
             connection.disconnectSync();
+            instance.closeSync();
         }
         return {
             rows,
@@ -42,7 +47,7 @@ function getColumnType(type) {
         case UBIGINT:
         case HUGEINT:
         case UHUGEINT:
-            return "bigint";
+            return "integer"; // TODO bigint?
         case FLOAT:
         case DOUBLE:
             return "number";

package/dist/src/databases/index.d.ts

@@ -2,6 +2,10 @@ import type { ColumnSchema, QueryParam } from "../runtime/index.js";
 export type DatabaseConfig = DuckDBConfig | SnowflakeConfig | PostgresConfig;
 export type DuckDBConfig = {
     type: "duckdb";
+    path?: string;
+    options?: {
+        [key: string]: string;
+    };
 };
 export type SnowflakeConfig = {
     type: "snowflake";

package/dist/src/databases/postgres.js

@@ -33,7 +33,7 @@ function getColumnSchema(column) {
 function getColumnType(oid) {
     switch (oid) {
         case 20: // int8
-            return "bigint";
+            return "integer"; // TODO bigint?
         case 21: // int2
         case 23: // int4
         case 26: // oid

package/dist/src/vite/config.js

@@ -17,7 +17,7 @@ export function config() {
                 {
                     find: /^(npm:.*)$/,
                     replacement: "$1",
-                    customResolver: resolveNpmImport
+                    customResolver: (source) => ({ id: resolveNpmImport(source), external: true })
                 },
                 {
                     find: /^jsr:(.*)$/,

package/dist/src/vite/observable.js

@@ -54,7 +54,7 @@ export function observable({ window = new JSDOM().window, parser = new window.DO
                         const template = parseTemplate(value);
                         if (!template.expressions.length && !cell.output)
                             statics.add(cell);
-                        const content = md([stripExpressions(template, value)]);
+                        const content = md([unescapeDollarBackslashCurly(stripExpressions(template, value))]);
                         const codes = content.querySelectorAll("code[class^=language-]");
                         await Promise.all(Array.from(codes, highlight));
                         div.appendChild(content);
@@ -197,6 +197,9 @@ function stripExpressions(template, input) {
     }
     return String(source);
 }
+function unescapeDollarBackslashCurly(input) {
+    return input.replace(/(\$\\*)\\({)/g, "$1$2");
+}
 /** Returns true if the specified character is preceded by an equals sign, ignoring whitespace. */
 function hasPrecedingEquals(input, index) {
     let i = index - 1;

package/package.json

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