@visactor/vbi 0.4.17 → 0.4.19

package/dist/builder/adapters/index.d.ts

@@ -0,0 +1 @@
+export * from './vquery-vseed';

package/dist/builder/adapters/vquery-vseed/build-vquery.d.ts

@@ -0,0 +1,3 @@
+import type { VBIQueryBuilder } from '../../../types';
+import type { DefaultVBIQueryDSL } from './types';
+export declare const buildVQueryDSL: VBIQueryBuilder<DefaultVBIQueryDSL>;

package/dist/builder/adapters/vquery-vseed/build-vseed.d.ts

@@ -0,0 +1,3 @@
+import type { VBISeedBuilder } from '../../../types';
+import type { DefaultVBIQueryDSL, DefaultVBISeedDSL } from './types';
+export declare const buildVSeedDSL: VBISeedBuilder<DefaultVBIQueryDSL, DefaultVBISeedDSL>;

package/dist/builder/adapters/vquery-vseed/index.d.ts

@@ -0,0 +1,7 @@
+import type { VBIBuilderAdapters } from '../../../types';
+import type { DefaultVBIQueryDSL, DefaultVBISeedDSL } from './types';
+export type { DefaultVBIQueryDSL, DefaultVBISeedDSL } from './types';
+export { buildVQueryDSL } from './build-vquery';
+export { buildVSeedDSL } from './build-vseed';
+export declare const defaultVBIBuilderAdapters: VBIBuilderAdapters<DefaultVBIQueryDSL, DefaultVBISeedDSL>;
+export declare const resolveVBIBuilderAdapters: <TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL>(adapters?: Partial<VBIBuilderAdapters<TQueryDSL, TSeedDSL>>) => VBIBuilderAdapters<TQueryDSL, TSeedDSL>;

package/dist/builder/adapters/vquery-vseed/types.d.ts

@@ -0,0 +1,4 @@
+import type { VSeedDSL } from '@visactor/vseed';
+import type { VQueryDSL } from '@visactor/vquery';
+export type DefaultVBIQueryDSL = VQueryDSL;
+export type DefaultVBISeedDSL = VSeedDSL;

package/dist/builder/{vbi-builder.d.ts → builder.d.ts}

@@ -1,11 +1,11 @@
 import * as Y from 'yjs';
-import type { VSeedDSL } from '@visactor/vseed';
-import type { VQueryDSL } from '@visactor/vquery';
+import type { DefaultVBIQueryDSL, DefaultVBISeedDSL } from './adapters/vquery-vseed';
 import { DimensionsBuilder, MeasuresBuilder, HavingFilterBuilder, WhereFilterBuilder, ChartTypeBuilder, ThemeBuilder, LocaleBuilder, LimitBuilder, UndoManager } from './features';
-import type { VBIDSL, VBIBuilderInterface } from '../types';
-export declare class VBIBuilder implements VBIBuilderInterface {
+import type { VBIDSL, VBIBuilderAdapters, VBIBuilderInterface, VBIBuilderOptions } from '../types';
+export declare class VBIBuilder<TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL> implements VBIBuilderInterface<TQueryDSL, TSeedDSL> {
     doc: Y.Doc;
     dsl: Y.Map<any>;
+    adapters: VBIBuilderAdapters<TQueryDSL, TSeedDSL>;
     chartType: ChartTypeBuilder;
     measures: MeasuresBuilder;
     dimensions: DimensionsBuilder;
@@ -15,11 +15,11 @@ export declare class VBIBuilder implements VBIBuilderInterface {
     locale: LocaleBuilder;
     limit: LimitBuilder;
     undoManager: UndoManager;
-    constructor(doc: Y.Doc);
+    constructor(doc: Y.Doc, options?: VBIBuilderOptions<TQueryDSL, TSeedDSL>);
     applyUpdate: (update: Uint8Array, transactionOrigin?: any) => void;
     encodeStateAsUpdate: (targetStateVector?: Uint8Array) => Uint8Array<ArrayBufferLike>;
-    buildVSeed: () => Promise<VSeedDSL>;
-    buildVQuery: () => VQueryDSL;
+    buildVSeed: () => Promise<TSeedDSL>;
+    buildVQuery: () => TQueryDSL;
     build: () => VBIDSL;
     isEmpty: () => boolean;
     getSchema: () => Promise<{

package/dist/builder/features/havingFilter/having-node-builder.d.ts

@@ -1,5 +1,5 @@
 import * as Y from 'yjs';
-import { VBIHavingFilter } from '../../../types';
+import { VBIHavingFilter, VBIHavingAggregate } from '../../../types';
 /**
  * @description Having 过滤节点构建器，用于配置单个 Having 过滤条件
  */
@@ -18,6 +18,10 @@ export declare class HavingFilterNodeBuilder {
      * @description 获取过滤操作符
      */
     getOperator(): string | undefined;
+    /**
+     * @description 获取聚合配置
+     */
+    getAggregate(): VBIHavingAggregate | undefined;
     /**
      * @description 设置过滤条件的值
      * @param value - 过滤值
@@ -28,6 +32,11 @@ export declare class HavingFilterNodeBuilder {
      * @param operator - 操作符
      */
     setOperator(operator: string): this;
+    /**
+     * @description 设置聚合配置
+     * @param aggregate - 聚合配置
+     */
+    setAggregate(aggregate: VBIHavingAggregate): this;
     /**
      * @description 导出为 JSON
      */

package/dist/builder/index.d.ts

@@ -1,3 +1,4 @@
-export { VBIBuilder } from './vbi-builder';
+export { VBIBuilder } from './builder';
 export { VBI } from '../vbi';
+export * from './adapters';
 export { MeasuresBuilder, DimensionsBuilder, ChartTypeBuilder, HavingFilterBuilder, WhereFilterBuilder, ThemeBuilder, LocaleBuilder, LimitBuilder, UndoManager, } from './features';

package/dist/builder/modules/index.d.ts

@@ -1,8 +1,5 @@
 export { applyUpdateToDoc } from './apply-update';
 export { encodeDocStateAsUpdate } from './encode-state-as-update';
 export { buildVBIDSL } from './build';
-export { buildVQueryDSL } from './build-vquery';
-export { buildVSeedDSL } from './build-vseed';
 export { isEmptyVBIDSL } from './is-empty';
 export { getBuilderSchema } from './get-schema';
-export { createBuilderFeatures } from './create-builder-features';

package/dist/index.cjs

@@ -27,12 +27,15 @@ __webpack_require__.d(__webpack_exports__, {
     HavingFilterBuilder: ()=>HavingFilterBuilder,
     WhereFilterBuilder: ()=>WhereFilterBuilder,
     isVBIHavingGroup: ()=>isVBIHavingGroup,
+    resolveVBIBuilderAdapters: ()=>resolveVBIBuilderAdapters,
     VBIBuilder: ()=>VBIBuilder,
     VBI: ()=>VBI,
     isVBIHavingFilter: ()=>isVBIHavingFilter,
-    findTreeNodesBy: ()=>vseed_namespaceObject.findTreeNodesBy,
     ThemeBuilder: ()=>ThemeBuilder,
+    findTreeNodesBy: ()=>vseed_namespaceObject.findTreeNodesBy,
     id: ()=>id_id,
+    createVBI: ()=>createVBI,
+    defaultVBIBuilderAdapters: ()=>defaultVBIBuilderAdapters,
     MeasuresBuilder: ()=>MeasuresBuilder,
     LimitBuilder: ()=>LimitBuilder,
     DimensionsBuilder: ()=>DimensionsBuilder,
@@ -55,12 +58,28 @@ const getConnector = async (id)=>{
     return connector;
 };
 const external_yjs_namespaceObject = require("yjs");
-const applyUpdateToDoc = (doc, update, transactionOrigin)=>{
-    external_yjs_namespaceObject.applyUpdate(doc, update, transactionOrigin);
-};
-const encodeDocStateAsUpdate = (doc, targetStateVector)=>external_yjs_namespaceObject.encodeStateAsUpdate(doc, targetStateVector);
-const buildVBIDSL = (dsl)=>dsl.toJSON();
 const external_remeda_namespaceObject = require("remeda");
+const VBI_TO_VQUERY_AGGR_FUNC_MAP = {
+    count: 'count',
+    countDistinct: 'count_distinct',
+    sum: 'sum',
+    avg: 'avg',
+    min: 'min',
+    max: 'max',
+    variance: 'variance',
+    variancePop: 'variance_pop',
+    stddev: 'stddev',
+    median: 'median',
+    quantile: 'quantile'
+};
+const mapAggregateForVQuery = (aggregate)=>{
+    if (!aggregate) return aggregate;
+    const mappedFunc = VBI_TO_VQUERY_AGGR_FUNC_MAP[aggregate.func] ?? aggregate.func;
+    return {
+        ...aggregate,
+        func: mappedFunc
+    };
+};
 const buildSelect = (queryDSL, context)=>{
     const { vbiDSL } = context;
     const measures = vbiDSL.measures;
@@ -72,14 +91,17 @@ const buildSelect = (queryDSL, context)=>{
     const measureSelects = measureNodes.map((measure)=>({
             field: measure.field,
             alias: measure.alias,
-            aggr: measure.aggregate
+            aggr: mapAggregateForVQuery(measure.aggregate)
         }));
     const dimensionNodes = dimensions.filter((dimension)=>DimensionsBuilder.isDimensionNode(dimension));
     const dimensionSelects = dimensionNodes.map((dimension)=>({
             field: dimension.field,
             alias: dimension.alias
         }));
-    result.select = measureSelects.concat(dimensionSelects);
+    result.select = [
+        ...measureSelects,
+        ...dimensionSelects
+    ];
     return result;
 };
 const buildGroupBy = (queryDSL, context)=>{
@@ -190,6 +212,9 @@ function handleSimpleFilter(filter) {
         }
     ];
 }
+const DEFAULT_HAVING_AGGREGATE = {
+    func: 'sum'
+};
 const buildHaving = (queryDSL, context)=>{
     const { vbiDSL } = context;
     const havingFilter = vbiDSL.havingFilter;
@@ -219,15 +244,25 @@ function buildHaving_mapGroupToCondition(group) {
     };
 }
 function buildHaving_mapFilterToCondition(filter) {
-    const mappedOp = filter.op ?? '=';
+    const mappedOp = normalizeOperator(filter.op, filter.value);
+    const aggregate = mapAggregateForVQuery(filter.aggregate ?? DEFAULT_HAVING_AGGREGATE);
     return [
         {
             field: filter.field,
+            aggr: aggregate,
             op: mappedOp,
             value: filter.value
         }
     ];
 }
+function normalizeOperator(op, value) {
+    let mappedOp = op ?? '=';
+    if (Array.isArray(value)) {
+        if ('=' === mappedOp) mappedOp = 'in';
+        if ('!=' === mappedOp) mappedOp = 'not in';
+    }
+    return mappedOp;
+}
 const buildLimit = (queryDSL, context)=>{
     const result = {
         ...queryDSL
@@ -243,10 +278,7 @@ const buildVQuery = (vbiDSL, builder)=>{
             });
     return (0, external_remeda_namespaceObject.pipe)({}, wrapper(buildSelect), wrapper(buildGroupBy), wrapper(buildWhere), wrapper(buildHaving), wrapper(buildLimit));
 };
-const buildVQueryDSL = (dsl, builder)=>{
-    const vbiDSL = buildVBIDSL(dsl);
-    return buildVQuery(vbiDSL, builder);
-};
+const buildVQueryDSL = ({ vbiDSL, builder })=>buildVQuery(vbiDSL, builder);
 const buildVSeedDSL = async ({ vbiDSL, queryDSL })=>{
     const connectorId = vbiDSL.connectorId;
     const connector = await getConnector(connectorId);
@@ -263,21 +295,14 @@ const buildVSeedDSL = async ({ vbiDSL, queryDSL })=>{
         locale: vbiDSL.locale
     };
 };
-const getCollectionLength = (value)=>{
-    if (value instanceof external_yjs_namespaceObject.Array) return value.length;
-    if (Array.isArray(value)) return value.length;
-    return 0;
-};
-const isEmptyVBIDSL = (dsl)=>{
-    const dimensionsLength = getCollectionLength(dsl.get('dimensions'));
-    const measuresLength = getCollectionLength(dsl.get('measures'));
-    return 0 === dimensionsLength && 0 === measuresLength;
-};
-const getBuilderSchema = async (dsl)=>{
-    const connectorId = dsl.get('connectorId');
-    const connector = await getConnector(connectorId);
-    return connector.discoverSchema();
+const defaultVBIBuilderAdapters = {
+    buildVQuery: buildVQueryDSL,
+    buildVSeed: buildVSeedDSL
 };
+const resolveVBIBuilderAdapters = (adapters)=>({
+        buildVQuery: adapters?.buildVQuery ?? defaultVBIBuilderAdapters.buildVQuery,
+        buildVSeed: adapters?.buildVSeed ?? defaultVBIBuilderAdapters.buildVSeed
+    });
 class MeasureNodeBuilder {
     yMap;
     constructor(yMap){
@@ -818,6 +843,9 @@ class HavingFilterNodeBuilder {
     getOperator() {
         return this.yMap.get('op');
     }
+    getAggregate() {
+        return this.yMap.get('aggregate');
+    }
     setValue(value) {
         this.yMap.set('value', value);
         return this;
@@ -826,6 +854,10 @@ class HavingFilterNodeBuilder {
         this.yMap.set('op', operator);
         return this;
     }
+    setAggregate(aggregate) {
+        this.yMap.set('aggregate', aggregate);
+        return this;
+    }
     toJSON() {
         return this.yMap.toJSON();
     }
@@ -852,6 +884,9 @@ class HavingGroupBuilder {
         const yMap = new external_yjs_namespaceObject.Map();
         yMap.set('id', id_id.uuid());
         yMap.set('field', field);
+        yMap.set('aggregate', {
+            func: 'sum'
+        });
         this.getConditions().push([
             yMap
         ]);
@@ -909,6 +944,9 @@ class HavingFilterBuilder {
         const yMap = new external_yjs_namespaceObject.Map();
         yMap.set('id', id_id.uuid());
         yMap.set('field', field);
+        yMap.set('aggregate', {
+            func: 'sum'
+        });
         this.getConditions().push([
             yMap
         ]);
@@ -1085,20 +1123,30 @@ class UndoManager {
         this.manager.clear(clearUndoStack, clearRedoStack);
     }
 }
-const createBuilderFeatures = (doc, dsl)=>({
-        undoManager: new UndoManager(dsl),
-        chartType: new ChartTypeBuilder(doc, dsl),
-        measures: new MeasuresBuilder(doc, dsl),
-        dimensions: new DimensionsBuilder(doc, dsl),
-        havingFilter: new HavingFilterBuilder(doc, dsl),
-        whereFilter: new WhereFilterBuilder(doc, dsl),
-        theme: new ThemeBuilder(doc, dsl),
-        locale: new LocaleBuilder(doc, dsl),
-        limit: new LimitBuilder(doc, dsl)
-    });
+const applyUpdateToDoc = (doc, update, transactionOrigin)=>{
+    external_yjs_namespaceObject.applyUpdate(doc, update, transactionOrigin);
+};
+const encodeDocStateAsUpdate = (doc, targetStateVector)=>external_yjs_namespaceObject.encodeStateAsUpdate(doc, targetStateVector);
+const buildVBIDSL = (dsl)=>dsl.toJSON();
+const getCollectionLength = (value)=>{
+    if (value instanceof external_yjs_namespaceObject.Array) return value.length;
+    if (Array.isArray(value)) return value.length;
+    return 0;
+};
+const isEmptyVBIDSL = (dsl)=>{
+    const dimensionsLength = getCollectionLength(dsl.get('dimensions'));
+    const measuresLength = getCollectionLength(dsl.get('measures'));
+    return 0 === dimensionsLength && 0 === measuresLength;
+};
+const getBuilderSchema = async (dsl)=>{
+    const connectorId = dsl.get('connectorId');
+    const connector = await getConnector(connectorId);
+    return connector.discoverSchema();
+};
 class VBIBuilder {
     doc;
     dsl;
+    adapters;
     chartType;
     measures;
     dimensions;
@@ -1108,31 +1156,44 @@ class VBIBuilder {
     locale;
     limit;
     undoManager;
-    constructor(doc){
+    constructor(doc, options){
         this.doc = doc;
         this.dsl = doc.getMap('dsl');
-        const features = createBuilderFeatures(doc, this.dsl);
-        this.undoManager = features.undoManager;
-        this.chartType = features.chartType;
-        this.measures = features.measures;
-        this.dimensions = features.dimensions;
-        this.havingFilter = features.havingFilter;
-        this.whereFilter = features.whereFilter;
-        this.theme = features.theme;
-        this.locale = features.locale;
-        this.limit = features.limit;
+        this.adapters = resolveVBIBuilderAdapters(options?.adapters);
+        this.undoManager = new UndoManager(this.dsl);
+        this.chartType = new ChartTypeBuilder(doc, this.dsl);
+        this.measures = new MeasuresBuilder(doc, this.dsl);
+        this.dimensions = new DimensionsBuilder(doc, this.dsl);
+        this.havingFilter = new HavingFilterBuilder(doc, this.dsl);
+        this.whereFilter = new WhereFilterBuilder(doc, this.dsl);
+        this.theme = new ThemeBuilder(doc, this.dsl);
+        this.locale = new LocaleBuilder(doc, this.dsl);
+        this.limit = new LimitBuilder(doc, this.dsl);
     }
     applyUpdate = (update, transactionOrigin)=>applyUpdateToDoc(this.doc, update, transactionOrigin);
     encodeStateAsUpdate = (targetStateVector)=>encodeDocStateAsUpdate(this.doc, targetStateVector);
     buildVSeed = async ()=>{
         const vbiDSL = this.build();
-        const queryDSL = this.buildVQuery();
-        return buildVSeedDSL({
+        const queryDSL = this.adapters.buildVQuery({
+            dsl: this.dsl,
             vbiDSL,
-            queryDSL
+            builder: this
+        });
+        return this.adapters.buildVSeed({
+            dsl: this.dsl,
+            vbiDSL,
+            queryDSL,
+            builder: this
+        });
+    };
+    buildVQuery = ()=>{
+        const vbiDSL = this.build();
+        return this.adapters.buildVQuery({
+            dsl: this.dsl,
+            vbiDSL,
+            builder: this
         });
     };
-    buildVQuery = ()=>buildVQueryDSL(this.dsl, this);
     build = ()=>buildVBIDSL(this.dsl);
     isEmpty = ()=>isEmptyVBIDSL(this.dsl);
     getSchema = async ()=>getBuilderSchema(this.dsl);
@@ -1243,7 +1304,7 @@ const setBaseDSLFields = (dsl, vbi)=>{
     if (vbi.locale) dsl.set('locale', vbi.locale);
     if (void 0 !== vbi.version) dsl.set('version', vbi.version);
 };
-const fromVBIDSLInput = (vbi)=>{
+const fromVBIDSLInput = (vbi, options)=>{
     const doc = new external_yjs_namespaceObject.Doc();
     const dsl = doc.getMap('dsl');
     doc.transact(()=>{
@@ -1253,7 +1314,7 @@ const fromVBIDSLInput = (vbi)=>{
         dsl.set('measures', ensureYArray(vbi.measures, 'field'));
         dsl.set('dimensions', ensureYArray(vbi.dimensions, 'field'));
     });
-    return new VBIBuilder(doc);
+    return new VBIBuilder(doc, options);
 };
 const generateEmptyDSL = (connectorId)=>({
         connectorId,
@@ -1274,14 +1335,29 @@ const generateEmptyDSL = (connectorId)=>({
         locale: 'zh-CN',
         version: 0
     });
-const createVBI = ()=>({
+const mergeBuilderOptions = (base, overrides)=>{
+    if (!base) return overrides;
+    if (!overrides) return base;
+    return {
+        ...base,
+        ...overrides,
+        adapters: {
+            ...base.adapters,
+            ...overrides.adapters
+        }
+    };
+};
+function createVBI(defaultBuilderOptions) {
+    const from = (vbi, builderOptions)=>fromVBIDSLInput(vbi, mergeBuilderOptions(defaultBuilderOptions, builderOptions));
+    return {
         connectorMap: connectorMap,
         registerConnector: registerConnector,
         getConnector: getConnector,
         generateEmptyDSL: generateEmptyDSL,
-        from: fromVBIDSLInput,
-        create: fromVBIDSLInput
-    });
+        from,
+        create: from
+    };
+}
 const VBI = createVBI();
 exports.ChartTypeBuilder = __webpack_exports__.ChartTypeBuilder;
 exports.DimensionsBuilder = __webpack_exports__.DimensionsBuilder;
@@ -1295,6 +1371,8 @@ exports.VBI = __webpack_exports__.VBI;
 exports.VBIBuilder = __webpack_exports__.VBIBuilder;
 exports.WhereFilterBuilder = __webpack_exports__.WhereFilterBuilder;
 exports.buildVQuery = __webpack_exports__.buildVQuery;
+exports.createVBI = __webpack_exports__.createVBI;
+exports.defaultVBIBuilderAdapters = __webpack_exports__.defaultVBIBuilderAdapters;
 exports.findTreeNodesBy = __webpack_exports__.findTreeNodesBy;
 exports.id = __webpack_exports__.id;
 exports.isVBIFilter = __webpack_exports__.isVBIFilter;
@@ -1302,6 +1380,7 @@ exports.isVBIHavingFilter = __webpack_exports__.isVBIHavingFilter;
 exports.isVBIHavingGroup = __webpack_exports__.isVBIHavingGroup;
 exports.isVBIWhereGroup = __webpack_exports__.isVBIWhereGroup;
 exports.preorderTraverse = __webpack_exports__.preorderTraverse;
+exports.resolveVBIBuilderAdapters = __webpack_exports__.resolveVBIBuilderAdapters;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "ChartTypeBuilder",
     "DimensionsBuilder",
@@ -1315,13 +1394,16 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "VBIBuilder",
     "WhereFilterBuilder",
     "buildVQuery",
+    "createVBI",
+    "defaultVBIBuilderAdapters",
     "findTreeNodesBy",
     "id",
     "isVBIFilter",
     "isVBIHavingFilter",
     "isVBIHavingGroup",
     "isVBIWhereGroup",
-    "preorderTraverse"
+    "preorderTraverse",
+    "resolveVBIBuilderAdapters"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/index.d.ts

@@ -1,6 +1,9 @@
 export { VBI } from './vbi';
+export { createVBI } from './vbi/create-vbi';
+export type { VBIInstance } from './vbi/create-vbi';
 export { VBIBuilder } from './builder';
+export { defaultVBIBuilderAdapters, resolveVBIBuilderAdapters } from './builder/adapters';
 export { MeasuresBuilder, DimensionsBuilder, ChartTypeBuilder, WhereFilterBuilder, HavingFilterBuilder, ThemeBuilder, LocaleBuilder, LimitBuilder, UndoManager, } from './builder';
 export * from './types';
-export * from './utils';
-export * from './pipeline';
+export { id, isVBIFilter, isVBIHavingFilter, isVBIHavingGroup, isVBIWhereGroup, preorderTraverse, findTreeNodesBy, } from './utils';
+export { buildVQuery } from './pipeline';

package/dist/index.js

@@ -12,11 +12,27 @@ const getConnector = async (id)=>{
     if ('function' == typeof connector) return connector();
     return connector;
 };
-const applyUpdateToDoc = (doc, update, transactionOrigin)=>{
-    applyUpdate(doc, update, transactionOrigin);
+const VBI_TO_VQUERY_AGGR_FUNC_MAP = {
+    count: 'count',
+    countDistinct: 'count_distinct',
+    sum: 'sum',
+    avg: 'avg',
+    min: 'min',
+    max: 'max',
+    variance: 'variance',
+    variancePop: 'variance_pop',
+    stddev: 'stddev',
+    median: 'median',
+    quantile: 'quantile'
+};
+const mapAggregateForVQuery = (aggregate)=>{
+    if (!aggregate) return aggregate;
+    const mappedFunc = VBI_TO_VQUERY_AGGR_FUNC_MAP[aggregate.func] ?? aggregate.func;
+    return {
+        ...aggregate,
+        func: mappedFunc
+    };
 };
-const encodeDocStateAsUpdate = (doc, targetStateVector)=>encodeStateAsUpdate(doc, targetStateVector);
-const buildVBIDSL = (dsl)=>dsl.toJSON();
 const buildSelect = (queryDSL, context)=>{
     const { vbiDSL } = context;
     const measures = vbiDSL.measures;
@@ -28,14 +44,17 @@ const buildSelect = (queryDSL, context)=>{
     const measureSelects = measureNodes.map((measure)=>({
             field: measure.field,
             alias: measure.alias,
-            aggr: measure.aggregate
+            aggr: mapAggregateForVQuery(measure.aggregate)
         }));
     const dimensionNodes = dimensions.filter((dimension)=>DimensionsBuilder.isDimensionNode(dimension));
     const dimensionSelects = dimensionNodes.map((dimension)=>({
             field: dimension.field,
             alias: dimension.alias
         }));
-    result.select = measureSelects.concat(dimensionSelects);
+    result.select = [
+        ...measureSelects,
+        ...dimensionSelects
+    ];
     return result;
 };
 const buildGroupBy = (queryDSL, context)=>{
@@ -146,6 +165,9 @@ function handleSimpleFilter(filter) {
         }
     ];
 }
+const DEFAULT_HAVING_AGGREGATE = {
+    func: 'sum'
+};
 const buildHaving = (queryDSL, context)=>{
     const { vbiDSL } = context;
     const havingFilter = vbiDSL.havingFilter;
@@ -175,15 +197,25 @@ function buildHaving_mapGroupToCondition(group) {
     };
 }
 function buildHaving_mapFilterToCondition(filter) {
-    const mappedOp = filter.op ?? '=';
+    const mappedOp = normalizeOperator(filter.op, filter.value);
+    const aggregate = mapAggregateForVQuery(filter.aggregate ?? DEFAULT_HAVING_AGGREGATE);
     return [
         {
             field: filter.field,
+            aggr: aggregate,
             op: mappedOp,
             value: filter.value
         }
     ];
 }
+function normalizeOperator(op, value) {
+    let mappedOp = op ?? '=';
+    if (Array.isArray(value)) {
+        if ('=' === mappedOp) mappedOp = 'in';
+        if ('!=' === mappedOp) mappedOp = 'not in';
+    }
+    return mappedOp;
+}
 const buildLimit = (queryDSL, context)=>{
     const result = {
         ...queryDSL
@@ -199,10 +231,7 @@ const buildVQuery = (vbiDSL, builder)=>{
             });
     return pipe({}, wrapper(buildSelect), wrapper(buildGroupBy), wrapper(buildWhere), wrapper(buildHaving), wrapper(buildLimit));
 };
-const buildVQueryDSL = (dsl, builder)=>{
-    const vbiDSL = buildVBIDSL(dsl);
-    return buildVQuery(vbiDSL, builder);
-};
+const buildVQueryDSL = ({ vbiDSL, builder })=>buildVQuery(vbiDSL, builder);
 const buildVSeedDSL = async ({ vbiDSL, queryDSL })=>{
     const connectorId = vbiDSL.connectorId;
     const connector = await getConnector(connectorId);
@@ -219,21 +248,14 @@ const buildVSeedDSL = async ({ vbiDSL, queryDSL })=>{
         locale: vbiDSL.locale
     };
 };
-const getCollectionLength = (value)=>{
-    if (value instanceof external_yjs_Array) return value.length;
-    if (Array.isArray(value)) return value.length;
-    return 0;
-};
-const isEmptyVBIDSL = (dsl)=>{
-    const dimensionsLength = getCollectionLength(dsl.get('dimensions'));
-    const measuresLength = getCollectionLength(dsl.get('measures'));
-    return 0 === dimensionsLength && 0 === measuresLength;
-};
-const getBuilderSchema = async (dsl)=>{
-    const connectorId = dsl.get('connectorId');
-    const connector = await getConnector(connectorId);
-    return connector.discoverSchema();
+const defaultVBIBuilderAdapters = {
+    buildVQuery: buildVQueryDSL,
+    buildVSeed: buildVSeedDSL
 };
+const resolveVBIBuilderAdapters = (adapters)=>({
+        buildVQuery: adapters?.buildVQuery ?? defaultVBIBuilderAdapters.buildVQuery,
+        buildVSeed: adapters?.buildVSeed ?? defaultVBIBuilderAdapters.buildVSeed
+    });
 class MeasureNodeBuilder {
     yMap;
     constructor(yMap){
@@ -772,6 +794,9 @@ class HavingFilterNodeBuilder {
     getOperator() {
         return this.yMap.get('op');
     }
+    getAggregate() {
+        return this.yMap.get('aggregate');
+    }
     setValue(value) {
         this.yMap.set('value', value);
         return this;
@@ -780,6 +805,10 @@ class HavingFilterNodeBuilder {
         this.yMap.set('op', operator);
         return this;
     }
+    setAggregate(aggregate) {
+        this.yMap.set('aggregate', aggregate);
+        return this;
+    }
     toJSON() {
         return this.yMap.toJSON();
     }
@@ -806,6 +835,9 @@ class HavingGroupBuilder {
         const yMap = new external_yjs_Map();
         yMap.set('id', id_id.uuid());
         yMap.set('field', field);
+        yMap.set('aggregate', {
+            func: 'sum'
+        });
         this.getConditions().push([
             yMap
         ]);
@@ -863,6 +895,9 @@ class HavingFilterBuilder {
         const yMap = new external_yjs_Map();
         yMap.set('id', id_id.uuid());
         yMap.set('field', field);
+        yMap.set('aggregate', {
+            func: 'sum'
+        });
         this.getConditions().push([
             yMap
         ]);
@@ -1039,20 +1074,30 @@ class undo_manager_UndoManager {
         this.manager.clear(clearUndoStack, clearRedoStack);
     }
 }
-const createBuilderFeatures = (doc, dsl)=>({
-        undoManager: new undo_manager_UndoManager(dsl),
-        chartType: new ChartTypeBuilder(doc, dsl),
-        measures: new MeasuresBuilder(doc, dsl),
-        dimensions: new DimensionsBuilder(doc, dsl),
-        havingFilter: new HavingFilterBuilder(doc, dsl),
-        whereFilter: new WhereFilterBuilder(doc, dsl),
-        theme: new ThemeBuilder(doc, dsl),
-        locale: new LocaleBuilder(doc, dsl),
-        limit: new LimitBuilder(doc, dsl)
-    });
+const applyUpdateToDoc = (doc, update, transactionOrigin)=>{
+    applyUpdate(doc, update, transactionOrigin);
+};
+const encodeDocStateAsUpdate = (doc, targetStateVector)=>encodeStateAsUpdate(doc, targetStateVector);
+const buildVBIDSL = (dsl)=>dsl.toJSON();
+const getCollectionLength = (value)=>{
+    if (value instanceof external_yjs_Array) return value.length;
+    if (Array.isArray(value)) return value.length;
+    return 0;
+};
+const isEmptyVBIDSL = (dsl)=>{
+    const dimensionsLength = getCollectionLength(dsl.get('dimensions'));
+    const measuresLength = getCollectionLength(dsl.get('measures'));
+    return 0 === dimensionsLength && 0 === measuresLength;
+};
+const getBuilderSchema = async (dsl)=>{
+    const connectorId = dsl.get('connectorId');
+    const connector = await getConnector(connectorId);
+    return connector.discoverSchema();
+};
 class VBIBuilder {
     doc;
     dsl;
+    adapters;
     chartType;
     measures;
     dimensions;
@@ -1062,31 +1107,44 @@ class VBIBuilder {
     locale;
     limit;
     undoManager;
-    constructor(doc){
+    constructor(doc, options){
         this.doc = doc;
         this.dsl = doc.getMap('dsl');
-        const features = createBuilderFeatures(doc, this.dsl);
-        this.undoManager = features.undoManager;
-        this.chartType = features.chartType;
-        this.measures = features.measures;
-        this.dimensions = features.dimensions;
-        this.havingFilter = features.havingFilter;
-        this.whereFilter = features.whereFilter;
-        this.theme = features.theme;
-        this.locale = features.locale;
-        this.limit = features.limit;
+        this.adapters = resolveVBIBuilderAdapters(options?.adapters);
+        this.undoManager = new undo_manager_UndoManager(this.dsl);
+        this.chartType = new ChartTypeBuilder(doc, this.dsl);
+        this.measures = new MeasuresBuilder(doc, this.dsl);
+        this.dimensions = new DimensionsBuilder(doc, this.dsl);
+        this.havingFilter = new HavingFilterBuilder(doc, this.dsl);
+        this.whereFilter = new WhereFilterBuilder(doc, this.dsl);
+        this.theme = new ThemeBuilder(doc, this.dsl);
+        this.locale = new LocaleBuilder(doc, this.dsl);
+        this.limit = new LimitBuilder(doc, this.dsl);
     }
     applyUpdate = (update, transactionOrigin)=>applyUpdateToDoc(this.doc, update, transactionOrigin);
     encodeStateAsUpdate = (targetStateVector)=>encodeDocStateAsUpdate(this.doc, targetStateVector);
     buildVSeed = async ()=>{
         const vbiDSL = this.build();
-        const queryDSL = this.buildVQuery();
-        return buildVSeedDSL({
+        const queryDSL = this.adapters.buildVQuery({
+            dsl: this.dsl,
+            vbiDSL,
+            builder: this
+        });
+        return this.adapters.buildVSeed({
+            dsl: this.dsl,
+            vbiDSL,
+            queryDSL,
+            builder: this
+        });
+    };
+    buildVQuery = ()=>{
+        const vbiDSL = this.build();
+        return this.adapters.buildVQuery({
+            dsl: this.dsl,
             vbiDSL,
-            queryDSL
+            builder: this
         });
     };
-    buildVQuery = ()=>buildVQueryDSL(this.dsl, this);
     build = ()=>buildVBIDSL(this.dsl);
     isEmpty = ()=>isEmptyVBIDSL(this.dsl);
     getSchema = async ()=>getBuilderSchema(this.dsl);
@@ -1197,7 +1255,7 @@ const setBaseDSLFields = (dsl, vbi)=>{
     if (vbi.locale) dsl.set('locale', vbi.locale);
     if (void 0 !== vbi.version) dsl.set('version', vbi.version);
 };
-const fromVBIDSLInput = (vbi)=>{
+const fromVBIDSLInput = (vbi, options)=>{
     const doc = new Doc();
     const dsl = doc.getMap('dsl');
     doc.transact(()=>{
@@ -1207,7 +1265,7 @@ const fromVBIDSLInput = (vbi)=>{
         dsl.set('measures', ensureYArray(vbi.measures, 'field'));
         dsl.set('dimensions', ensureYArray(vbi.dimensions, 'field'));
     });
-    return new VBIBuilder(doc);
+    return new VBIBuilder(doc, options);
 };
 const generateEmptyDSL = (connectorId)=>({
         connectorId,
@@ -1228,13 +1286,28 @@ const generateEmptyDSL = (connectorId)=>({
         locale: 'zh-CN',
         version: 0
     });
-const createVBI = ()=>({
+const mergeBuilderOptions = (base, overrides)=>{
+    if (!base) return overrides;
+    if (!overrides) return base;
+    return {
+        ...base,
+        ...overrides,
+        adapters: {
+            ...base.adapters,
+            ...overrides.adapters
+        }
+    };
+};
+function createVBI(defaultBuilderOptions) {
+    const from = (vbi, builderOptions)=>fromVBIDSLInput(vbi, mergeBuilderOptions(defaultBuilderOptions, builderOptions));
+    return {
         connectorMap: connectorMap,
         registerConnector: registerConnector,
         getConnector: getConnector,
         generateEmptyDSL: generateEmptyDSL,
-        from: fromVBIDSLInput,
-        create: fromVBIDSLInput
-    });
+        from,
+        create: from
+    };
+}
 const VBI = createVBI();
-export { ChartTypeBuilder, DimensionsBuilder, HavingFilterBuilder, LimitBuilder, LocaleBuilder, MeasuresBuilder, ThemeBuilder, undo_manager_UndoManager as UndoManager, VBI, VBIBuilder, WhereFilterBuilder, buildVQuery, findTreeNodesBy, id_id as id, isVBIFilter, isVBIHavingFilter, isVBIHavingGroup, isVBIWhereGroup, preorderTraverse };
+export { ChartTypeBuilder, DimensionsBuilder, HavingFilterBuilder, LimitBuilder, LocaleBuilder, MeasuresBuilder, ThemeBuilder, undo_manager_UndoManager as UndoManager, VBI, VBIBuilder, WhereFilterBuilder, buildVQuery, createVBI, defaultVBIBuilderAdapters, findTreeNodesBy, id_id as id, isVBIFilter, isVBIHavingFilter, isVBIHavingGroup, isVBIWhereGroup, preorderTraverse, resolveVBIBuilderAdapters };

package/dist/pipeline/vqueryDSL/aggregateMap.d.ts

@@ -0,0 +1,30 @@
+export type VQueryAggregateFunc = 'count' | 'count_distinct' | 'sum' | 'avg' | 'min' | 'max' | 'variance' | 'variance_pop' | 'stddev' | 'median' | 'quantile';
+export type VQueryAggregate = {
+    func: VQueryAggregateFunc;
+    quantile?: number;
+};
+export type VBIAggregateInput = {
+    func: 'count';
+} | {
+    func: 'countDistinct';
+} | {
+    func: 'sum';
+} | {
+    func: 'avg';
+} | {
+    func: 'min';
+} | {
+    func: 'max';
+} | {
+    func: 'variance';
+} | {
+    func: 'variancePop';
+} | {
+    func: 'stddev';
+} | {
+    func: 'median';
+} | {
+    func: 'quantile';
+    quantile?: number;
+};
+export declare const mapAggregateForVQuery: (aggregate: VBIAggregateInput | undefined) => VQueryAggregate | undefined;

package/dist/pipeline/vqueryDSL/index.d.ts

@@ -1,4 +1,3 @@
 import type { VQueryDSL } from '@visactor/vquery';
-import type { VBIDSL } from '../../types';
-import type { VBIBuilder } from '../../builder';
-export declare const buildVQuery: (vbiDSL: VBIDSL, builder: VBIBuilder) => VQueryDSL;
+import type { VBIBuilderInterface, VBIDSL } from '../../types';
+export declare const buildVQuery: (vbiDSL: VBIDSL, builder: VBIBuilderInterface<any, any>) => VQueryDSL;

package/dist/pipeline/vqueryDSL/types.d.ts

@@ -1,7 +1,6 @@
 import type { VQueryDSL } from '@visactor/vquery';
-import type { VBIDSL } from '../../types';
-import type { VBIBuilder } from '../../builder';
+import type { VBIBuilderInterface, VBIDSL } from '../../types';
 export type buildPipe = (queryDSL: VQueryDSL, context: {
     vbiDSL: VBIDSL;
-    builder: VBIBuilder;
+    builder: VBIBuilderInterface<any, any>;
 }) => VQueryDSL;

package/dist/types/builder/VBIInterface.d.ts

@@ -1,9 +1,8 @@
-import type { VQueryDSL } from '@visactor/vquery';
+import type { DefaultVBIQueryDSL, DefaultVBISeedDSL } from '../../builder/adapters/vquery-vseed/types';
 import type { VBIDSL } from '../dsl';
-import type { VSeedDSL } from '@visactor/vseed';
 import type { MeasuresBuilder, DimensionsBuilder, ChartTypeBuilder, HavingFilterBuilder, WhereFilterBuilder, ThemeBuilder, LocaleBuilder, LimitBuilder, UndoManager } from '../../builder/features';
 import type { Map, Doc } from 'yjs';
-export interface VBIBuilderInterface {
+export interface VBIBuilderInterface<TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL> {
     doc: Doc;
     dsl: Map<any>;
     undoManager: UndoManager;
@@ -17,8 +16,8 @@ export interface VBIBuilderInterface {
     limit: LimitBuilder;
     applyUpdate: (update: Uint8Array, origin?: any) => void;
     encodeStateAsUpdate: (targetStateVector?: Uint8Array) => Uint8Array;
-    buildVSeed: () => Promise<VSeedDSL>;
-    buildVQuery: () => VQueryDSL;
+    buildVSeed: () => Promise<TSeedDSL>;
+    buildVQuery: () => TQueryDSL;
     build: () => VBIDSL;
     isEmpty: () => boolean;
 }

package/dist/types/builder/adapter.d.ts

@@ -0,0 +1,21 @@
+import type { DefaultVBIQueryDSL, DefaultVBISeedDSL } from '../../builder/adapters/vquery-vseed/types';
+import type { Map } from 'yjs';
+import type { VBIDSL } from '../dsl';
+import type { VBIBuilderInterface } from './VBIInterface';
+export interface VBIBuildVQueryContext<TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL> {
+    dsl: Map<any>;
+    vbiDSL: VBIDSL;
+    builder: VBIBuilderInterface<TQueryDSL, TSeedDSL>;
+}
+export interface VBIBuildVSeedContext<TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL> extends VBIBuildVQueryContext<TQueryDSL, TSeedDSL> {
+    queryDSL: TQueryDSL;
+}
+export type VBIQueryBuilder<TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL> = (context: VBIBuildVQueryContext<TQueryDSL, TSeedDSL>) => TQueryDSL;
+export type VBISeedBuilder<TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL> = (context: VBIBuildVSeedContext<TQueryDSL, TSeedDSL>) => Promise<TSeedDSL> | TSeedDSL;
+export interface VBIBuilderAdapters<TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL> {
+    buildVQuery: VBIQueryBuilder<TQueryDSL, TSeedDSL>;
+    buildVSeed: VBISeedBuilder<TQueryDSL, TSeedDSL>;
+}
+export interface VBIBuilderOptions<TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL> {
+    adapters?: Partial<VBIBuilderAdapters<TQueryDSL, TSeedDSL>>;
+}

package/dist/types/builder/index.d.ts

@@ -1,2 +1,3 @@
 export type { VBIBuilderInterface } from './VBIInterface';
+export type { VBIBuildVQueryContext, VBIBuildVSeedContext, VBIQueryBuilder, VBISeedBuilder, VBIBuilderAdapters, VBIBuilderOptions, } from './adapter';
 export type { ObserveCallback } from './observe';

package/dist/types/dsl/havingFilter/having.d.ts

@@ -1,11 +1,30 @@
 import { z } from 'zod';
+import { zAggregate } from '../measures/aggregate';
 declare const zHavingLogicalOperator: z.ZodEnum<{
     and: "and";
     or: "or";
 }>;
+export type VBIHavingAggregate = z.infer<typeof zAggregate>;
 export declare const zVBIHavingFilter: z.ZodObject<{
     id: z.ZodString;
     field: z.ZodString;
+    aggregate: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
+        func: z.ZodEnum<{
+            count: "count";
+            countDistinct: "countDistinct";
+            sum: "sum";
+            avg: "avg";
+            min: "min";
+            max: "max";
+            variance: "variance";
+            variancePop: "variancePop";
+            stddev: "stddev";
+            median: "median";
+        }>;
+    }, z.core.$strip>, z.ZodObject<{
+        func: z.ZodLiteral<"quantile">;
+        quantile: z.ZodOptional<z.ZodNumber>;
+    }, z.core.$strip>], "func">>;
     op: z.ZodOptional<z.ZodString>;
     value: z.ZodOptional<z.ZodAny>;
 }, z.core.$strip>;

package/dist/types/dsl/index.d.ts

@@ -1,7 +1,7 @@
 export type { VBIDimensionTree, VBIDimensionGroup, VBIDimension } from './dimensions/dimensions';
 export type { VBIMeasureTree, VBIMeasureGroup, VBIMeasure } from './measures/measures';
 export type { VBIFilter, VBIWhereGroup, VBIWhereClause } from './whereFilter/filters';
-export type { VBIHavingFilter, VBIHavingGroup, VBIHavingClause } from './havingFilter/having';
+export type { VBIHavingFilter, VBIHavingGroup, VBIHavingClause, VBIHavingAggregate } from './havingFilter/having';
 export type { VBIDSLTheme } from './theme/theme';
 export type { VBIDSLLocale } from './locale/locale';
 export type { VBIDSL, VBIDSLInput } from './vbi/vbi';

package/dist/types/dsl/measures/aggregate.d.ts

@@ -1,7 +1,19 @@
 import { z } from 'zod';
+export declare const VBI_MEASURE_SIMPLE_AGGREGATE_FUNCS: readonly ["count", "countDistinct", "sum", "avg", "min", "max", "variance", "variancePop", "stddev", "median"];
 export declare const zAggregate: z.ZodDiscriminatedUnion<[z.ZodObject<{
-    func: z.ZodLiteral<"sum" | "count" | "avg" | "min" | "max">;
+    func: z.ZodEnum<{
+        count: "count";
+        countDistinct: "countDistinct";
+        sum: "sum";
+        avg: "avg";
+        min: "min";
+        max: "max";
+        variance: "variance";
+        variancePop: "variancePop";
+        stddev: "stddev";
+        median: "median";
+    }>;
 }, z.core.$strip>, z.ZodObject<{
     func: z.ZodLiteral<"quantile">;
-    quantile: z.ZodNumber;
+    quantile: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>], "func">;

package/dist/types/dsl/measures/measures.d.ts

@@ -12,10 +12,21 @@ export declare const zVBIMeasure: z.ZodObject<{
         size: "size";
     }>;
     aggregate: z.ZodDiscriminatedUnion<[z.ZodObject<{
-        func: z.ZodLiteral<"sum" | "count" | "avg" | "min" | "max">;
+        func: z.ZodEnum<{
+            count: "count";
+            countDistinct: "countDistinct";
+            sum: "sum";
+            avg: "avg";
+            min: "min";
+            max: "max";
+            variance: "variance";
+            variancePop: "variancePop";
+            stddev: "stddev";
+            median: "median";
+        }>;
     }, z.core.$strip>, z.ZodObject<{
         func: z.ZodLiteral<"quantile">;
-        quantile: z.ZodNumber;
+        quantile: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>], "func">;
 }, z.core.$strip>;
 export declare const zVBIMeasureGroup: z.ZodType<VBIMeasureGroup>;
@@ -32,10 +43,21 @@ export declare const zVBIMeasureTree: z.ZodArray<z.ZodUnion<readonly [z.ZodObjec
         size: "size";
     }>;
     aggregate: z.ZodDiscriminatedUnion<[z.ZodObject<{
-        func: z.ZodLiteral<"sum" | "count" | "avg" | "min" | "max">;
+        func: z.ZodEnum<{
+            count: "count";
+            countDistinct: "countDistinct";
+            sum: "sum";
+            avg: "avg";
+            min: "min";
+            max: "max";
+            variance: "variance";
+            variancePop: "variancePop";
+            stddev: "stddev";
+            median: "median";
+        }>;
     }, z.core.$strip>, z.ZodObject<{
         func: z.ZodLiteral<"quantile">;
-        quantile: z.ZodNumber;
+        quantile: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>], "func">;
 }, z.core.$strip>, z.ZodType<VBIMeasureGroup, unknown, z.core.$ZodTypeInternals<VBIMeasureGroup, unknown>>]>>;
 export type VBIMeasure = z.infer<typeof zVBIMeasure>;

package/dist/types/dsl/vbi/vbi.d.ts

@@ -20,10 +20,21 @@ export declare const zVBIDSL: z.ZodObject<{
             size: "size";
         }>;
         aggregate: z.ZodDiscriminatedUnion<[z.ZodObject<{
-            func: z.ZodLiteral<"sum" | "count" | "avg" | "min" | "max">;
+            func: z.ZodEnum<{
+                count: "count";
+                countDistinct: "countDistinct";
+                sum: "sum";
+                avg: "avg";
+                min: "min";
+                max: "max";
+                variance: "variance";
+                variancePop: "variancePop";
+                stddev: "stddev";
+                median: "median";
+            }>;
         }, z.core.$strip>, z.ZodObject<{
             func: z.ZodLiteral<"quantile">;
-            quantile: z.ZodNumber;
+            quantile: z.ZodOptional<z.ZodNumber>;
         }, z.core.$strip>], "func">;
     }, z.core.$strip>, z.ZodType<import("..").VBIMeasureGroup, unknown, z.core.$ZodTypeInternals<import("..").VBIMeasureGroup, unknown>>]>>;
     havingFilter: z.ZodDefault<z.ZodOptional<z.ZodType<{

package/dist/vbi/create-vbi.d.ts

@@ -1,14 +1,15 @@
-export declare const createVBI: () => {
-    connectorMap: Map<string, {
-        discoverSchema: () => Promise<import("..").VBISchema>;
-        query: (queryProps: import("..").VBIQueryProps) => Promise<import("..").VBIQueryResult>;
-    } | (() => Promise<import("..").VBIConnector>)>;
-    registerConnector: (id: import("../types/connector/connector").VBIConnectorId, connector: import("..").VBIConnector | (() => Promise<import("..").VBIConnector>)) => void;
-    getConnector: (id: import("../types/connector/connector").VBIConnectorId) => Promise<{
-        discoverSchema: () => Promise<import("..").VBISchema>;
-        query: (queryProps: import("..").VBIQueryProps) => Promise<import("..").VBIQueryResult>;
-    }>;
-    generateEmptyDSL: (connectorId: import("../types/connector/connector").VBIConnectorId) => import("..").VBIDSL;
-    from: (vbi: import("..").VBIDSLInput) => import("..").VBIBuilder;
-    create: (vbi: import("..").VBIDSLInput) => import("..").VBIBuilder;
-};
+import type { DefaultVBIQueryDSL, DefaultVBISeedDSL } from '../builder/adapters/vquery-vseed/types';
+import { connectorMap, getConnector, registerConnector } from '../builder/connector';
+import type { VBIBuilder } from '../builder/builder';
+import type { VBIDSLInput, VBIBuilderOptions } from '../types';
+import { generateEmptyDSL } from './generate-empty-dsl';
+export interface VBIInstance<TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL> {
+    connectorMap: typeof connectorMap;
+    registerConnector: typeof registerConnector;
+    getConnector: typeof getConnector;
+    generateEmptyDSL: typeof generateEmptyDSL;
+    from: (vbi: VBIDSLInput, builderOptions?: VBIBuilderOptions<TQueryDSL, TSeedDSL>) => VBIBuilder<TQueryDSL, TSeedDSL>;
+    create: (vbi: VBIDSLInput, builderOptions?: VBIBuilderOptions<TQueryDSL, TSeedDSL>) => VBIBuilder<TQueryDSL, TSeedDSL>;
+}
+export declare function createVBI(): VBIInstance<DefaultVBIQueryDSL, DefaultVBISeedDSL>;
+export declare function createVBI<TQueryDSL, TSeedDSL>(defaultBuilderOptions: VBIBuilderOptions<TQueryDSL, TSeedDSL>): VBIInstance<TQueryDSL, TSeedDSL>;

package/dist/vbi/from/from-vbi-dsl-input.d.ts

@@ -1,3 +1,4 @@
-import type { VBIDSLInput } from '../../types';
+import type { DefaultVBIQueryDSL, DefaultVBISeedDSL } from '../../builder/adapters/vquery-vseed/types';
+import type { VBIDSLInput, VBIBuilderOptions } from '../../types';
 import { VBIBuilder } from '../../builder';
-export declare const fromVBIDSLInput: (vbi: VBIDSLInput) => VBIBuilder;
+export declare const fromVBIDSLInput: <TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL>(vbi: VBIDSLInput, options?: VBIBuilderOptions<TQueryDSL, TSeedDSL>) => VBIBuilder<TQueryDSL, TSeedDSL>;

package/dist/vbi.d.ts

@@ -1,14 +1 @@
-export declare const VBI: {
-    connectorMap: Map<string, {
-        discoverSchema: () => Promise<import("./types").VBISchema>;
-        query: (queryProps: import("./types").VBIQueryProps) => Promise<import("./types").VBIQueryResult>;
-    } | (() => Promise<import("./types").VBIConnector>)>;
-    registerConnector: (id: import("./types/connector/connector").VBIConnectorId, connector: import("./types").VBIConnector | (() => Promise<import("./types").VBIConnector>)) => void;
-    getConnector: (id: import("./types/connector/connector").VBIConnectorId) => Promise<{
-        discoverSchema: () => Promise<import("./types").VBISchema>;
-        query: (queryProps: import("./types").VBIQueryProps) => Promise<import("./types").VBIQueryResult>;
-    }>;
-    generateEmptyDSL: (connectorId: import("./types/connector/connector").VBIConnectorId) => import("./types").VBIDSL;
-    from: (vbi: import("./types").VBIDSLInput) => import("./builder").VBIBuilder;
-    create: (vbi: import("./types").VBIDSLInput) => import("./builder").VBIBuilder;
-};
+export declare const VBI: import(".").VBIInstance<import("./builder").DefaultVBIQueryDSL, import("@visactor/vseed").VSeed>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vbi",
-  "version": "0.4.17",
+  "version": "0.4.19",
   "license": "MIT",
   "homepage": "https://visactor.github.io/VBI",
   "bugs": "https://github.com/VisActor/VBI/issues",
@@ -33,11 +33,11 @@
     "uuid": "13.0.0",
     "yjs": "13.6.28",
     "zod": "4.0.17",
-    "@visactor/vseed": "0.4.17"
+    "@visactor/vseed": "0.4.19"
   },
   "optionalDependencies": {
-    "@visactor/vquery": "0.4.17",
-    "@visactor/vseed": "0.4.17"
+    "@visactor/vquery": "0.4.19",
+    "@visactor/vseed": "0.4.19"
   },
   "devDependencies": {
     "@eslint/js": "9.39.0",
@@ -51,7 +51,7 @@
     "ts-morph": "26.0.0",
     "typescript": "5.9.3",
     "typescript-eslint": "8.48.0",
-    "@visactor/vquery": "0.4.17"
+    "@visactor/vquery": "0.4.19"
   },
   "scripts": {
     "build": "rslib build",

package/dist/builder/modules/build-vquery.d.ts

@@ -1,4 +0,0 @@
-import * as Y from 'yjs';
-import type { VQueryDSL } from '@visactor/vquery';
-import type { VBIBuilder } from '../vbi-builder';
-export declare const buildVQueryDSL: (dsl: Y.Map<any>, builder: VBIBuilder) => VQueryDSL;

package/dist/builder/modules/build-vseed.d.ts

@@ -1,8 +0,0 @@
-import type { VSeedDSL } from '@visactor/vseed';
-import type { VQueryDSL } from '@visactor/vquery';
-import type { VBIDSL } from '../../types';
-export interface BuildVSeedInput {
-    vbiDSL: VBIDSL;
-    queryDSL: VQueryDSL;
-}
-export declare const buildVSeedDSL: ({ vbiDSL, queryDSL }: BuildVSeedInput) => Promise<VSeedDSL>;

package/dist/builder/modules/create-builder-features.d.ts

@@ -1,14 +0,0 @@
-import * as Y from 'yjs';
-import { DimensionsBuilder, MeasuresBuilder, HavingFilterBuilder, WhereFilterBuilder, ChartTypeBuilder, ThemeBuilder, LocaleBuilder, LimitBuilder, UndoManager } from '../features';
-export interface BuilderFeatureInstances {
-    chartType: ChartTypeBuilder;
-    measures: MeasuresBuilder;
-    dimensions: DimensionsBuilder;
-    havingFilter: HavingFilterBuilder;
-    whereFilter: WhereFilterBuilder;
-    theme: ThemeBuilder;
-    locale: LocaleBuilder;
-    limit: LimitBuilder;
-    undoManager: UndoManager;
-}
-export declare const createBuilderFeatures: (doc: Y.Doc, dsl: Y.Map<any>) => BuilderFeatureInstances;