@visactor/vquery 0.1.50 → 0.2.0

package/dist/dataset/dataset.d.ts

@@ -1,4 +1,4 @@
-import { DatasetColumn, QueryDSL } from '../types';
+import { DatasetColumn, DatasetSource, QueryDSL } from '../types';
 import { DuckDB } from '../db/duckDb';
 import { IndexedDB } from '../db/indexedDb';
 export declare class Dataset {
@@ -6,8 +6,8 @@ export declare class Dataset {
     private indexedDB;
     private _datasetId;
     constructor(duckDB: DuckDB, indexedDB: IndexedDB, datasetId: string);
-    init(temporaryColumns?: DatasetColumn[]): Promise<void>;
-    createOrReplaceView(columns?: DatasetColumn[]): Promise<void>;
+    init(temporaryColumns?: DatasetColumn[], temporaryDatasetSource?: DatasetSource): Promise<void>;
+    createOrReplaceView(columns: DatasetColumn[], datasetSource: DatasetSource): Promise<void>;
     query<T extends Record<string, number | string>>(queryDSL: QueryDSL<T>): Promise<{
         performance: {
             startAt: string;

package/dist/index.cjs

@@ -185,13 +185,14 @@ class Dataset {
         this.indexedDB = indexedDB1;
         this._datasetId = datasetId;
     }
-    async init(temporaryColumns = []) {
+    async init(temporaryColumns, temporaryDatasetSource) {
         const datasetInfo = await this.indexedDB.readDataset(this._datasetId);
         if (!datasetInfo) throw new Error(`Dataset ${this._datasetId} not found`);
-        const columns = temporaryColumns.length > 0 ? temporaryColumns : datasetInfo.datasetSchema.columns;
-        if (columns.length > 0) await this.createOrReplaceView(columns);
+        const columns = temporaryColumns ? temporaryColumns : datasetInfo.datasetSchema.columns;
+        const datasetSource = temporaryDatasetSource || datasetInfo.datasetSource;
+        if (columns.length > 0 && datasetSource) await this.createOrReplaceView(columns, datasetSource);
     }
-    async createOrReplaceView(columns = []) {
+    async createOrReplaceView(columns, datasetSource) {
         const readFunctionMap = {
             csv: 'read_csv_auto',
             json: 'read_json_auto',
@@ -205,13 +206,10 @@ class Dataset {
             datetime: 'TIMESTAMP',
             timestamp: 'TIMESTAMP'
         };
-        const datasetInfo = await this.indexedDB.readDataset(this._datasetId);
-        if (!datasetInfo) throw new Error(`Dataset ${this._datasetId} not found`);
-        const { datasetSource: dataSource } = datasetInfo;
-        if (dataSource) {
-            const readFunction = readFunctionMap[dataSource.type];
-            if (!readFunction) throw new Error(`Unsupported dataSource type: ${dataSource.type}`);
-            await this.duckDB.writeFile(this._datasetId, dataSource.blob);
+        if (datasetSource) {
+            const readFunction = readFunctionMap[datasetSource.type];
+            if (!readFunction) throw new Error(`Unsupported dataSource type: ${datasetSource.type}`);
+            await this.duckDB.writeFile(this._datasetId, datasetSource.blob);
             const columnsStruct = `{${columns.map((c)=>`'${c.name}': '${dataTypeMap[c.type] || 'VARCHAR'}'`).join(', ')}}`;
             const columnNames = columns.map((c)=>`"${c.name}"`).join(', ');
             const createViewSql = `CREATE OR REPLACE VIEW "${this._datasetId}" AS SELECT ${columnNames} FROM ${readFunction}('${this._datasetId}', columns=${columnsStruct})`;
@@ -536,11 +534,12 @@ class VQuery {
         await this.checkDatasetExists(datasetId);
         await this.indexedDB.deleteDataset(datasetId);
     }
-    async connectDataset(datasetId, temporaryColumns = []) {
+    async connectDataset(datasetId, temporaryColumns, temporaryRawDatasetSource) {
         await this.checkInitialized();
         await this.checkDatasetExists(datasetId);
         const dataset = new Dataset(this.duckDB, this.indexedDB, datasetId);
-        await dataset.init(temporaryColumns);
+        const temporaryDatasetSource = temporaryRawDatasetSource ? await DatasetSourceBuilder.from(temporaryRawDatasetSource).build() : void 0;
+        await dataset.init(temporaryColumns, temporaryDatasetSource);
         return dataset;
     }
     async hasDataset(datasetId) {

package/dist/index.js

@@ -150,13 +150,14 @@ class Dataset {
         this.indexedDB = indexedDB1;
         this._datasetId = datasetId;
     }
-    async init(temporaryColumns = []) {
+    async init(temporaryColumns, temporaryDatasetSource) {
         const datasetInfo = await this.indexedDB.readDataset(this._datasetId);
         if (!datasetInfo) throw new Error(`Dataset ${this._datasetId} not found`);
-        const columns = temporaryColumns.length > 0 ? temporaryColumns : datasetInfo.datasetSchema.columns;
-        if (columns.length > 0) await this.createOrReplaceView(columns);
+        const columns = temporaryColumns ? temporaryColumns : datasetInfo.datasetSchema.columns;
+        const datasetSource = temporaryDatasetSource || datasetInfo.datasetSource;
+        if (columns.length > 0 && datasetSource) await this.createOrReplaceView(columns, datasetSource);
     }
-    async createOrReplaceView(columns = []) {
+    async createOrReplaceView(columns, datasetSource) {
         const readFunctionMap = {
             csv: 'read_csv_auto',
             json: 'read_json_auto',
@@ -170,13 +171,10 @@ class Dataset {
             datetime: 'TIMESTAMP',
             timestamp: 'TIMESTAMP'
         };
-        const datasetInfo = await this.indexedDB.readDataset(this._datasetId);
-        if (!datasetInfo) throw new Error(`Dataset ${this._datasetId} not found`);
-        const { datasetSource: dataSource } = datasetInfo;
-        if (dataSource) {
-            const readFunction = readFunctionMap[dataSource.type];
-            if (!readFunction) throw new Error(`Unsupported dataSource type: ${dataSource.type}`);
-            await this.duckDB.writeFile(this._datasetId, dataSource.blob);
+        if (datasetSource) {
+            const readFunction = readFunctionMap[datasetSource.type];
+            if (!readFunction) throw new Error(`Unsupported dataSource type: ${datasetSource.type}`);
+            await this.duckDB.writeFile(this._datasetId, datasetSource.blob);
             const columnsStruct = `{${columns.map((c)=>`'${c.name}': '${dataTypeMap[c.type] || 'VARCHAR'}'`).join(', ')}}`;
             const columnNames = columns.map((c)=>`"${c.name}"`).join(', ');
             const createViewSql = `CREATE OR REPLACE VIEW "${this._datasetId}" AS SELECT ${columnNames} FROM ${readFunction}('${this._datasetId}', columns=${columnsStruct})`;
@@ -500,11 +498,12 @@ class VQuery {
         await this.checkDatasetExists(datasetId);
         await this.indexedDB.deleteDataset(datasetId);
     }
-    async connectDataset(datasetId, temporaryColumns = []) {
+    async connectDataset(datasetId, temporaryColumns, temporaryRawDatasetSource) {
         await this.checkInitialized();
         await this.checkDatasetExists(datasetId);
         const dataset = new Dataset(this.duckDB, this.indexedDB, datasetId);
-        await dataset.init(temporaryColumns);
+        const temporaryDatasetSource = temporaryRawDatasetSource ? await DatasetSourceBuilder.from(temporaryRawDatasetSource).build() : void 0;
+        await dataset.init(temporaryColumns, temporaryDatasetSource);
         return dataset;
     }
     async hasDataset(datasetId) {

package/dist/vquery.d.ts

@@ -10,7 +10,7 @@ export declare class VQuery {
     createDataset(datasetId: string, columns?: DatasetColumn[], rawDatasetSource?: RawDatasetSource): Promise<void>;
     updateDatasetSource(datasetId: string, columns?: DatasetColumn[], rawDatasetSource?: RawDatasetSource): Promise<void>;
     dropDataset(datasetId: string): Promise<void>;
-    connectDataset(datasetId: string, temporaryColumns?: DatasetColumn[]): Promise<Dataset>;
+    connectDataset(datasetId: string, temporaryColumns?: DatasetColumn[], temporaryRawDatasetSource?: RawDatasetSource): Promise<Dataset>;
     hasDataset(datasetId: string): Promise<boolean>;
     listDatasets(): Promise<{
         datasetId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vquery",
-  "version": "0.1.50",
+  "version": "0.2.0",
   "type": "module",
   "exports": {
     ".": {