@hpcc-js/wasm-duckdb 1.15.0 → 1.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hpcc-js/wasm-duckdb",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "hpcc-js - WASM DuckDB",
   "type": "module",
   "exports": {
@@ -27,6 +27,7 @@
     "bundle-watch": "npm run bundle-dev -- --watch",
     "build-dev": "run-p gen-types bundle-dev",
     "build": "run-p gen-types bundle",
+    "build-all": "run-s build-cpp gen-types bundle",
     "lint-skypack": "npx -y @skypack/package-check",
     "lint-eslint": "eslint \"src/**/*.ts\" \"tests/**/*.ts\"",
     "lint": "run-p lint-eslint",
@@ -55,5 +56,5 @@
   },
   "homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/",
   "license": "Apache-2.0",
-  "gitHead": "81504905bd26f44c1e68b31760269dee081c0cbb"
+  "gitHead": "f539a56609708635b900faf022e9384707b1003c"
 }

package/src/duckdb.ts

@@ -3,7 +3,7 @@ import load, { reset } from "../../../build/packages/duckdb/duckdblib.wasm";
 import type { MainModule, DuckDB as CPPDuckDB } from "../types/duckdblib.js";
 import { MainModuleEx } from "@hpcc-js/wasm-util";
 
-let g_duckdb: Promise<DuckDB>;
+let g_duckdb: Promise<DuckDB> | undefined;
 const textEncoder = new TextEncoder();
 
 /**
@@ -91,7 +91,7 @@ const textEncoder = new TextEncoder();
  * @see [DuckDB Documentation](https://duckdb.org/docs/)
  * @see [DuckDB GitHub](https://github.com/duckdb/duckdb)
  */
-export class DuckDB extends MainModuleEx<MainModule> implements Disposable {
+export class DuckDB extends MainModuleEx<MainModule> {
 
     db: CPPDuckDB
 
@@ -103,47 +103,6 @@ export class DuckDB extends MainModuleEx<MainModule> implements Disposable {
         FS_createPath("/", "home/web_user", true, true);
     }
 
-    /**
-     * Disposes of the DuckDB database instance and releases resources.
-     * 
-     * This method should be called when you're done using the database to free up
-     * memory and clean up resources. After calling dispose, the instance should not be used.
-     * 
-     * @example
-     * ```ts
-     * const duckdb = await DuckDB.load();
-     * const connection = duckdb.connect();
-     * // ... use the database ...
-     * connection.delete();
-     * duckdb.dispose();
-     * ```
-     * 
-     * @example Using statement (TypeScript 5.2+)
-     * ```ts
-     * {
-     *     using duckdb = await DuckDB.load();
-     *     const connection = duckdb.connect();
-     *     // ... use the database ...
-     *     connection.delete();
-     * } // duckdb.dispose() is called automatically
-     * ```
-     */
-    dispose(): void {
-        try {
-            this.db?.terminate();
-        } finally {
-            this.db?.delete();
-        }
-    }
-
-    /**
-     * Symbol.dispose implementation for use with `using` declarations.
-     * @internal
-     */
-    [Symbol.dispose](): void {
-        this.dispose();
-    }
-
     /**
      * Loads and initializes the DuckDB WASM module.
      * 
@@ -167,7 +126,7 @@ export class DuckDB extends MainModuleEx<MainModule> implements Disposable {
                 return new DuckDB(module)
             });
         }
-        return g_duckdb;
+        return g_duckdb!;
     }
 
     /**
@@ -182,8 +141,20 @@ export class DuckDB extends MainModuleEx<MainModule> implements Disposable {
      * // The next call to DuckDB.load() will create a fresh instance
      * ```
      */
-    static unload() {
-        reset();
+    static async unload() {
+        try {
+            const duckdb = await g_duckdb;
+            if (duckdb?.db) {
+                try {
+                    duckdb.db.terminate();
+                } finally {
+                    duckdb.db.delete();
+                }
+            }
+        } finally {
+            reset();
+            g_duckdb = undefined;
+        }
     }
 
     /**
@@ -240,6 +211,27 @@ export class DuckDB extends MainModuleEx<MainModule> implements Disposable {
         return Number(this.db.numberOfThreads());
     }
 
+    getExceptionMessage(error: unknown): { type: string, message?: string } {
+        const mod: any = this._module as any;
+        try {
+            const result = mod?.getExceptionMessage?.(error);
+            if (Array.isArray(result)) {
+                return {
+                    type: result[0] ?? "",
+                    message: result[1] ?? ""
+                };
+            }
+        } catch (_err) {
+            void _err;
+        }
+
+        const err: any = error;
+        return {
+            type: err?.name ?? "Error",
+            message: typeof err?.message === "string" ? err.message : String(error)
+        };
+    }
+
     /**
      * Registers a binary file in the virtual file system.
      * 
@@ -371,5 +363,5 @@ export class DuckDB extends MainModuleEx<MainModule> implements Disposable {
         const encoded = textEncoder.encode(content);
         this.registerFile(fileName, encoded);
     }
-
 }
+

package/types/duckdb.d.ts

@@ -85,40 +85,9 @@ import { MainModuleEx } from "@hpcc-js/wasm-util";
  * @see [DuckDB Documentation](https://duckdb.org/docs/)
  * @see [DuckDB GitHub](https://github.com/duckdb/duckdb)
  */
-export declare class DuckDB extends MainModuleEx<MainModule> implements Disposable {
+export declare class DuckDB extends MainModuleEx<MainModule> {
     db: CPPDuckDB;
     private constructor();
-    /**
-     * Disposes of the DuckDB database instance and releases resources.
-     *
-     * This method should be called when you're done using the database to free up
-     * memory and clean up resources. After calling dispose, the instance should not be used.
-     *
-     * @example
-     * ```ts
-     * const duckdb = await DuckDB.load();
-     * const connection = duckdb.connect();
-     * // ... use the database ...
-     * connection.delete();
-     * duckdb.dispose();
-     * ```
-     *
-     * @example Using statement (TypeScript 5.2+)
-     * ```ts
-     * {
-     *     using duckdb = await DuckDB.load();
-     *     const connection = duckdb.connect();
-     *     // ... use the database ...
-     *     connection.delete();
-     * } // duckdb.dispose() is called automatically
-     * ```
-     */
-    dispose(): void;
-    /**
-     * Symbol.dispose implementation for use with `using` declarations.
-     * @internal
-     */
-    [Symbol.dispose](): void;
     /**
      * Loads and initializes the DuckDB WASM module.
      *
@@ -149,7 +118,7 @@ export declare class DuckDB extends MainModuleEx<MainModule> implements Disposab
      * // The next call to DuckDB.load() will create a fresh instance
      * ```
      */
-    static unload(): void;
+    static unload(): Promise<void>;
     /**
      * Returns the DuckDB version string.
      *
@@ -195,6 +164,10 @@ export declare class DuckDB extends MainModuleEx<MainModule> implements Disposab
      * ```
      */
     numberOfThreads(): number;
+    getExceptionMessage(error: unknown): {
+        type: string;
+        message?: string;
+    };
     /**
      * Registers a binary file in the virtual file system.
      *