ys.knife.query.js 0.0.13 → 0.0.15

package/dist/api.d.ts

@@ -1,18 +1,27 @@
-import { PagedList, AggResult, BaseReq } from "./pagedlist";
-import { ListReq, PageReq } from "./pagedlist";
+import { PagedList, AggResult, BaseReq, PageReq } from "./pagedlist";
 import { FilterInfo } from "./filter";
-import { AggInfo } from "./agg";
+import { AggInfo, AggType } from "./agg";
+import { SelectInfo } from "./select";
+import { OrderByInfo } from "./orderby";
+import { DeepKeys } from "./type";
 type PageFunc<T> = (req: PageReq) => Promise<PagedList<T>>;
 type PageFunc2<T> = (offset?: number, limit?: number, agg?: string | null, filter?: string | null, orderBy?: string | null, select?: string | null, distinct?: boolean) => Promise<PagedList<T>>;
 export declare function $page<T>(func: PageFunc2<T>): PageFunc<T>;
 export interface IdEntity {
-    id: string | number;
+    id?: string | number;
 }
 export declare function findBy<T>(func: PageFunc<T>, key: keyof T, val: string | number | boolean | bigint): Promise<T | null>;
 export declare function findById<T extends IdEntity>(func: PageFunc<T>, id: number | string): Promise<T | null>;
-export declare function count<T>(func: PageFunc<T>, filter: FilterInfo): Promise<number>;
-export declare function asList<T>(func: PageFunc<T>, listReq: ListReq): Promise<T[]>;
-export declare function all<T>(func: PageFunc<T>, baseReq: BaseReq, maxPageSize?: number): Promise<T[]>;
-export declare function aggValue<T>(func: PageFunc<T>, agg: AggInfo, filter: FilterInfo | null): Promise<AggResult>;
+export declare function count<T>(func: PageFunc<T>, filter?: FilterInfo | string | null): Promise<number>;
+export declare function distinctCount<T>(func: PageFunc<T>, select: SelectInfo | string, filter?: FilterInfo | string | null): Promise<number>;
+export declare function distinctList<T>(func: PageFunc<T>, select: SelectInfo | string, filter?: FilterInfo | string | null, orderBy?: OrderByInfo | string | null, maxPageSize?: number, throwIfOverflow?: boolean): Promise<T[]>;
+export declare function asList<T>(func: PageFunc<T>, filter?: FilterInfo | string | null, orderBy?: OrderByInfo | string | null, select?: SelectInfo | string | null, maxPageSize?: number, throwIfOverflow?: boolean): Promise<T[]>;
+export declare function loadAll<T>(func: PageFunc<T>, baseReq: BaseReq, maxPageSize?: number): Promise<T[]>;
+export declare function aggValue<T>(func: PageFunc<T>, agg: AggInfo | string, filter?: FilterInfo | string | null): Promise<AggResult>;
+export declare function aggProp<T>(func: PageFunc<T>, prop: DeepKeys<T>, aggType?: AggType, filter?: FilterInfo | string | null): Promise<number>;
+export declare function sumProp<T>(func: PageFunc<T>, prop: DeepKeys<T>, filter?: FilterInfo | string | null): Promise<number>;
+export declare function maxProp<T>(func: PageFunc<T>, prop: DeepKeys<T>, filter?: FilterInfo | string | null): Promise<number>;
+export declare function minProp<T>(func: PageFunc<T>, prop: DeepKeys<T>, filter?: FilterInfo | string | null): Promise<number>;
+export declare function avgProp<T>(func: PageFunc<T>, prop: DeepKeys<T>, filter?: FilterInfo | string | null): Promise<number>;
 export {};
 //# sourceMappingURL=api.d.ts.map

package/dist/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAU,UAAU,EAAY,MAAM,UAAU,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGhC,KAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3D,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AAEjM,wBAAgB,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAExD;AAED,MAAM,WAAW,QAAQ;IACrB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;CACtB;AAED,wBAAsB,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAW3H;AAED,wBAAsB,QAAQ,CAAC,CAAC,SAAS,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAE5G;AACD,wBAAsB,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAOrF;AACD,wBAAsB,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAGjF;AACD,wBAAsB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,GAAE,MAAwB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAiBrH;AACD,wBAAsB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAQhH"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}

package/dist/api.js

@@ -16,11 +16,19 @@ exports.$page = $page;
 exports.findBy = findBy;
 exports.findById = findById;
 exports.count = count;
+exports.distinctCount = distinctCount;
+exports.distinctList = distinctList;
 exports.asList = asList;
-exports.all = all;
+exports.loadAll = loadAll;
 exports.aggValue = aggValue;
+exports.aggProp = aggProp;
+exports.sumProp = sumProp;
+exports.maxProp = maxProp;
+exports.minProp = minProp;
+exports.avgProp = avgProp;
 const filter_1 = require("./filter");
 const constant_1 = require("./constant");
+const agg_1 = require("./agg");
 const default_1 = __importDefault(require("./default"));
 function $page(func) {
     return (req) => func(req.offset, req.limit, req.agg, req.filter, req.orderBy, req.select, req.distinct);
@@ -55,13 +63,50 @@ function count(func, filter) {
         return res.totalCount;
     });
 }
-function asList(func, listReq) {
+function distinctCount(func, select, filter) {
     return __awaiter(this, void 0, void 0, function* () {
-        const res = yield func(listReq);
+        const res = yield func({
+            limit: 0,
+            offset: 0,
+            filter: filter === null || filter === void 0 ? void 0 : filter.toString(),
+            select: select.toString(),
+            distinct: true
+        });
+        return res.totalCount;
+    });
+}
+function distinctList(func_1, select_1, filter_2, orderBy_1) {
+    return __awaiter(this, arguments, void 0, function* (func, select, filter, orderBy, maxPageSize = default_1.default.maxLimit, throwIfOverflow = true) {
+        const res = yield func({
+            limit: maxPageSize,
+            offset: 0,
+            filter: filter === null || filter === void 0 ? void 0 : filter.toString(),
+            select: select.toString(),
+            orderBy: orderBy === null || orderBy === void 0 ? void 0 : orderBy.toString(),
+            distinct: true
+        });
+        if (res.hasNext && throwIfOverflow) {
+            throw new Error("hasNext is true, distinctList will lose data.");
+        }
+        return res.items;
+    });
+}
+function asList(func_1, filter_2, orderBy_1, select_1) {
+    return __awaiter(this, arguments, void 0, function* (func, filter, orderBy, select, maxPageSize = default_1.default.defaultLimit, throwIfOverflow = true) {
+        const res = yield func({
+            limit: maxPageSize,
+            offset: 0,
+            filter: filter === null || filter === void 0 ? void 0 : filter.toString(),
+            select: select === null || select === void 0 ? void 0 : select.toString(),
+            orderBy: orderBy === null || orderBy === void 0 ? void 0 : orderBy.toString(),
+        });
+        if (res.hasNext && throwIfOverflow) {
+            throw new Error("hasNext is true, asList will lose data.");
+        }
         return res.items;
     });
 }
-function all(func_1, baseReq_1) {
+function loadAll(func_1, baseReq_1) {
     return __awaiter(this, arguments, void 0, function* (func, baseReq, maxPageSize = default_1.default.maxLimit) {
         let resArray = [];
         let offset = 0;
@@ -84,7 +129,40 @@ function aggValue(func, agg, filter) {
             filter: filter === null || filter === void 0 ? void 0 : filter.toString(),
             agg: agg.toString()
         });
-        return res.agg;
+        return res.aggs;
+    });
+}
+function aggProp(func_1, prop_1) {
+    return __awaiter(this, arguments, void 0, function* (func, prop, aggType = agg_1.AggType.Sum, filter) {
+        var _a;
+        const tempAggKey = "__tg0";
+        const res = yield func({
+            limit: 0,
+            offset: 0,
+            filter: filter === null || filter === void 0 ? void 0 : filter.toString(),
+            agg: (0, agg_1.agg)(prop, aggType, tempAggKey).toString()
+        });
+        return Number((_a = res.aggs) === null || _a === void 0 ? void 0 : _a[tempAggKey]);
+    });
+}
+function sumProp(func, prop, filter) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return aggProp(func, prop, agg_1.AggType.Sum, filter);
+    });
+}
+function maxProp(func, prop, filter) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return aggProp(func, prop, agg_1.AggType.Max, filter);
+    });
+}
+function minProp(func, prop, filter) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return aggProp(func, prop, agg_1.AggType.Min, filter);
+    });
+}
+function avgProp(func, prop, filter) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return aggProp(func, prop, agg_1.AggType.Avg, filter);
     });
 }
 //# sourceMappingURL=api.js.map

package/dist/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}

package/dist/pagedlist.d.ts

@@ -6,20 +6,20 @@ export interface PagedList<T> {
     offset: number;
     totalCount: number;
     hasNext: boolean;
-    agg?: AggResult;
+    aggs?: AggResult;
     items: T[];
 }
 export interface BaseReq {
-    filter?: string | null;
-    orderBy?: string | null;
-    select?: string | null;
-    distinct?: boolean;
+    filter?: string | null | undefined;
+    orderBy?: string | null | undefined;
+    select?: string | null | undefined;
+    distinct?: boolean | undefined;
 }
 export interface ListReq extends BaseReq {
     limit?: number;
     offset?: number;
 }
 export interface PageReq extends ListReq {
-    agg?: string | null;
+    agg?: string | null | undefined;
 }
 //# sourceMappingURL=pagedlist.d.ts.map

package/dist/pagedlist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pagedlist.d.ts","sourceRoot":"","sources":["../src/pagedlist.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CACzC;AACD,MAAM,WAAW,SAAS,CAAC,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,CAAC,EAAE,CAAC;CACd;AACD,MAAM,WAAW,OAAO;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AACD,MAAM,WAAW,OAAQ,SAAQ,OAAO;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB;AACD,MAAM,WAAW,OAAQ,SAAQ,OAAO;IACpC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB"}
+{"version":3,"file":"pagedlist.d.ts","sourceRoot":"","sources":["../src/pagedlist.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CACzC;AACD,MAAM,WAAW,SAAS,CAAC,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,KAAK,EAAE,CAAC,EAAE,CAAC;CACd;AACD,MAAM,WAAW,OAAO;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACnC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC;AACD,MAAM,WAAW,OAAQ,SAAQ,OAAO;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB;AACD,MAAM,WAAW,OAAQ,SAAQ,OAAO;IACpC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ys.knife.query.js",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "ys.knife.query.js是一个用于构建查询的基础类库，提供了丰富的API用于创建和管理查询表达式",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",