@visactor/vbi 0.4.12 → 0.4.14

package/dist/pipeline/index.d.ts

@@ -1 +1 @@
-export { buildVQuery } from './vqueryDSL';
+export { buildVQuery } from './vqueryDSL/index';

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

@@ -0,0 +1,2 @@
+import type { buildPipe } from './types';
+export declare const buildGroupBy: buildPipe;

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

@@ -0,0 +1,2 @@
+import type { buildPipe } from './types';
+export declare const buildHaving: buildPipe;

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

@@ -0,0 +1,2 @@
+import type { buildPipe } from './types';
+export declare const buildLimit: buildPipe;

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

@@ -0,0 +1,2 @@
+import type { buildPipe } from './types';
+export declare const buildSelect: buildPipe;

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

@@ -0,0 +1,2 @@
+import type { buildPipe } from './types';
+export declare const buildWhere: buildPipe;

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

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

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

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

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

@@ -2,7 +2,8 @@ import type { VQueryDSL } from '@visactor/vquery';
 import type { VBIDSL } from '../dsl';
 import type { VSeedDSL } from '@visactor/vseed';
 import type { MeasuresBuilder, DimensionsBuilder, ChartTypeBuilder, HavingFiltersBuilder, WhereFiltersBuilder } from '../../builder/sub-builders';
-import type { Map, Doc, UndoManager } from 'yjs';
+import type { Map, Doc } from 'yjs';
+import type { UndoManager } from '../../builder/undo-manager';
 export interface VBIBuilderInterface {
     doc: Doc;
     dsl: Map<any>;

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

@@ -1,13 +1,18 @@
 import { z } from 'zod';
 export declare const zVBIHavingFilter: z.ZodObject<{
+    id: z.ZodString;
     field: z.ZodString;
-    operator: z.ZodOptional<z.ZodString>;
+    op: z.ZodOptional<z.ZodString>;
     value: z.ZodOptional<z.ZodAny>;
 }, z.core.$strip>;
 export type VBIHavingFilter = z.infer<typeof zVBIHavingFilter>;
-export declare const zVBIHavingArray: z.ZodArray<z.ZodObject<{
-    field: z.ZodString;
-    operator: z.ZodOptional<z.ZodString>;
-    value: z.ZodOptional<z.ZodAny>;
-}, z.core.$strip>>;
-export type VBIHavingArray = z.infer<typeof zVBIHavingArray>;
+export declare const zVBIHavingGroup: z.ZodType<VBIHavingGroup>;
+export declare const zVBIHavingClause: z.ZodType<VBIHavingClause>;
+export type VBIHavingGroup = {
+    id: string;
+    op: 'and' | 'or';
+    conditions: VBIHavingClause[];
+};
+export type VBIHavingClause = VBIHavingFilter | VBIHavingGroup;
+export declare function isVBIHavingFilter(clause: VBIHavingClause): clause is VBIHavingFilter;
+export declare function isVBIHavingGroup(clause: VBIHavingClause): clause is VBIHavingGroup;

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

@@ -1,6 +1,8 @@
 export type { VBIDimensionTree, VBIDimensionGroup, VBIDimension } from './dimensions/dimensions';
 export type { VBIMeasureTree, VBIMeasureGroup, VBIMeasure } from './measures/measures';
-export type { VBIFilter } from './whereFilters/filters';
-export type { VBIHavingFilter, VBIHavingArray } from './havingFilters/having';
+export type { VBIFilter, VBIWhereGroup, VBIWhereClause } from './whereFilters/filters';
+export { isVBIFilter, isVBIWhereGroup } from './whereFilters/filters';
+export type { VBIHavingFilter, VBIHavingGroup, VBIHavingClause } from './havingFilters/having';
+export { isVBIHavingFilter, isVBIHavingGroup } from './havingFilters/having';
 export type { VBIDSLTheme } from './theme/theme';
 export type { VBIDSL } from './vbi/vbi';

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

@@ -17,16 +17,8 @@ export declare const zVBIDSL: z.ZodObject<{
             quantile: z.ZodNumber;
         }, z.core.$strip>], "func">;
     }, z.core.$strip>, z.ZodType<import("..").VBIMeasureGroup, unknown, z.core.$ZodTypeInternals<import("..").VBIMeasureGroup, unknown>>]>>;
-    havingFilters: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
-        field: z.ZodString;
-        operator: z.ZodOptional<z.ZodString>;
-        value: z.ZodOptional<z.ZodAny>;
-    }, z.core.$strip>>>>;
-    whereFilters: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
-        field: z.ZodString;
-        operator: z.ZodOptional<z.ZodString>;
-        value: z.ZodOptional<z.ZodAny>;
-    }, z.core.$strip>>>>;
+    havingFilters: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodType<import("..").VBIHavingClause, unknown, z.core.$ZodTypeInternals<import("..").VBIHavingClause, unknown>>>>>;
+    whereFilters: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodType<import("..").VBIWhereClause, unknown, z.core.$ZodTypeInternals<import("..").VBIWhereClause, unknown>>>>>;
     theme: z.ZodEnum<{
         light: "light";
         dark: "dark";

package/dist/types/dsl/whereFilters/filters.d.ts

@@ -1,7 +1,18 @@
 import { z } from 'zod';
 export declare const zVBIFilter: z.ZodObject<{
+    id: z.ZodString;
     field: z.ZodString;
-    operator: z.ZodOptional<z.ZodString>;
+    op: z.ZodOptional<z.ZodString>;
     value: z.ZodOptional<z.ZodAny>;
 }, z.core.$strip>;
 export type VBIFilter = z.infer<typeof zVBIFilter>;
+export declare const zVBIWhereGroup: z.ZodType<VBIWhereGroup>;
+export declare const zVBIWhereClause: z.ZodType<VBIWhereClause>;
+export type VBIWhereGroup = {
+    id: string;
+    op: 'and' | 'or';
+    conditions: VBIWhereClause[];
+};
+export type VBIWhereClause = VBIFilter | VBIWhereGroup;
+export declare function isVBIFilter(clause: VBIWhereClause): clause is VBIFilter;
+export declare function isVBIWhereGroup(clause: VBIWhereClause): clause is VBIWhereGroup;

package/dist/types/index.d.ts

@@ -1,4 +1,3 @@
 export * from './dsl';
 export * from './builder';
 export * from './connector';
-export * from './dsl/havingFilters/having';

package/dist/utils/id.d.ts

@@ -0,0 +1,3 @@
+export declare const id: {
+    uuid: () => string;
+};

package/dist/utils/index.d.ts

@@ -1 +1,2 @@
 export * from './tree';
+export { id } from './id';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vbi",
-  "version": "0.4.12",
+  "version": "0.4.14",
   "license": "MIT",
   "homepage": "https://visactor.github.io/VBI",
   "bugs": "https://github.com/VisActor/VBI/issues",
@@ -28,28 +28,30 @@
     "dist"
   ],
   "dependencies": {
-    "zod": "4.0.17",
     "remeda": "2.28.0",
-    "yjs": "13.6.28",
     "simple-statistics": "7.8.8",
-    "@visactor/vseed": "0.4.12"
+    "uuid": "13.0.0",
+    "yjs": "13.6.28",
+    "zod": "4.0.17",
+    "@visactor/vseed": "0.4.14"
   },
   "optionalDependencies": {
-    "@visactor/vseed": "0.4.12",
-    "@visactor/vquery": "0.4.12"
+    "@visactor/vquery": "0.4.14",
+    "@visactor/vseed": "0.4.14"
   },
   "devDependencies": {
     "@eslint/js": "9.39.0",
     "@rslib/core": "0.16.1",
     "@rstest/core": "0.8.3",
     "@types/node": "24.10.1",
+    "@types/uuid": "11.0.0",
     "eslint": "9.39.0",
     "globals": "16.4.0",
     "prettier": "3.6.2",
+    "ts-morph": "26.0.0",
     "typescript": "5.9.3",
     "typescript-eslint": "8.48.0",
-    "ts-morph": "26.0.0",
-    "@visactor/vquery": "0.4.12"
+    "@visactor/vquery": "0.4.14"
   },
   "scripts": {
     "build": "rslib build",
@@ -59,10 +61,10 @@
     "test": "rstest",
     "test:update": "rstest --update",
     "test:coverage": "rstest --coverage && node scripts/build-coverage-badge.mjs && open coverage/index.html",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.test.json",
     "build:test": "node scripts/build-tests.mjs",
     "build:examples": "node scripts/build-examples.mjs",
     "build:api": "node scripts/build-api.mjs",
-    "g": "pnpm run build:test && pnpm run build:examples && pnpm run build:api && pnpm run format"
+    "g": "pnpm build:test && pnpm build:examples && pnpm build:api && pnpm test:update && pnpm format"
   }
 }

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

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