@malloydata/db-duckdb 0.0.103-dev231115200636 → 0.0.103

package/dist/duckdb_connection.d.ts

@@ -17,7 +17,7 @@ export declare class DuckDBConnection extends DuckDBCommon {
         rows: TableData;
         totalRows: number;
     }>;
-    runSQLStream(sql: string, _options?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
+    runSQLStream(sql: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
     createHash(sqlCommand: string): Promise<string>;
     close(): Promise<void>;
 }

package/dist/duckdb_connection.js

@@ -113,7 +113,7 @@ class DuckDBConnection extends duckdb_common_1.DuckDBCommon {
             }
         });
     }
-    async *runSQLStream(sql, _options = {}) {
+    async *runSQLStream(sql, { rowLimit, abortSignal } = {}) {
         await this.setup();
         if (!this.connection) {
             throw new Error('Connection not open');
@@ -123,7 +123,13 @@ class DuckDBConnection extends duckdb_common_1.DuckDBCommon {
             await this.runDuckDBQuery(statements[0]);
             statements.shift();
         }
+        let index = 0;
         for await (const row of this.connection.stream(statements[0])) {
+            if ((rowLimit !== undefined && index >= rowLimit) ||
+                (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted)) {
+                break;
+            }
+            index++;
             yield row;
         }
     }

package/dist/duckdb_wasm_connection.d.ts

@@ -21,11 +21,11 @@ export declare abstract class DuckDBWASMConnection extends DuckDBCommon {
     get database(): duckdb.AsyncDuckDB | null;
     loadExtension(ext: string): Promise<void>;
     protected setup(): Promise<void>;
-    protected runDuckDBQuery(sql: string): Promise<{
+    protected runDuckDBQuery(sql: string, abortSignal?: AbortSignal): Promise<{
         rows: QueryDataRow[];
         totalRows: number;
     }>;
-    runSQLStream(sql: string, _options?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
+    runSQLStream(sql: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
     private findTables;
     fetchSchemaForSQLBlock(sqlRef: SQLBlock, options: FetchSchemaOptions): Promise<{
         structDef: StructDef;

package/dist/duckdb_wasm_connection.js

@@ -201,10 +201,16 @@ class DuckDBWASMConnection extends duckdb_common_1.DuckDBCommon {
         }
         await this.isSetup;
     }
-    async runDuckDBQuery(sql) {
+    async runDuckDBQuery(sql, abortSignal) {
         var _a;
+        const cancel = () => {
+            var _a;
+            (_a = this.connection) === null || _a === void 0 ? void 0 : _a.cancelSent();
+        };
+        abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.addEventListener('abort', cancel);
         const table = await ((_a = this.connection) === null || _a === void 0 ? void 0 : _a.query(sql));
-        if (table === undefined) {
+        abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener('abort', cancel);
+        if (!table) {
             throw new Error('Table is undefined.');
         }
         if ((table === null || table === void 0 ? void 0 : table.numRows) !== null) {
@@ -220,21 +226,38 @@ class DuckDBWASMConnection extends duckdb_common_1.DuckDBCommon {
             throw new Error('Boom');
         }
     }
-    async *runSQLStream(sql, _options = {}) {
+    async *runSQLStream(sql, { rowLimit, abortSignal } = {}) {
         if (!this.connection) {
             throw new Error('duckdb-wasm not connected');
         }
         await this.setup();
         const statements = sql.split('-- hack: split on this');
+        let done = false;
+        const cancel = () => {
+            var _a;
+            done = true;
+            (_a = this.connection) === null || _a === void 0 ? void 0 : _a.cancelSent();
+        };
+        abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.addEventListener('abort', cancel);
         while (statements.length > 1) {
-            await this.runDuckDBQuery(statements[0]);
+            await this.runDuckDBQuery(statements[0], abortSignal);
             statements.shift();
         }
+        let index = 0;
         for await (const chunk of await this.connection.send(statements[0])) {
+            if (done) {
+                break;
+            }
             for (const row of chunk.toArray()) {
+                if ((rowLimit !== undefined && index >= rowLimit) ||
+                    (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted)) {
+                    break;
+                }
                 yield unwrapRow(row);
+                index++;
             }
         }
+        abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener('abort', cancel);
     }
     async findTables(tables, { refreshTimestamp }) {
         const fetchRemoteFile = async (tablePath) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.103-dev231115200636",
+  "version": "0.0.103",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -41,8 +41,8 @@
   },
   "dependencies": {
     "@malloydata/duckdb-wasm": "0.0.6",
-    "@malloydata/malloy": "^0.0.103-dev231115200636",
-    "@malloydata/malloy-interfaces": "^0.0.103-dev231115200636",
+    "@malloydata/malloy": "^0.0.103",
+    "@malloydata/malloy-interfaces": "^0.0.103",
     "apache-arrow": "^13.0.0",
     "duckdb": "0.9.2",
     "web-worker": "^1.2.0"