@visactor/vbi 0.4.12 → 0.4.14

package/dist/index.cjs

@@ -24,16 +24,19 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    zVBIHavingFilter: ()=>zVBIHavingFilter,
-    zVBIHavingArray: ()=>zVBIHavingArray,
+    preorderTraverse: ()=>vseed_namespaceObject.preorderTraverse,
+    isVBIHavingGroup: ()=>isVBIHavingGroup,
     MeasuresBuilder: ()=>MeasuresBuilder,
     DimensionsBuilder: ()=>DimensionsBuilder,
     VBIBuilder: ()=>VBIBuilder,
     ChartTypeBuilder: ()=>ChartTypeBuilder,
+    isVBIFilter: ()=>isVBIFilter,
     VBI: ()=>VBI,
-    preorderTraverse: ()=>vseed_namespaceObject.preorderTraverse,
+    isVBIWhereGroup: ()=>isVBIWhereGroup,
+    isVBIHavingFilter: ()=>isVBIHavingFilter,
     buildVQuery: ()=>buildVQuery,
-    findTreeNodesBy: ()=>vseed_namespaceObject.findTreeNodesBy
+    findTreeNodesBy: ()=>vseed_namespaceObject.findTreeNodesBy,
+    id: ()=>id_id
 });
 const external_yjs_namespaceObject = require("yjs");
 class DimensionNodeBuilder {
@@ -200,20 +203,90 @@ class MeasuresBuilder {
         return 'children' in node;
     }
 }
+const vseed_namespaceObject = require("@visactor/vseed");
+const external_uuid_namespaceObject = require("uuid");
+const id_id = {
+    uuid: ()=>(0, external_uuid_namespaceObject.v4)()
+};
 class HavingFiltersNodeBuilder {
     yMap;
     constructor(yMap){
         this.yMap = yMap;
     }
+    getId() {
+        return this.yMap.get('id');
+    }
     getField() {
         return this.yMap.get('field');
     }
+    getOperator() {
+        return this.yMap.get('op');
+    }
     setValue(value) {
         this.yMap.set('value', value);
         return this;
     }
     setOperator(operator) {
-        this.yMap.set('operator', operator);
+        this.yMap.set('op', operator);
+        return this;
+    }
+    toJson() {
+        return this.yMap.toJSON();
+    }
+}
+class HavingGroupBuilder {
+    yMap;
+    constructor(yMap){
+        this.yMap = yMap;
+    }
+    getId() {
+        return this.yMap.get('id');
+    }
+    getOperator() {
+        return this.yMap.get('op');
+    }
+    setOperator(op) {
+        this.yMap.set('op', op);
+        return this;
+    }
+    add(field, callback) {
+        const yMap = new external_yjs_namespaceObject.Map();
+        yMap.set('id', id_id.uuid());
+        yMap.set('field', field);
+        const conditions = this.yMap.get('conditions');
+        conditions.push([
+            yMap
+        ]);
+        const node = new HavingFiltersNodeBuilder(yMap);
+        callback(node);
+        return this;
+    }
+    addGroup(op, callback) {
+        const yMap = new external_yjs_namespaceObject.Map();
+        yMap.set('id', id_id.uuid());
+        yMap.set('op', op);
+        yMap.set('conditions', new external_yjs_namespaceObject.Array());
+        const conditions = this.yMap.get('conditions');
+        conditions.push([
+            yMap
+        ]);
+        const group = new HavingGroupBuilder(yMap);
+        callback(group);
+        return this;
+    }
+    remove(idOrIndex) {
+        const conditions = this.yMap.get('conditions');
+        if ('number' == typeof idOrIndex) {
+            if (idOrIndex >= 0 && idOrIndex < conditions.length) conditions.delete(idOrIndex, 1);
+        } else {
+            const index = conditions.toArray().findIndex((item)=>item.get('id') === idOrIndex);
+            if (-1 !== index) conditions.delete(index, 1);
+        }
+        return this;
+    }
+    clear() {
+        const conditions = this.yMap.get('conditions');
+        conditions.delete(0, conditions.length);
         return this;
     }
     toJson() {
@@ -222,54 +295,76 @@ class HavingFiltersNodeBuilder {
 }
 class HavingFiltersBuilder {
     dsl;
-    constructor(_doc, dsl){
+    doc;
+    constructor(doc, dsl){
+        this.doc = doc;
         this.dsl = dsl;
+        if (!this.dsl.get('havingFilters')) this.doc.transact(()=>{
+            this.dsl.set('havingFilters', new external_yjs_namespaceObject.Array());
+        });
     }
     add(field, callback) {
-        if (!field || 'string' != typeof field) throw new Error('Field is required and must be a string');
-        const defaultFilter = {
-            field,
-            operator: 'eq',
-            value: null
-        };
         const yMap = new external_yjs_namespaceObject.Map();
-        for (const [key, value] of Object.entries(defaultFilter))yMap.set(key, value);
+        yMap.set('id', id_id.uuid());
+        yMap.set('field', field);
         this.dsl.get('havingFilters').push([
             yMap
         ]);
-        const filterNode = new HavingFiltersNodeBuilder(yMap);
-        callback(filterNode);
+        const node = new HavingFiltersNodeBuilder(yMap);
+        callback(node);
         return this;
     }
-    update(field, callback) {
+    addGroup(op, callback) {
+        const yMap = new external_yjs_namespaceObject.Map();
+        yMap.set('id', id_id.uuid());
+        yMap.set('op', op);
+        yMap.set('conditions', new external_yjs_namespaceObject.Array());
+        this.dsl.get('havingFilters').push([
+            yMap
+        ]);
+        const group = new HavingGroupBuilder(yMap);
+        callback(group);
+        return this;
+    }
+    update(id, callback) {
         const havingFilters = this.dsl.get('havingFilters');
-        const index = havingFilters.toArray().findIndex((item)=>item.get('field') === field);
-        if (-1 === index) throw new Error(`Having filter with field "${field}" not found`);
+        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);
         callback(node);
         return this;
     }
-    remove(field) {
-        if (!field || 'string' != typeof field) console.error('[HavingFiltersBuilder] Invalid field name:', field);
+    updateGroup(id, callback) {
         const havingFilters = this.dsl.get('havingFilters');
-        const index = havingFilters.toArray().findIndex((item)=>item.get('field') === field);
-        if (-1 !== index) this.dsl.get('havingFilters').delete(index, 1);
+        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);
+        callback(group);
         return this;
     }
-    find(field) {
+    remove(idOrIndex) {
         const havingFilters = this.dsl.get('havingFilters');
-        const index = havingFilters.toArray().findIndex((item)=>item.get('field') === field);
-        if (-1 === index) return;
-        return new HavingFiltersNodeBuilder(havingFilters.get(index));
+        if ('number' == typeof idOrIndex) {
+            if (idOrIndex >= 0 && idOrIndex < havingFilters.length) havingFilters.delete(idOrIndex, 1);
+        } else {
+            const index = havingFilters.toArray().findIndex((item)=>item.get('id') === idOrIndex);
+            if (-1 !== index) havingFilters.delete(index, 1);
+        }
+        return this;
     }
-    findAll() {
+    find(id) {
         const havingFilters = this.dsl.get('havingFilters');
-        return havingFilters.toArray().map((yMap)=>new HavingFiltersNodeBuilder(yMap));
+        const yMap = havingFilters.toArray().find((item)=>item.get('id') === id);
+        if (!yMap) return;
+        if (HavingFiltersBuilder.isGroup(yMap)) return new HavingGroupBuilder(yMap);
+        return new HavingFiltersNodeBuilder(yMap);
     }
     clear() {
         const havingFilters = this.dsl.get('havingFilters');
-        if (havingFilters.length > 0) havingFilters.delete(0, havingFilters.length);
+        havingFilters.delete(0, havingFilters.length);
         return this;
     }
     toJson() {
@@ -281,8 +376,13 @@ class HavingFiltersBuilder {
             this.dsl.get('havingFilters').unobserve(callback);
         };
     }
+    static isGroup(yMap) {
+        return void 0 !== yMap.get('op') && void 0 !== yMap.get('conditions');
+    }
+    static isNode(yMap) {
+        return void 0 !== yMap.get('field');
+    }
 }
-const vseed_namespaceObject = require("@visactor/vseed");
 class ChartTypeBuilder {
     dsl;
     constructor(_doc, dsl){
@@ -337,11 +437,17 @@ class WhereFilterNodeBuilder {
     constructor(yMap){
         this.yMap = yMap;
     }
+    getId() {
+        return this.yMap.get('id');
+    }
     getField() {
         return this.yMap.get('field');
     }
+    getOperator() {
+        return this.yMap.get('op');
+    }
     setOperator(operator) {
-        this.yMap.set('operator', operator);
+        this.yMap.set('op', operator);
         return this;
     }
     setValue(value) {
@@ -352,6 +458,65 @@ class WhereFilterNodeBuilder {
         return this.yMap.toJSON();
     }
 }
+class WhereGroupBuilder {
+    yMap;
+    constructor(yMap){
+        this.yMap = yMap;
+    }
+    getId() {
+        return this.yMap.get('id');
+    }
+    getOperator() {
+        return this.yMap.get('op');
+    }
+    setOperator(op) {
+        this.yMap.set('op', op);
+        return this;
+    }
+    add(field, callback) {
+        const yMap = new external_yjs_namespaceObject.Map();
+        yMap.set('id', id_id.uuid());
+        yMap.set('field', field);
+        const conditions = this.yMap.get('conditions');
+        conditions.push([
+            yMap
+        ]);
+        const node = new WhereFilterNodeBuilder(yMap);
+        callback(node);
+        return this;
+    }
+    addGroup(op, callback) {
+        const yMap = new external_yjs_namespaceObject.Map();
+        yMap.set('id', id_id.uuid());
+        yMap.set('op', op);
+        yMap.set('conditions', new external_yjs_namespaceObject.Array());
+        const conditions = this.yMap.get('conditions');
+        conditions.push([
+            yMap
+        ]);
+        const group = new WhereGroupBuilder(yMap);
+        callback(group);
+        return this;
+    }
+    remove(idOrIndex) {
+        const conditions = this.yMap.get('conditions');
+        if ('number' == typeof idOrIndex) {
+            if (idOrIndex >= 0 && idOrIndex < conditions.length) conditions.delete(idOrIndex, 1);
+        } else {
+            const index = conditions.toArray().findIndex((item)=>item.get('id') === idOrIndex);
+            if (-1 !== index) conditions.delete(index, 1);
+        }
+        return this;
+    }
+    clear() {
+        const conditions = this.yMap.get('conditions');
+        conditions.delete(0, conditions.length);
+        return this;
+    }
+    toJson() {
+        return this.yMap.toJSON();
+    }
+}
 class WhereFiltersBuilder {
     dsl;
     doc;
@@ -363,11 +528,9 @@ class WhereFiltersBuilder {
         });
     }
     add(field, callback) {
-        const filter = {
-            field
-        };
         const yMap = new external_yjs_namespaceObject.Map();
-        for (const [key, value] of Object.entries(filter))yMap.set(key, value);
+        yMap.set('id', id_id.uuid());
+        yMap.set('field', field);
         this.dsl.get('whereFilters').push([
             yMap
         ]);
@@ -375,31 +538,53 @@ class WhereFiltersBuilder {
         callback(node);
         return this;
     }
-    update(field, callback) {
+    addGroup(op, callback) {
+        const yMap = new external_yjs_namespaceObject.Map();
+        yMap.set('id', id_id.uuid());
+        yMap.set('op', op);
+        yMap.set('conditions', new external_yjs_namespaceObject.Array());
+        this.dsl.get('whereFilters').push([
+            yMap
+        ]);
+        const group = new WhereGroupBuilder(yMap);
+        callback(group);
+        return this;
+    }
+    update(id, callback) {
         const whereFilters = this.dsl.get('whereFilters');
-        const index = whereFilters.toArray().findIndex((item)=>item.get('field') === field);
-        if (-1 === index) throw new Error(`Where filter with field ${field} not found`);
+        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);
         callback(node);
         return this;
     }
-    remove(field) {
+    updateGroup(id, callback) {
         const whereFilters = this.dsl.get('whereFilters');
-        const index = whereFilters.toArray().findIndex((item)=>item.get('field') === field);
-        if (-1 === index) return this;
-        whereFilters.delete(index, 1);
+        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);
+        callback(group);
         return this;
     }
-    find(field) {
+    remove(idOrIndex) {
         const whereFilters = this.dsl.get('whereFilters');
-        const index = whereFilters.toArray().findIndex((item)=>item.get('field') === field);
-        if (-1 === index) return;
-        return new WhereFilterNodeBuilder(whereFilters.get(index));
+        if ('number' == typeof idOrIndex) {
+            if (idOrIndex >= 0 && idOrIndex < whereFilters.length) whereFilters.delete(idOrIndex, 1);
+        } else {
+            const index = whereFilters.toArray().findIndex((item)=>item.get('id') === idOrIndex);
+            if (-1 !== index) whereFilters.delete(index, 1);
+        }
+        return this;
     }
-    findAll() {
+    find(id) {
         const whereFilters = this.dsl.get('whereFilters');
-        return whereFilters.toArray().map((yMap)=>new WhereFilterNodeBuilder(yMap));
+        const yMap = whereFilters.toArray().find((item)=>item.get('id') === id);
+        if (!yMap) return;
+        if (WhereFiltersBuilder.isGroup(yMap)) return new WhereGroupBuilder(yMap);
+        return new WhereFilterNodeBuilder(yMap);
     }
     clear() {
         const whereFilters = this.dsl.get('whereFilters');
@@ -415,63 +600,35 @@ class WhereFiltersBuilder {
             this.dsl.get('whereFilters').unobserve(callback);
         };
     }
+    static isGroup(yMap) {
+        return void 0 !== yMap.get('op') && void 0 !== yMap.get('conditions');
+    }
+    static isNode(yMap) {
+        return void 0 !== yMap.get('field');
+    }
+}
+class UndoManager {
+    manager;
+    constructor(scope){
+        this.manager = new external_yjs_namespaceObject.UndoManager(scope);
+    }
+    undo() {
+        return null !== this.manager.undo();
+    }
+    redo() {
+        return null !== this.manager.redo();
+    }
+    canUndo() {
+        return this.manager.canUndo();
+    }
+    canRedo() {
+        return this.manager.canRedo();
+    }
+    clear(clearUndoStack, clearRedoStack) {
+        this.manager.clear(clearUndoStack, clearRedoStack);
+    }
 }
-const external_zod_namespaceObject = require("zod");
-const zVBIHavingFilter = external_zod_namespaceObject.z.object({
-    field: external_zod_namespaceObject.z.string(),
-    operator: external_zod_namespaceObject.z.string().optional(),
-    value: external_zod_namespaceObject.z.any().optional()
-});
-const zVBIHavingArray = external_zod_namespaceObject.z.array(zVBIHavingFilter);
 const external_remeda_namespaceObject = require("remeda");
-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 buildWhere = (queryDSL, context)=>{
-    const { vbiDSL } = context;
-    const whereFilters = vbiDSL.whereFilters || [];
-    if (0 === whereFilters.length) return queryDSL;
-    const result = {
-        ...queryDSL
-    };
-    result.where = {
-        op: 'and',
-        conditions: whereFilters.flatMap((filter)=>{
-            if ('between' === filter.operator && filter.value && 'object' == typeof filter.value && !Array.isArray(filter.value)) {
-                const conditions = [];
-                if (void 0 !== filter.value.min && null !== filter.value.min && '' !== filter.value.min) conditions.push({
-                    field: filter.field,
-                    op: '<' === filter.value.leftOp ? '>' : '>=',
-                    value: filter.value.min
-                });
-                if (void 0 !== filter.value.max && null !== filter.value.max && '' !== filter.value.max) conditions.push({
-                    field: filter.field,
-                    op: '<' === filter.value.rightOp ? '<' : '<=',
-                    value: filter.value.max
-                });
-                return conditions;
-            }
-            let mappedOp = filter.operator ?? '=';
-            if (Array.isArray(filter.value)) {
-                if ('=' === mappedOp) mappedOp = 'in';
-                if ('!=' === mappedOp) mappedOp = 'not in';
-            }
-            return [
-                {
-                    field: filter.field,
-                    op: mappedOp,
-                    value: filter.value
-                }
-            ];
-        })
-    };
-    return result;
-};
-const buildOrderBy = (queryDSL, context)=>queryDSL;
 const buildSelect = (queryDSL, context)=>{
     const { vbiDSL } = context;
     const measures = vbiDSL.measures;
@@ -503,14 +660,68 @@ const buildGroupBy = (queryDSL, context)=>{
     result.groupBy = dimensionNodes.map((dimension)=>dimension.field);
     return result;
 };
-const buildLimit = (queryDSL, context)=>{
+const buildWhere = (queryDSL, context)=>{
+    const { vbiDSL } = context;
+    const whereFilters = vbiDSL.whereFilters || [];
+    if (0 === whereFilters.length) return queryDSL;
     const result = {
         ...queryDSL
     };
-    const limit = context.vbiDSL.limit ?? 1000;
-    result.limit = limit;
+    result.where = {
+        op: 'and',
+        conditions: whereFilters.flatMap(mapClauseToCondition)
+    };
     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) 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({
+        field: filter.field,
+        op: '<' === value.leftOp ? '>' : '>=',
+        value: value.min
+    });
+    if (void 0 !== value.max && null !== value.max && '' !== value.max) conditions.push({
+        field: filter.field,
+        op: '<' === value.rightOp ? '<' : '<=',
+        value: value.max
+    });
+    return conditions;
+}
+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 havingFilters = vbiDSL.havingFilters || [];
@@ -520,17 +731,50 @@ const buildHaving = (queryDSL, context)=>{
     };
     result.having = {
         op: 'and',
-        conditions: havingFilters.map((filter)=>{
-            const mappedOp = filter.operator ?? '=';
-            return {
-                field: filter.field,
-                op: mappedOp,
-                value: filter.value
-            };
-        })
+        conditions: havingFilters.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 = filter.op ?? '=';
+    return [
+        {
+            field: filter.field,
+            op: mappedOp,
+            value: filter.value
+        }
+    ];
+}
+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 connectorMap = new Map();
 const registerConnector = (id, connector)=>{
     connectorMap.set(id, connector);
@@ -553,7 +797,7 @@ class VBIBuilder {
     constructor(doc){
         this.doc = doc;
         this.dsl = doc.getMap('dsl');
-        this.undoManager = new external_yjs_namespaceObject.UndoManager(this.dsl);
+        this.undoManager = new UndoManager(this.dsl);
         this.chartType = new ChartTypeBuilder(doc, this.dsl);
         this.measures = new MeasuresBuilder(doc, this.dsl);
         this.dimensions = new DimensionsBuilder(doc, this.dsl);
@@ -633,7 +877,27 @@ const createVBI = ()=>({
                 if (vbi.limit) dsl.set('limit', vbi.limit);
                 if (vbi.locale) dsl.set('locale', vbi.locale);
                 if (vbi.version) dsl.set('version', vbi.version);
-                const ensureYArray = (arr)=>{
+                const toYMap = (obj, ensureId = false)=>{
+                    const yMap = new external_yjs_namespaceObject.Map();
+                    if (ensureId && !obj.id) yMap.set('id', id_id.uuid());
+                    for (const [key, value] of Object.entries(obj))if ('conditions' === key && Array.isArray(value)) {
+                        const yArr = new external_yjs_namespaceObject.Array();
+                        value.forEach((child)=>{
+                            if (child instanceof external_yjs_namespaceObject.Map) yArr.push([
+                                child
+                            ]);
+                            else if ('object' == typeof child && null !== child) yArr.push([
+                                toYMap(child, true)
+                            ]);
+                            else yArr.push([
+                                child
+                            ]);
+                        });
+                        yMap.set(key, yArr);
+                    } else yMap.set(key, value);
+                    return yMap;
+                };
+                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();
@@ -641,20 +905,17 @@ const createVBI = ()=>({
                         if (item instanceof external_yjs_namespaceObject.Map) yArr.push([
                             item
                         ]);
-                        else if ('object' == typeof item && null !== item) {
-                            const yMap = new external_yjs_namespaceObject.Map();
-                            for (const [key, value] of Object.entries(item))yMap.set(key, value);
-                            yArr.push([
-                                yMap
-                            ]);
-                        } else yArr.push([
+                        else if ('object' == typeof item && null !== item) yArr.push([
+                            toYMap(item, ensureId)
+                        ]);
+                        else yArr.push([
                             item
                         ]);
                     });
                     return yArr;
                 };
-                dsl.set('whereFilters', ensureYArray(vbi.whereFilters));
-                dsl.set('havingFilters', ensureYArray(vbi.havingFilters));
+                dsl.set('whereFilters', ensureYArray(vbi.whereFilters, true));
+                dsl.set('havingFilters', ensureYArray(vbi.havingFilters, true));
                 dsl.set('measures', ensureYArray(vbi.measures));
                 dsl.set('dimensions', ensureYArray(vbi.dimensions));
             });
@@ -662,6 +923,55 @@ const createVBI = ()=>({
         }
     });
 const VBI = createVBI();
+const external_zod_namespaceObject = require("zod");
+const zVBIFilter = external_zod_namespaceObject.z.object({
+    id: external_zod_namespaceObject.z.string(),
+    field: external_zod_namespaceObject.z.string(),
+    op: external_zod_namespaceObject.z.string().optional(),
+    value: external_zod_namespaceObject.z.any().optional()
+});
+const zVBIWhereGroup = external_zod_namespaceObject.z.lazy(()=>external_zod_namespaceObject.z.object({
+        id: external_zod_namespaceObject.z.string(),
+        op: external_zod_namespaceObject.z["enum"]([
+            'and',
+            'or'
+        ]),
+        conditions: external_zod_namespaceObject.z.array(zVBIWhereClause)
+    }));
+const zVBIWhereClause = external_zod_namespaceObject.z.lazy(()=>external_zod_namespaceObject.z.union([
+        zVBIFilter,
+        zVBIWhereGroup
+    ]));
+function isVBIFilter(clause) {
+    return 'field' in clause;
+}
+function isVBIWhereGroup(clause) {
+    return 'conditions' in clause;
+}
+const zVBIHavingFilter = external_zod_namespaceObject.z.object({
+    id: external_zod_namespaceObject.z.string(),
+    field: external_zod_namespaceObject.z.string(),
+    op: external_zod_namespaceObject.z.string().optional(),
+    value: external_zod_namespaceObject.z.any().optional()
+});
+const zVBIHavingGroup = external_zod_namespaceObject.z.lazy(()=>external_zod_namespaceObject.z.object({
+        id: external_zod_namespaceObject.z.string(),
+        op: external_zod_namespaceObject.z["enum"]([
+            'and',
+            'or'
+        ]),
+        conditions: external_zod_namespaceObject.z.array(zVBIHavingClause)
+    }));
+const zVBIHavingClause = external_zod_namespaceObject.z.lazy(()=>external_zod_namespaceObject.z.union([
+        zVBIHavingFilter,
+        zVBIHavingGroup
+    ]));
+function isVBIHavingFilter(clause) {
+    return 'field' in clause;
+}
+function isVBIHavingGroup(clause) {
+    return 'conditions' in clause;
+}
 exports.ChartTypeBuilder = __webpack_exports__.ChartTypeBuilder;
 exports.DimensionsBuilder = __webpack_exports__.DimensionsBuilder;
 exports.MeasuresBuilder = __webpack_exports__.MeasuresBuilder;
@@ -669,9 +979,12 @@ exports.VBI = __webpack_exports__.VBI;
 exports.VBIBuilder = __webpack_exports__.VBIBuilder;
 exports.buildVQuery = __webpack_exports__.buildVQuery;
 exports.findTreeNodesBy = __webpack_exports__.findTreeNodesBy;
+exports.id = __webpack_exports__.id;
+exports.isVBIFilter = __webpack_exports__.isVBIFilter;
+exports.isVBIHavingFilter = __webpack_exports__.isVBIHavingFilter;
+exports.isVBIHavingGroup = __webpack_exports__.isVBIHavingGroup;
+exports.isVBIWhereGroup = __webpack_exports__.isVBIWhereGroup;
 exports.preorderTraverse = __webpack_exports__.preorderTraverse;
-exports.zVBIHavingArray = __webpack_exports__.zVBIHavingArray;
-exports.zVBIHavingFilter = __webpack_exports__.zVBIHavingFilter;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "ChartTypeBuilder",
     "DimensionsBuilder",
@@ -680,9 +993,12 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "VBIBuilder",
     "buildVQuery",
     "findTreeNodesBy",
-    "preorderTraverse",
-    "zVBIHavingArray",
-    "zVBIHavingFilter"
+    "id",
+    "isVBIFilter",
+    "isVBIHavingFilter",
+    "isVBIHavingGroup",
+    "isVBIWhereGroup",
+    "preorderTraverse"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true