@observablehq/notebook-kit 1.1.0-rc.12 → 1.1.0-rc.14

package/dist/package.json

@@ -5,7 +5,7 @@
         "type": "git",
         "url": "git+https://github.com/observablehq/notebook-kit.git"
     },
-    "version": "1.1.0-rc.12",
+    "version": "1.1.0-rc.14",
     "type": "module",
     "scripts": {
         "test": "vitest",
@@ -67,6 +67,7 @@
         "@eslint/js": "^9.29.0",
         "@types/jsdom": "^21.1.7",
         "@types/markdown-it": "^14.1.2",
+        "bun-types": "^1.2.20",
         "eslint": "^9.29.0",
         "globals": "^16.2.0",
         "htl": "^0.3.1",

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

@@ -1,6 +1,6 @@
 import type { ColumnSchema, QueryParam } from "../runtime/index.js";
 export { hash as getQueryHash, nameHash as getNameHash } from "../lib/hash.js";
-export type DatabaseConfig = DuckDBConfig | SnowflakeConfig | PostgresConfig;
+export type DatabaseConfig = DuckDBConfig | SQLiteConfig | SnowflakeConfig | PostgresConfig;
 export type DuckDBConfig = {
     type: "duckdb";
     path?: string;
@@ -8,6 +8,10 @@ export type DuckDBConfig = {
         [key: string]: string;
     };
 };
+export type SQLiteConfig = {
+    type: "sqlite";
+    path?: string;
+};
 export type SnowflakeConfig = {
     type: "snowflake";
     account: string;

package/dist/src/databases/index.js

@@ -22,8 +22,12 @@ export async function getDatabaseConfig(sourcePath, databaseName) {
             config = { type: "postgres" };
         else if (databaseName === "duckdb")
             config = { type: "duckdb" };
-        else if (/\.(duck)?db$/i.test(databaseName))
+        else if (databaseName === "sqlite")
+            config = { type: "sqlite" };
+        else if (/\.duckdb$/i.test(databaseName))
             config = { type: "duckdb", path: databaseName };
+        else if (/\.db$/i.test(databaseName))
+            config = { type: "sqlite", path: databaseName }; // TODO disambiguate
         else
             throw new Error(`database not found: ${databaseName}`);
     }
@@ -33,6 +37,8 @@ export async function getDatabase(config, context) {
     switch (config.type) {
         case "duckdb":
             return (await import("./duckdb.js")).default(config, context);
+        case "sqlite":
+            return (await import(process.versions.bun ? "./sqlite-bun.js" : "./sqlite-node.js")).default(config, context);
         case "snowflake":
             return (await import("./snowflake.js")).default(config);
         case "postgres":

package/dist/src/databases/sqlite-bun.d.ts

@@ -0,0 +1,2 @@
+import type { DatabaseContext, SQLiteConfig, QueryTemplateFunction } from "./index.js";
+export default function sqlite({ path }: SQLiteConfig, context: DatabaseContext): QueryTemplateFunction;

package/dist/src/databases/sqlite-bun.js

@@ -0,0 +1,30 @@
+import { join } from "node:path";
+import { Database } from "bun:sqlite";
+import { getColumnType } from "./sqlite.js";
+export default function sqlite({ path = ":memory:" }, context) {
+    if (path !== undefined)
+        path = join(context.cwd, path);
+    return async (strings, ...params) => {
+        const date = new Date();
+        const database = new Database(path);
+        try {
+            const statement = database.prepare(strings.join("?"));
+            const rows = statement.all(...params);
+            return {
+                rows,
+                schema: getStatementSchema(statement),
+                duration: Date.now() - +date,
+                date
+            };
+        }
+        finally {
+            database.close();
+        }
+    };
+}
+function getStatementSchema(statement) {
+    return statement.columnNames.map((name, i) => ({
+        name,
+        type: getColumnType(statement.columnTypes[i])
+    }));
+}

package/dist/src/databases/sqlite-node.d.ts

@@ -0,0 +1,2 @@
+import type { DatabaseContext, SQLiteConfig, QueryTemplateFunction } from "./index.js";
+export default function sqlite({ path }: SQLiteConfig, context: DatabaseContext): QueryTemplateFunction;

package/dist/src/databases/sqlite-node.js

@@ -0,0 +1,29 @@
+import { join } from "node:path";
+import { DatabaseSync } from "node:sqlite";
+import { getColumnType } from "./sqlite.js";
+export default function sqlite({ path = ":memory:" }, context) {
+    if (path !== undefined)
+        path = join(context.cwd, path);
+    return async (strings, ...params) => {
+        const date = new Date();
+        const database = new DatabaseSync(path);
+        try {
+            const statement = database.prepare(strings.join("?"));
+            const rows = statement.all(...params);
+            return {
+                rows,
+                schema: getStatementSchema(statement),
+                duration: Date.now() - +date,
+                date
+            };
+        }
+        finally {
+            database.close();
+        }
+    };
+}
+function getStatementSchema(statement) {
+    return statement
+        .columns()
+        .map((column) => ({ name: column.name, type: getColumnType(column.type) }));
+}

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

@@ -0,0 +1,2 @@
+import type { ColumnSchema } from "../runtime/index.js";
+export declare function getColumnType(type: string | null): ColumnSchema["type"];

package/dist/src/databases/sqlite.js

@@ -0,0 +1,36 @@
+export function getColumnType(type) {
+    switch (type) {
+        case "INT":
+        case "INTEGER":
+        case "TINYINT":
+        case "SMALLINT":
+        case "MEDIUMINT":
+        case "BIGINT":
+        case "UNSIGNED BIG INT":
+        case "INT2":
+        case "INT8":
+            return "integer";
+        case "TEXT":
+        case "CLOB":
+            return "string";
+        case "REAL":
+        case "DOUBLE":
+        case "DOUBLE PRECISION":
+        case "FLOAT":
+        case "NUMERIC":
+            return "number";
+        case "BLOB":
+            return "buffer";
+        case "DATE":
+        case "DATETIME":
+            return "string"; // TODO convert strings to Date instances in sql.js
+        case null:
+            return "other";
+        default:
+            return /^(?:(?:(?:VARYING|NATIVE) )?CHARACTER|(?:N|VAR|NVAR)CHAR)\(/.test(type)
+                ? "string"
+                : /^(?:DECIMAL|NUMERIC)\(/.test(type)
+                    ? "number"
+                    : "other";
+    }
+}

package/package.json

@@ -5,7 +5,7 @@
     "type": "git",
     "url": "git+https://github.com/observablehq/notebook-kit.git"
   },
-  "version": "1.1.0-rc.12",
+  "version": "1.1.0-rc.14",
   "type": "module",
   "scripts": {
     "test": "vitest",
@@ -67,6 +67,7 @@
     "@eslint/js": "^9.29.0",
     "@types/jsdom": "^21.1.7",
     "@types/markdown-it": "^14.1.2",
+    "bun-types": "^1.2.20",
     "eslint": "^9.29.0",
     "globals": "^16.2.0",
     "htl": "^0.3.1",