@visactor/vquery 0.4.12 → 0.4.14

package/dist/browser/esm/adapters/storage-adapter/idb-helpers.d.ts

@@ -0,0 +1,4 @@
+export declare const idbPut: <T>(db: IDBDatabase, storeName: string, value: T) => Promise<any>;
+export declare const idbGet: <T>(db: IDBDatabase, storeName: string, key: any) => Promise<T | undefined>;
+export declare const idbDelete: (db: IDBDatabase, storeName: string, key: any) => Promise<any>;
+export declare const idbGetAll: <T>(db: IDBDatabase, storeName: string) => Promise<T[]>;

package/dist/browser/esm/browser.js

@@ -29,7 +29,15 @@ class PostgresDialect {
         return new NullIntrospector();
     }
 }
-const isSelectItem = (item)=>'object' == typeof item && 'field' in item;
+const OPERATOR_MAP = {
+    gt: '>',
+    gte: '>=',
+    lt: '<',
+    lte: '<=',
+    eq: '=',
+    neq: '!='
+};
+const toSqlOperator = (op)=>OPERATOR_MAP[op] ?? op;
 const escapeValue = (value)=>{
     if (null === value) return 'null';
     if ('string' == typeof value) return `'${value.replace(/'/g, "''")}'`;
@@ -37,6 +45,7 @@ const escapeValue = (value)=>{
     if ('boolean' == typeof value) return value ? 'TRUE' : 'FALSE';
     return `'${String(value).replace(/'/g, "''")}'`;
 };
+const isSelectItem = (item)=>'object' == typeof item && 'field' in item;
 const inlineParameters = (sql, params)=>{
     if (0 === params.length) return sql;
     if (sql.includes('?')) {
@@ -51,15 +60,6 @@ const inlineParameters = (sql, params)=>{
     });
     return sql;
 };
-const operatorMap = {
-    gt: '>',
-    gte: '>=',
-    lt: '<',
-    lte: '<=',
-    eq: '=',
-    neq: '!='
-};
-const toSqlOperator = (op)=>operatorMap[op] ?? op;
 const applyWhere = (qb, where)=>{
     if (!where) return qb;
     const toRaw = (w)=>{
@@ -114,15 +114,6 @@ const applyGroupBy = (qb, fields)=>{
     }
     return qb;
 };
-const having_operatorMap = {
-    gt: '>',
-    gte: '>=',
-    lt: '<',
-    lte: '<=',
-    eq: '=',
-    neq: '!='
-};
-const having_toSqlOperator = (op)=>having_operatorMap[op] ?? op;
 const applyHaving = (qb, having)=>{
     if (!having) return qb;
     const toRaw = (h)=>{
@@ -134,7 +125,7 @@ const applyHaving = (qb, having)=>{
         const leaf = h;
         const field = leaf.field;
         const value = leaf.value;
-        const op = having_toSqlOperator(leaf.op);
+        const op = toSqlOperator(leaf.op);
         if ([
             'sum',
             'avg',
@@ -265,6 +256,13 @@ const DATA_TYPE_MAP = {
     datetime: 'TIMESTAMP',
     timestamp: 'TIMESTAMP'
 };
+const buildColumnsStruct = (columns)=>{
+    const columnDefs = columns.map((c)=>{
+        const duckDBType = DATA_TYPE_MAP[c.type] || 'VARCHAR';
+        return `'${c.name}': '${duckDBType}'`;
+    });
+    return `{${columnDefs.join(', ')}}`;
+};
 class Dataset {
     queryAdapter;
     storageAdapter;
@@ -286,7 +284,7 @@ class Dataset {
         const readFunction = READ_FUNCTION_MAP[datasetSource.type];
         if (!readFunction) throw new Error(`Unsupported dataSource type: ${datasetSource.type}`);
         await this.queryAdapter.writeFile(this._datasetId, datasetSource.blob);
-        const columnsStruct = this.buildColumnsStruct(columns);
+        const columnsStruct = buildColumnsStruct(columns);
         const columnNames = columns.map((c)=>`"${c.name}"`).join(', ');
         let readSql = `${readFunction}('${this._datasetId}')`;
         if ('csv' === datasetSource.type || 'json' === datasetSource.type) readSql = `${readFunction}('${this._datasetId}', columns=${columnsStruct})`;
@@ -316,13 +314,6 @@ class Dataset {
     get datasetId() {
         return this._datasetId;
     }
-    buildColumnsStruct(columns) {
-        const columnDefs = columns.map((c)=>{
-            const duckDBType = DATA_TYPE_MAP[c.type] || 'VARCHAR';
-            return `'${c.name}': '${duckDBType}'`;
-        });
-        return `{${columnDefs.join(', ')}}`;
-    }
 }
 const isUrl = (url)=>isHttpUrl(url) || isBase64Url(url);
 const isHttpUrl = (url)=>url.startsWith('http://') || url.startsWith('https://');
@@ -369,6 +360,23 @@ class DatasetSourceBuilder {
         });
     }
 }
+const wrapIDBRequest = (db, storeName, mode, operation)=>new Promise((resolve, reject)=>{
+        const transaction = db.transaction([
+            storeName
+        ], mode);
+        const store = transaction.objectStore(storeName);
+        const request = operation(store);
+        request.onsuccess = ()=>{
+            resolve(request.result);
+        };
+        request.onerror = ()=>{
+            reject(request.error);
+        };
+    });
+const idbPut = (db, storeName, value)=>wrapIDBRequest(db, storeName, 'readwrite', (store)=>store.put(value));
+const idbGet = (db, storeName, key)=>wrapIDBRequest(db, storeName, 'readonly', (store)=>store.get(key));
+const idbDelete = (db, storeName, key)=>wrapIDBRequest(db, storeName, 'readwrite', (store)=>store.delete(key));
+const idbGetAll = (db, storeName)=>wrapIDBRequest(db, storeName, 'readonly', (store)=>store.getAll());
 class IndexedDBAdapter {
     db = null;
     dbName;
@@ -398,68 +406,28 @@ class IndexedDBAdapter {
             this.db = null;
         }
     };
-    writeDataset = (datasetId, datasetSchema, datasetSource)=>new Promise((resolve, reject)=>{
-            if (!this.db) return reject('DB is not open');
-            const transaction = this.db.transaction([
-                this.datasetStoreName
-            ], 'readwrite');
-            const store = transaction.objectStore(this.datasetStoreName);
-            const request = store.put({
-                datasetId,
-                datasetSchema,
-                datasetSource
-            });
-            request.onsuccess = ()=>{
-                resolve();
-            };
-            request.onerror = (event)=>{
-                reject(event.target.error);
-            };
-        });
-    readDataset = (datasetId)=>new Promise((resolve, reject)=>{
-            if (!this.db) return reject('DB is not open');
-            const transaction = this.db.transaction([
-                this.datasetStoreName
-            ], 'readonly');
-            const store = transaction.objectStore(this.datasetStoreName);
-            const request = store.get(datasetId);
-            request.onsuccess = (event)=>{
-                const result = event.target.result;
-                resolve(result || null);
-            };
-            request.onerror = (event)=>{
-                reject(event.target.error);
-            };
-        });
-    deleteDataset = (datasetId)=>new Promise((resolve, reject)=>{
-            if (!this.db) return reject('DB is not open');
-            const transaction = this.db.transaction([
-                this.datasetStoreName
-            ], 'readwrite');
-            const store = transaction.objectStore(this.datasetStoreName);
-            const request = store.delete(datasetId);
-            request.onsuccess = ()=>{
-                resolve();
-            };
-            request.onerror = (event)=>{
-                reject(event.target.error);
-            };
-        });
-    listDatasets = ()=>new Promise((resolve, reject)=>{
-            if (!this.db) return reject('DB is not open');
-            const transaction = this.db.transaction([
-                this.datasetStoreName
-            ], 'readonly');
-            const store = transaction.objectStore(this.datasetStoreName);
-            const request = store.getAll();
-            request.onsuccess = (event)=>{
-                const result = event.target.result;
-                resolve(result);
-            };
-            request.onerror = (event)=>{
-                reject(event.target.error);
-            };
-        });
+    writeDataset = (datasetId, datasetSchema, datasetSource)=>{
+        if (!this.db) return Promise.reject('DB is not open');
+        const record = {
+            datasetId,
+            datasetSchema,
+            datasetSource
+        };
+        return idbPut(this.db, this.datasetStoreName, record).then(()=>void 0);
+    };
+    readDataset = async (datasetId)=>{
+        if (!this.db) return Promise.reject('DB is not open');
+        const result = await idbGet(this.db, this.datasetStoreName, datasetId);
+        return result ?? null;
+    };
+    deleteDataset = (datasetId)=>{
+        if (!this.db) return Promise.reject('DB is not open');
+        return idbDelete(this.db, this.datasetStoreName, datasetId).then(()=>void 0);
+    };
+    listDatasets = async ()=>{
+        if (!this.db) return Promise.reject('DB is not open');
+        return idbGetAll(this.db, this.datasetStoreName);
+    };
 }
 class DuckDBWebQueryAdapter {
     db = null;
@@ -548,7 +516,7 @@ class VQuery {
         const datasetSchema = {
             datasetId,
             datasetAlias: datasetId,
-            columns: columns
+            columns
         };
         await this.storageAdapter.writeDataset(datasetId, datasetSchema, datasetSource);
     }
@@ -559,7 +527,7 @@ class VQuery {
         const datasetSchema = {
             datasetId,
             datasetAlias: datasetId,
-            columns: columns
+            columns
         };
         await this.storageAdapter.writeDataset(datasetId, datasetSchema, datasetSource);
     }

package/dist/browser/esm/dataset/constants.d.ts

@@ -0,0 +1,7 @@
+import { DatasetSourceType, DataType } from '../types';
+export declare const READ_FUNCTION_MAP: Record<DatasetSourceType, string>;
+export declare const DATA_TYPE_MAP: Record<DataType, string>;
+export declare const buildColumnsStruct: (columns: {
+    name: string;
+    type: DataType;
+}[]) => string;

package/dist/browser/esm/dataset/dataset.d.ts

@@ -5,19 +5,8 @@ export declare class Dataset {
     private storageAdapter;
     private _datasetId;
     constructor(queryAdapter: QueryAdapter, storageAdapter: StorageAdapter, datasetId: string);
-    /**
-     * Initialize the dataset by loading it into the query engine
-     * @param temporaryColumns Optional temporary columns to override storage schema
-     * @param temporaryDatasetSource Optional temporary data source to override storage source
-     */
     init(temporaryColumns?: DatasetColumn[], temporaryDatasetSource?: DatasetSource): Promise<void>;
-    /**
-     * Register file and create a view in DuckDB
-     */
     createOrReplaceView(columns: DatasetColumn[], datasetSource: DatasetSource): Promise<void>;
-    /**
-     * Execute query using VQuery DSL
-     */
     query<T extends Record<string, number | string>>(queryDSL: QueryDSL<T> | VQueryDSL<T>): Promise<{
         performance: {
             startAt: string;
@@ -27,9 +16,6 @@ export declare class Dataset {
         dataset: any[];
         table: any;
     }>;
-    /**
-     * Execute raw SQL query
-     */
     queryBySQL(sql: string): Promise<{
         performance: {
             startAt: string;
@@ -39,10 +25,6 @@ export declare class Dataset {
         dataset: any[];
         table: any;
     }>;
-    /**
-     * Clean up resources
-     */
     disconnect(): Promise<void>;
     get datasetId(): string;
-    private buildColumnsStruct;
 }

package/dist/browser/esm/sql-builder/utils/escape.d.ts

@@ -0,0 +1 @@
+export declare const escapeValue: (value: unknown) => string;

package/dist/browser/esm/sql-builder/utils/guards.d.ts

@@ -0,0 +1,2 @@
+import { SelectItem } from '../../types/dsl/Select';
+export declare const isSelectItem: <T>(item: keyof T | SelectItem<T>) => item is SelectItem<T>;

package/dist/browser/esm/sql-builder/utils/index.d.ts

@@ -0,0 +1,3 @@
+export * from './operator';
+export * from './escape';
+export * from './guards';

package/dist/browser/esm/sql-builder/utils/operator.d.ts

@@ -0,0 +1,5 @@
+/**
+ * SQL operator mapping from VBI DSL operators to SQL operators
+ */
+export declare const OPERATOR_MAP: Record<string, string>;
+export declare const toSqlOperator: (op: string) => string;

package/dist/node/cjs/adapters/storage-adapter/idb-helpers.d.ts

@@ -0,0 +1,4 @@
+export declare const idbPut: <T>(db: IDBDatabase, storeName: string, value: T) => Promise<any>;
+export declare const idbGet: <T>(db: IDBDatabase, storeName: string, key: any) => Promise<T | undefined>;
+export declare const idbDelete: (db: IDBDatabase, storeName: string, key: any) => Promise<any>;
+export declare const idbGetAll: <T>(db: IDBDatabase, storeName: string) => Promise<T[]>;

package/dist/node/cjs/dataset/constants.d.ts

@@ -0,0 +1,7 @@
+import { DatasetSourceType, DataType } from '../types';
+export declare const READ_FUNCTION_MAP: Record<DatasetSourceType, string>;
+export declare const DATA_TYPE_MAP: Record<DataType, string>;
+export declare const buildColumnsStruct: (columns: {
+    name: string;
+    type: DataType;
+}[]) => string;

package/dist/node/cjs/dataset/dataset.d.ts

@@ -5,19 +5,8 @@ export declare class Dataset {
     private storageAdapter;
     private _datasetId;
     constructor(queryAdapter: QueryAdapter, storageAdapter: StorageAdapter, datasetId: string);
-    /**
-     * Initialize the dataset by loading it into the query engine
-     * @param temporaryColumns Optional temporary columns to override storage schema
-     * @param temporaryDatasetSource Optional temporary data source to override storage source
-     */
     init(temporaryColumns?: DatasetColumn[], temporaryDatasetSource?: DatasetSource): Promise<void>;
-    /**
-     * Register file and create a view in DuckDB
-     */
     createOrReplaceView(columns: DatasetColumn[], datasetSource: DatasetSource): Promise<void>;
-    /**
-     * Execute query using VQuery DSL
-     */
     query<T extends Record<string, number | string>>(queryDSL: QueryDSL<T> | VQueryDSL<T>): Promise<{
         performance: {
             startAt: string;
@@ -27,9 +16,6 @@ export declare class Dataset {
         dataset: any[];
         table: any;
     }>;
-    /**
-     * Execute raw SQL query
-     */
     queryBySQL(sql: string): Promise<{
         performance: {
             startAt: string;
@@ -39,10 +25,6 @@ export declare class Dataset {
         dataset: any[];
         table: any;
     }>;
-    /**
-     * Clean up resources
-     */
     disconnect(): Promise<void>;
     get datasetId(): string;
-    private buildColumnsStruct;
 }

package/dist/node/cjs/node.cjs

@@ -67,7 +67,6 @@ class PostgresDialect {
         return new NullIntrospector();
     }
 }
-const isSelectItem = (item)=>'object' == typeof item && 'field' in item;
 const escapeValue = (value)=>{
     if (null === value) return 'null';
     if ('string' == typeof value) return `'${value.replace(/'/g, "''")}'`;
@@ -89,7 +88,7 @@ const inlineParameters = (sql, params)=>{
     });
     return sql;
 };
-const operatorMap = {
+const OPERATOR_MAP = {
     gt: '>',
     gte: '>=',
     lt: '<',
@@ -97,7 +96,7 @@ const operatorMap = {
     eq: '=',
     neq: '!='
 };
-const toSqlOperator = (op)=>operatorMap[op] ?? op;
+const toSqlOperator = (op)=>OPERATOR_MAP[op] ?? op;
 const applyWhere = (qb, where)=>{
     if (!where) return qb;
     const toRaw = (w)=>{
@@ -152,15 +151,6 @@ const applyGroupBy = (qb, fields)=>{
     }
     return qb;
 };
-const having_operatorMap = {
-    gt: '>',
-    gte: '>=',
-    lt: '<',
-    lte: '<=',
-    eq: '=',
-    neq: '!='
-};
-const having_toSqlOperator = (op)=>having_operatorMap[op] ?? op;
 const applyHaving = (qb, having)=>{
     if (!having) return qb;
     const toRaw = (h)=>{
@@ -172,7 +162,7 @@ const applyHaving = (qb, having)=>{
         const leaf = h;
         const field = leaf.field;
         const value = leaf.value;
-        const op = having_toSqlOperator(leaf.op);
+        const op = toSqlOperator(leaf.op);
         if ([
             'sum',
             'avg',
@@ -228,6 +218,7 @@ const applyOrder = (qb, orderBy)=>{
     });
     return qb;
 };
+const isSelectItem = (item)=>'object' == typeof item && 'field' in item;
 const DATE_FORMAT_MAP = {
     year: '%Y',
     month: '%Y-%m',
@@ -303,6 +294,13 @@ const DATA_TYPE_MAP = {
     datetime: 'TIMESTAMP',
     timestamp: 'TIMESTAMP'
 };
+const buildColumnsStruct = (columns)=>{
+    const columnDefs = columns.map((c)=>{
+        const duckDBType = DATA_TYPE_MAP[c.type] || 'VARCHAR';
+        return `'${c.name}': '${duckDBType}'`;
+    });
+    return `{${columnDefs.join(', ')}}`;
+};
 class Dataset {
     queryAdapter;
     storageAdapter;
@@ -324,7 +322,7 @@ class Dataset {
         const readFunction = READ_FUNCTION_MAP[datasetSource.type];
         if (!readFunction) throw new Error(`Unsupported dataSource type: ${datasetSource.type}`);
         await this.queryAdapter.writeFile(this._datasetId, datasetSource.blob);
-        const columnsStruct = this.buildColumnsStruct(columns);
+        const columnsStruct = buildColumnsStruct(columns);
         const columnNames = columns.map((c)=>`"${c.name}"`).join(', ');
         let readSql = `${readFunction}('${this._datasetId}')`;
         if ('csv' === datasetSource.type || 'json' === datasetSource.type) readSql = `${readFunction}('${this._datasetId}', columns=${columnsStruct})`;
@@ -354,13 +352,6 @@ class Dataset {
     get datasetId() {
         return this._datasetId;
     }
-    buildColumnsStruct(columns) {
-        const columnDefs = columns.map((c)=>{
-            const duckDBType = DATA_TYPE_MAP[c.type] || 'VARCHAR';
-            return `'${c.name}': '${duckDBType}'`;
-        });
-        return `{${columnDefs.join(', ')}}`;
-    }
 }
 const isUrl = (url)=>isHttpUrl(url) || isBase64Url(url);
 const isHttpUrl = (url)=>url.startsWith('http://') || url.startsWith('https://');
@@ -523,7 +514,7 @@ class VQuery {
         const datasetSchema = {
             datasetId,
             datasetAlias: datasetId,
-            columns: columns
+            columns
         };
         await this.storageAdapter.writeDataset(datasetId, datasetSchema, datasetSource);
     }
@@ -534,7 +525,7 @@ class VQuery {
         const datasetSchema = {
             datasetId,
             datasetAlias: datasetId,
-            columns: columns
+            columns
         };
         await this.storageAdapter.writeDataset(datasetId, datasetSchema, datasetSource);
     }

package/dist/node/cjs/sql-builder/utils/escape.d.ts

@@ -0,0 +1 @@
+export declare const escapeValue: (value: unknown) => string;

package/dist/node/cjs/sql-builder/utils/guards.d.ts

@@ -0,0 +1,2 @@
+import { SelectItem } from '../../types/dsl/Select';
+export declare const isSelectItem: <T>(item: keyof T | SelectItem<T>) => item is SelectItem<T>;

package/dist/node/cjs/sql-builder/utils/index.d.ts

@@ -0,0 +1,3 @@
+export * from './operator';
+export * from './escape';
+export * from './guards';

package/dist/node/cjs/sql-builder/utils/operator.d.ts

@@ -0,0 +1,5 @@
+/**
+ * SQL operator mapping from VBI DSL operators to SQL operators
+ */
+export declare const OPERATOR_MAP: Record<string, string>;
+export declare const toSqlOperator: (op: string) => string;

package/dist/node/esm/adapters/storage-adapter/idb-helpers.d.ts

@@ -0,0 +1,4 @@
+export declare const idbPut: <T>(db: IDBDatabase, storeName: string, value: T) => Promise<any>;
+export declare const idbGet: <T>(db: IDBDatabase, storeName: string, key: any) => Promise<T | undefined>;
+export declare const idbDelete: (db: IDBDatabase, storeName: string, key: any) => Promise<any>;
+export declare const idbGetAll: <T>(db: IDBDatabase, storeName: string) => Promise<T[]>;

package/dist/node/esm/dataset/constants.d.ts

@@ -0,0 +1,7 @@
+import { DatasetSourceType, DataType } from '../types';
+export declare const READ_FUNCTION_MAP: Record<DatasetSourceType, string>;
+export declare const DATA_TYPE_MAP: Record<DataType, string>;
+export declare const buildColumnsStruct: (columns: {
+    name: string;
+    type: DataType;
+}[]) => string;

package/dist/node/esm/dataset/dataset.d.ts

@@ -5,19 +5,8 @@ export declare class Dataset {
     private storageAdapter;
     private _datasetId;
     constructor(queryAdapter: QueryAdapter, storageAdapter: StorageAdapter, datasetId: string);
-    /**
-     * Initialize the dataset by loading it into the query engine
-     * @param temporaryColumns Optional temporary columns to override storage schema
-     * @param temporaryDatasetSource Optional temporary data source to override storage source
-     */
     init(temporaryColumns?: DatasetColumn[], temporaryDatasetSource?: DatasetSource): Promise<void>;
-    /**
-     * Register file and create a view in DuckDB
-     */
     createOrReplaceView(columns: DatasetColumn[], datasetSource: DatasetSource): Promise<void>;
-    /**
-     * Execute query using VQuery DSL
-     */
     query<T extends Record<string, number | string>>(queryDSL: QueryDSL<T> | VQueryDSL<T>): Promise<{
         performance: {
             startAt: string;
@@ -27,9 +16,6 @@ export declare class Dataset {
         dataset: any[];
         table: any;
     }>;
-    /**
-     * Execute raw SQL query
-     */
     queryBySQL(sql: string): Promise<{
         performance: {
             startAt: string;
@@ -39,10 +25,6 @@ export declare class Dataset {
         dataset: any[];
         table: any;
     }>;
-    /**
-     * Clean up resources
-     */
     disconnect(): Promise<void>;
     get datasetId(): string;
-    private buildColumnsStruct;
 }

package/dist/node/esm/node.js

@@ -30,7 +30,15 @@ class PostgresDialect {
         return new NullIntrospector();
     }
 }
-const isSelectItem = (item)=>'object' == typeof item && 'field' in item;
+const OPERATOR_MAP = {
+    gt: '>',
+    gte: '>=',
+    lt: '<',
+    lte: '<=',
+    eq: '=',
+    neq: '!='
+};
+const toSqlOperator = (op)=>OPERATOR_MAP[op] ?? op;
 const escapeValue = (value)=>{
     if (null === value) return 'null';
     if ('string' == typeof value) return `'${value.replace(/'/g, "''")}'`;
@@ -38,6 +46,7 @@ const escapeValue = (value)=>{
     if ('boolean' == typeof value) return value ? 'TRUE' : 'FALSE';
     return `'${String(value).replace(/'/g, "''")}'`;
 };
+const isSelectItem = (item)=>'object' == typeof item && 'field' in item;
 const inlineParameters = (sql, params)=>{
     if (0 === params.length) return sql;
     if (sql.includes('?')) {
@@ -52,15 +61,6 @@ const inlineParameters = (sql, params)=>{
     });
     return sql;
 };
-const operatorMap = {
-    gt: '>',
-    gte: '>=',
-    lt: '<',
-    lte: '<=',
-    eq: '=',
-    neq: '!='
-};
-const toSqlOperator = (op)=>operatorMap[op] ?? op;
 const applyWhere = (qb, where)=>{
     if (!where) return qb;
     const toRaw = (w)=>{
@@ -115,15 +115,6 @@ const applyGroupBy = (qb, fields)=>{
     }
     return qb;
 };
-const having_operatorMap = {
-    gt: '>',
-    gte: '>=',
-    lt: '<',
-    lte: '<=',
-    eq: '=',
-    neq: '!='
-};
-const having_toSqlOperator = (op)=>having_operatorMap[op] ?? op;
 const applyHaving = (qb, having)=>{
     if (!having) return qb;
     const toRaw = (h)=>{
@@ -135,7 +126,7 @@ const applyHaving = (qb, having)=>{
         const leaf = h;
         const field = leaf.field;
         const value = leaf.value;
-        const op = having_toSqlOperator(leaf.op);
+        const op = toSqlOperator(leaf.op);
         if ([
             'sum',
             'avg',
@@ -266,6 +257,13 @@ const DATA_TYPE_MAP = {
     datetime: 'TIMESTAMP',
     timestamp: 'TIMESTAMP'
 };
+const buildColumnsStruct = (columns)=>{
+    const columnDefs = columns.map((c)=>{
+        const duckDBType = DATA_TYPE_MAP[c.type] || 'VARCHAR';
+        return `'${c.name}': '${duckDBType}'`;
+    });
+    return `{${columnDefs.join(', ')}}`;
+};
 class Dataset {
     queryAdapter;
     storageAdapter;
@@ -287,7 +285,7 @@ class Dataset {
         const readFunction = READ_FUNCTION_MAP[datasetSource.type];
         if (!readFunction) throw new Error(`Unsupported dataSource type: ${datasetSource.type}`);
         await this.queryAdapter.writeFile(this._datasetId, datasetSource.blob);
-        const columnsStruct = this.buildColumnsStruct(columns);
+        const columnsStruct = buildColumnsStruct(columns);
         const columnNames = columns.map((c)=>`"${c.name}"`).join(', ');
         let readSql = `${readFunction}('${this._datasetId}')`;
         if ('csv' === datasetSource.type || 'json' === datasetSource.type) readSql = `${readFunction}('${this._datasetId}', columns=${columnsStruct})`;
@@ -317,13 +315,6 @@ class Dataset {
     get datasetId() {
         return this._datasetId;
     }
-    buildColumnsStruct(columns) {
-        const columnDefs = columns.map((c)=>{
-            const duckDBType = DATA_TYPE_MAP[c.type] || 'VARCHAR';
-            return `'${c.name}': '${duckDBType}'`;
-        });
-        return `{${columnDefs.join(', ')}}`;
-    }
 }
 const isUrl = (url)=>isHttpUrl(url) || isBase64Url(url);
 const isHttpUrl = (url)=>url.startsWith('http://') || url.startsWith('https://');
@@ -484,7 +475,7 @@ class VQuery {
         const datasetSchema = {
             datasetId,
             datasetAlias: datasetId,
-            columns: columns
+            columns
         };
         await this.storageAdapter.writeDataset(datasetId, datasetSchema, datasetSource);
     }
@@ -495,7 +486,7 @@ class VQuery {
         const datasetSchema = {
             datasetId,
             datasetAlias: datasetId,
-            columns: columns
+            columns
         };
         await this.storageAdapter.writeDataset(datasetId, datasetSchema, datasetSource);
     }

package/dist/node/esm/sql-builder/utils/escape.d.ts

@@ -0,0 +1 @@
+export declare const escapeValue: (value: unknown) => string;

package/dist/node/esm/sql-builder/utils/guards.d.ts

@@ -0,0 +1,2 @@
+import { SelectItem } from '../../types/dsl/Select';
+export declare const isSelectItem: <T>(item: keyof T | SelectItem<T>) => item is SelectItem<T>;

package/dist/node/esm/sql-builder/utils/index.d.ts

@@ -0,0 +1,3 @@
+export * from './operator';
+export * from './escape';
+export * from './guards';

package/dist/node/esm/sql-builder/utils/operator.d.ts

@@ -0,0 +1,5 @@
+/**
+ * SQL operator mapping from VBI DSL operators to SQL operators
+ */
+export declare const OPERATOR_MAP: Record<string, string>;
+export declare const toSqlOperator: (op: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vquery",
-  "version": "0.4.12",
+  "version": "0.4.14",
   "license": "MIT",
   "homepage": "https://visactor.github.io/VBI",
   "bugs": "https://github.com/VisActor/VBI/issues",
@@ -63,6 +63,7 @@
     "dev": "rslib build --watch --no-clean",
     "lint": "eslint .",
     "test": "rstest",
+    "format": "prettier --write .",
     "test:update": "rstest --update",
     "test:coverage": "rstest --coverage && node scripts/build-coverage-badge.mjs && open ./coverage/index.html",
     "typecheck": "tsc --noEmit"

package/dist/browser/esm/sql-builder/utils.d.ts

@@ -1,8 +0,0 @@
-import { Where, WhereClause, WhereGroup, WhereLeaf } from '../types';
-import { SelectItem } from '../types/dsl/Select';
-export declare const isSelectItem: <T>(item: keyof T | SelectItem<T>) => item is SelectItem<T>;
-export declare const isWhereLeaf: <T>(where: Where<T> | WhereClause<T>) => where is WhereLeaf<T>;
-export declare const isWhereGroup: <T>(where: Where<T> | WhereClause<T>) => where is WhereGroup<T>;
-export declare const isStringOrNumber: (value: unknown) => value is string | number;
-export declare const escapeLiteral: <T>(value: T[keyof T]) => T[keyof T];
-export declare const escapeValue: (value: unknown) => string;

package/dist/node/cjs/sql-builder/utils.d.ts

@@ -1,8 +0,0 @@
-import { Where, WhereClause, WhereGroup, WhereLeaf } from '../types';
-import { SelectItem } from '../types/dsl/Select';
-export declare const isSelectItem: <T>(item: keyof T | SelectItem<T>) => item is SelectItem<T>;
-export declare const isWhereLeaf: <T>(where: Where<T> | WhereClause<T>) => where is WhereLeaf<T>;
-export declare const isWhereGroup: <T>(where: Where<T> | WhereClause<T>) => where is WhereGroup<T>;
-export declare const isStringOrNumber: (value: unknown) => value is string | number;
-export declare const escapeLiteral: <T>(value: T[keyof T]) => T[keyof T];
-export declare const escapeValue: (value: unknown) => string;

package/dist/node/esm/sql-builder/utils.d.ts

@@ -1,8 +0,0 @@
-import { Where, WhereClause, WhereGroup, WhereLeaf } from '../types';
-import { SelectItem } from '../types/dsl/Select';
-export declare const isSelectItem: <T>(item: keyof T | SelectItem<T>) => item is SelectItem<T>;
-export declare const isWhereLeaf: <T>(where: Where<T> | WhereClause<T>) => where is WhereLeaf<T>;
-export declare const isWhereGroup: <T>(where: Where<T> | WhereClause<T>) => where is WhereGroup<T>;
-export declare const isStringOrNumber: (value: unknown) => value is string | number;
-export declare const escapeLiteral: <T>(value: T[keyof T]) => T[keyof T];
-export declare const escapeValue: (value: unknown) => string;