@malloydata/db-duckdb 0.0.131-dev240312174126 → 0.0.131-dev240314002549

package/dist/duckdb_wasm_connection.js

@@ -91,14 +91,6 @@ const unwrapArrow = (value) => {
         else if (Array.isArray(value)) {
             return value.map(exports.unwrapArrow);
         }
-        else if (obj['microseconds'] && obj['timezone'] === null) {
-            // Convert epoch µs to ms
-            return Number(obj['microseconds']) / 1000;
-        }
-        else if (obj['days']) {
-            // Convert epoch day to Date
-            return new Date(obj['days'] * 8.64e7);
-        }
         else {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const result = {};

package/dist/duckdb_wasm_connection_browser.js

@@ -49,6 +49,60 @@ exports.DuckDBWASMConnection = void 0;
 const duckdb = __importStar(require("@duckdb/duckdb-wasm"));
 const duckdb_wasm_connection_1 = require("./duckdb_wasm_connection");
 const wasm_client_1 = require("@motherduck/wasm-client");
+function unwrapMotherDuck(value) {
+    let result = null;
+    if (value !== null && typeof value === 'object') {
+        if (value instanceof wasm_client_1.DuckDBDate) {
+            result = new Date(value.days * 8.64e7);
+        }
+        else if (value instanceof wasm_client_1.DuckDBDecimal) {
+            result = Number(value.scaledValue) / Math.pow(10, value.scale);
+        }
+        else if (value instanceof wasm_client_1.DuckDBTime) {
+            result = new Date(Number(value.microseconds) / 1000);
+        }
+        else if (value instanceof wasm_client_1.DuckDBTimestampMicroseconds) {
+            result = new Date(Number(value.microseconds) / 1000);
+        }
+        else if (value instanceof wasm_client_1.DuckDBTimestampMilliseconds) {
+            result = new Date(Number(value.milliseconds));
+        }
+        else if (value instanceof wasm_client_1.DuckDBTimestampNanoseconds) {
+            result = new Date(Number(value.nanoseconds) / 1000 / 1000);
+        }
+        else if (value instanceof wasm_client_1.DuckDBTimestampSeconds) {
+            result = new Date(Number(value.seconds) * 1000);
+        }
+        else if (value instanceof wasm_client_1.DuckDBStruct) {
+            const struct = {};
+            for (const structEntry of value.entries) {
+                struct[structEntry.key] = unwrapMotherDuck(structEntry.value);
+            }
+            result = struct;
+        }
+        else if (value instanceof wasm_client_1.DuckDBList) {
+            result = value.values.map(unwrapMotherDuck);
+        }
+        else {
+            result = value.toString();
+        }
+    }
+    else if (typeof value === 'bigint') {
+        result = Number(value);
+    }
+    else {
+        result = value;
+    }
+    return result;
+}
+function unwrapMotherDuckRow(row) {
+    const result = {};
+    for (const entry of Object.entries(row)) {
+        const [key, value] = entry;
+        result[key] = unwrapMotherDuck(value);
+    }
+    return result;
+}
 class DuckDBWASMConnection extends duckdb_wasm_connection_1.DuckDBWASMConnection {
     constructor() {
         super(...arguments);
@@ -112,7 +166,9 @@ class DuckDBWASMConnection extends duckdb_wasm_connection_1.DuckDBWASMConnection
                 if (queryId) {
                     const result = await connection.evaluateQueuedQuery(queryId);
                     if (result === null || result === void 0 ? void 0 : result.data) {
-                        const rows = (0, duckdb_wasm_connection_1.unwrapArrow)(result.data.toRows());
+                        const rows = result.data
+                            .toRows()
+                            .map(row => unwrapMotherDuckRow(row));
                         const totalRows = result.data.rowCount;
                         return {
                             rows,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.131-dev240312174126",
+  "version": "0.0.131-dev240314002549",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@duckdb/duckdb-wasm": "1.28.1-dev106.0",
-    "@malloydata/malloy": "^0.0.131-dev240312174126",
+    "@malloydata/malloy": "^0.0.131-dev240314002549",
     "@motherduck/wasm-client": "^0.4.0",
     "apache-arrow": "^14.0.0",
     "duckdb": "0.9.2",