@sqlrooms/duckdb 0.24.8 → 0.24.10

package/dist/connectors/WasmDuckDbConnector.d.ts

@@ -18,12 +18,4 @@ export interface WasmDuckDbConnector extends DuckDbConnector {
     readonly type: 'wasm';
 }
 export declare function createWasmDuckDbConnector(options?: WasmDuckDbConnectorOptions): WasmDuckDbConnector;
-export declare class DuckQueryError extends Error {
-    readonly cause: unknown;
-    readonly query: string | undefined;
-    readonly queryCallStack: string | undefined;
-    constructor(err: unknown, query: string, stack: string | undefined);
-    getDetailedMessage(): string;
-    getMessageForUser(): string;
-}
 //# sourceMappingURL=WasmDuckDbConnector.d.ts.map

package/dist/connectors/WasmDuckDbConnector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WasmDuckDbConnector.d.ts","sourceRoot":"","sources":["../../src/connectors/WasmDuckDbConnector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAa9C,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGlD,MAAM,WAAW,0BAA2B,SAAQ,MAAM,CAAC,YAAY;IACrE,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IAC1D,KAAK,IAAI,MAAM,CAAC,WAAW,CAAC;IAC5B,aAAa,IAAI,MAAM,CAAC,qBAAqB,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,yBAAyB,CACvC,OAAO,GAAE,0BAA+B,GACvC,mBAAmB,CAkPrB;AAeD,qBAAa,cAAe,SAAQ,KAAK;IACvC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;gBAChC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS;IAOlE,kBAAkB;IAOlB,iBAAiB;CAGlB"}
+{"version":3,"file":"WasmDuckDbConnector.d.ts","sourceRoot":"","sources":["../../src/connectors/WasmDuckDbConnector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAa9C,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAIlD,MAAM,WAAW,0BAA2B,SAAQ,MAAM,CAAC,YAAY;IACrE,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IAC1D,KAAK,IAAI,MAAM,CAAC,WAAW,CAAC;IAC5B,aAAa,IAAI,MAAM,CAAC,qBAAqB,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,yBAAyB,CACvC,OAAO,GAAE,0BAA+B,GACvC,mBAAmB,CAkQrB"}

package/dist/connectors/WasmDuckDbConnector.js

@@ -1,10 +1,11 @@
 import * as duckdb from '@duckdb/duckdb-wasm';
 import { DuckDBDataProtocol } from '@duckdb/duckdb-wasm';
 import { isSpatialLoadFileOptions, } from '@sqlrooms/room-config';
-import { splitFilePath } from '@sqlrooms/utils';
+import { safeJsonParse, splitFilePath } from '@sqlrooms/utils';
 import * as arrow from 'apache-arrow';
 import { createBaseDuckDbConnector, } from './BaseDuckDbConnector';
 import { load, loadObjects as loadObjectsSql, loadSpatial } from './load/load';
+import { getSqlErrorWithPointer } from '../duckdb-utils';
 export function createWasmDuckDbConnector(options = {}) {
     const { logging = false, initializationQuery = '', dbPath = ':memory:', bundles = duckdb.getJsDelivrBundles(), ...restConfig } = options;
     let db = null;
@@ -43,7 +44,7 @@ export function createWasmDuckDbConnector(options = {}) {
                     ...restConfig,
                     path: restConfig.path ?? dbPath,
                 });
-                conn = augmentConnectionQueryError(await db.connect());
+                conn = await db.connect();
             }
             catch (err) {
                 db = null;
@@ -73,7 +74,7 @@ export function createWasmDuckDbConnector(options = {}) {
             if (signal.aborted) {
                 throw new Error('Query aborted before execution');
             }
-            const localConn = augmentConnectionQueryError(await db.connect());
+            const localConn = await db.connect();
             const streamPromise = localConn.send(query, true);
             let reader = null;
             const buildTable = async () => {
@@ -103,6 +104,19 @@ export function createWasmDuckDbConnector(options = {}) {
             try {
                 return await Promise.race([buildTable(), abortPromise]);
             }
+            catch (e) {
+                // Some errors are returned as JSON, so we try to parse them
+                if (e instanceof Error) {
+                    const parsed = safeJsonParse(e.message);
+                    if (parsed !== null &&
+                        typeof parsed === 'object' &&
+                        'exception_message' in parsed) {
+                        throw new Error(`${parsed.exception_type} ${parsed.error_subtype}: ${parsed.exception_message}` +
+                            `\n${getSqlErrorWithPointer(query, Number(parsed.position)).formatted}`);
+                    }
+                }
+                throw e;
+            }
             finally {
                 if (abortHandler) {
                     signal.removeEventListener('abort', abortHandler);
@@ -196,37 +210,4 @@ export function createWasmDuckDbConnector(options = {}) {
         },
     };
 }
-function augmentConnectionQueryError(conn) {
-    const originalQuery = conn.query;
-    conn.query = (async (q) => {
-        const stack = new Error().stack;
-        try {
-            return await originalQuery.call(conn, q);
-        }
-        catch (err) {
-            throw new DuckQueryError(err, q, stack);
-        }
-    });
-    return conn;
-}
-export class DuckQueryError extends Error {
-    cause;
-    query;
-    queryCallStack;
-    constructor(err, query, stack) {
-        super(err instanceof Error ? err.message : `${err}`);
-        this.cause = err;
-        this.query = query;
-        this.queryCallStack = stack;
-        Object.setPrototypeOf(this, DuckQueryError.prototype);
-    }
-    getDetailedMessage() {
-        const { message, query, queryCallStack: stack } = this;
-        return (`DB query failed: ${message}` +
-            `\n\nFull query:\n\n${query}\n\nQuery call stack:\n\n${stack}\n\n`);
-    }
-    getMessageForUser() {
-        return this.message;
-    }
-}
 //# sourceMappingURL=WasmDuckDbConnector.js.map

package/dist/connectors/WasmDuckDbConnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"WasmDuckDbConnector.js","sourceRoot":"","sources":["../../src/connectors/WasmDuckDbConnector.ts"],"names":[],"mappings":"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","sourcesContent":["import * as duckdb from '@duckdb/duckdb-wasm';\nimport {DuckDBDataProtocol} from '@duckdb/duckdb-wasm';\nimport {\n  LoadFileOptions,\n  StandardLoadOptions,\n  isSpatialLoadFileOptions,\n} from '@sqlrooms/room-config';\nimport {splitFilePath} from '@sqlrooms/utils';\nimport * as arrow from 'apache-arrow';\nimport {\n  BaseDuckDbConnectorImpl,\n  createBaseDuckDbConnector,\n} from './BaseDuckDbConnector';\nimport {DuckDbConnector} from './DuckDbConnector';\nimport {load, loadObjects as loadObjectsSql, loadSpatial} from './load/load';\n\nexport interface WasmDuckDbConnectorOptions extends duckdb.DuckDBConfig {\n  /** @deprecated use `path` instead */\n  dbPath?: string;\n  initializationQuery?: string;\n  logging?: boolean;\n  /**\n   * DuckDB bundles to use. Defaults to jsDelivr bundles. To use locally\n   * bundled files, you will need to import them in your app and construct a\n   * `DuckDBBundles` object.\n   */\n  bundles?: duckdb.DuckDBBundles;\n}\n\nexport interface WasmDuckDbConnector extends DuckDbConnector {\n  getDb(): duckdb.AsyncDuckDB;\n  getConnection(): duckdb.AsyncDuckDBConnection;\n  readonly type: 'wasm';\n}\n\nexport function createWasmDuckDbConnector(\n  options: WasmDuckDbConnectorOptions = {},\n): WasmDuckDbConnector {\n  const {\n    logging = false,\n    initializationQuery = '',\n    dbPath = ':memory:',\n    bundles = duckdb.getJsDelivrBundles(),\n    ...restConfig\n  } = options;\n\n  let db: duckdb.AsyncDuckDB | null = null;\n  let conn: duckdb.AsyncDuckDBConnection | null = null;\n  let worker: Worker | null = null;\n\n  const impl: BaseDuckDbConnectorImpl = {\n    async initializeInternal() {\n      if (!globalThis.Worker) {\n        throw new Error('No Worker support in this environment');\n      }\n      try {\n        const allBundles = bundles;\n        const bestBundle = await duckdb.selectBundle(allBundles);\n        if (!bestBundle.mainWorker) {\n          throw new Error('No best bundle found for DuckDB worker');\n        }\n        const workerScriptUrl = new URL(\n          bestBundle.mainWorker,\n          globalThis.location.origin,\n        ).href;\n        const workerUrl = URL.createObjectURL(\n          new Blob([`importScripts(\"${workerScriptUrl}\");`], {\n            type: 'text/javascript',\n          }),\n        );\n\n        worker = new window.Worker(workerUrl);\n        const logger = logging ? new duckdb.ConsoleLogger() : {log: () => {}};\n\n        db = new (class extends duckdb.AsyncDuckDB {\n          onError(event: ErrorEvent) {\n            super.onError(event);\n            console.error('DuckDB worker error:', event);\n          }\n        })(logger, worker);\n\n        const mainModule = new URL(\n          bestBundle.mainModule,\n          globalThis.location.origin,\n        ).href;\n        const pthreadWorker = bestBundle.pthreadWorker\n          ? new URL(bestBundle.pthreadWorker, globalThis.location.origin).href\n          : undefined;\n        await db.instantiate(mainModule, pthreadWorker);\n        URL.revokeObjectURL(workerUrl);\n\n        await db.open({\n          ...restConfig,\n          path: restConfig.path ?? dbPath,\n        });\n\n        conn = augmentConnectionQueryError(await db.connect());\n      } catch (err) {\n        db = null;\n        conn = null;\n        worker = null;\n        throw err;\n      }\n    },\n\n    async destroyInternal() {\n      if (conn) {\n        await conn.close();\n        conn = null;\n      }\n      if (db) {\n        await db.terminate();\n        db = null;\n      }\n      if (worker) {\n        worker.terminate();\n        worker = null;\n      }\n    },\n\n    async executeQueryInternal<T extends arrow.TypeMap = any>(\n      query: string,\n      signal: AbortSignal,\n    ): Promise<arrow.Table<T>> {\n      if (!db) {\n        throw new Error('DuckDB not initialized');\n      }\n\n      if (signal.aborted) {\n        throw new Error('Query aborted before execution');\n      }\n\n      const localConn = augmentConnectionQueryError(await db.connect());\n      const streamPromise = localConn.send<T>(query, true);\n      let reader: arrow.RecordBatchReader<T> | null = null;\n\n      const buildTable = async () => {\n        reader = await streamPromise;\n        const batches: arrow.RecordBatch<T>[] = [];\n        let rowCount = 0;\n        for await (const batch of reader) {\n          if (batch.numRows === 0) continue;\n          batches.push(batch);\n          rowCount += batch.numRows;\n        }\n        if (rowCount === 0) {\n          return arrow.tableFromArrays({}) as unknown as arrow.Table<T>;\n        }\n        return new arrow.Table(batches);\n      };\n\n      let abortHandler: (() => void) | undefined;\n      const abortPromise = new Promise<never>((_, reject) => {\n        abortHandler = () => {\n          localConn.cancelSent().catch(() => {});\n          reader?.cancel?.();\n          reject(new Error('Query cancelled'));\n        };\n        signal.addEventListener('abort', abortHandler);\n      });\n\n      try {\n        return await Promise.race([buildTable(), abortPromise]);\n      } finally {\n        if (abortHandler) {\n          signal.removeEventListener('abort', abortHandler);\n        }\n        await localConn.close();\n      }\n    },\n\n    async cancelQueryInternal() {\n      if (conn) {\n        try {\n          await conn.cancelSent();\n        } catch (err) {\n          console.warn('DuckDB cancelSent failed:', err);\n        }\n      }\n    },\n\n    async loadFileInternal(\n      file: string | File,\n      tableName: string,\n      opts?: LoadFileOptions,\n    ) {\n      if (!conn) {\n        throw new Error('DuckDB connection not initialized');\n      }\n      await withTempRegisteredFile(file, async (fileName) => {\n        if (opts && isSpatialLoadFileOptions(opts)) {\n          await conn!.query(loadSpatial(tableName, fileName, opts));\n        } else {\n          await conn!.query(\n            load(opts?.method ?? 'auto', tableName, fileName, opts),\n          );\n        }\n      });\n    },\n\n    async loadArrowInternal(\n      file: arrow.Table | Uint8Array,\n      tableName: string,\n      opts?: {schema?: string},\n    ) {\n      if (!conn) {\n        throw new Error('DuckDB connection not initialized');\n      }\n      const options = {name: tableName, schema: opts?.schema};\n      if (file instanceof arrow.Table) {\n        await conn.insertArrowTable(file, options);\n      } else {\n        await conn.insertArrowFromIPCStream(file, options);\n      }\n    },\n\n    async loadObjectsInternal(\n      file: Record<string, unknown>[],\n      tableName: string,\n      opts?: StandardLoadOptions,\n    ) {\n      if (!conn) {\n        throw new Error('DuckDB connection not initialized');\n      }\n      await conn.query(loadObjectsSql(tableName, file, opts));\n    },\n  };\n\n  const base = createBaseDuckDbConnector({dbPath, initializationQuery}, impl);\n\n  async function withTempRegisteredFile(\n    file: string | File,\n    action: (fileName: string) => Promise<void>,\n  ) {\n    if (!conn || !db) {\n      throw new Error('DuckDB connection not initialized');\n    }\n    let fileName: string;\n    let tempFileName: string | undefined = undefined;\n    if (file instanceof File) {\n      const {ext} = splitFilePath(file.name);\n      tempFileName = `${Math.random().toString(36).substring(2, 15)}${ext ? `.${ext}` : ''}`;\n      fileName = tempFileName;\n      await db.registerFileHandle(\n        fileName,\n        file,\n        DuckDBDataProtocol.BROWSER_FILEREADER,\n        true,\n      );\n    } else {\n      fileName = file;\n    }\n    try {\n      await action(fileName);\n    } finally {\n      if (tempFileName) {\n        await db!.dropFile(tempFileName);\n      }\n    }\n  }\n\n  return {\n    ...base,\n    getDb() {\n      if (!db) {\n        throw new Error('DuckDB not initialized');\n      }\n      return db;\n    },\n    getConnection() {\n      if (!conn) {\n        throw new Error('DuckDB connection not initialized');\n      }\n      return conn;\n    },\n    get type() {\n      return 'wasm' as const;\n    },\n  };\n}\n\nfunction augmentConnectionQueryError(conn: duckdb.AsyncDuckDBConnection) {\n  const originalQuery = conn.query;\n  conn.query = (async (q: string) => {\n    const stack = new Error().stack;\n    try {\n      return await originalQuery.call(conn, q);\n    } catch (err) {\n      throw new DuckQueryError(err, q, stack);\n    }\n  }) as typeof conn.query;\n  return conn;\n}\n\nexport class DuckQueryError extends Error {\n  readonly cause: unknown;\n  readonly query: string | undefined;\n  readonly queryCallStack: string | undefined;\n  constructor(err: unknown, query: string, stack: string | undefined) {\n    super(err instanceof Error ? err.message : `${err}`);\n    this.cause = err;\n    this.query = query;\n    this.queryCallStack = stack;\n    Object.setPrototypeOf(this, DuckQueryError.prototype);\n  }\n  getDetailedMessage() {\n    const {message, query, queryCallStack: stack} = this;\n    return (\n      `DB query failed: ${message}` +\n      `\\n\\nFull query:\\n\\n${query}\\n\\nQuery call stack:\\n\\n${stack}\\n\\n`\n    );\n  }\n  getMessageForUser() {\n    return this.message;\n  }\n}\n"]}
+{"version":3,"file":"WasmDuckDbConnector.js","sourceRoot":"","sources":["../../src/connectors/WasmDuckDbConnector.ts"],"names":[],"mappings":"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","sourcesContent":["import * as duckdb from '@duckdb/duckdb-wasm';\nimport {DuckDBDataProtocol} from '@duckdb/duckdb-wasm';\nimport {\n  LoadFileOptions,\n  StandardLoadOptions,\n  isSpatialLoadFileOptions,\n} from '@sqlrooms/room-config';\nimport {safeJsonParse, splitFilePath} from '@sqlrooms/utils';\nimport * as arrow from 'apache-arrow';\nimport {\n  BaseDuckDbConnectorImpl,\n  createBaseDuckDbConnector,\n} from './BaseDuckDbConnector';\nimport {DuckDbConnector} from './DuckDbConnector';\nimport {load, loadObjects as loadObjectsSql, loadSpatial} from './load/load';\nimport {getSqlErrorWithPointer} from '../duckdb-utils';\n\nexport interface WasmDuckDbConnectorOptions extends duckdb.DuckDBConfig {\n  /** @deprecated use `path` instead */\n  dbPath?: string;\n  initializationQuery?: string;\n  logging?: boolean;\n  /**\n   * DuckDB bundles to use. Defaults to jsDelivr bundles. To use locally\n   * bundled files, you will need to import them in your app and construct a\n   * `DuckDBBundles` object.\n   */\n  bundles?: duckdb.DuckDBBundles;\n}\n\nexport interface WasmDuckDbConnector extends DuckDbConnector {\n  getDb(): duckdb.AsyncDuckDB;\n  getConnection(): duckdb.AsyncDuckDBConnection;\n  readonly type: 'wasm';\n}\n\nexport function createWasmDuckDbConnector(\n  options: WasmDuckDbConnectorOptions = {},\n): WasmDuckDbConnector {\n  const {\n    logging = false,\n    initializationQuery = '',\n    dbPath = ':memory:',\n    bundles = duckdb.getJsDelivrBundles(),\n    ...restConfig\n  } = options;\n\n  let db: duckdb.AsyncDuckDB | null = null;\n  let conn: duckdb.AsyncDuckDBConnection | null = null;\n  let worker: Worker | null = null;\n\n  const impl: BaseDuckDbConnectorImpl = {\n    async initializeInternal() {\n      if (!globalThis.Worker) {\n        throw new Error('No Worker support in this environment');\n      }\n      try {\n        const allBundles = bundles;\n        const bestBundle = await duckdb.selectBundle(allBundles);\n        if (!bestBundle.mainWorker) {\n          throw new Error('No best bundle found for DuckDB worker');\n        }\n        const workerScriptUrl = new URL(\n          bestBundle.mainWorker,\n          globalThis.location.origin,\n        ).href;\n        const workerUrl = URL.createObjectURL(\n          new Blob([`importScripts(\"${workerScriptUrl}\");`], {\n            type: 'text/javascript',\n          }),\n        );\n\n        worker = new window.Worker(workerUrl);\n        const logger = logging ? new duckdb.ConsoleLogger() : {log: () => {}};\n\n        db = new (class extends duckdb.AsyncDuckDB {\n          onError(event: ErrorEvent) {\n            super.onError(event);\n            console.error('DuckDB worker error:', event);\n          }\n        })(logger, worker);\n\n        const mainModule = new URL(\n          bestBundle.mainModule,\n          globalThis.location.origin,\n        ).href;\n        const pthreadWorker = bestBundle.pthreadWorker\n          ? new URL(bestBundle.pthreadWorker, globalThis.location.origin).href\n          : undefined;\n        await db.instantiate(mainModule, pthreadWorker);\n        URL.revokeObjectURL(workerUrl);\n\n        await db.open({\n          ...restConfig,\n          path: restConfig.path ?? dbPath,\n        });\n\n        conn = await db.connect();\n      } catch (err) {\n        db = null;\n        conn = null;\n        worker = null;\n        throw err;\n      }\n    },\n\n    async destroyInternal() {\n      if (conn) {\n        await conn.close();\n        conn = null;\n      }\n      if (db) {\n        await db.terminate();\n        db = null;\n      }\n      if (worker) {\n        worker.terminate();\n        worker = null;\n      }\n    },\n\n    async executeQueryInternal<T extends arrow.TypeMap = any>(\n      query: string,\n      signal: AbortSignal,\n    ): Promise<arrow.Table<T>> {\n      if (!db) {\n        throw new Error('DuckDB not initialized');\n      }\n\n      if (signal.aborted) {\n        throw new Error('Query aborted before execution');\n      }\n\n      const localConn = await db.connect();\n      const streamPromise = localConn.send<T>(query, true);\n      let reader: arrow.RecordBatchReader<T> | null = null;\n\n      const buildTable = async () => {\n        reader = await streamPromise;\n        const batches: arrow.RecordBatch<T>[] = [];\n        let rowCount = 0;\n        for await (const batch of reader) {\n          if (batch.numRows === 0) continue;\n          batches.push(batch);\n          rowCount += batch.numRows;\n        }\n        if (rowCount === 0) {\n          return arrow.tableFromArrays({}) as unknown as arrow.Table<T>;\n        }\n        return new arrow.Table(batches);\n      };\n\n      let abortHandler: (() => void) | undefined;\n      const abortPromise = new Promise<never>((_, reject) => {\n        abortHandler = () => {\n          localConn.cancelSent().catch(() => {});\n          reader?.cancel?.();\n          reject(new Error('Query cancelled'));\n        };\n        signal.addEventListener('abort', abortHandler);\n      });\n\n      try {\n        return await Promise.race([buildTable(), abortPromise]);\n      } catch (e) {\n        // Some errors are returned as JSON, so we try to parse them\n        if (e instanceof Error) {\n          const parsed: any = safeJsonParse(e.message);\n          if (\n            parsed !== null &&\n            typeof parsed === 'object' &&\n            'exception_message' in parsed\n          ) {\n            throw new Error(\n              `${parsed.exception_type} ${parsed.error_subtype}: ${parsed.exception_message}` +\n                `\\n${getSqlErrorWithPointer(query, Number(parsed.position)).formatted}`,\n            );\n          }\n        }\n        throw e;\n      } finally {\n        if (abortHandler) {\n          signal.removeEventListener('abort', abortHandler);\n        }\n        await localConn.close();\n      }\n    },\n\n    async cancelQueryInternal() {\n      if (conn) {\n        try {\n          await conn.cancelSent();\n        } catch (err) {\n          console.warn('DuckDB cancelSent failed:', err);\n        }\n      }\n    },\n\n    async loadFileInternal(\n      file: string | File,\n      tableName: string,\n      opts?: LoadFileOptions,\n    ) {\n      if (!conn) {\n        throw new Error('DuckDB connection not initialized');\n      }\n      await withTempRegisteredFile(file, async (fileName) => {\n        if (opts && isSpatialLoadFileOptions(opts)) {\n          await conn!.query(loadSpatial(tableName, fileName, opts));\n        } else {\n          await conn!.query(\n            load(opts?.method ?? 'auto', tableName, fileName, opts),\n          );\n        }\n      });\n    },\n\n    async loadArrowInternal(\n      file: arrow.Table | Uint8Array,\n      tableName: string,\n      opts?: {schema?: string},\n    ) {\n      if (!conn) {\n        throw new Error('DuckDB connection not initialized');\n      }\n      const options = {name: tableName, schema: opts?.schema};\n      if (file instanceof arrow.Table) {\n        await conn.insertArrowTable(file, options);\n      } else {\n        await conn.insertArrowFromIPCStream(file, options);\n      }\n    },\n\n    async loadObjectsInternal(\n      file: Record<string, unknown>[],\n      tableName: string,\n      opts?: StandardLoadOptions,\n    ) {\n      if (!conn) {\n        throw new Error('DuckDB connection not initialized');\n      }\n      await conn.query(loadObjectsSql(tableName, file, opts));\n    },\n  };\n\n  const base = createBaseDuckDbConnector({dbPath, initializationQuery}, impl);\n\n  async function withTempRegisteredFile(\n    file: string | File,\n    action: (fileName: string) => Promise<void>,\n  ) {\n    if (!conn || !db) {\n      throw new Error('DuckDB connection not initialized');\n    }\n    let fileName: string;\n    let tempFileName: string | undefined = undefined;\n    if (file instanceof File) {\n      const {ext} = splitFilePath(file.name);\n      tempFileName = `${Math.random().toString(36).substring(2, 15)}${ext ? `.${ext}` : ''}`;\n      fileName = tempFileName;\n      await db.registerFileHandle(\n        fileName,\n        file,\n        DuckDBDataProtocol.BROWSER_FILEREADER,\n        true,\n      );\n    } else {\n      fileName = file;\n    }\n    try {\n      await action(fileName);\n    } finally {\n      if (tempFileName) {\n        await db!.dropFile(tempFileName);\n      }\n    }\n  }\n\n  return {\n    ...base,\n    getDb() {\n      if (!db) {\n        throw new Error('DuckDB not initialized');\n      }\n      return db;\n    },\n    getConnection() {\n      if (!conn) {\n        throw new Error('DuckDB connection not initialized');\n      }\n      return conn;\n    },\n    get type() {\n      return 'wasm' as const;\n    },\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqlrooms/duckdb",
-  "version": "0.24.8",
+  "version": "0.24.10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/index.js",
@@ -19,10 +19,10 @@
   },
   "dependencies": {
     "@duckdb/duckdb-wasm": ">=1.29.0-0",
-    "@sqlrooms/duckdb-config": "0.24.8",
-    "@sqlrooms/room-config": "0.24.8",
-    "@sqlrooms/room-store": "0.24.8",
-    "@sqlrooms/utils": "0.24.8",
+    "@sqlrooms/duckdb-config": "0.24.10",
+    "@sqlrooms/room-config": "0.24.10",
+    "@sqlrooms/room-store": "0.24.10",
+    "@sqlrooms/utils": "0.24.10",
     "fast-deep-equal": "^3.1.3",
     "immer": "^10.1.1",
     "zod": "^3.25.73",
@@ -45,5 +45,5 @@
     "test": "jest",
     "test:watch": "jest --watch"
   },
-  "gitHead": "0052b4e350225495bcaf513e75307868e57364a0"
+  "gitHead": "3643e8b85da5780a328c531aa8e867524e688a61"
 }