@malloydata/db-duckdb 0.0.41-dev230615144150 → 0.0.41-dev230615174435

package/dist/duckdb_wasm_connection.d.ts

@@ -5,11 +5,11 @@ declare type RemoteFileCallback = (tableName: string) => Promise<Uint8Array | un
 export declare abstract class DuckDBWASMConnection extends DuckDBCommon {
     readonly name: string;
     private databasePath;
-    private workingDirectory;
+    protected workingDirectory: string;
     connecting: Promise<void>;
     protected _connection: duckdb.AsyncDuckDBConnection | null;
     protected _database: duckdb.AsyncDuckDB | null;
-    protected isSetup: boolean;
+    protected isSetup: Promise<void> | undefined;
     private worker;
     private remoteFileCallbacks;
     private remoteFileStatus;
@@ -18,6 +18,7 @@ export declare abstract class DuckDBWASMConnection extends DuckDBCommon {
     abstract getBundles(): duckdb.DuckDBBundles;
     get connection(): duckdb.AsyncDuckDBConnection | null;
     get database(): duckdb.AsyncDuckDB | null;
+    loadExtension(ext: string): Promise<void>;
     protected setup(): Promise<void>;
     protected runDuckDBQuery(sql: string): Promise<{
         rows: QueryDataRow[];

package/dist/duckdb_wasm_connection.js

@@ -94,7 +94,9 @@ const unwrapArrow = (value) => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const result = {};
             for (const key in obj) {
-                result[key] = unwrapArrow(obj[key]);
+                if (Object.prototype.hasOwnProperty.call(obj, key)) {
+                    result[key] = unwrapArrow(obj[key]);
+                }
             }
             return result;
         }
@@ -126,7 +128,6 @@ class DuckDBWASMConnection extends duckdb_common_1.DuckDBCommon {
         this.workingDirectory = workingDirectory;
         this._connection = null;
         this._database = null;
-        this.isSetup = false;
         this.worker = null;
         this.remoteFileCallbacks = [];
         this.remoteFileStatus = {};
@@ -164,8 +165,31 @@ class DuckDBWASMConnection extends duckdb_common_1.DuckDBCommon {
     get database() {
         return this._database;
     }
+    async loadExtension(ext) {
+        try {
+            await this.runDuckDBQuery(`INSTALL '${ext}'`);
+            await this.runDuckDBQuery(`LOAD '${ext}'`);
+        }
+        catch (error) {
+            // eslint-disable-next-line no-console
+            console.error(`Unable to load ${ext} extension`, error);
+        }
+    }
     async setup() {
+        const doSetup = async () => {
+            if (this.workingDirectory) {
+                await this.runDuckDBQuery(`SET FILE_SEARCH_PATH='${this.workingDirectory}'`);
+            }
+            // Not quite ready for prime time
+            // for (const ext of ['json', 'httpfs', 'icu']) {
+            //   await this.loadExtension(ext);
+            // }
+        };
         await this.connecting;
+        if (!this.isSetup) {
+            this.isSetup = doSetup();
+        }
+        await this.isSetup;
     }
     async runDuckDBQuery(sql) {
         var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.41-dev230615144150",
+  "version": "0.0.41-dev230615174435",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -40,10 +40,10 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/duckdb-wasm": "0.0.1",
-    "@malloydata/malloy": "^0.0.41-dev230615144150",
+    "@malloydata/duckdb-wasm": "0.0.2",
+    "@malloydata/malloy": "^0.0.40",
     "apache-arrow": "^11.0.0",
-    "duckdb": "0.7.1",
+    "duckdb": "0.8.1",
     "web-worker": "^1.2.0"
   }
 }