@visactor/vquery 0.4.8 → 0.4.10

package/dist/browser/esm/browser.js

@@ -51,7 +51,17 @@ const inlineParameters = (sql, params)=>{
     });
     return sql;
 };
-const applyWhere = (where)=>{
+const operatorMap = {
+    gt: '>',
+    gte: '>=',
+    lt: '<',
+    lte: '<=',
+    eq: '=',
+    neq: '!='
+};
+const toSqlOperator = (op)=>operatorMap[op] ?? op;
+const applyWhere = (qb, where)=>{
+    if (!where) return qb;
     const toRaw = (w)=>{
         if ('op' in w && 'conditions' in w) {
             const parts = w.conditions.map((c)=>toRaw(c));
@@ -61,6 +71,7 @@ const applyWhere = (where)=>{
         const leaf = w;
         const field = leaf.field;
         const value = leaf.value;
+        const sqlOp = toSqlOperator(leaf.op);
         switch(leaf.op){
             case 'is null':
                 return external_kysely_sql`${external_kysely_sql.ref(field)} is null`;
@@ -91,10 +102,10 @@ const applyWhere = (where)=>{
                     return external_kysely_sql`${external_kysely_sql.ref(field)} not between ${external_kysely_sql.val(a)} and ${external_kysely_sql.val(b)}`;
                 }
             default:
-                return external_kysely_sql`${external_kysely_sql.ref(field)} ${external_kysely_sql.raw(leaf.op)} ${external_kysely_sql.val(value)}`;
+                return external_kysely_sql`${external_kysely_sql.ref(field)} ${external_kysely_sql.raw(sqlOp)} ${external_kysely_sql.val(value)}`;
         }
     };
-    return toRaw(where);
+    return qb.where(toRaw(where));
 };
 const applyGroupBy = (qb, fields)=>{
     if (fields && fields.length > 0) {
@@ -103,10 +114,82 @@ const applyGroupBy = (qb, fields)=>{
     }
     return qb;
 };
+const having_operatorMap = {
+    gt: '>',
+    gte: '>=',
+    lt: '<',
+    lte: '<=',
+    eq: '=',
+    neq: '!='
+};
+const having_toSqlOperator = (op)=>having_operatorMap[op] ?? op;
+const applyHaving = (qb, having)=>{
+    if (!having) return qb;
+    const toRaw = (h)=>{
+        if ('op' in h && 'conditions' in h) {
+            const parts = h.conditions.map((c)=>toRaw(c));
+            const sep = external_kysely_sql` ${external_kysely_sql.raw(h.op)} `;
+            return external_kysely_sql`(${external_kysely_sql.join(parts, sep)})`;
+        }
+        const leaf = h;
+        const field = leaf.field;
+        const value = leaf.value;
+        const op = having_toSqlOperator(leaf.op);
+        if ([
+            'sum',
+            'avg',
+            'count',
+            'min',
+            'max'
+        ].includes(op)) {
+            const aggrExpr = external_kysely_sql`${external_kysely_sql.raw(op.toLowerCase())}(${external_kysely_sql.ref(field)})`;
+            return external_kysely_sql`${aggrExpr} = ${external_kysely_sql.val(value)}`;
+        }
+        switch(leaf.op){
+            case 'is null':
+                return external_kysely_sql`${external_kysely_sql.ref(field)} is null`;
+            case 'is not null':
+                return external_kysely_sql`${external_kysely_sql.ref(field)} is not null`;
+            case 'in':
+                {
+                    const items = Array.isArray(value) ? value : [
+                        value
+                    ];
+                    return external_kysely_sql`${external_kysely_sql.ref(field)} in (${external_kysely_sql.join(items.map((v)=>external_kysely_sql.val(v)))})`;
+                }
+            case 'not in':
+                {
+                    const items = Array.isArray(value) ? value : [
+                        value
+                    ];
+                    return external_kysely_sql`not ${external_kysely_sql.ref(field)} in (${external_kysely_sql.join(items.map((v)=>external_kysely_sql.val(v)))})`;
+                }
+            case 'between':
+                {
+                    const [a, b] = value;
+                    return external_kysely_sql`${external_kysely_sql.ref(field)} between ${external_kysely_sql.val(a)} and ${external_kysely_sql.val(b)}`;
+                }
+            case 'not between':
+                {
+                    const [a, b] = value;
+                    return external_kysely_sql`${external_kysely_sql.ref(field)} not between ${external_kysely_sql.val(a)} and ${external_kysely_sql.val(b)}`;
+                }
+            default:
+                return external_kysely_sql`${external_kysely_sql.ref(field)} ${external_kysely_sql.raw(op)} ${external_kysely_sql.val(value)}`;
+        }
+    };
+    return qb.having(toRaw(having));
+};
 const applyLimit = (qb, limit)=>{
     if (limit && 'number' == typeof limit) qb = qb.limit(limit);
     return qb;
 };
+const applyOrder = (qb, orderBy)=>{
+    if (orderBy && orderBy.length > 0) orderBy.forEach((o)=>{
+        qb = qb.orderBy(o.field, o.order ?? 'asc');
+    });
+    return qb;
+};
 const DATE_FORMAT_MAP = {
     year: '%Y',
     month: '%Y-%m',
@@ -121,9 +204,9 @@ const applySelect = (qb, select)=>{
             if (isSelectItem(item)) {
                 const field = item.field;
                 const expression = eb.ref(field);
+                const alias = item.alias ?? field;
                 if (item.aggr) {
                     const { func } = item.aggr;
-                    const alias = item.alias ?? field;
                     if ([
                         'avg',
                         'sum',
@@ -150,7 +233,6 @@ const applySelect = (qb, select)=>{
                         if ('quarter' === dateTrunc) return external_kysely_sql`strftime(CAST(${expression} AS TIMESTAMP), '%Y') || '-Q' || date_part('quarter', CAST(${expression} AS TIMESTAMP))`.as(alias);
                     }
                 }
-                const alias = item.alias ?? field;
                 return expression.as(alias);
             }
             return item;
@@ -163,12 +245,13 @@ const convertDSLToSQL = (dsl, tableName)=>{
     });
     let qb = db.selectFrom(tableName);
     qb = applySelect(qb, dsl.select);
-    if (dsl.where) qb = qb.where(applyWhere(dsl.where));
+    qb = applyWhere(qb, dsl.where);
     qb = applyGroupBy(qb, dsl.groupBy);
-    if (dsl.orderBy && dsl.orderBy.length > 0) for (const o of dsl.orderBy)qb = qb.orderBy(o.field, o.order ?? 'asc');
+    qb = applyHaving(qb, dsl.having);
+    qb = applyOrder(qb, dsl.orderBy);
     qb = applyLimit(qb, dsl.limit);
-    const compiled = qb.compile();
-    return inlineParameters(compiled.sql, compiled.parameters);
+    const { sql, parameters } = qb.compile();
+    return inlineParameters(sql, parameters);
 };
 const READ_FUNCTION_MAP = {
     csv: 'read_csv_auto',

package/dist/browser/esm/sql-builder/builders/having.d.ts

@@ -0,0 +1,3 @@
+import type { SelectQueryBuilder } from 'kysely';
+import { Having, HavingClause } from '../../types';
+export declare const applyHaving: <DB, TB extends keyof DB & string, O, T>(qb: SelectQueryBuilder<DB, TB, O>, having?: Having<T> | HavingClause<T>) => SelectQueryBuilder<DB, TB, O>;

package/dist/browser/esm/sql-builder/builders/index.d.ts

@@ -1,4 +1,6 @@
 export { applyWhere } from './where';
 export { applyGroupBy } from './groupBy';
+export { applyHaving } from './having';
 export { applyLimit } from './limit';
+export { applyOrder } from './order';
 export { applySelect } from './select';

package/dist/browser/esm/sql-builder/builders/order.d.ts

@@ -0,0 +1,7 @@
+import type { SelectQueryBuilder } from 'kysely';
+type OrderByItem = {
+    field: string;
+    order?: 'asc' | 'desc';
+};
+export declare const applyOrder: <DB, TB extends keyof DB & string, O>(qb: SelectQueryBuilder<DB, TB, O>, orderBy?: Array<OrderByItem>) => SelectQueryBuilder<DB, TB, O>;
+export {};

package/dist/browser/esm/sql-builder/builders/where.d.ts

@@ -1,3 +1,3 @@
 import { Where, WhereClause } from '../../types';
-import type { RawBuilder } from 'kysely';
-export declare const applyWhere: <T>(where: Where<T> | WhereClause<T>) => RawBuilder<boolean>;
+import type { SelectQueryBuilder } from 'kysely';
+export declare const applyWhere: <DB, TB extends keyof DB & string, O, T>(qb: SelectQueryBuilder<DB, TB, O>, where?: Where<T> | WhereClause<T>) => SelectQueryBuilder<DB, TB, O>;

package/dist/browser/esm/sql-builder/dslToSQL.d.ts

@@ -1,2 +1,2 @@
-import { QueryDSL, VQueryDSL } from '../types';
+import type { QueryDSL, VQueryDSL } from '../types';
 export declare const convertDSLToSQL: <T, TableName extends string>(dsl: QueryDSL<T> | VQueryDSL<T>, tableName: TableName) => string;

package/dist/browser/esm/types/dsl/Having.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Having 子句类型定义
+ * 用于聚合后的数据筛选
+ */
+export type Having<T> = HavingGroup<T>;
+export type HavingGroup<T> = {
+    op: 'and' | 'or';
+    conditions: Array<HavingClause<T>>;
+};
+export type HavingClause<T> = HavingLeaf<T> | HavingGroup<T>;
+/**
+ * Having 叶子节点
+ * 支持聚合函数操作符
+ */
+export type HavingLeaf<T> = {
+    [K in keyof T]: {
+        [O in HavingOperator]: {
+            field: K;
+            op: O;
+        } & (O extends 'is null' | 'is not null' ? {
+            value?: never;
+        } : O extends 'in' | 'not in' ? {
+            value: T[K] | T[K][];
+        } : O extends 'between' | 'not between' ? {
+            value: [T[K], T[K]];
+        } : {
+            value: T[K];
+        });
+    }[HavingOperator];
+}[keyof T];
+/**
+ * Having 操作符
+ * 聚合函数操作符
+ */
+export type HavingOperator = 'sum' | 'avg' | 'count' | 'min' | 'max' | '=' | '!=' | '>' | '>=' | '<' | '<=' | 'between' | 'not between' | 'in' | 'not in' | 'is null' | 'is not null';

package/dist/browser/esm/types/dsl/QueryDSL.d.ts

@@ -1,4 +1,5 @@
 import { GroupBy } from './GroupBy';
+import { Having } from './Having';
 import { OrderBy } from './OrderBy';
 import { Select } from './Select';
 import { Where } from './Where';
@@ -6,6 +7,7 @@ export interface QueryDSL<Table> {
     select: Select<Table>;
     where?: Where<Table>;
     groupBy?: GroupBy<Table>;
+    having?: Having<Table>;
     orderBy?: OrderBy<Table>;
     limit?: number;
 }

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

@@ -3,3 +3,4 @@ export type { GroupBy } from './GroupBy';
 export type { OrderBy } from './OrderBy';
 export type { Select } from './Select';
 export type { Where, WhereClause, WhereLeaf, WhereGroup } from './Where';
+export type { Having, HavingClause, HavingLeaf, HavingGroup, HavingOperator } from './Having';

package/dist/node/cjs/node.cjs

@@ -89,7 +89,17 @@ const inlineParameters = (sql, params)=>{
     });
     return sql;
 };
-const applyWhere = (where)=>{
+const operatorMap = {
+    gt: '>',
+    gte: '>=',
+    lt: '<',
+    lte: '<=',
+    eq: '=',
+    neq: '!='
+};
+const toSqlOperator = (op)=>operatorMap[op] ?? op;
+const applyWhere = (qb, where)=>{
+    if (!where) return qb;
     const toRaw = (w)=>{
         if ('op' in w && 'conditions' in w) {
             const parts = w.conditions.map((c)=>toRaw(c));
@@ -99,6 +109,7 @@ const applyWhere = (where)=>{
         const leaf = w;
         const field = leaf.field;
         const value = leaf.value;
+        const sqlOp = toSqlOperator(leaf.op);
         switch(leaf.op){
             case 'is null':
                 return (0, external_kysely_namespaceObject.sql)`${external_kysely_namespaceObject.sql.ref(field)} is null`;
@@ -129,10 +140,10 @@ const applyWhere = (where)=>{
                     return (0, external_kysely_namespaceObject.sql)`${external_kysely_namespaceObject.sql.ref(field)} not between ${external_kysely_namespaceObject.sql.val(a)} and ${external_kysely_namespaceObject.sql.val(b)}`;
                 }
             default:
-                return (0, external_kysely_namespaceObject.sql)`${external_kysely_namespaceObject.sql.ref(field)} ${external_kysely_namespaceObject.sql.raw(leaf.op)} ${external_kysely_namespaceObject.sql.val(value)}`;
+                return (0, external_kysely_namespaceObject.sql)`${external_kysely_namespaceObject.sql.ref(field)} ${external_kysely_namespaceObject.sql.raw(sqlOp)} ${external_kysely_namespaceObject.sql.val(value)}`;
         }
     };
-    return toRaw(where);
+    return qb.where(toRaw(where));
 };
 const applyGroupBy = (qb, fields)=>{
     if (fields && fields.length > 0) {
@@ -141,10 +152,82 @@ const applyGroupBy = (qb, fields)=>{
     }
     return qb;
 };
+const having_operatorMap = {
+    gt: '>',
+    gte: '>=',
+    lt: '<',
+    lte: '<=',
+    eq: '=',
+    neq: '!='
+};
+const having_toSqlOperator = (op)=>having_operatorMap[op] ?? op;
+const applyHaving = (qb, having)=>{
+    if (!having) return qb;
+    const toRaw = (h)=>{
+        if ('op' in h && 'conditions' in h) {
+            const parts = h.conditions.map((c)=>toRaw(c));
+            const sep = (0, external_kysely_namespaceObject.sql)` ${external_kysely_namespaceObject.sql.raw(h.op)} `;
+            return (0, external_kysely_namespaceObject.sql)`(${external_kysely_namespaceObject.sql.join(parts, sep)})`;
+        }
+        const leaf = h;
+        const field = leaf.field;
+        const value = leaf.value;
+        const op = having_toSqlOperator(leaf.op);
+        if ([
+            'sum',
+            'avg',
+            'count',
+            'min',
+            'max'
+        ].includes(op)) {
+            const aggrExpr = (0, external_kysely_namespaceObject.sql)`${external_kysely_namespaceObject.sql.raw(op.toLowerCase())}(${external_kysely_namespaceObject.sql.ref(field)})`;
+            return (0, external_kysely_namespaceObject.sql)`${aggrExpr} = ${external_kysely_namespaceObject.sql.val(value)}`;
+        }
+        switch(leaf.op){
+            case 'is null':
+                return (0, external_kysely_namespaceObject.sql)`${external_kysely_namespaceObject.sql.ref(field)} is null`;
+            case 'is not null':
+                return (0, external_kysely_namespaceObject.sql)`${external_kysely_namespaceObject.sql.ref(field)} is not null`;
+            case 'in':
+                {
+                    const items = Array.isArray(value) ? value : [
+                        value
+                    ];
+                    return (0, external_kysely_namespaceObject.sql)`${external_kysely_namespaceObject.sql.ref(field)} in (${external_kysely_namespaceObject.sql.join(items.map((v)=>external_kysely_namespaceObject.sql.val(v)))})`;
+                }
+            case 'not in':
+                {
+                    const items = Array.isArray(value) ? value : [
+                        value
+                    ];
+                    return (0, external_kysely_namespaceObject.sql)`not ${external_kysely_namespaceObject.sql.ref(field)} in (${external_kysely_namespaceObject.sql.join(items.map((v)=>external_kysely_namespaceObject.sql.val(v)))})`;
+                }
+            case 'between':
+                {
+                    const [a, b] = value;
+                    return (0, external_kysely_namespaceObject.sql)`${external_kysely_namespaceObject.sql.ref(field)} between ${external_kysely_namespaceObject.sql.val(a)} and ${external_kysely_namespaceObject.sql.val(b)}`;
+                }
+            case 'not between':
+                {
+                    const [a, b] = value;
+                    return (0, external_kysely_namespaceObject.sql)`${external_kysely_namespaceObject.sql.ref(field)} not between ${external_kysely_namespaceObject.sql.val(a)} and ${external_kysely_namespaceObject.sql.val(b)}`;
+                }
+            default:
+                return (0, external_kysely_namespaceObject.sql)`${external_kysely_namespaceObject.sql.ref(field)} ${external_kysely_namespaceObject.sql.raw(op)} ${external_kysely_namespaceObject.sql.val(value)}`;
+        }
+    };
+    return qb.having(toRaw(having));
+};
 const applyLimit = (qb, limit)=>{
     if (limit && 'number' == typeof limit) qb = qb.limit(limit);
     return qb;
 };
+const applyOrder = (qb, orderBy)=>{
+    if (orderBy && orderBy.length > 0) orderBy.forEach((o)=>{
+        qb = qb.orderBy(o.field, o.order ?? 'asc');
+    });
+    return qb;
+};
 const DATE_FORMAT_MAP = {
     year: '%Y',
     month: '%Y-%m',
@@ -159,9 +242,9 @@ const applySelect = (qb, select)=>{
             if (isSelectItem(item)) {
                 const field = item.field;
                 const expression = eb.ref(field);
+                const alias = item.alias ?? field;
                 if (item.aggr) {
                     const { func } = item.aggr;
-                    const alias = item.alias ?? field;
                     if ([
                         'avg',
                         'sum',
@@ -188,7 +271,6 @@ const applySelect = (qb, select)=>{
                         if ('quarter' === dateTrunc) return (0, external_kysely_namespaceObject.sql)`strftime(CAST(${expression} AS TIMESTAMP), '%Y') || '-Q' || date_part('quarter', CAST(${expression} AS TIMESTAMP))`.as(alias);
                     }
                 }
-                const alias = item.alias ?? field;
                 return expression.as(alias);
             }
             return item;
@@ -201,12 +283,13 @@ const convertDSLToSQL = (dsl, tableName)=>{
     });
     let qb = db.selectFrom(tableName);
     qb = applySelect(qb, dsl.select);
-    if (dsl.where) qb = qb.where(applyWhere(dsl.where));
+    qb = applyWhere(qb, dsl.where);
     qb = applyGroupBy(qb, dsl.groupBy);
-    if (dsl.orderBy && dsl.orderBy.length > 0) for (const o of dsl.orderBy)qb = qb.orderBy(o.field, o.order ?? 'asc');
+    qb = applyHaving(qb, dsl.having);
+    qb = applyOrder(qb, dsl.orderBy);
     qb = applyLimit(qb, dsl.limit);
-    const compiled = qb.compile();
-    return inlineParameters(compiled.sql, compiled.parameters);
+    const { sql, parameters } = qb.compile();
+    return inlineParameters(sql, parameters);
 };
 const READ_FUNCTION_MAP = {
     csv: 'read_csv_auto',

package/dist/node/cjs/sql-builder/builders/having.d.ts

@@ -0,0 +1,3 @@
+import type { SelectQueryBuilder } from 'kysely';
+import { Having, HavingClause } from '../../types';
+export declare const applyHaving: <DB, TB extends keyof DB & string, O, T>(qb: SelectQueryBuilder<DB, TB, O>, having?: Having<T> | HavingClause<T>) => SelectQueryBuilder<DB, TB, O>;

package/dist/node/cjs/sql-builder/builders/index.d.ts

@@ -1,4 +1,6 @@
 export { applyWhere } from './where';
 export { applyGroupBy } from './groupBy';
+export { applyHaving } from './having';
 export { applyLimit } from './limit';
+export { applyOrder } from './order';
 export { applySelect } from './select';

package/dist/node/cjs/sql-builder/builders/order.d.ts

@@ -0,0 +1,7 @@
+import type { SelectQueryBuilder } from 'kysely';
+type OrderByItem = {
+    field: string;
+    order?: 'asc' | 'desc';
+};
+export declare const applyOrder: <DB, TB extends keyof DB & string, O>(qb: SelectQueryBuilder<DB, TB, O>, orderBy?: Array<OrderByItem>) => SelectQueryBuilder<DB, TB, O>;
+export {};

package/dist/node/cjs/sql-builder/builders/where.d.ts

@@ -1,3 +1,3 @@
 import { Where, WhereClause } from '../../types';
-import type { RawBuilder } from 'kysely';
-export declare const applyWhere: <T>(where: Where<T> | WhereClause<T>) => RawBuilder<boolean>;
+import type { SelectQueryBuilder } from 'kysely';
+export declare const applyWhere: <DB, TB extends keyof DB & string, O, T>(qb: SelectQueryBuilder<DB, TB, O>, where?: Where<T> | WhereClause<T>) => SelectQueryBuilder<DB, TB, O>;

package/dist/node/cjs/sql-builder/dslToSQL.d.ts

@@ -1,2 +1,2 @@
-import { QueryDSL, VQueryDSL } from '../types';
+import type { QueryDSL, VQueryDSL } from '../types';
 export declare const convertDSLToSQL: <T, TableName extends string>(dsl: QueryDSL<T> | VQueryDSL<T>, tableName: TableName) => string;

package/dist/node/cjs/types/dsl/Having.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Having 子句类型定义
+ * 用于聚合后的数据筛选
+ */
+export type Having<T> = HavingGroup<T>;
+export type HavingGroup<T> = {
+    op: 'and' | 'or';
+    conditions: Array<HavingClause<T>>;
+};
+export type HavingClause<T> = HavingLeaf<T> | HavingGroup<T>;
+/**
+ * Having 叶子节点
+ * 支持聚合函数操作符
+ */
+export type HavingLeaf<T> = {
+    [K in keyof T]: {
+        [O in HavingOperator]: {
+            field: K;
+            op: O;
+        } & (O extends 'is null' | 'is not null' ? {
+            value?: never;
+        } : O extends 'in' | 'not in' ? {
+            value: T[K] | T[K][];
+        } : O extends 'between' | 'not between' ? {
+            value: [T[K], T[K]];
+        } : {
+            value: T[K];
+        });
+    }[HavingOperator];
+}[keyof T];
+/**
+ * Having 操作符
+ * 聚合函数操作符
+ */
+export type HavingOperator = 'sum' | 'avg' | 'count' | 'min' | 'max' | '=' | '!=' | '>' | '>=' | '<' | '<=' | 'between' | 'not between' | 'in' | 'not in' | 'is null' | 'is not null';

package/dist/node/cjs/types/dsl/QueryDSL.d.ts

@@ -1,4 +1,5 @@
 import { GroupBy } from './GroupBy';
+import { Having } from './Having';
 import { OrderBy } from './OrderBy';
 import { Select } from './Select';
 import { Where } from './Where';
@@ -6,6 +7,7 @@ export interface QueryDSL<Table> {
     select: Select<Table>;
     where?: Where<Table>;
     groupBy?: GroupBy<Table>;
+    having?: Having<Table>;
     orderBy?: OrderBy<Table>;
     limit?: number;
 }

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

@@ -3,3 +3,4 @@ export type { GroupBy } from './GroupBy';
 export type { OrderBy } from './OrderBy';
 export type { Select } from './Select';
 export type { Where, WhereClause, WhereLeaf, WhereGroup } from './Where';
+export type { Having, HavingClause, HavingLeaf, HavingGroup, HavingOperator } from './Having';

package/dist/node/esm/node.js

@@ -52,7 +52,17 @@ const inlineParameters = (sql, params)=>{
     });
     return sql;
 };
-const applyWhere = (where)=>{
+const operatorMap = {
+    gt: '>',
+    gte: '>=',
+    lt: '<',
+    lte: '<=',
+    eq: '=',
+    neq: '!='
+};
+const toSqlOperator = (op)=>operatorMap[op] ?? op;
+const applyWhere = (qb, where)=>{
+    if (!where) return qb;
     const toRaw = (w)=>{
         if ('op' in w && 'conditions' in w) {
             const parts = w.conditions.map((c)=>toRaw(c));
@@ -62,6 +72,7 @@ const applyWhere = (where)=>{
         const leaf = w;
         const field = leaf.field;
         const value = leaf.value;
+        const sqlOp = toSqlOperator(leaf.op);
         switch(leaf.op){
             case 'is null':
                 return external_kysely_sql`${external_kysely_sql.ref(field)} is null`;
@@ -92,10 +103,10 @@ const applyWhere = (where)=>{
                     return external_kysely_sql`${external_kysely_sql.ref(field)} not between ${external_kysely_sql.val(a)} and ${external_kysely_sql.val(b)}`;
                 }
             default:
-                return external_kysely_sql`${external_kysely_sql.ref(field)} ${external_kysely_sql.raw(leaf.op)} ${external_kysely_sql.val(value)}`;
+                return external_kysely_sql`${external_kysely_sql.ref(field)} ${external_kysely_sql.raw(sqlOp)} ${external_kysely_sql.val(value)}`;
         }
     };
-    return toRaw(where);
+    return qb.where(toRaw(where));
 };
 const applyGroupBy = (qb, fields)=>{
     if (fields && fields.length > 0) {
@@ -104,10 +115,82 @@ const applyGroupBy = (qb, fields)=>{
     }
     return qb;
 };
+const having_operatorMap = {
+    gt: '>',
+    gte: '>=',
+    lt: '<',
+    lte: '<=',
+    eq: '=',
+    neq: '!='
+};
+const having_toSqlOperator = (op)=>having_operatorMap[op] ?? op;
+const applyHaving = (qb, having)=>{
+    if (!having) return qb;
+    const toRaw = (h)=>{
+        if ('op' in h && 'conditions' in h) {
+            const parts = h.conditions.map((c)=>toRaw(c));
+            const sep = external_kysely_sql` ${external_kysely_sql.raw(h.op)} `;
+            return external_kysely_sql`(${external_kysely_sql.join(parts, sep)})`;
+        }
+        const leaf = h;
+        const field = leaf.field;
+        const value = leaf.value;
+        const op = having_toSqlOperator(leaf.op);
+        if ([
+            'sum',
+            'avg',
+            'count',
+            'min',
+            'max'
+        ].includes(op)) {
+            const aggrExpr = external_kysely_sql`${external_kysely_sql.raw(op.toLowerCase())}(${external_kysely_sql.ref(field)})`;
+            return external_kysely_sql`${aggrExpr} = ${external_kysely_sql.val(value)}`;
+        }
+        switch(leaf.op){
+            case 'is null':
+                return external_kysely_sql`${external_kysely_sql.ref(field)} is null`;
+            case 'is not null':
+                return external_kysely_sql`${external_kysely_sql.ref(field)} is not null`;
+            case 'in':
+                {
+                    const items = Array.isArray(value) ? value : [
+                        value
+                    ];
+                    return external_kysely_sql`${external_kysely_sql.ref(field)} in (${external_kysely_sql.join(items.map((v)=>external_kysely_sql.val(v)))})`;
+                }
+            case 'not in':
+                {
+                    const items = Array.isArray(value) ? value : [
+                        value
+                    ];
+                    return external_kysely_sql`not ${external_kysely_sql.ref(field)} in (${external_kysely_sql.join(items.map((v)=>external_kysely_sql.val(v)))})`;
+                }
+            case 'between':
+                {
+                    const [a, b] = value;
+                    return external_kysely_sql`${external_kysely_sql.ref(field)} between ${external_kysely_sql.val(a)} and ${external_kysely_sql.val(b)}`;
+                }
+            case 'not between':
+                {
+                    const [a, b] = value;
+                    return external_kysely_sql`${external_kysely_sql.ref(field)} not between ${external_kysely_sql.val(a)} and ${external_kysely_sql.val(b)}`;
+                }
+            default:
+                return external_kysely_sql`${external_kysely_sql.ref(field)} ${external_kysely_sql.raw(op)} ${external_kysely_sql.val(value)}`;
+        }
+    };
+    return qb.having(toRaw(having));
+};
 const applyLimit = (qb, limit)=>{
     if (limit && 'number' == typeof limit) qb = qb.limit(limit);
     return qb;
 };
+const applyOrder = (qb, orderBy)=>{
+    if (orderBy && orderBy.length > 0) orderBy.forEach((o)=>{
+        qb = qb.orderBy(o.field, o.order ?? 'asc');
+    });
+    return qb;
+};
 const DATE_FORMAT_MAP = {
     year: '%Y',
     month: '%Y-%m',
@@ -122,9 +205,9 @@ const applySelect = (qb, select)=>{
             if (isSelectItem(item)) {
                 const field = item.field;
                 const expression = eb.ref(field);
+                const alias = item.alias ?? field;
                 if (item.aggr) {
                     const { func } = item.aggr;
-                    const alias = item.alias ?? field;
                     if ([
                         'avg',
                         'sum',
@@ -151,7 +234,6 @@ const applySelect = (qb, select)=>{
                         if ('quarter' === dateTrunc) return external_kysely_sql`strftime(CAST(${expression} AS TIMESTAMP), '%Y') || '-Q' || date_part('quarter', CAST(${expression} AS TIMESTAMP))`.as(alias);
                     }
                 }
-                const alias = item.alias ?? field;
                 return expression.as(alias);
             }
             return item;
@@ -164,12 +246,13 @@ const convertDSLToSQL = (dsl, tableName)=>{
     });
     let qb = db.selectFrom(tableName);
     qb = applySelect(qb, dsl.select);
-    if (dsl.where) qb = qb.where(applyWhere(dsl.where));
+    qb = applyWhere(qb, dsl.where);
     qb = applyGroupBy(qb, dsl.groupBy);
-    if (dsl.orderBy && dsl.orderBy.length > 0) for (const o of dsl.orderBy)qb = qb.orderBy(o.field, o.order ?? 'asc');
+    qb = applyHaving(qb, dsl.having);
+    qb = applyOrder(qb, dsl.orderBy);
     qb = applyLimit(qb, dsl.limit);
-    const compiled = qb.compile();
-    return inlineParameters(compiled.sql, compiled.parameters);
+    const { sql, parameters } = qb.compile();
+    return inlineParameters(sql, parameters);
 };
 const READ_FUNCTION_MAP = {
     csv: 'read_csv_auto',

package/dist/node/esm/sql-builder/builders/having.d.ts

@@ -0,0 +1,3 @@
+import type { SelectQueryBuilder } from 'kysely';
+import { Having, HavingClause } from '../../types';
+export declare const applyHaving: <DB, TB extends keyof DB & string, O, T>(qb: SelectQueryBuilder<DB, TB, O>, having?: Having<T> | HavingClause<T>) => SelectQueryBuilder<DB, TB, O>;

package/dist/node/esm/sql-builder/builders/index.d.ts

@@ -1,4 +1,6 @@
 export { applyWhere } from './where';
 export { applyGroupBy } from './groupBy';
+export { applyHaving } from './having';
 export { applyLimit } from './limit';
+export { applyOrder } from './order';
 export { applySelect } from './select';

package/dist/node/esm/sql-builder/builders/order.d.ts

@@ -0,0 +1,7 @@
+import type { SelectQueryBuilder } from 'kysely';
+type OrderByItem = {
+    field: string;
+    order?: 'asc' | 'desc';
+};
+export declare const applyOrder: <DB, TB extends keyof DB & string, O>(qb: SelectQueryBuilder<DB, TB, O>, orderBy?: Array<OrderByItem>) => SelectQueryBuilder<DB, TB, O>;
+export {};

package/dist/node/esm/sql-builder/builders/where.d.ts

@@ -1,3 +1,3 @@
 import { Where, WhereClause } from '../../types';
-import type { RawBuilder } from 'kysely';
-export declare const applyWhere: <T>(where: Where<T> | WhereClause<T>) => RawBuilder<boolean>;
+import type { SelectQueryBuilder } from 'kysely';
+export declare const applyWhere: <DB, TB extends keyof DB & string, O, T>(qb: SelectQueryBuilder<DB, TB, O>, where?: Where<T> | WhereClause<T>) => SelectQueryBuilder<DB, TB, O>;

package/dist/node/esm/sql-builder/dslToSQL.d.ts

@@ -1,2 +1,2 @@
-import { QueryDSL, VQueryDSL } from '../types';
+import type { QueryDSL, VQueryDSL } from '../types';
 export declare const convertDSLToSQL: <T, TableName extends string>(dsl: QueryDSL<T> | VQueryDSL<T>, tableName: TableName) => string;

package/dist/node/esm/types/dsl/Having.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Having 子句类型定义
+ * 用于聚合后的数据筛选
+ */
+export type Having<T> = HavingGroup<T>;
+export type HavingGroup<T> = {
+    op: 'and' | 'or';
+    conditions: Array<HavingClause<T>>;
+};
+export type HavingClause<T> = HavingLeaf<T> | HavingGroup<T>;
+/**
+ * Having 叶子节点
+ * 支持聚合函数操作符
+ */
+export type HavingLeaf<T> = {
+    [K in keyof T]: {
+        [O in HavingOperator]: {
+            field: K;
+            op: O;
+        } & (O extends 'is null' | 'is not null' ? {
+            value?: never;
+        } : O extends 'in' | 'not in' ? {
+            value: T[K] | T[K][];
+        } : O extends 'between' | 'not between' ? {
+            value: [T[K], T[K]];
+        } : {
+            value: T[K];
+        });
+    }[HavingOperator];
+}[keyof T];
+/**
+ * Having 操作符
+ * 聚合函数操作符
+ */
+export type HavingOperator = 'sum' | 'avg' | 'count' | 'min' | 'max' | '=' | '!=' | '>' | '>=' | '<' | '<=' | 'between' | 'not between' | 'in' | 'not in' | 'is null' | 'is not null';

package/dist/node/esm/types/dsl/QueryDSL.d.ts

@@ -1,4 +1,5 @@
 import { GroupBy } from './GroupBy';
+import { Having } from './Having';
 import { OrderBy } from './OrderBy';
 import { Select } from './Select';
 import { Where } from './Where';
@@ -6,6 +7,7 @@ export interface QueryDSL<Table> {
     select: Select<Table>;
     where?: Where<Table>;
     groupBy?: GroupBy<Table>;
+    having?: Having<Table>;
     orderBy?: OrderBy<Table>;
     limit?: number;
 }

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

@@ -3,3 +3,4 @@ export type { GroupBy } from './GroupBy';
 export type { OrderBy } from './OrderBy';
 export type { Select } from './Select';
 export type { Where, WhereClause, WhereLeaf, WhereGroup } from './Where';
+export type { Having, HavingClause, HavingLeaf, HavingGroup, HavingOperator } from './Having';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vquery",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "type": "module",
   "exports": {
     ".": {