@visactor/vbi 0.4.15 → 0.4.16

package/dist/index.js

@@ -2,8 +2,7 @@ import { Array as external_yjs_Array, Doc, Map as external_yjs_Map, UndoManager,
 import { ChartTypeEnum, findTreeNodesBy, preorderTraverse } from "@visactor/vseed";
 import { v4 } from "uuid";
 import { pipe } from "remeda";
-import { z } from "zod";
-class DimensionNodeBuilder {
+class MeasureNodeBuilder {
     yMap;
     constructor(yMap){
         this.yMap = yMap;
@@ -15,71 +14,83 @@ class DimensionNodeBuilder {
         this.yMap.set('alias', alias);
         return this;
     }
-    toJson() {
+    setEncoding(encoding) {
+        this.yMap.set('encoding', encoding);
+        return this;
+    }
+    setAggregate(aggregate) {
+        this.yMap.set('aggregate', aggregate);
+        return this;
+    }
+    toJSON() {
         return this.yMap.toJSON();
     }
 }
-class DimensionsBuilder {
+class MeasuresBuilder {
     dsl;
     constructor(_doc, dsl){
         this.dsl = dsl;
     }
     add(field, callback) {
-        const dimension = {
+        const measure = {
             alias: field,
-            field
+            field,
+            encoding: 'yAxis',
+            aggregate: {
+                func: 'sum'
+            }
         };
         const yMap = new external_yjs_Map();
-        for (const [key, value] of Object.entries(dimension))yMap.set(key, value);
-        this.dsl.get('dimensions').push([
+        for (const [key, value] of Object.entries(measure))yMap.set(key, value);
+        this.dsl.get('measures').push([
             yMap
         ]);
-        const node = new DimensionNodeBuilder(yMap);
+        const node = new MeasureNodeBuilder(yMap);
         callback(node);
         return this;
     }
     remove(field) {
-        const dimensions = this.dsl.get('dimensions');
-        const index = dimensions.toArray().findIndex((item)=>item.get('field') === field);
-        if (-1 !== index) this.dsl.get('dimensions').delete(index, 1);
+        const measures = this.dsl.get('measures');
+        const index = measures.toArray().findIndex((item)=>item.get('field') === field);
+        if (-1 !== index) this.dsl.get('measures').delete(index, 1);
         return this;
     }
     update(field, callback) {
-        const dimensions = this.dsl.get('dimensions');
-        const index = dimensions.toArray().findIndex((item)=>item.get('field') === field);
-        if (-1 === index) throw new Error(`Dimension with field "${field}" not found`);
-        const dimensionYMap = dimensions.get(index);
-        const node = new DimensionNodeBuilder(dimensionYMap);
+        const measures = this.dsl.get('measures');
+        const index = measures.toArray().findIndex((item)=>item.get('field') === field);
+        if (-1 === index) throw new Error(`Measure with field "${field}" not found`);
+        const measureYMap = measures.get(index);
+        const node = new MeasureNodeBuilder(measureYMap);
         callback(node);
         return this;
     }
     find(field) {
-        const dimensions = this.dsl.get('dimensions');
-        const index = dimensions.toArray().findIndex((item)=>item.get('field') === field);
+        const measures = this.dsl.get('measures');
+        const index = measures.toArray().findIndex((item)=>item.get('field') === field);
         if (-1 === index) return;
-        return new DimensionNodeBuilder(dimensions.get(index));
+        return new MeasureNodeBuilder(measures.get(index));
     }
     findAll() {
-        const dimensions = this.dsl.get('dimensions');
-        return dimensions.toArray().map((yMap)=>new DimensionNodeBuilder(yMap));
+        const measures = this.dsl.get('measures');
+        return measures.toArray().map((yMap)=>new MeasureNodeBuilder(yMap));
     }
-    toJson() {
-        return this.dsl.get('dimensions').toJSON();
+    toJSON() {
+        return this.dsl.get('measures').toJSON();
     }
     observe(callback) {
-        this.dsl.get('dimensions').observe(callback);
+        this.dsl.get('measures').observe(callback);
         return ()=>{
-            this.dsl.get('dimensions').unobserve(callback);
+            this.dsl.get('measures').unobserve(callback);
         };
     }
-    static isDimensionNode(node) {
-        return 'alias' in node && !('children' in node);
+    static isMeasureNode(node) {
+        return 'encoding' in node || 'aggregate' in node;
     }
-    static isDimensionGroup(node) {
+    static isMeasureGroup(node) {
         return 'children' in node;
     }
 }
-class MeasureNodeBuilder {
+class DimensionNodeBuilder {
     yMap;
     constructor(yMap){
         this.yMap = yMap;
@@ -91,86 +102,161 @@ class MeasureNodeBuilder {
         this.yMap.set('alias', alias);
         return this;
     }
-    setEncoding(encoding) {
-        this.yMap.set('encoding', encoding);
-        return this;
-    }
-    setAggregate(aggregate) {
-        this.yMap.set('aggregate', aggregate);
-        return this;
-    }
-    toJson() {
+    toJSON() {
         return this.yMap.toJSON();
     }
 }
-class MeasuresBuilder {
+class DimensionsBuilder {
     dsl;
     constructor(_doc, dsl){
         this.dsl = dsl;
     }
     add(field, callback) {
-        const measure = {
+        const dimension = {
             alias: field,
-            field,
-            encoding: 'yAxis',
-            aggregate: {
-                func: 'sum'
-            }
+            field
         };
         const yMap = new external_yjs_Map();
-        for (const [key, value] of Object.entries(measure))yMap.set(key, value);
-        this.dsl.get('measures').push([
+        for (const [key, value] of Object.entries(dimension))yMap.set(key, value);
+        this.dsl.get('dimensions').push([
             yMap
         ]);
-        const node = new MeasureNodeBuilder(yMap);
+        const node = new DimensionNodeBuilder(yMap);
         callback(node);
         return this;
     }
     remove(field) {
-        const measures = this.dsl.get('measures');
-        const index = measures.toArray().findIndex((item)=>item.get('field') === field);
-        if (-1 !== index) this.dsl.get('measures').delete(index, 1);
+        const dimensions = this.dsl.get('dimensions');
+        const index = dimensions.toArray().findIndex((item)=>item.get('field') === field);
+        if (-1 !== index) this.dsl.get('dimensions').delete(index, 1);
         return this;
     }
     update(field, callback) {
-        const measures = this.dsl.get('measures');
-        const index = measures.toArray().findIndex((item)=>item.get('field') === field);
-        if (-1 === index) throw new Error(`Measure with field "${field}" not found`);
-        const measureYMap = measures.get(index);
-        const node = new MeasureNodeBuilder(measureYMap);
+        const dimensions = this.dsl.get('dimensions');
+        const index = dimensions.toArray().findIndex((item)=>item.get('field') === field);
+        if (-1 === index) throw new Error(`Dimension with field "${field}" not found`);
+        const dimensionYMap = dimensions.get(index);
+        const node = new DimensionNodeBuilder(dimensionYMap);
         callback(node);
         return this;
     }
     find(field) {
-        const measures = this.dsl.get('measures');
-        const index = measures.toArray().findIndex((item)=>item.get('field') === field);
+        const dimensions = this.dsl.get('dimensions');
+        const index = dimensions.toArray().findIndex((item)=>item.get('field') === field);
         if (-1 === index) return;
-        return new MeasureNodeBuilder(measures.get(index));
+        return new DimensionNodeBuilder(dimensions.get(index));
     }
     findAll() {
-        const measures = this.dsl.get('measures');
-        return measures.toArray().map((yMap)=>new MeasureNodeBuilder(yMap));
+        const dimensions = this.dsl.get('dimensions');
+        return dimensions.toArray().map((yMap)=>new DimensionNodeBuilder(yMap));
     }
-    toJson() {
-        return this.dsl.get('measures').toJSON();
+    toJSON() {
+        return this.dsl.get('dimensions').toJSON();
     }
     observe(callback) {
-        this.dsl.get('measures').observe(callback);
+        this.dsl.get('dimensions').observe(callback);
         return ()=>{
-            this.dsl.get('measures').unobserve(callback);
+            this.dsl.get('dimensions').unobserve(callback);
         };
     }
-    static isMeasureNode(node) {
-        return 'encoding' in node || 'aggregate' in node;
+    static isDimensionNode(node) {
+        return 'alias' in node && !('children' in node);
     }
-    static isMeasureGroup(node) {
+    static isDimensionGroup(node) {
         return 'children' in node;
     }
 }
+class ChartTypeBuilder {
+    dsl;
+    constructor(_doc, dsl){
+        this.dsl = dsl;
+    }
+    observe(callback) {
+        const wrapper = (e, trans)=>{
+            if (e.keysChanged.has('chartType')) callback(e, trans);
+        };
+        this.dsl.observe(wrapper);
+        return ()=>{
+            this.dsl.unobserve(wrapper);
+        };
+    }
+    changeChartType(chartType) {
+        this.dsl.set('chartType', chartType);
+    }
+    getChartType() {
+        return this.dsl.get('chartType') || 'table';
+    }
+    toJSON() {
+        return this.dsl.get('chartType') || 'table';
+    }
+    getAvailableChartTypes() {
+        return [
+            ChartTypeEnum.Table,
+            ChartTypeEnum.PivotTable,
+            ChartTypeEnum.Line,
+            ChartTypeEnum.Column,
+            ChartTypeEnum.ColumnPercent,
+            ChartTypeEnum.ColumnParallel,
+            ChartTypeEnum.BarPercent,
+            ChartTypeEnum.BarParallel,
+            ChartTypeEnum.Area,
+            ChartTypeEnum.AreaPercent,
+            ChartTypeEnum.DualAxis,
+            ChartTypeEnum.Scatter,
+            ChartTypeEnum.Rose,
+            ChartTypeEnum.RoseParallel,
+            ChartTypeEnum.Pie,
+            ChartTypeEnum.Donut,
+            ChartTypeEnum.Radar,
+            ChartTypeEnum.Funnel,
+            ChartTypeEnum.Heatmap,
+            ChartTypeEnum.Boxplot,
+            ChartTypeEnum.Histogram
+        ];
+    }
+}
 const id_id = {
     uuid: ()=>v4()
 };
-class HavingFiltersNodeBuilder {
+function isVBIFilter(clause) {
+    return 'field' in clause;
+}
+function isVBIWhereGroup(clause) {
+    return 'conditions' in clause;
+}
+function isVBIHavingFilter(clause) {
+    return 'field' in clause;
+}
+function isVBIHavingGroup(clause) {
+    return 'conditions' in clause;
+}
+function createWhereGroup(op = 'and', groupId = 'root') {
+    const yMap = new external_yjs_Map();
+    yMap.set('id', groupId);
+    yMap.set('op', op);
+    yMap.set('conditions', new external_yjs_Array());
+    return yMap;
+}
+function isWhereGroup(yMap) {
+    return void 0 !== yMap.get('op') && void 0 !== yMap.get('conditions');
+}
+function findEntry(collection, entryId) {
+    const items = collection.toArray();
+    for(let index = 0; index < items.length; index++){
+        const item = items[index];
+        if (item.get('id') === entryId) return {
+            collection,
+            index,
+            item
+        };
+        if (isWhereGroup(item)) {
+            const nestedCollection = item.get('conditions');
+            const nestedMatch = findEntry(nestedCollection, entryId);
+            if (nestedMatch) return nestedMatch;
+        }
+    }
+}
+class WhereFilterNodeBuilder {
     yMap;
     constructor(yMap){
         this.yMap = yMap;
@@ -181,26 +267,33 @@ class HavingFiltersNodeBuilder {
     getField() {
         return this.yMap.get('field');
     }
+    setField(field) {
+        this.yMap.set('field', field);
+        return this;
+    }
     getOperator() {
         return this.yMap.get('op');
     }
-    setValue(value) {
-        this.yMap.set('value', value);
-        return this;
-    }
     setOperator(operator) {
         this.yMap.set('op', operator);
         return this;
     }
-    toJson() {
+    setValue(value) {
+        this.yMap.set('value', value);
+        return this;
+    }
+    toJSON() {
         return this.yMap.toJSON();
     }
 }
-class HavingGroupBuilder {
+class WhereGroupBuilder {
     yMap;
     constructor(yMap){
         this.yMap = yMap;
     }
+    getConditions() {
+        return this.yMap.get('conditions');
+    }
     getId() {
         return this.yMap.get('id');
     }
@@ -215,29 +308,24 @@ class HavingGroupBuilder {
         const yMap = new external_yjs_Map();
         yMap.set('id', id_id.uuid());
         yMap.set('field', field);
-        const conditions = this.yMap.get('conditions');
-        conditions.push([
+        this.getConditions().push([
             yMap
         ]);
-        const node = new HavingFiltersNodeBuilder(yMap);
+        const node = new WhereFilterNodeBuilder(yMap);
         callback(node);
         return this;
     }
     addGroup(op, callback) {
-        const yMap = new external_yjs_Map();
-        yMap.set('id', id_id.uuid());
-        yMap.set('op', op);
-        yMap.set('conditions', new external_yjs_Array());
-        const conditions = this.yMap.get('conditions');
-        conditions.push([
+        const yMap = createWhereGroup(op, id_id.uuid());
+        this.getConditions().push([
             yMap
         ]);
-        const group = new HavingGroupBuilder(yMap);
+        const group = new WhereGroupBuilder(yMap);
         callback(group);
         return this;
     }
     remove(idOrIndex) {
-        const conditions = this.yMap.get('conditions');
+        const conditions = this.getConditions();
         if ('number' == typeof idOrIndex) {
             if (idOrIndex >= 0 && idOrIndex < conditions.length) conditions.delete(idOrIndex, 1);
         } else {
@@ -247,154 +335,138 @@ class HavingGroupBuilder {
         return this;
     }
     clear() {
-        const conditions = this.yMap.get('conditions');
+        const conditions = this.getConditions();
         conditions.delete(0, conditions.length);
         return this;
     }
-    toJson() {
+    toJSON() {
         return this.yMap.toJSON();
     }
 }
-class HavingFiltersBuilder {
-    dsl;
-    doc;
+class WhereFilterBuilder {
+    whereFilter;
     constructor(doc, dsl){
-        this.doc = doc;
-        this.dsl = dsl;
-        if (!this.dsl.get('havingFilters')) this.doc.transact(()=>{
-            this.dsl.set('havingFilters', new external_yjs_Array());
+        doc.transact(()=>{
+            const existingWhereFilter = dsl.get('whereFilter');
+            if (existingWhereFilter instanceof external_yjs_Map) this.whereFilter = existingWhereFilter;
+            else {
+                this.whereFilter = createWhereGroup();
+                dsl.set('whereFilter', this.whereFilter);
+            }
+            if (!(this.whereFilter.get('conditions') instanceof external_yjs_Array)) this.whereFilter.set('conditions', new external_yjs_Array());
+            if (!this.whereFilter.get('id')) this.whereFilter.set('id', 'root');
+            if (!this.whereFilter.get('op')) this.whereFilter.set('op', 'and');
         });
     }
+    getConditions() {
+        return this.whereFilter.get('conditions');
+    }
     add(field, callback) {
         const yMap = new external_yjs_Map();
         yMap.set('id', id_id.uuid());
         yMap.set('field', field);
-        this.dsl.get('havingFilters').push([
+        this.getConditions().push([
             yMap
         ]);
-        const node = new HavingFiltersNodeBuilder(yMap);
+        const node = new WhereFilterNodeBuilder(yMap);
         callback(node);
         return this;
     }
     addGroup(op, callback) {
-        const yMap = new external_yjs_Map();
-        yMap.set('id', id_id.uuid());
-        yMap.set('op', op);
-        yMap.set('conditions', new external_yjs_Array());
-        this.dsl.get('havingFilters').push([
+        const yMap = createWhereGroup(op, id_id.uuid());
+        this.getConditions().push([
             yMap
         ]);
-        const group = new HavingGroupBuilder(yMap);
+        const group = new WhereGroupBuilder(yMap);
         callback(group);
         return this;
     }
     update(id, callback) {
-        const havingFilters = this.dsl.get('havingFilters');
-        const index = havingFilters.toArray().findIndex((item)=>item.get('id') === id);
-        if (-1 === index) throw new Error(`Having filter with id ${id} not found`);
-        const filterYMap = havingFilters.get(index);
-        const node = new HavingFiltersNodeBuilder(filterYMap);
+        const conditions = this.getConditions();
+        const match = findEntry(conditions, id);
+        if (!match) throw new Error(`Where filter with id ${id} not found`);
+        if (!WhereFilterBuilder.isNode(match.item)) throw new Error(`Item with id ${id} is not a filter`);
+        const filterYMap = match.item;
+        const node = new WhereFilterNodeBuilder(filterYMap);
         callback(node);
         return this;
     }
     updateGroup(id, callback) {
-        const havingFilters = this.dsl.get('havingFilters');
-        const index = havingFilters.toArray().findIndex((item)=>item.get('id') === id);
-        if (-1 === index) throw new Error(`Having group with id ${id} not found`);
-        const yMap = havingFilters.get(index);
-        if (!HavingFiltersBuilder.isGroup(yMap)) throw new Error(`Item with id ${id} is not a group`);
-        const group = new HavingGroupBuilder(yMap);
+        const conditions = this.getConditions();
+        const match = findEntry(conditions, id);
+        if (!match) throw new Error(`Where group with id ${id} not found`);
+        const yMap = match.item;
+        if (!WhereFilterBuilder.isGroup(yMap)) throw new Error(`Item with id ${id} is not a group`);
+        const group = new WhereGroupBuilder(yMap);
         callback(group);
         return this;
     }
     remove(idOrIndex) {
-        const havingFilters = this.dsl.get('havingFilters');
+        const conditions = this.getConditions();
         if ('number' == typeof idOrIndex) {
-            if (idOrIndex >= 0 && idOrIndex < havingFilters.length) havingFilters.delete(idOrIndex, 1);
+            if (idOrIndex >= 0 && idOrIndex < conditions.length) conditions.delete(idOrIndex, 1);
         } else {
-            const index = havingFilters.toArray().findIndex((item)=>item.get('id') === idOrIndex);
-            if (-1 !== index) havingFilters.delete(index, 1);
+            const match = findEntry(conditions, idOrIndex);
+            if (match) match.collection.delete(match.index, 1);
         }
         return this;
     }
     find(id) {
-        const havingFilters = this.dsl.get('havingFilters');
-        const yMap = havingFilters.toArray().find((item)=>item.get('id') === id);
+        const conditions = this.getConditions();
+        const match = findEntry(conditions, id);
+        const yMap = match?.item;
         if (!yMap) return;
-        if (HavingFiltersBuilder.isGroup(yMap)) return new HavingGroupBuilder(yMap);
-        return new HavingFiltersNodeBuilder(yMap);
+        if (WhereFilterBuilder.isGroup(yMap)) return new WhereGroupBuilder(yMap);
+        return new WhereFilterNodeBuilder(yMap);
     }
     clear() {
-        const havingFilters = this.dsl.get('havingFilters');
-        havingFilters.delete(0, havingFilters.length);
+        const conditions = this.getConditions();
+        conditions.delete(0, conditions.length);
         return this;
     }
-    toJson() {
-        return this.dsl.get('havingFilters').toJSON();
+    toJSON() {
+        return this.whereFilter.toJSON();
     }
     observe(callback) {
-        this.dsl.get('havingFilters').observe(callback);
+        this.whereFilter.observeDeep(callback);
         return ()=>{
-            this.dsl.get('havingFilters').unobserve(callback);
+            this.whereFilter.unobserveDeep(callback);
         };
     }
     static isGroup(yMap) {
-        return void 0 !== yMap.get('op') && void 0 !== yMap.get('conditions');
+        return isWhereGroup(yMap);
     }
     static isNode(yMap) {
         return void 0 !== yMap.get('field');
     }
 }
-class ChartTypeBuilder {
-    dsl;
-    constructor(_doc, dsl){
-        this.dsl = dsl;
-    }
-    observe(callback) {
-        const wrapper = (e, trans)=>{
-            if (e.keysChanged.has('chartType')) callback(e, trans);
-        };
-        this.dsl.observe(wrapper);
-        return ()=>{
-            this.dsl.unobserve(wrapper);
+function createHavingGroup(op = 'and', groupId = 'root') {
+    const yMap = new external_yjs_Map();
+    yMap.set('id', groupId);
+    yMap.set('op', op);
+    yMap.set('conditions', new external_yjs_Array());
+    return yMap;
+}
+function isHavingGroup(yMap) {
+    return void 0 !== yMap.get('op') && void 0 !== yMap.get('conditions');
+}
+function having_utils_findEntry(collection, entryId) {
+    const items = collection.toArray();
+    for(let index = 0; index < items.length; index++){
+        const item = items[index];
+        if (item.get('id') === entryId) return {
+            collection,
+            index,
+            item
         };
-    }
-    changeChartType(chartType) {
-        this.dsl.set('chartType', chartType);
-    }
-    getChartType() {
-        return this.dsl.get('chartType') || 'table';
-    }
-    toJson() {
-        return this.dsl.get('chartType') || 'table';
-    }
-    getAvailableChartTypes() {
-        return [
-            ChartTypeEnum.Table,
-            ChartTypeEnum.PivotTable,
-            ChartTypeEnum.Line,
-            ChartTypeEnum.Column,
-            ChartTypeEnum.ColumnPercent,
-            ChartTypeEnum.ColumnParallel,
-            ChartTypeEnum.BarPercent,
-            ChartTypeEnum.BarParallel,
-            ChartTypeEnum.Area,
-            ChartTypeEnum.AreaPercent,
-            ChartTypeEnum.DualAxis,
-            ChartTypeEnum.Scatter,
-            ChartTypeEnum.Rose,
-            ChartTypeEnum.RoseParallel,
-            ChartTypeEnum.Pie,
-            ChartTypeEnum.Donut,
-            ChartTypeEnum.Radar,
-            ChartTypeEnum.Funnel,
-            ChartTypeEnum.Heatmap,
-            ChartTypeEnum.Boxplot,
-            ChartTypeEnum.Histogram
-        ];
+        if (isHavingGroup(item)) {
+            const nestedCollection = item.get('conditions');
+            const nestedMatch = having_utils_findEntry(nestedCollection, entryId);
+            if (nestedMatch) return nestedMatch;
+        }
     }
 }
-class WhereFilterNodeBuilder {
+class HavingFilterNodeBuilder {
     yMap;
     constructor(yMap){
         this.yMap = yMap;
@@ -408,23 +480,26 @@ class WhereFilterNodeBuilder {
     getOperator() {
         return this.yMap.get('op');
     }
-    setOperator(operator) {
-        this.yMap.set('op', operator);
-        return this;
-    }
     setValue(value) {
         this.yMap.set('value', value);
         return this;
     }
-    toJson() {
+    setOperator(operator) {
+        this.yMap.set('op', operator);
+        return this;
+    }
+    toJSON() {
         return this.yMap.toJSON();
     }
 }
-class WhereGroupBuilder {
+class HavingGroupBuilder {
     yMap;
     constructor(yMap){
         this.yMap = yMap;
     }
+    getConditions() {
+        return this.yMap.get('conditions');
+    }
     getId() {
         return this.yMap.get('id');
     }
@@ -439,29 +514,24 @@ class WhereGroupBuilder {
         const yMap = new external_yjs_Map();
         yMap.set('id', id_id.uuid());
         yMap.set('field', field);
-        const conditions = this.yMap.get('conditions');
-        conditions.push([
+        this.getConditions().push([
             yMap
         ]);
-        const node = new WhereFilterNodeBuilder(yMap);
+        const node = new HavingFilterNodeBuilder(yMap);
         callback(node);
         return this;
     }
     addGroup(op, callback) {
-        const yMap = new external_yjs_Map();
-        yMap.set('id', id_id.uuid());
-        yMap.set('op', op);
-        yMap.set('conditions', new external_yjs_Array());
-        const conditions = this.yMap.get('conditions');
-        conditions.push([
+        const yMap = createHavingGroup(op, id_id.uuid());
+        this.getConditions().push([
             yMap
         ]);
-        const group = new WhereGroupBuilder(yMap);
+        const group = new HavingGroupBuilder(yMap);
         callback(group);
         return this;
     }
     remove(idOrIndex) {
-        const conditions = this.yMap.get('conditions');
+        const conditions = this.getConditions();
         if ('number' == typeof idOrIndex) {
             if (idOrIndex >= 0 && idOrIndex < conditions.length) conditions.delete(idOrIndex, 1);
         } else {
@@ -471,104 +541,183 @@ class WhereGroupBuilder {
         return this;
     }
     clear() {
-        const conditions = this.yMap.get('conditions');
+        const conditions = this.getConditions();
         conditions.delete(0, conditions.length);
         return this;
     }
-    toJson() {
+    toJSON() {
         return this.yMap.toJSON();
     }
 }
-class WhereFiltersBuilder {
-    dsl;
-    doc;
+class HavingFilterBuilder {
+    havingFilter;
     constructor(doc, dsl){
-        this.doc = doc;
-        this.dsl = dsl;
-        if (!this.dsl.get('whereFilters')) this.doc.transact(()=>{
-            this.dsl.set('whereFilters', new external_yjs_Array());
+        doc.transact(()=>{
+            const existingHavingFilter = dsl.get('havingFilter');
+            if (existingHavingFilter instanceof external_yjs_Map) this.havingFilter = existingHavingFilter;
+            else {
+                this.havingFilter = createHavingGroup();
+                dsl.set('havingFilter', this.havingFilter);
+            }
+            if (!(this.havingFilter.get('conditions') instanceof external_yjs_Array)) this.havingFilter.set('conditions', new external_yjs_Array());
+            if (!this.havingFilter.get('id')) this.havingFilter.set('id', 'root');
+            if (!this.havingFilter.get('op')) this.havingFilter.set('op', 'and');
         });
     }
+    getConditions() {
+        return this.havingFilter.get('conditions');
+    }
     add(field, callback) {
         const yMap = new external_yjs_Map();
         yMap.set('id', id_id.uuid());
         yMap.set('field', field);
-        this.dsl.get('whereFilters').push([
+        this.getConditions().push([
             yMap
         ]);
-        const node = new WhereFilterNodeBuilder(yMap);
+        const node = new HavingFilterNodeBuilder(yMap);
         callback(node);
         return this;
     }
     addGroup(op, callback) {
-        const yMap = new external_yjs_Map();
-        yMap.set('id', id_id.uuid());
-        yMap.set('op', op);
-        yMap.set('conditions', new external_yjs_Array());
-        this.dsl.get('whereFilters').push([
+        const yMap = createHavingGroup(op, id_id.uuid());
+        this.getConditions().push([
             yMap
         ]);
-        const group = new WhereGroupBuilder(yMap);
+        const group = new HavingGroupBuilder(yMap);
         callback(group);
         return this;
     }
     update(id, callback) {
-        const whereFilters = this.dsl.get('whereFilters');
-        const index = whereFilters.toArray().findIndex((item)=>item.get('id') === id);
-        if (-1 === index) throw new Error(`Where filter with id ${id} not found`);
-        const filterYMap = whereFilters.get(index);
-        const node = new WhereFilterNodeBuilder(filterYMap);
+        const conditions = this.getConditions();
+        const match = having_utils_findEntry(conditions, id);
+        if (!match) throw new Error(`Having filter with id ${id} not found`);
+        if (!HavingFilterBuilder.isNode(match.item)) throw new Error(`Item with id ${id} is not a filter`);
+        const filterYMap = match.item;
+        const node = new HavingFilterNodeBuilder(filterYMap);
         callback(node);
         return this;
     }
     updateGroup(id, callback) {
-        const whereFilters = this.dsl.get('whereFilters');
-        const index = whereFilters.toArray().findIndex((item)=>item.get('id') === id);
-        if (-1 === index) throw new Error(`Where group with id ${id} not found`);
-        const yMap = whereFilters.get(index);
-        if (!WhereFiltersBuilder.isGroup(yMap)) throw new Error(`Item with id ${id} is not a group`);
-        const group = new WhereGroupBuilder(yMap);
+        const conditions = this.getConditions();
+        const match = having_utils_findEntry(conditions, id);
+        if (!match) throw new Error(`Having group with id ${id} not found`);
+        const yMap = match.item;
+        if (!HavingFilterBuilder.isGroup(yMap)) throw new Error(`Item with id ${id} is not a group`);
+        const group = new HavingGroupBuilder(yMap);
         callback(group);
         return this;
     }
     remove(idOrIndex) {
-        const whereFilters = this.dsl.get('whereFilters');
+        const conditions = this.getConditions();
         if ('number' == typeof idOrIndex) {
-            if (idOrIndex >= 0 && idOrIndex < whereFilters.length) whereFilters.delete(idOrIndex, 1);
+            if (idOrIndex >= 0 && idOrIndex < conditions.length) conditions.delete(idOrIndex, 1);
         } else {
-            const index = whereFilters.toArray().findIndex((item)=>item.get('id') === idOrIndex);
-            if (-1 !== index) whereFilters.delete(index, 1);
+            const match = having_utils_findEntry(conditions, idOrIndex);
+            if (match) match.collection.delete(match.index, 1);
         }
         return this;
     }
     find(id) {
-        const whereFilters = this.dsl.get('whereFilters');
-        const yMap = whereFilters.toArray().find((item)=>item.get('id') === id);
+        const conditions = this.getConditions();
+        const match = having_utils_findEntry(conditions, id);
+        const yMap = match?.item;
         if (!yMap) return;
-        if (WhereFiltersBuilder.isGroup(yMap)) return new WhereGroupBuilder(yMap);
-        return new WhereFilterNodeBuilder(yMap);
+        if (HavingFilterBuilder.isGroup(yMap)) return new HavingGroupBuilder(yMap);
+        return new HavingFilterNodeBuilder(yMap);
     }
     clear() {
-        const whereFilters = this.dsl.get('whereFilters');
-        whereFilters.delete(0, whereFilters.length);
+        const conditions = this.getConditions();
+        conditions.delete(0, conditions.length);
         return this;
     }
-    toJson() {
-        return this.dsl.get('whereFilters').toJSON();
+    toJSON() {
+        return this.havingFilter.toJSON();
     }
     observe(callback) {
-        this.dsl.get('whereFilters').observe(callback);
+        this.havingFilter.observeDeep(callback);
         return ()=>{
-            this.dsl.get('whereFilters').unobserve(callback);
+            this.havingFilter.unobserveDeep(callback);
         };
     }
     static isGroup(yMap) {
-        return void 0 !== yMap.get('op') && void 0 !== yMap.get('conditions');
+        return isHavingGroup(yMap);
     }
     static isNode(yMap) {
         return void 0 !== yMap.get('field');
     }
 }
+class ThemeBuilder {
+    dsl;
+    constructor(_doc, dsl){
+        this.dsl = dsl;
+    }
+    observe(callback) {
+        const wrapper = (e, trans)=>{
+            if (e.keysChanged.has('theme')) callback(e, trans);
+        };
+        this.dsl.observe(wrapper);
+        return ()=>{
+            this.dsl.unobserve(wrapper);
+        };
+    }
+    setTheme(theme) {
+        this.dsl.set('theme', theme);
+    }
+    getTheme() {
+        return this.dsl.get('theme') || 'light';
+    }
+    toJSON() {
+        return this.getTheme();
+    }
+}
+class LocaleBuilder {
+    dsl;
+    constructor(_doc, dsl){
+        this.dsl = dsl;
+    }
+    observe(callback) {
+        const wrapper = (e, trans)=>{
+            if (e.keysChanged.has('locale')) callback(e, trans);
+        };
+        this.dsl.observe(wrapper);
+        return ()=>{
+            this.dsl.unobserve(wrapper);
+        };
+    }
+    setLocale(locale) {
+        this.dsl.set('locale', locale);
+    }
+    getLocale() {
+        return this.dsl.get('locale') || 'zh-CN';
+    }
+    toJSON() {
+        return this.getLocale();
+    }
+}
+class LimitBuilder {
+    dsl;
+    constructor(_doc, dsl){
+        this.dsl = dsl;
+    }
+    observe(callback) {
+        const wrapper = (e, trans)=>{
+            if (e.keysChanged.has('limit')) callback(e, trans);
+        };
+        this.dsl.observe(wrapper);
+        return ()=>{
+            this.dsl.unobserve(wrapper);
+        };
+    }
+    setLimit(limit) {
+        this.dsl.set('limit', limit);
+    }
+    getLimit() {
+        return this.dsl.get('limit');
+    }
+    toJSON() {
+        return this.getLimit();
+    }
+}
 class undo_manager_UndoManager {
     manager;
     constructor(scope){
@@ -623,22 +772,19 @@ const buildGroupBy = (queryDSL, context)=>{
 };
 const buildWhere = (queryDSL, context)=>{
     const { vbiDSL } = context;
-    const whereFilters = vbiDSL.whereFilters || [];
-    if (0 === whereFilters.length) return queryDSL;
+    const whereFilter = vbiDSL.whereFilter;
+    if (!whereFilter || 0 === whereFilter.conditions.length) return queryDSL;
     const result = {
         ...queryDSL
     };
-    result.where = {
-        op: 'and',
-        conditions: whereFilters.flatMap(mapClauseToCondition)
-    };
+    result.where = mapGroupToCondition(whereFilter);
     return result;
 };
-function isWhereGroup(clause) {
+function buildWhere_isWhereGroup(clause) {
     return 'op' in clause && 'conditions' in clause;
 }
 function mapClauseToCondition(clause) {
-    if (isWhereGroup(clause)) return [
+    if (buildWhere_isWhereGroup(clause)) return [
         mapGroupToCondition(clause)
     ];
     return mapFilterToCondition(clause);
@@ -650,23 +796,62 @@ function mapGroupToCondition(group) {
     };
 }
 function mapFilterToCondition(filter) {
-    if ('between' === filter.op) return handleBetweenFilter(filter);
+    if ('between' === filter.op || 'not between' === filter.op) return handleBetweenFilter(filter);
     return handleSimpleFilter(filter);
 }
 function handleBetweenFilter(filter) {
-    const conditions = [];
-    const value = filter.value;
-    if (void 0 !== value.min && null !== value.min && '' !== value.min) conditions.push({
+    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
-    });
-    if (void 0 !== value.max && null !== value.max && '' !== value.max) conditions.push({
+    } : void 0;
+    const upperCondition = void 0 !== value.max && null !== value.max && '' !== value.max ? {
         field: filter.field,
         op: '<' === value.rightOp ? '<' : '<=',
         value: value.max
-    });
-    return conditions;
+    } : 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 ?? '=';
@@ -685,22 +870,22 @@ function handleSimpleFilter(filter) {
 }
 const buildHaving = (queryDSL, context)=>{
     const { vbiDSL } = context;
-    const havingFilters = vbiDSL.havingFilters || [];
-    if (0 === havingFilters.length) return queryDSL;
+    const havingFilter = vbiDSL.havingFilter;
+    if (!havingFilter || 0 === havingFilter.conditions.length) return queryDSL;
     const result = {
         ...queryDSL
     };
     result.having = {
-        op: 'and',
-        conditions: havingFilters.flatMap(buildHaving_mapClauseToCondition)
+        op: havingFilter.op,
+        conditions: havingFilter.conditions.flatMap(buildHaving_mapClauseToCondition)
     };
     return result;
 };
-function isHavingGroup(clause) {
+function buildHaving_isHavingGroup(clause) {
     return 'op' in clause && 'conditions' in clause;
 }
 function buildHaving_mapClauseToCondition(clause) {
-    if (isHavingGroup(clause)) return [
+    if (buildHaving_isHavingGroup(clause)) return [
         buildHaving_mapGroupToCondition(clause)
     ];
     return buildHaving_mapFilterToCondition(clause);
@@ -753,8 +938,11 @@ class VBIBuilder {
     chartType;
     measures;
     dimensions;
-    havingFilters;
-    whereFilters;
+    havingFilter;
+    whereFilter;
+    theme;
+    locale;
+    limit;
     constructor(doc){
         this.doc = doc;
         this.dsl = doc.getMap('dsl');
@@ -762,8 +950,11 @@ class VBIBuilder {
         this.chartType = new ChartTypeBuilder(doc, this.dsl);
         this.measures = new MeasuresBuilder(doc, this.dsl);
         this.dimensions = new DimensionsBuilder(doc, this.dsl);
-        this.havingFilters = new HavingFiltersBuilder(doc, this.dsl);
-        this.whereFilters = new WhereFiltersBuilder(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) {
         applyUpdate(this.doc, update);
@@ -800,18 +991,6 @@ class VBIBuilder {
         const result = await con.discoverSchema();
         return result;
     };
-    setLimit(limit) {
-        this.dsl.set('limit', limit);
-        return this;
-    }
-    setLocale(locale) {
-        this.dsl.set('locale', locale);
-        return this;
-    }
-    setTheme(theme) {
-        this.dsl.set('theme', theme);
-        return this;
-    }
 }
 const createVBI = ()=>({
         connectorMap: connectorMap,
@@ -822,8 +1001,16 @@ const createVBI = ()=>({
                 chartType: 'table',
                 measures: [],
                 dimensions: [],
-                whereFilters: [],
-                havingFilters: [],
+                whereFilter: {
+                    id: 'root',
+                    op: 'and',
+                    conditions: []
+                },
+                havingFilter: {
+                    id: 'root',
+                    op: 'and',
+                    conditions: []
+                },
                 theme: 'light',
                 locale: 'zh-CN',
                 version: 0
@@ -837,7 +1024,7 @@ const createVBI = ()=>({
                 if (vbi.theme) dsl.set('theme', vbi.theme);
                 if (vbi.limit) dsl.set('limit', vbi.limit);
                 if (vbi.locale) dsl.set('locale', vbi.locale);
-                if (vbi.version) dsl.set('version', vbi.version);
+                if (void 0 !== vbi.version) dsl.set('version', vbi.version);
                 const toYMap = (obj, ensureId = false)=>{
                     const yMap = new external_yjs_Map();
                     if (ensureId && !obj.id) yMap.set('id', id_id.uuid());
@@ -875,8 +1062,38 @@ const createVBI = ()=>({
                     });
                     return yArr;
                 };
-                dsl.set('whereFilters', ensureYArray(vbi.whereFilters, true));
-                dsl.set('havingFilters', ensureYArray(vbi.havingFilters, true));
+                const whereFilter = vbi.whereFilter ?? {
+                    id: 'root',
+                    op: 'and',
+                    conditions: []
+                };
+                const whereGroup = whereFilter instanceof external_yjs_Map ? whereFilter : createWhereGroup();
+                if (whereFilter instanceof external_yjs_Map) {
+                    if (!(whereGroup.get('conditions') instanceof external_yjs_Array)) whereGroup.set('conditions', new external_yjs_Array());
+                    if (!whereGroup.get('id')) whereGroup.set('id', 'root');
+                    if (!whereGroup.get('op')) whereGroup.set('op', 'and');
+                } else {
+                    whereGroup.set('id', whereFilter.id ?? 'root');
+                    whereGroup.set('op', whereFilter.op ?? 'and');
+                    whereGroup.set('conditions', ensureYArray(whereFilter.conditions, true));
+                }
+                dsl.set('whereFilter', whereGroup);
+                const havingFilter = vbi.havingFilter ?? {
+                    id: 'root',
+                    op: 'and',
+                    conditions: []
+                };
+                const havingGroup = havingFilter instanceof external_yjs_Map ? havingFilter : createHavingGroup();
+                if (havingFilter instanceof external_yjs_Map) {
+                    if (!(havingGroup.get('conditions') instanceof external_yjs_Array)) havingGroup.set('conditions', new external_yjs_Array());
+                    if (!havingGroup.get('id')) havingGroup.set('id', 'root');
+                    if (!havingGroup.get('op')) havingGroup.set('op', 'and');
+                } else {
+                    havingGroup.set('id', havingFilter.id ?? 'root');
+                    havingGroup.set('op', havingFilter.op ?? 'and');
+                    havingGroup.set('conditions', ensureYArray(havingFilter.conditions, true));
+                }
+                dsl.set('havingFilter', havingGroup);
                 dsl.set('measures', ensureYArray(vbi.measures));
                 dsl.set('dimensions', ensureYArray(vbi.dimensions));
             });
@@ -884,52 +1101,4 @@ const createVBI = ()=>({
         }
     });
 const VBI = createVBI();
-const zVBIFilter = z.object({
-    id: z.string(),
-    field: z.string(),
-    op: z.string().optional(),
-    value: z.any().optional()
-});
-const zVBIWhereGroup = z.lazy(()=>z.object({
-        id: z.string(),
-        op: z["enum"]([
-            'and',
-            'or'
-        ]),
-        conditions: z.array(zVBIWhereClause)
-    }));
-const zVBIWhereClause = z.lazy(()=>z.union([
-        zVBIFilter,
-        zVBIWhereGroup
-    ]));
-function isVBIFilter(clause) {
-    return 'field' in clause;
-}
-function isVBIWhereGroup(clause) {
-    return 'conditions' in clause;
-}
-const zVBIHavingFilter = z.object({
-    id: z.string(),
-    field: z.string(),
-    op: z.string().optional(),
-    value: z.any().optional()
-});
-const zVBIHavingGroup = z.lazy(()=>z.object({
-        id: z.string(),
-        op: z["enum"]([
-            'and',
-            'or'
-        ]),
-        conditions: z.array(zVBIHavingClause)
-    }));
-const zVBIHavingClause = z.lazy(()=>z.union([
-        zVBIHavingFilter,
-        zVBIHavingGroup
-    ]));
-function isVBIHavingFilter(clause) {
-    return 'field' in clause;
-}
-function isVBIHavingGroup(clause) {
-    return 'conditions' in clause;
-}
-export { ChartTypeBuilder, DimensionsBuilder, MeasuresBuilder, VBI, VBIBuilder, 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, findTreeNodesBy, id_id as id, isVBIFilter, isVBIHavingFilter, isVBIHavingGroup, isVBIWhereGroup, preorderTraverse };