@visactor/vbi 0.4.19 → 0.4.20

package/dist/index.cjs

@@ -27,19 +27,19 @@ __webpack_require__.d(__webpack_exports__, {
     HavingFilterBuilder: ()=>HavingFilterBuilder,
     WhereFilterBuilder: ()=>WhereFilterBuilder,
     isVBIHavingGroup: ()=>isVBIHavingGroup,
-    resolveVBIBuilderAdapters: ()=>resolveVBIBuilderAdapters,
-    VBIBuilder: ()=>VBIBuilder,
+    resolveVBIChartBuilderAdapters: ()=>resolveVBIChartBuilderAdapters,
     VBI: ()=>VBI,
     isVBIHavingFilter: ()=>isVBIHavingFilter,
     ThemeBuilder: ()=>ThemeBuilder,
     findTreeNodesBy: ()=>vseed_namespaceObject.findTreeNodesBy,
     id: ()=>id_id,
     createVBI: ()=>createVBI,
-    defaultVBIBuilderAdapters: ()=>defaultVBIBuilderAdapters,
     MeasuresBuilder: ()=>MeasuresBuilder,
     LimitBuilder: ()=>LimitBuilder,
     DimensionsBuilder: ()=>DimensionsBuilder,
     ChartTypeBuilder: ()=>ChartTypeBuilder,
+    VBIChartBuilder: ()=>VBIChartBuilder,
+    defaultVBIChartBuilderAdapters: ()=>defaultVBIChartBuilderAdapters,
     isVBIFilter: ()=>isVBIFilter,
     isVBIWhereGroup: ()=>isVBIWhereGroup,
     preorderTraverse: ()=>vseed_namespaceObject.preorderTraverse,
@@ -59,250 +59,6 @@ const getConnector = async (id)=>{
 };
 const external_yjs_namespaceObject = require("yjs");
 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;
-    const dimensions = vbiDSL.dimensions;
-    const result = {
-        ...queryDSL
-    };
-    const measureNodes = measures.filter((measure)=>MeasuresBuilder.isMeasureNode(measure));
-    const measureSelects = measureNodes.map((measure)=>({
-            field: measure.field,
-            alias: measure.alias,
-            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,
-        ...dimensionSelects
-    ];
-    return result;
-};
-const buildGroupBy = (queryDSL, context)=>{
-    const result = {
-        ...queryDSL
-    };
-    const { vbiDSL } = context;
-    const dimensions = vbiDSL.dimensions;
-    const dimensionNodes = dimensions.filter((dimension)=>DimensionsBuilder.isDimensionNode(dimension));
-    result.groupBy = dimensionNodes.map((dimension)=>dimension.field);
-    return result;
-};
-const buildWhere = (queryDSL, context)=>{
-    const { vbiDSL } = context;
-    const whereFilter = vbiDSL.whereFilter;
-    if (!whereFilter || 0 === whereFilter.conditions.length) return queryDSL;
-    const result = {
-        ...queryDSL
-    };
-    result.where = mapGroupToCondition(whereFilter);
-    return result;
-};
-function isWhereGroup(clause) {
-    return 'op' in clause && 'conditions' in clause;
-}
-function mapClauseToCondition(clause) {
-    if (isWhereGroup(clause)) return [
-        mapGroupToCondition(clause)
-    ];
-    return mapFilterToCondition(clause);
-}
-function mapGroupToCondition(group) {
-    return {
-        op: group.op,
-        conditions: group.conditions.flatMap(mapClauseToCondition)
-    };
-}
-function mapFilterToCondition(filter) {
-    if ('between' === filter.op || 'not between' === filter.op) return handleBetweenFilter(filter);
-    return handleSimpleFilter(filter);
-}
-function handleBetweenFilter(filter) {
-    const value = normalizeBetweenValue(filter.value);
-    const lowerCondition = void 0 !== value.min && null !== value.min && '' !== value.min ? {
-        field: filter.field,
-        op: '<' === value.leftOp ? '>' : '>=',
-        value: value.min
-    } : void 0;
-    const upperCondition = void 0 !== value.max && null !== value.max && '' !== value.max ? {
-        field: filter.field,
-        op: '<' === value.rightOp ? '<' : '<=',
-        value: value.max
-    } : void 0;
-    if ('not between' === filter.op) {
-        const outsideConditions = [
-            lowerCondition && invertLowerBound(lowerCondition),
-            upperCondition && invertUpperBound(upperCondition)
-        ].filter(Boolean);
-        if (outsideConditions.length <= 1) return outsideConditions;
-        return [
-            {
-                op: 'or',
-                conditions: outsideConditions
-            }
-        ];
-    }
-    return [
-        lowerCondition,
-        upperCondition
-    ].filter(Boolean);
-}
-function normalizeBetweenValue(value) {
-    if (Array.isArray(value)) return {
-        min: value[0],
-        max: value[1],
-        leftOp: '<=',
-        rightOp: '<='
-    };
-    if ('object' == typeof value && null !== value) return value;
-    return {};
-}
-function invertLowerBound(condition) {
-    return {
-        field: condition.field,
-        op: '>' === condition.op ? '<=' : '<',
-        value: condition.value
-    };
-}
-function invertUpperBound(condition) {
-    return {
-        field: condition.field,
-        op: '<' === condition.op ? '>=' : '>',
-        value: condition.value
-    };
-}
-function handleSimpleFilter(filter) {
-    let mappedOp = filter.op ?? '=';
-    const value = filter.value;
-    if (Array.isArray(value)) {
-        if ('=' === mappedOp) mappedOp = 'in';
-        if ('!=' === mappedOp) mappedOp = 'not in';
-    }
-    return [
-        {
-            field: filter.field,
-            op: mappedOp,
-            value
-        }
-    ];
-}
-const DEFAULT_HAVING_AGGREGATE = {
-    func: 'sum'
-};
-const buildHaving = (queryDSL, context)=>{
-    const { vbiDSL } = context;
-    const havingFilter = vbiDSL.havingFilter;
-    if (!havingFilter || 0 === havingFilter.conditions.length) return queryDSL;
-    const result = {
-        ...queryDSL
-    };
-    result.having = {
-        op: havingFilter.op,
-        conditions: havingFilter.conditions.flatMap(buildHaving_mapClauseToCondition)
-    };
-    return result;
-};
-function isHavingGroup(clause) {
-    return 'op' in clause && 'conditions' in clause;
-}
-function buildHaving_mapClauseToCondition(clause) {
-    if (isHavingGroup(clause)) return [
-        buildHaving_mapGroupToCondition(clause)
-    ];
-    return buildHaving_mapFilterToCondition(clause);
-}
-function buildHaving_mapGroupToCondition(group) {
-    return {
-        op: group.op,
-        conditions: group.conditions.flatMap(buildHaving_mapClauseToCondition)
-    };
-}
-function buildHaving_mapFilterToCondition(filter) {
-    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
-    };
-    const limit = context.vbiDSL.limit ?? 1000;
-    result.limit = limit;
-    return result;
-};
-const buildVQuery = (vbiDSL, builder)=>{
-    const wrapper = (processor)=>(queryDSL)=>processor(queryDSL, {
-                vbiDSL,
-                builder
-            });
-    return (0, external_remeda_namespaceObject.pipe)({}, wrapper(buildSelect), wrapper(buildGroupBy), wrapper(buildWhere), wrapper(buildHaving), wrapper(buildLimit));
-};
-const buildVQueryDSL = ({ vbiDSL, builder })=>buildVQuery(vbiDSL, builder);
-const buildVSeedDSL = async ({ vbiDSL, queryDSL })=>{
-    const connectorId = vbiDSL.connectorId;
-    const connector = await getConnector(connectorId);
-    const schema = await connector.discoverSchema();
-    const queryResult = await connector.query({
-        queryDSL,
-        schema,
-        connectorId
-    });
-    return {
-        chartType: vbiDSL.chartType,
-        dataset: queryResult.dataset,
-        theme: vbiDSL.theme,
-        locale: vbiDSL.locale
-    };
-};
-const defaultVBIBuilderAdapters = {
-    buildVQuery: buildVQueryDSL,
-    buildVSeed: buildVSeedDSL
-};
-const resolveVBIBuilderAdapters = (adapters)=>({
-        buildVQuery: adapters?.buildVQuery ?? defaultVBIBuilderAdapters.buildVQuery,
-        buildVSeed: adapters?.buildVSeed ?? defaultVBIBuilderAdapters.buildVSeed
-    });
 class MeasureNodeBuilder {
     yMap;
     constructor(yMap){
@@ -314,6 +70,12 @@ class MeasureNodeBuilder {
     getField() {
         return this.yMap.get('field');
     }
+    getEncoding() {
+        return this.yMap.get('encoding');
+    }
+    getSort() {
+        return this.yMap.get('sort');
+    }
     setAlias(alias) {
         this.yMap.set('alias', alias);
         return this;
@@ -322,10 +84,29 @@ class MeasureNodeBuilder {
         this.yMap.set('encoding', encoding);
         return this;
     }
+    setSort(sort) {
+        this.yMap.set('sort', sort);
+        return this;
+    }
     setAggregate(aggregate) {
         this.yMap.set('aggregate', aggregate);
         return this;
     }
+    setFormat(format) {
+        this.yMap.set('format', format);
+        return this;
+    }
+    getFormat() {
+        return this.yMap.get('format');
+    }
+    clearFormat() {
+        this.yMap.delete('format');
+        return this;
+    }
+    clearSort() {
+        this.yMap.delete('sort');
+        return this;
+    }
     toJSON() {
         return this.yMap.toJSON();
     }
@@ -360,9 +141,369 @@ const normalizeMeasureNodeIds = (measures)=>{
     });
 };
 const locateMeasureIndexById = (measures, measureId)=>measures.toArray().findIndex((item)=>item.get('id') === measureId);
+const MEASURE_ENCODING_SUPPORT = {
+    table: [
+        'column'
+    ],
+    pivotTable: [
+        'detail'
+    ],
+    column: [
+        'yAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    columnParallel: [
+        'yAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    columnPercent: [
+        'yAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    line: [
+        'yAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    area: [
+        'yAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    areaPercent: [
+        'yAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    bar: [
+        'xAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    barParallel: [
+        'xAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    barPercent: [
+        'xAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    dualAxis: [
+        'primaryYAxis',
+        'secondaryYAxis',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    scatter: [
+        'xAxis',
+        'yAxis',
+        'size',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    pie: [
+        'angle',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    donut: [
+        'angle',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    rose: [
+        'radius',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    roseParallel: [
+        'radius',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    radar: [
+        'radius',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    funnel: [
+        'size',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    heatmap: [
+        'color',
+        'detail',
+        'label',
+        'tooltip'
+    ],
+    histogram: [
+        'value',
+        'x0',
+        'x1',
+        'yAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    boxplot: [
+        'value',
+        'q1',
+        'q3',
+        'min',
+        'max',
+        'median',
+        'outliers',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    treeMap: [
+        'size',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    sunburst: [
+        'size',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    circlePacking: [
+        'size',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    raceBar: [
+        'xAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    raceColumn: [
+        'yAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    raceLine: [
+        'yAxis',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    raceScatter: [
+        'xAxis',
+        'yAxis',
+        'size',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    racePie: [
+        'angle',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ],
+    raceDonut: [
+        'angle',
+        'detail',
+        'color',
+        'label',
+        'tooltip'
+    ]
+};
+const repeatEncoding = (first, rest = first)=>(index)=>0 === index ? first : rest;
+const STRATEGY_BY_CHART_TYPE = {
+    [vseed_namespaceObject.ChartTypeEnum.Table]: {
+        supported: MEASURE_ENCODING_SUPPORT.table,
+        recommend: repeatEncoding('column')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.PivotTable]: {
+        supported: MEASURE_ENCODING_SUPPORT.pivotTable,
+        recommend: repeatEncoding('detail')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Column]: {
+        supported: MEASURE_ENCODING_SUPPORT.column,
+        recommend: repeatEncoding('yAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.ColumnParallel]: {
+        supported: MEASURE_ENCODING_SUPPORT.columnParallel,
+        recommend: repeatEncoding('yAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.ColumnPercent]: {
+        supported: MEASURE_ENCODING_SUPPORT.columnPercent,
+        recommend: repeatEncoding('yAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Line]: {
+        supported: MEASURE_ENCODING_SUPPORT.line,
+        recommend: repeatEncoding('yAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Area]: {
+        supported: MEASURE_ENCODING_SUPPORT.area,
+        recommend: repeatEncoding('yAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.AreaPercent]: {
+        supported: MEASURE_ENCODING_SUPPORT.areaPercent,
+        recommend: repeatEncoding('yAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Bar]: {
+        supported: MEASURE_ENCODING_SUPPORT.bar,
+        recommend: repeatEncoding('xAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.BarParallel]: {
+        supported: MEASURE_ENCODING_SUPPORT.barParallel,
+        recommend: repeatEncoding('xAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.BarPercent]: {
+        supported: MEASURE_ENCODING_SUPPORT.barPercent,
+        recommend: repeatEncoding('xAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.DualAxis]: {
+        supported: MEASURE_ENCODING_SUPPORT.dualAxis,
+        recommend: (index)=>0 === index ? 'primaryYAxis' : 'secondaryYAxis'
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Scatter]: {
+        supported: MEASURE_ENCODING_SUPPORT.scatter,
+        recommend: (index)=>0 === index ? 'xAxis' : 'yAxis'
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Pie]: {
+        supported: MEASURE_ENCODING_SUPPORT.pie,
+        recommend: repeatEncoding('angle')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Donut]: {
+        supported: MEASURE_ENCODING_SUPPORT.donut,
+        recommend: repeatEncoding('angle')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Rose]: {
+        supported: MEASURE_ENCODING_SUPPORT.rose,
+        recommend: repeatEncoding('radius')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RoseParallel]: {
+        supported: MEASURE_ENCODING_SUPPORT.roseParallel,
+        recommend: repeatEncoding('radius')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Radar]: {
+        supported: MEASURE_ENCODING_SUPPORT.radar,
+        recommend: repeatEncoding('radius')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Funnel]: {
+        supported: MEASURE_ENCODING_SUPPORT.funnel,
+        recommend: repeatEncoding('size')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Heatmap]: {
+        supported: MEASURE_ENCODING_SUPPORT.heatmap,
+        recommend: repeatEncoding('color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Histogram]: {
+        supported: MEASURE_ENCODING_SUPPORT.histogram,
+        recommend: repeatEncoding('value')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Boxplot]: {
+        supported: MEASURE_ENCODING_SUPPORT.boxplot,
+        recommend: repeatEncoding('value')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.TreeMap]: {
+        supported: MEASURE_ENCODING_SUPPORT.treeMap,
+        recommend: repeatEncoding('size')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Sunburst]: {
+        supported: MEASURE_ENCODING_SUPPORT.sunburst,
+        recommend: repeatEncoding('size')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.CirclePacking]: {
+        supported: MEASURE_ENCODING_SUPPORT.circlePacking,
+        recommend: repeatEncoding('size')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RaceBar]: {
+        supported: MEASURE_ENCODING_SUPPORT.raceBar,
+        recommend: repeatEncoding('xAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RaceColumn]: {
+        supported: MEASURE_ENCODING_SUPPORT.raceColumn,
+        recommend: repeatEncoding('yAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RaceLine]: {
+        supported: MEASURE_ENCODING_SUPPORT.raceLine,
+        recommend: repeatEncoding('yAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RaceScatter]: {
+        supported: MEASURE_ENCODING_SUPPORT.raceScatter,
+        recommend: (index)=>0 === index ? 'xAxis' : 'yAxis'
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RacePie]: {
+        supported: MEASURE_ENCODING_SUPPORT.racePie,
+        recommend: repeatEncoding('angle')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RaceDonut]: {
+        supported: MEASURE_ENCODING_SUPPORT.raceDonut,
+        recommend: repeatEncoding('angle')
+    }
+};
+const DEFAULT_STRATEGY = STRATEGY_BY_CHART_TYPE[vseed_namespaceObject.ChartTypeEnum.Table];
+const getSupportedMeasureEncodingsForChartType = (chartType)=>[
+        ...(STRATEGY_BY_CHART_TYPE[chartType] || DEFAULT_STRATEGY).supported
+    ];
+const getRecommendedMeasureEncodingsForChartType = (chartType, measureCount)=>{
+    const strategy = STRATEGY_BY_CHART_TYPE[chartType] || DEFAULT_STRATEGY;
+    if (measureCount <= 0) return [];
+    return Array.from({
+        length: measureCount
+    }, (_, index)=>strategy.recommend(index));
+};
 class MeasuresBuilder {
+    doc;
     dsl;
     constructor(doc, dsl){
+        this.doc = doc;
         this.dsl = dsl;
         doc.transact(()=>{
             const measures = getOrCreateMeasures(this.dsl);
@@ -370,38 +511,47 @@ class MeasuresBuilder {
         });
     }
     add(field, callback) {
+        const measures = getOrCreateMeasures(this.dsl);
+        const chartType = this.dsl.get('chartType') || 'table';
+        const [encoding] = getRecommendedMeasureEncodingsForChartType(chartType, measures.length + 1).slice(-1);
         const measure = {
             id: id_id.uuid(),
             alias: field,
             field,
-            encoding: 'yAxis',
+            encoding,
             aggregate: {
                 func: 'sum'
             }
         };
         const yMap = new external_yjs_namespaceObject.Map();
-        for (const [key, value] of Object.entries(measure))yMap.set(key, value);
-        const measures = getOrCreateMeasures(this.dsl);
-        measures.push([
-            yMap
-        ]);
-        const node = new MeasureNodeBuilder(yMap);
-        callback(node);
+        this.doc.transact(()=>{
+            for (const [key, value] of Object.entries(measure))yMap.set(key, value);
+            const measures = getOrCreateMeasures(this.dsl);
+            measures.push([
+                yMap
+            ]);
+            const node = new MeasureNodeBuilder(yMap);
+            callback(node);
+        });
         return this;
     }
     remove(id) {
-        const measures = getOrCreateMeasures(this.dsl);
-        const index = locateMeasureIndexById(measures, id);
-        if (-1 !== index) measures.delete(index, 1);
+        this.doc.transact(()=>{
+            const measures = getOrCreateMeasures(this.dsl);
+            const index = locateMeasureIndexById(measures, id);
+            if (-1 !== index) measures.delete(index, 1);
+        });
         return this;
     }
     update(id, callback) {
-        const measures = getOrCreateMeasures(this.dsl);
-        const index = locateMeasureIndexById(measures, id);
-        if (-1 === index) throw new Error(`Measure with id "${id}" not found`);
-        const measureYMap = measures.get(index);
-        const node = new MeasureNodeBuilder(measureYMap);
-        callback(node);
+        this.doc.transact(()=>{
+            const measures = getOrCreateMeasures(this.dsl);
+            const index = locateMeasureIndexById(measures, id);
+            if (-1 === index) throw new Error(`Measure with id "${id}" not found`);
+            const measureYMap = measures.get(index);
+            const node = new MeasureNodeBuilder(measureYMap);
+            callback(node);
+        });
         return this;
     }
     find(predicate) {
@@ -422,9 +572,9 @@ class MeasuresBuilder {
     }
     observe(callback) {
         const measures = getOrCreateMeasures(this.dsl);
-        measures.observe(callback);
+        measures.observeDeep(callback);
         return ()=>{
-            measures.unobserve(callback);
+            measures.unobserveDeep(callback);
         };
     }
     static isMeasureNode(node) {
@@ -445,10 +595,36 @@ class DimensionNodeBuilder {
     getField() {
         return this.yMap.get('field');
     }
-    setAlias(alias) {
+    getEncoding() {
+        return this.yMap.get('encoding');
+    }
+    getSort() {
+        return this.yMap.get('sort');
+    }
+    setAlias(alias) {
         this.yMap.set('alias', alias);
         return this;
     }
+    setEncoding(encoding) {
+        this.yMap.set('encoding', encoding);
+        return this;
+    }
+    setSort(sort) {
+        this.yMap.set('sort', sort);
+        return this;
+    }
+    setAggregate(aggregate) {
+        this.yMap.set('aggregate', aggregate);
+        return this;
+    }
+    clearAggregate() {
+        this.yMap.delete('aggregate');
+        return this;
+    }
+    clearSort() {
+        this.yMap.delete('sort');
+        return this;
+    }
     toJSON() {
         return this.yMap.toJSON();
     }
@@ -466,9 +642,423 @@ const normalizeDimensionNodeIds = (dimensions)=>{
     });
 };
 const locateDimensionIndexById = (dimensions, dimensionId)=>dimensions.toArray().findIndex((item)=>item.get('id') === dimensionId);
+const DIMENSION_ENCODING_SUPPORT = {
+    table: [
+        'column'
+    ],
+    pivotTable: [
+        'row',
+        'column'
+    ],
+    column: [
+        'xAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    columnParallel: [
+        'xAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    columnPercent: [
+        'xAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    line: [
+        'xAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    area: [
+        'xAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    areaPercent: [
+        'xAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    dualAxis: [
+        'xAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    bar: [
+        'yAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    barParallel: [
+        'yAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    barPercent: [
+        'yAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    pie: [
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    donut: [
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    funnel: [
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    scatter: [
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    rose: [
+        'angle',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    roseParallel: [
+        'angle',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    radar: [
+        'angle',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    heatmap: [
+        'xAxis',
+        'yAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    boxplot: [
+        'xAxis',
+        'color',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    histogram: [
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    treeMap: [
+        'hierarchy',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    sunburst: [
+        'hierarchy',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    circlePacking: [
+        'hierarchy',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    raceBar: [
+        'player',
+        'yAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    raceColumn: [
+        'player',
+        'xAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    raceLine: [
+        'player',
+        'xAxis',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    raceScatter: [
+        'player',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    racePie: [
+        'player',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ],
+    raceDonut: [
+        'player',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ]
+};
+const dimension_encoding_repeatEncoding = (first, rest = first)=>(index)=>0 === index ? first : rest;
+const alternateEncoding = (a, b)=>(index)=>index % 2 === 0 ? a : b;
+const dimension_encoding_STRATEGY_BY_CHART_TYPE = {
+    [vseed_namespaceObject.ChartTypeEnum.Table]: {
+        supported: DIMENSION_ENCODING_SUPPORT.table,
+        recommend: dimension_encoding_repeatEncoding('column')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.PivotTable]: {
+        supported: DIMENSION_ENCODING_SUPPORT.pivotTable,
+        recommend: alternateEncoding('column', 'row')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Column]: {
+        supported: DIMENSION_ENCODING_SUPPORT.column,
+        recommend: dimension_encoding_repeatEncoding('xAxis', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.ColumnParallel]: {
+        supported: DIMENSION_ENCODING_SUPPORT.columnParallel,
+        recommend: dimension_encoding_repeatEncoding('xAxis', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.ColumnPercent]: {
+        supported: DIMENSION_ENCODING_SUPPORT.columnPercent,
+        recommend: dimension_encoding_repeatEncoding('xAxis', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Line]: {
+        supported: DIMENSION_ENCODING_SUPPORT.line,
+        recommend: dimension_encoding_repeatEncoding('xAxis', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Area]: {
+        supported: DIMENSION_ENCODING_SUPPORT.area,
+        recommend: dimension_encoding_repeatEncoding('xAxis', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.AreaPercent]: {
+        supported: DIMENSION_ENCODING_SUPPORT.areaPercent,
+        recommend: dimension_encoding_repeatEncoding('xAxis', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.DualAxis]: {
+        supported: DIMENSION_ENCODING_SUPPORT.dualAxis,
+        recommend: dimension_encoding_repeatEncoding('xAxis', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Bar]: {
+        supported: DIMENSION_ENCODING_SUPPORT.bar,
+        recommend: dimension_encoding_repeatEncoding('yAxis', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.BarParallel]: {
+        supported: DIMENSION_ENCODING_SUPPORT.barParallel,
+        recommend: dimension_encoding_repeatEncoding('yAxis', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.BarPercent]: {
+        supported: DIMENSION_ENCODING_SUPPORT.barPercent,
+        recommend: dimension_encoding_repeatEncoding('yAxis', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Pie]: {
+        supported: DIMENSION_ENCODING_SUPPORT.pie,
+        recommend: dimension_encoding_repeatEncoding('color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Donut]: {
+        supported: DIMENSION_ENCODING_SUPPORT.donut,
+        recommend: dimension_encoding_repeatEncoding('color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Funnel]: {
+        supported: DIMENSION_ENCODING_SUPPORT.funnel,
+        recommend: dimension_encoding_repeatEncoding('color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Scatter]: {
+        supported: DIMENSION_ENCODING_SUPPORT.scatter,
+        recommend: dimension_encoding_repeatEncoding('color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Rose]: {
+        supported: DIMENSION_ENCODING_SUPPORT.rose,
+        recommend: dimension_encoding_repeatEncoding('angle', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RoseParallel]: {
+        supported: DIMENSION_ENCODING_SUPPORT.roseParallel,
+        recommend: dimension_encoding_repeatEncoding('angle', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Radar]: {
+        supported: DIMENSION_ENCODING_SUPPORT.radar,
+        recommend: dimension_encoding_repeatEncoding('angle', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Heatmap]: {
+        supported: DIMENSION_ENCODING_SUPPORT.heatmap,
+        recommend: dimension_encoding_repeatEncoding('xAxis', 'yAxis')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Boxplot]: {
+        supported: DIMENSION_ENCODING_SUPPORT.boxplot,
+        recommend: dimension_encoding_repeatEncoding('xAxis', 'color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Histogram]: {
+        supported: DIMENSION_ENCODING_SUPPORT.histogram,
+        recommend: dimension_encoding_repeatEncoding('color')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.TreeMap]: {
+        supported: DIMENSION_ENCODING_SUPPORT.treeMap,
+        recommend: dimension_encoding_repeatEncoding('hierarchy')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.Sunburst]: {
+        supported: DIMENSION_ENCODING_SUPPORT.sunburst,
+        recommend: dimension_encoding_repeatEncoding('hierarchy')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.CirclePacking]: {
+        supported: DIMENSION_ENCODING_SUPPORT.circlePacking,
+        recommend: dimension_encoding_repeatEncoding('hierarchy')
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RaceBar]: {
+        supported: DIMENSION_ENCODING_SUPPORT.raceBar,
+        recommend: (index)=>{
+            if (0 === index) return 'player';
+            if (1 === index) return 'yAxis';
+            return 'color';
+        }
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RaceColumn]: {
+        supported: DIMENSION_ENCODING_SUPPORT.raceColumn,
+        recommend: (index)=>{
+            if (0 === index) return 'player';
+            if (1 === index) return 'xAxis';
+            return 'color';
+        }
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RaceLine]: {
+        supported: DIMENSION_ENCODING_SUPPORT.raceLine,
+        recommend: (index)=>0 === index ? 'player' : 'color'
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RaceScatter]: {
+        supported: DIMENSION_ENCODING_SUPPORT.raceScatter,
+        recommend: (index)=>0 === index ? 'player' : 'color'
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RacePie]: {
+        supported: DIMENSION_ENCODING_SUPPORT.racePie,
+        recommend: (index)=>0 === index ? 'player' : 'color'
+    },
+    [vseed_namespaceObject.ChartTypeEnum.RaceDonut]: {
+        supported: DIMENSION_ENCODING_SUPPORT.raceDonut,
+        recommend: (index)=>0 === index ? 'player' : 'color'
+    }
+};
+const dimension_encoding_DEFAULT_STRATEGY = dimension_encoding_STRATEGY_BY_CHART_TYPE[vseed_namespaceObject.ChartTypeEnum.Table];
+const getSupportedDimensionEncodingsForChartType = (chartType)=>[
+        ...(dimension_encoding_STRATEGY_BY_CHART_TYPE[chartType] || dimension_encoding_DEFAULT_STRATEGY).supported
+    ];
+const getRecommendedDimensionEncodingsForChartType = (chartType, dimensionCount)=>{
+    const strategy = dimension_encoding_STRATEGY_BY_CHART_TYPE[chartType] || dimension_encoding_DEFAULT_STRATEGY;
+    if (dimensionCount <= 0) return [];
+    return Array.from({
+        length: dimensionCount
+    }, (_, index)=>strategy.recommend(index));
+};
 class DimensionsBuilder {
+    doc;
     dsl;
     constructor(doc, dsl){
+        this.doc = doc;
         this.dsl = dsl;
         doc.transact(()=>{
             const dimensions = getOrCreateDimensions(this.dsl);
@@ -476,34 +1066,44 @@ class DimensionsBuilder {
         });
     }
     add(field, callback) {
+        const dimensions = getOrCreateDimensions(this.dsl);
+        const chartType = this.dsl.get('chartType') || 'table';
+        const [encoding] = getRecommendedDimensionEncodingsForChartType(chartType, dimensions.length + 1).slice(-1);
         const dimension = {
             id: id_id.uuid(),
             alias: field,
-            field
+            field,
+            encoding
         };
         const yMap = new external_yjs_namespaceObject.Map();
-        for (const [key, value] of Object.entries(dimension))yMap.set(key, value);
-        const dimensions = getOrCreateDimensions(this.dsl);
-        dimensions.push([
-            yMap
-        ]);
-        const node = new DimensionNodeBuilder(yMap);
-        callback(node);
+        this.doc.transact(()=>{
+            for (const [key, value] of Object.entries(dimension))yMap.set(key, value);
+            const dimensions = getOrCreateDimensions(this.dsl);
+            dimensions.push([
+                yMap
+            ]);
+            const node = new DimensionNodeBuilder(yMap);
+            callback(node);
+        });
         return this;
     }
     remove(id) {
-        const dimensions = getOrCreateDimensions(this.dsl);
-        const index = locateDimensionIndexById(dimensions, id);
-        if (-1 !== index) dimensions.delete(index, 1);
+        this.doc.transact(()=>{
+            const dimensions = getOrCreateDimensions(this.dsl);
+            const index = locateDimensionIndexById(dimensions, id);
+            if (-1 !== index) dimensions.delete(index, 1);
+        });
         return this;
     }
     update(id, callback) {
-        const dimensions = getOrCreateDimensions(this.dsl);
-        const index = locateDimensionIndexById(dimensions, id);
-        if (-1 === index) throw new Error(`Dimension with id "${id}" not found`);
-        const dimensionYMap = dimensions.get(index);
-        const node = new DimensionNodeBuilder(dimensionYMap);
-        callback(node);
+        this.doc.transact(()=>{
+            const dimensions = getOrCreateDimensions(this.dsl);
+            const index = locateDimensionIndexById(dimensions, id);
+            if (-1 === index) throw new Error(`Dimension with id "${id}" not found`);
+            const dimensionYMap = dimensions.get(index);
+            const node = new DimensionNodeBuilder(dimensionYMap);
+            callback(node);
+        });
         return this;
     }
     find(predicate) {
@@ -524,9 +1124,9 @@ class DimensionsBuilder {
     }
     observe(callback) {
         const dimensions = getOrCreateDimensions(this.dsl);
-        dimensions.observe(callback);
+        dimensions.observeDeep(callback);
         return ()=>{
-            dimensions.unobserve(callback);
+            dimensions.unobserveDeep(callback);
         };
     }
     static isDimensionNode(node) {
@@ -536,9 +1136,27 @@ class DimensionsBuilder {
         return 'children' in node;
     }
 }
+const reapplyDimensionEncodings = (dsl, chartType)=>{
+    const dimensions = getOrCreateDimensions(dsl);
+    const nodes = dimensions.toArray().filter((item)=>item instanceof external_yjs_namespaceObject.Map && 'string' == typeof item.get('field'));
+    const encodings = getRecommendedDimensionEncodingsForChartType(chartType, nodes.length);
+    nodes.forEach((node, index)=>{
+        node.set('encoding', encodings[index]);
+    });
+};
+const reapplyMeasureEncodings = (dsl, chartType)=>{
+    const measures = getOrCreateMeasures(dsl);
+    const nodes = measures.toArray().filter((item)=>item instanceof external_yjs_namespaceObject.Map && 'string' == typeof item.get('field'));
+    const encodings = getRecommendedMeasureEncodingsForChartType(chartType, nodes.length);
+    nodes.forEach((node, index)=>{
+        node.set('encoding', encodings[index]);
+    });
+};
 class ChartTypeBuilder {
+    doc;
     dsl;
-    constructor(_doc, dsl){
+    constructor(doc, dsl){
+        this.doc = doc;
         this.dsl = dsl;
     }
     observe(callback) {
@@ -551,11 +1169,29 @@ class ChartTypeBuilder {
         };
     }
     changeChartType(chartType) {
-        this.dsl.set('chartType', chartType);
+        this.doc.transact(()=>{
+            this.dsl.set('chartType', chartType);
+            reapplyDimensionEncodings(this.dsl, chartType);
+            reapplyMeasureEncodings(this.dsl, chartType);
+        });
     }
     getChartType() {
         return this.dsl.get('chartType') || 'table';
     }
+    getSupportedDimensionEncodings() {
+        return getSupportedDimensionEncodingsForChartType(this.getChartType());
+    }
+    getRecommendedDimensionEncodings(dimensionCount) {
+        const resolvedCount = dimensionCount ?? this.dsl.get('dimensions')?.length;
+        return getRecommendedDimensionEncodingsForChartType(this.getChartType(), resolvedCount);
+    }
+    getSupportedMeasureEncodings() {
+        return getSupportedMeasureEncodingsForChartType(this.getChartType());
+    }
+    getRecommendedMeasureEncodings(measureCount) {
+        const resolvedCount = measureCount ?? this.dsl.get('measures')?.length;
+        return getRecommendedMeasureEncodingsForChartType(this.getChartType(), resolvedCount);
+    }
     toJSON() {
         return this.dsl.get('chartType') || 'table';
     }
@@ -563,25 +1199,35 @@ class ChartTypeBuilder {
         return [
             vseed_namespaceObject.ChartTypeEnum.Table,
             vseed_namespaceObject.ChartTypeEnum.PivotTable,
-            vseed_namespaceObject.ChartTypeEnum.Line,
             vseed_namespaceObject.ChartTypeEnum.Column,
-            vseed_namespaceObject.ChartTypeEnum.ColumnPercent,
             vseed_namespaceObject.ChartTypeEnum.ColumnParallel,
-            vseed_namespaceObject.ChartTypeEnum.BarPercent,
+            vseed_namespaceObject.ChartTypeEnum.ColumnPercent,
+            vseed_namespaceObject.ChartTypeEnum.Bar,
             vseed_namespaceObject.ChartTypeEnum.BarParallel,
+            vseed_namespaceObject.ChartTypeEnum.BarPercent,
+            vseed_namespaceObject.ChartTypeEnum.Line,
             vseed_namespaceObject.ChartTypeEnum.Area,
             vseed_namespaceObject.ChartTypeEnum.AreaPercent,
             vseed_namespaceObject.ChartTypeEnum.DualAxis,
             vseed_namespaceObject.ChartTypeEnum.Scatter,
-            vseed_namespaceObject.ChartTypeEnum.Rose,
-            vseed_namespaceObject.ChartTypeEnum.RoseParallel,
             vseed_namespaceObject.ChartTypeEnum.Pie,
             vseed_namespaceObject.ChartTypeEnum.Donut,
+            vseed_namespaceObject.ChartTypeEnum.Rose,
+            vseed_namespaceObject.ChartTypeEnum.RoseParallel,
             vseed_namespaceObject.ChartTypeEnum.Radar,
             vseed_namespaceObject.ChartTypeEnum.Funnel,
             vseed_namespaceObject.ChartTypeEnum.Heatmap,
             vseed_namespaceObject.ChartTypeEnum.Boxplot,
-            vseed_namespaceObject.ChartTypeEnum.Histogram
+            vseed_namespaceObject.ChartTypeEnum.Histogram,
+            vseed_namespaceObject.ChartTypeEnum.TreeMap,
+            vseed_namespaceObject.ChartTypeEnum.Sunburst,
+            vseed_namespaceObject.ChartTypeEnum.CirclePacking,
+            vseed_namespaceObject.ChartTypeEnum.RaceBar,
+            vseed_namespaceObject.ChartTypeEnum.RaceColumn,
+            vseed_namespaceObject.ChartTypeEnum.RaceLine,
+            vseed_namespaceObject.ChartTypeEnum.RaceScatter,
+            vseed_namespaceObject.ChartTypeEnum.RacePie,
+            vseed_namespaceObject.ChartTypeEnum.RaceDonut
         ];
     }
 }
@@ -592,7 +1238,7 @@ function createWhereGroup(op = 'and', groupId = 'root') {
     yMap.set('conditions', new external_yjs_namespaceObject.Array());
     return yMap;
 }
-function where_utils_isWhereGroup(yMap) {
+function isWhereGroup(yMap) {
     return void 0 !== yMap.get('op') && void 0 !== yMap.get('conditions');
 }
 function findEntry(collection, entryId) {
@@ -604,7 +1250,7 @@ function findEntry(collection, entryId) {
             index,
             item
         };
-        if (where_utils_isWhereGroup(item)) {
+        if (isWhereGroup(item)) {
             const nestedCollection = item.get('conditions');
             const nestedMatch = findEntry(nestedCollection, entryId);
             if (nestedMatch) return nestedMatch;
@@ -637,6 +1283,15 @@ class WhereFilterNodeBuilder {
         this.yMap.set('value', value);
         return this;
     }
+    setDate(predicate) {
+        this.yMap.set('op', 'date');
+        this.yMap.set('value', predicate);
+        return this;
+    }
+    getDate() {
+        if ('date' !== this.yMap.get('op')) return;
+        return this.yMap.get('value');
+    }
     toJSON() {
         return this.yMap.toJSON();
     }
@@ -797,7 +1452,7 @@ class WhereFilterBuilder {
         };
     }
     static isGroup(yMap) {
-        return where_utils_isWhereGroup(yMap);
+        return isWhereGroup(yMap);
     }
     static isNode(yMap) {
         return void 0 !== yMap.get('field');
@@ -810,7 +1465,7 @@ function createHavingGroup(op = 'and', groupId = 'root') {
     yMap.set('conditions', new external_yjs_namespaceObject.Array());
     return yMap;
 }
-function having_utils_isHavingGroup(yMap) {
+function isHavingGroup(yMap) {
     return void 0 !== yMap.get('op') && void 0 !== yMap.get('conditions');
 }
 function having_utils_findEntry(collection, entryId) {
@@ -822,7 +1477,7 @@ function having_utils_findEntry(collection, entryId) {
             index,
             item
         };
-        if (having_utils_isHavingGroup(item)) {
+        if (isHavingGroup(item)) {
             const nestedCollection = item.get('conditions');
             const nestedMatch = having_utils_findEntry(nestedCollection, entryId);
             if (nestedMatch) return nestedMatch;
@@ -1024,7 +1679,7 @@ class HavingFilterBuilder {
         };
     }
     static isGroup(yMap) {
-        return having_utils_isHavingGroup(yMap);
+        return isHavingGroup(yMap);
     }
     static isNode(yMap) {
         return void 0 !== yMap.get('field');
@@ -1123,17 +1778,518 @@ class UndoManager {
         this.manager.clear(clearUndoStack, clearRedoStack);
     }
 }
+const VBI_TO_VQUERY_MEASURE_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 VBI_TO_VQUERY_DIMENSION_AGGR_FUNC_MAP = {
+    toYear: 'to_year',
+    toQuarter: 'to_quarter',
+    toMonth: 'to_month',
+    toWeek: 'to_week',
+    toDay: 'to_day',
+    toHour: 'to_hour',
+    toMinute: 'to_minute',
+    toSecond: 'to_second'
+};
+const mapAggregateForVQuery = (aggregate)=>{
+    if (!aggregate) return aggregate;
+    const mappedFunc = VBI_TO_VQUERY_MEASURE_AGGR_FUNC_MAP[aggregate.func] ?? aggregate.func;
+    return {
+        ...aggregate,
+        func: mappedFunc
+    };
+};
+const mapDimensionAggregateForVQuery = (aggregate)=>{
+    if (!aggregate) return aggregate;
+    const mappedFunc = VBI_TO_VQUERY_DIMENSION_AGGR_FUNC_MAP[aggregate.func] ?? aggregate.func;
+    return {
+        ...aggregate,
+        func: mappedFunc
+    };
+};
+const buildSelect = (queryDSL, context)=>{
+    const { vbiDSL } = context;
+    const measures = vbiDSL.measures;
+    const dimensions = vbiDSL.dimensions;
+    const result = {
+        ...queryDSL
+    };
+    const measureNodes = measures.filter((measure)=>MeasuresBuilder.isMeasureNode(measure));
+    const measureSelects = measureNodes.map((measure)=>({
+            field: measure.field,
+            alias: measure.id,
+            aggr: mapAggregateForVQuery(measure.aggregate)
+        }));
+    const dimensionNodes = dimensions.filter((dimension)=>DimensionsBuilder.isDimensionNode(dimension));
+    const dimensionSelects = dimensionNodes.map((dimension)=>{
+        const aggregate = mapDimensionAggregateForVQuery(dimension.aggregate);
+        if (!aggregate) return {
+            field: dimension.field,
+            alias: dimension.id
+        };
+        return {
+            field: dimension.field,
+            alias: dimension.id,
+            aggr: aggregate
+        };
+    });
+    result.select = [
+        ...measureSelects,
+        ...dimensionSelects
+    ];
+    return result;
+};
+const buildGroupBy = (queryDSL, context)=>{
+    const result = {
+        ...queryDSL
+    };
+    const { vbiDSL } = context;
+    const dimensions = vbiDSL.dimensions;
+    const dimensionNodes = dimensions.filter((dimension)=>DimensionsBuilder.isDimensionNode(dimension));
+    result.groupBy = dimensionNodes.map((dimension)=>dimension.aggregate ? dimension.id : dimension.field);
+    return result;
+};
+function resolveDatePredicate(predicate, now) {
+    switch(predicate.type){
+        case 'range':
+            return resolveRange(predicate);
+        case 'period':
+            return resolvePeriod(predicate);
+        case 'relative':
+            return resolveRelative(predicate, now ?? new Date());
+        case 'current':
+            return resolveCurrent(predicate, now ?? new Date());
+    }
+}
+function resolveRange(p) {
+    return {
+        start: toDateString(p.start),
+        end: toDateString(p.end),
+        bounds: p.bounds ?? '[)'
+    };
+}
+function resolvePeriod(p) {
+    switch(p.unit){
+        case 'year':
+            return {
+                start: `${p.year}-01-01`,
+                end: `${p.year + 1}-01-01`,
+                bounds: '[)'
+            };
+        case 'quarter':
+            return resolveQuarter(p.year, p.quarter);
+        case 'month':
+            return resolveMonth(p.year, p.month);
+        case 'week':
+            return resolveISOWeek(p.year, p.week);
+        case 'day':
+            return resolveDay(p.date);
+    }
+}
+function resolveQuarter(year, quarter) {
+    const startMonth = (quarter - 1) * 3 + 1;
+    const start = formatDate(year, startMonth, 1);
+    const endDate = new Date(Date.UTC(year, startMonth - 1 + 3, 1));
+    return {
+        start,
+        end: utcToDateString(endDate),
+        bounds: '[)'
+    };
+}
+function resolveMonth(year, month) {
+    const start = formatDate(year, month, 1);
+    const endDate = new Date(Date.UTC(year, month, 1));
+    return {
+        start,
+        end: utcToDateString(endDate),
+        bounds: '[)'
+    };
+}
+function resolveISOWeek(year, week) {
+    const jan4 = new Date(Date.UTC(year, 0, 4));
+    const dayOfWeek = jan4.getUTCDay() || 7;
+    const monday = new Date(jan4.getTime() - (dayOfWeek - 1) * 86400000);
+    const weekStart = new Date(monday.getTime() + (week - 1) * 604800000);
+    const weekEnd = new Date(weekStart.getTime() + 604800000);
+    return {
+        start: utcToDateString(weekStart),
+        end: utcToDateString(weekEnd),
+        bounds: '[)'
+    };
+}
+function resolveDay(date) {
+    const d = 'string' == typeof date ? new Date(date + 'T00:00:00Z') : date;
+    const next = new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate() + 1));
+    return {
+        start: utcToDateString(d),
+        end: utcToDateString(next),
+        bounds: '[)'
+    };
+}
+function resolveRelative(p, now) {
+    const today = truncateToDay(now);
+    const offset = 'last' === p.mode ? -p.amount : p.amount;
+    const shifted = shiftDate(today, offset, p.unit);
+    if ('last' === p.mode) return {
+        start: utcToDateString(shifted),
+        end: utcToDateString(today),
+        bounds: '[)'
+    };
+    return {
+        start: utcToDateString(today),
+        end: utcToDateString(shifted),
+        bounds: '[)'
+    };
+}
+function resolveCurrent(p, now) {
+    const offset = p.offset ?? 0;
+    const base = truncateToDay(now);
+    const periodStart = getPeriodStart(base, p.unit, offset);
+    const periodEnd = shiftDate(periodStart, 1, p.unit);
+    return {
+        start: utcToDateString(periodStart),
+        end: utcToDateString(periodEnd),
+        bounds: '[)'
+    };
+}
+function getPeriodStart(date, unit, offset) {
+    const y = date.getUTCFullYear();
+    const m = date.getUTCMonth();
+    switch(unit){
+        case 'year':
+            return new Date(Date.UTC(y + offset, 0, 1));
+        case 'quarter':
+            {
+                const q = Math.floor(m / 3);
+                return new Date(Date.UTC(y, (q + offset) * 3, 1));
+            }
+        case 'month':
+            return new Date(Date.UTC(y, m + offset, 1));
+        case 'week':
+            {
+                const dow = date.getUTCDay() || 7;
+                const monday = new Date(date.getTime() - (dow - 1) * 86400000);
+                return new Date(monday.getTime() + 7 * offset * 86400000);
+            }
+        case 'day':
+            return new Date(Date.UTC(y, m, date.getUTCDate() + offset));
+        default:
+            return date;
+    }
+}
+function shiftDate(date, amount, unit) {
+    const y = date.getUTCFullYear();
+    const m = date.getUTCMonth();
+    const d = date.getUTCDate();
+    switch(unit){
+        case 'year':
+            return new Date(Date.UTC(y + amount, m, d));
+        case 'quarter':
+            return new Date(Date.UTC(y, m + 3 * amount, d));
+        case 'month':
+            return new Date(Date.UTC(y, m + amount, d));
+        case 'week':
+            return new Date(date.getTime() + 7 * amount * 86400000);
+        case 'day':
+            return new Date(Date.UTC(y, m, d + amount));
+        default:
+            return date;
+    }
+}
+function truncateToDay(date) {
+    return new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()));
+}
+function toDateString(input) {
+    if ('string' == typeof input) return input;
+    return utcToDateString(input);
+}
+function utcToDateString(date) {
+    return formatDate(date.getUTCFullYear(), date.getUTCMonth() + 1, date.getUTCDate());
+}
+function formatDate(year, month, day) {
+    const y = String(year);
+    const m = String(month).padStart(2, '0');
+    const d = String(day).padStart(2, '0');
+    return `${y}-${m}-${d}`;
+}
+const buildWhere = (queryDSL, context)=>{
+    const { vbiDSL } = context;
+    const whereFilter = vbiDSL.whereFilter;
+    if (!whereFilter || 0 === whereFilter.conditions.length) return queryDSL;
+    const result = {
+        ...queryDSL
+    };
+    result.where = mapGroupToCondition(whereFilter);
+    return result;
+};
+function buildWhere_isWhereGroup(clause) {
+    return 'op' in clause && 'conditions' in clause;
+}
+function mapClauseToCondition(clause) {
+    if (buildWhere_isWhereGroup(clause)) return [
+        mapGroupToCondition(clause)
+    ];
+    return mapFilterToCondition(clause);
+}
+function mapGroupToCondition(group) {
+    return {
+        op: group.op,
+        conditions: group.conditions.flatMap((c)=>mapClauseToCondition(c))
+    };
+}
+function mapFilterToCondition(filter) {
+    if ('date' === filter.op) return handleDateFilter(filter.field, filter.value);
+    if ('between' === filter.op || 'not between' === filter.op) return handleBetweenFilter(filter);
+    return handleSimpleFilter(filter);
+}
+function handleDateFilter(field, predicate) {
+    const range = resolveDatePredicate(predicate);
+    const startOp = '>=';
+    const endOp = '[]' === range.bounds ? '<=' : '<';
+    return [
+        {
+            field,
+            op: startOp,
+            value: range.start
+        },
+        {
+            field,
+            op: endOp,
+            value: range.end
+        }
+    ];
+}
+function handleBetweenFilter(filter) {
+    const value = normalizeBetweenValue(filter.value);
+    const lowerCondition = void 0 !== value.min && null !== value.min && '' !== value.min ? {
+        field: filter.field,
+        op: '<' === value.leftOp ? '>' : '>=',
+        value: value.min
+    } : void 0;
+    const upperCondition = void 0 !== value.max && null !== value.max && '' !== value.max ? {
+        field: filter.field,
+        op: '<' === value.rightOp ? '<' : '<=',
+        value: value.max
+    } : void 0;
+    if ('not between' === filter.op) {
+        const outsideConditions = [
+            lowerCondition && invertLowerBound(lowerCondition),
+            upperCondition && invertUpperBound(upperCondition)
+        ].filter(Boolean);
+        if (outsideConditions.length <= 1) return outsideConditions;
+        return [
+            {
+                op: 'or',
+                conditions: outsideConditions
+            }
+        ];
+    }
+    return [
+        lowerCondition,
+        upperCondition
+    ].filter(Boolean);
+}
+function normalizeBetweenValue(value) {
+    if (Array.isArray(value)) return {
+        min: value[0],
+        max: value[1],
+        leftOp: '<=',
+        rightOp: '<='
+    };
+    if ('object' == typeof value && null !== value) return value;
+    return {};
+}
+function invertLowerBound(condition) {
+    return {
+        field: condition.field,
+        op: '>' === condition.op ? '<=' : '<',
+        value: condition.value
+    };
+}
+function invertUpperBound(condition) {
+    return {
+        field: condition.field,
+        op: '<' === condition.op ? '>=' : '>',
+        value: condition.value
+    };
+}
+function handleSimpleFilter(filter) {
+    let mappedOp = filter.op;
+    const value = filter.value;
+    if (Array.isArray(value)) {
+        if ('=' === mappedOp) mappedOp = 'in';
+        if ('!=' === mappedOp) mappedOp = 'not in';
+    }
+    return [
+        {
+            field: filter.field,
+            op: mappedOp,
+            value
+        }
+    ];
+}
+const buildHaving = (queryDSL, context)=>{
+    const { vbiDSL } = context;
+    const havingFilter = vbiDSL.havingFilter;
+    if (!havingFilter || 0 === havingFilter.conditions.length) return queryDSL;
+    const result = {
+        ...queryDSL
+    };
+    result.having = {
+        op: havingFilter.op,
+        conditions: havingFilter.conditions.flatMap(buildHaving_mapClauseToCondition)
+    };
+    return result;
+};
+function buildHaving_isHavingGroup(clause) {
+    return 'op' in clause && 'conditions' in clause;
+}
+function buildHaving_mapClauseToCondition(clause) {
+    if (buildHaving_isHavingGroup(clause)) return [
+        buildHaving_mapGroupToCondition(clause)
+    ];
+    return buildHaving_mapFilterToCondition(clause);
+}
+function buildHaving_mapGroupToCondition(group) {
+    return {
+        op: group.op,
+        conditions: group.conditions.flatMap(buildHaving_mapClauseToCondition)
+    };
+}
+function buildHaving_mapFilterToCondition(filter) {
+    const mappedOp = normalizeOperator(filter.op, filter.value);
+    const aggregate = mapAggregateForVQuery(filter.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 toOrderItem = (node)=>({
+        field: node.id,
+        order: node.sort?.order
+    });
+const buildOrderBy = (queryDSL, context)=>{
+    const result = {
+        ...queryDSL
+    };
+    const dimensions = context.vbiDSL.dimensions.filter(DimensionsBuilder.isDimensionNode);
+    const measures = context.vbiDSL.measures.filter(MeasuresBuilder.isMeasureNode);
+    const sortedDimensions = dimensions.filter((node)=>node.sort);
+    const sortedMeasures = measures.filter((node)=>node.sort);
+    const sortedNodes = [
+        ...sortedDimensions,
+        ...sortedMeasures
+    ];
+    if (sortedNodes.length > 0) {
+        result.orderBy = sortedNodes.map(toOrderItem);
+        return result;
+    }
+    const firstDimension = dimensions[0];
+    if (firstDimension) result.orderBy = [
+        {
+            field: firstDimension.id,
+            order: 'asc'
+        }
+    ];
+    return result;
+};
+const buildLimit = (queryDSL, context)=>{
+    const result = {
+        ...queryDSL
+    };
+    const limit = context.vbiDSL.limit ?? 1000;
+    result.limit = limit;
+    return result;
+};
+const buildVQuery = (vbiDSL, builder)=>{
+    const wrapper = (processor)=>(queryDSL)=>processor(queryDSL, {
+                vbiDSL,
+                builder
+            });
+    return (0, external_remeda_namespaceObject.pipe)({}, wrapper(buildSelect), wrapper(buildGroupBy), wrapper(buildWhere), wrapper(buildHaving), wrapper(buildOrderBy), wrapper(buildLimit));
+};
+const buildVQueryDSL = ({ vbiDSL, builder })=>buildVQuery(vbiDSL, builder);
+const buildVSeedDSL = async ({ vbiDSL, queryDSL, options })=>{
+    const connectorId = vbiDSL.connectorId;
+    const connector = await getConnector(connectorId);
+    const schema = await connector.discoverSchema();
+    const queryResult = await connector.query({
+        queryDSL,
+        schema,
+        connectorId,
+        signal: options.signal
+    });
+    const measures = vbiDSL.measures.filter((measure)=>MeasuresBuilder.isMeasureNode(measure)).map((measure)=>{
+        const nextMeasure = {
+            id: measure.id,
+            alias: measure.alias
+        };
+        if (measure.encoding) nextMeasure.encoding = measure.encoding;
+        if (measure.format) if ('autoFormat' in measure.format && true === measure.format.autoFormat) nextMeasure.autoFormat = true;
+        else {
+            nextMeasure.autoFormat = false;
+            nextMeasure.numFormat = Object.fromEntries(Object.entries(measure.format).filter(([key])=>'autoFormat' !== key));
+        }
+        return nextMeasure;
+    });
+    const dimensions = vbiDSL.dimensions.filter((dimension)=>DimensionsBuilder.isDimensionNode(dimension)).map((dimension)=>{
+        const nextDimension = {
+            id: dimension.id,
+            alias: dimension.alias
+        };
+        if (dimension.encoding) nextDimension.encoding = dimension.encoding;
+        return nextDimension;
+    });
+    return {
+        chartType: vbiDSL.chartType,
+        dataset: queryResult.dataset,
+        dimensions,
+        measures,
+        theme: vbiDSL.theme,
+        locale: vbiDSL.locale
+    };
+};
+const defaultVBIChartBuilderAdapters = {
+    buildVQuery: buildVQueryDSL,
+    buildVSeed: buildVSeedDSL
+};
+const resolveVBIChartBuilderAdapters = (adapters)=>({
+        buildVQuery: adapters?.buildVQuery ?? defaultVBIChartBuilderAdapters.buildVQuery,
+        buildVSeed: adapters?.buildVSeed ?? defaultVBIChartBuilderAdapters.buildVSeed
+    });
 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 buildVBIChartDSL = (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 isEmptyVBIChartDSL = (dsl)=>{
     const dimensionsLength = getCollectionLength(dsl.get('dimensions'));
     const measuresLength = getCollectionLength(dsl.get('measures'));
     return 0 === dimensionsLength && 0 === measuresLength;
@@ -1143,7 +2299,7 @@ const getBuilderSchema = async (dsl)=>{
     const connector = await getConnector(connectorId);
     return connector.discoverSchema();
 };
-class VBIBuilder {
+class VBIChartBuilder {
     doc;
     dsl;
     adapters;
@@ -1159,7 +2315,7 @@ class VBIBuilder {
     constructor(doc, options){
         this.doc = doc;
         this.dsl = doc.getMap('dsl');
-        this.adapters = resolveVBIBuilderAdapters(options?.adapters);
+        this.adapters = resolveVBIChartBuilderAdapters(options?.adapters);
         this.undoManager = new UndoManager(this.dsl);
         this.chartType = new ChartTypeBuilder(doc, this.dsl);
         this.measures = new MeasuresBuilder(doc, this.dsl);
@@ -1172,7 +2328,7 @@ class VBIBuilder {
     }
     applyUpdate = (update, transactionOrigin)=>applyUpdateToDoc(this.doc, update, transactionOrigin);
     encodeStateAsUpdate = (targetStateVector)=>encodeDocStateAsUpdate(this.doc, targetStateVector);
-    buildVSeed = async ()=>{
+    buildVSeed = async (options = {})=>{
         const vbiDSL = this.build();
         const queryDSL = this.adapters.buildVQuery({
             dsl: this.dsl,
@@ -1183,6 +2339,7 @@ class VBIBuilder {
             dsl: this.dsl,
             vbiDSL,
             queryDSL,
+            options,
             builder: this
         });
     };
@@ -1194,14 +2351,13 @@ class VBIBuilder {
             builder: this
         });
     };
-    build = ()=>buildVBIDSL(this.dsl);
-    isEmpty = ()=>isEmptyVBIDSL(this.dsl);
+    build = ()=>buildVBIChartDSL(this.dsl);
+    isEmpty = ()=>isEmptyVBIChartDSL(this.dsl);
     getSchema = async ()=>getBuilderSchema(this.dsl);
 }
 const shouldEnsureIdForObject = (obj, ensureId)=>{
     if (true === ensureId) return true;
-    if ('field' === ensureId) return 'string' == typeof obj.field;
-    return false;
+    return 'field' === ensureId && 'string' == typeof obj.field;
 };
 const toYMap = (obj, ensureId = false)=>{
     const yMap = new external_yjs_namespaceObject.Map();
@@ -1209,23 +2365,9 @@ const toYMap = (obj, ensureId = false)=>{
     for (const [key, value] of Object.entries(obj)){
         if (('conditions' === key || 'children' === key) && Array.isArray(value)) {
             const yArr = new external_yjs_namespaceObject.Array();
-            for (const child of value){
-                if (child instanceof external_yjs_namespaceObject.Map) {
-                    yArr.push([
-                        child
-                    ]);
-                    continue;
-                }
-                if ('object' == typeof child && null !== child) {
-                    yArr.push([
-                        toYMap(child, ensureId)
-                    ]);
-                    continue;
-                }
-                yArr.push([
-                    child
-                ]);
-            }
+            for (const child of value)yArr.push([
+                toYMap(child, ensureId)
+            ]);
             yMap.set(key, yArr);
             continue;
         }
@@ -1235,65 +2377,34 @@ const toYMap = (obj, ensureId = false)=>{
 };
 const ensureYArray = (arr, ensureId = false)=>{
     if (!arr) return new external_yjs_namespaceObject.Array();
-    if (arr instanceof external_yjs_namespaceObject.Array) return arr;
     const yArr = new external_yjs_namespaceObject.Array();
-    for (const item of arr){
-        if (item instanceof external_yjs_namespaceObject.Map) {
-            yArr.push([
-                item
-            ]);
-            continue;
-        }
-        if ('object' == typeof item && null !== item) {
-            yArr.push([
-                toYMap(item, ensureId)
-            ]);
-            continue;
-        }
-        yArr.push([
-            item
-        ]);
-    }
+    for (const item of arr)yArr.push([
+        toYMap(item, ensureId)
+    ]);
     return yArr;
 };
-const getDefaultWhereFilter = ()=>({
+const ensureWhereGroup = (whereFilter)=>{
+    const source = whereFilter ?? {
         id: 'root',
         op: 'and',
         conditions: []
-    });
-const isFilterGroupInput = (value)=>'object' == typeof value && null !== value;
-const ensureWhereGroup = (whereFilter)=>{
-    const sourceWhereFilter = whereFilter instanceof external_yjs_namespaceObject.Map || isFilterGroupInput(whereFilter) ? whereFilter : getDefaultWhereFilter();
-    const whereGroup = sourceWhereFilter instanceof external_yjs_namespaceObject.Map ? sourceWhereFilter : createWhereGroup();
-    if (sourceWhereFilter instanceof external_yjs_namespaceObject.Map) {
-        if (!(whereGroup.get('conditions') instanceof external_yjs_namespaceObject.Array)) whereGroup.set('conditions', new external_yjs_namespaceObject.Array());
-        if (!whereGroup.get('id')) whereGroup.set('id', 'root');
-        if (!whereGroup.get('op')) whereGroup.set('op', 'and');
-        return whereGroup;
-    }
-    whereGroup.set('id', sourceWhereFilter.id ?? 'root');
-    whereGroup.set('op', sourceWhereFilter.op ?? 'and');
-    whereGroup.set('conditions', ensureYArray(sourceWhereFilter.conditions, true));
+    };
+    const whereGroup = createWhereGroup();
+    whereGroup.set('id', source.id);
+    whereGroup.set('op', source.op);
+    whereGroup.set('conditions', ensureYArray(source.conditions, true));
     return whereGroup;
 };
-const getDefaultHavingFilter = ()=>({
+const ensureHavingGroup = (havingFilter)=>{
+    const source = havingFilter ?? {
         id: 'root',
         op: 'and',
         conditions: []
-    });
-const ensure_having_group_isFilterGroupInput = (value)=>'object' == typeof value && null !== value;
-const ensureHavingGroup = (havingFilter)=>{
-    const sourceHavingFilter = havingFilter instanceof external_yjs_namespaceObject.Map || ensure_having_group_isFilterGroupInput(havingFilter) ? havingFilter : getDefaultHavingFilter();
-    const havingGroup = sourceHavingFilter instanceof external_yjs_namespaceObject.Map ? sourceHavingFilter : createHavingGroup();
-    if (sourceHavingFilter instanceof external_yjs_namespaceObject.Map) {
-        if (!(havingGroup.get('conditions') instanceof external_yjs_namespaceObject.Array)) havingGroup.set('conditions', new external_yjs_namespaceObject.Array());
-        if (!havingGroup.get('id')) havingGroup.set('id', 'root');
-        if (!havingGroup.get('op')) havingGroup.set('op', 'and');
-        return havingGroup;
-    }
-    havingGroup.set('id', sourceHavingFilter.id ?? 'root');
-    havingGroup.set('op', sourceHavingFilter.op ?? 'and');
-    havingGroup.set('conditions', ensureYArray(sourceHavingFilter.conditions, true));
+    };
+    const havingGroup = createHavingGroup();
+    havingGroup.set('id', source.id);
+    havingGroup.set('op', source.op);
+    havingGroup.set('conditions', ensureYArray(source.conditions, true));
     return havingGroup;
 };
 const setBaseDSLFields = (dsl, vbi)=>{
@@ -1304,7 +2415,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, options)=>{
+const createChartBuilderFromVBIChartDSLInput = (vbi, options)=>{
     const doc = new external_yjs_namespaceObject.Doc();
     const dsl = doc.getMap('dsl');
     doc.transact(()=>{
@@ -1314,9 +2425,9 @@ const fromVBIDSLInput = (vbi, options)=>{
         dsl.set('measures', ensureYArray(vbi.measures, 'field'));
         dsl.set('dimensions', ensureYArray(vbi.dimensions, 'field'));
     });
-    return new VBIBuilder(doc, options);
+    return new VBIChartBuilder(doc, options);
 };
-const generateEmptyDSL = (connectorId)=>({
+const generateEmptyChartDSL = (connectorId)=>({
         connectorId,
         chartType: 'table',
         measures: [],
@@ -1348,14 +2459,13 @@ const mergeBuilderOptions = (base, overrides)=>{
     };
 };
 function createVBI(defaultBuilderOptions) {
-    const from = (vbi, builderOptions)=>fromVBIDSLInput(vbi, mergeBuilderOptions(defaultBuilderOptions, builderOptions));
+    const createChart = (vbi, builderOptions)=>createChartBuilderFromVBIChartDSLInput(vbi, mergeBuilderOptions(defaultBuilderOptions, builderOptions));
     return {
         connectorMap: connectorMap,
         registerConnector: registerConnector,
         getConnector: getConnector,
-        generateEmptyDSL: generateEmptyDSL,
-        from,
-        create: from
+        generateEmptyChartDSL: generateEmptyChartDSL,
+        createChart
     };
 }
 const VBI = createVBI();
@@ -1368,11 +2478,11 @@ exports.MeasuresBuilder = __webpack_exports__.MeasuresBuilder;
 exports.ThemeBuilder = __webpack_exports__.ThemeBuilder;
 exports.UndoManager = __webpack_exports__.UndoManager;
 exports.VBI = __webpack_exports__.VBI;
-exports.VBIBuilder = __webpack_exports__.VBIBuilder;
+exports.VBIChartBuilder = __webpack_exports__.VBIChartBuilder;
 exports.WhereFilterBuilder = __webpack_exports__.WhereFilterBuilder;
 exports.buildVQuery = __webpack_exports__.buildVQuery;
 exports.createVBI = __webpack_exports__.createVBI;
-exports.defaultVBIBuilderAdapters = __webpack_exports__.defaultVBIBuilderAdapters;
+exports.defaultVBIChartBuilderAdapters = __webpack_exports__.defaultVBIChartBuilderAdapters;
 exports.findTreeNodesBy = __webpack_exports__.findTreeNodesBy;
 exports.id = __webpack_exports__.id;
 exports.isVBIFilter = __webpack_exports__.isVBIFilter;
@@ -1380,7 +2490,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;
+exports.resolveVBIChartBuilderAdapters = __webpack_exports__.resolveVBIChartBuilderAdapters;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "ChartTypeBuilder",
     "DimensionsBuilder",
@@ -1391,11 +2501,11 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "ThemeBuilder",
     "UndoManager",
     "VBI",
-    "VBIBuilder",
+    "VBIChartBuilder",
     "WhereFilterBuilder",
     "buildVQuery",
     "createVBI",
-    "defaultVBIBuilderAdapters",
+    "defaultVBIChartBuilderAdapters",
     "findTreeNodesBy",
     "id",
     "isVBIFilter",
@@ -1403,7 +2513,7 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "isVBIHavingGroup",
     "isVBIWhereGroup",
     "preorderTraverse",
-    "resolveVBIBuilderAdapters"
+    "resolveVBIChartBuilderAdapters"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true