ys.knife.query.js 0.0.10 → 0.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/api.d.ts CHANGED
@@ -3,6 +3,8 @@ import { ListReq, PageReq } from "./pagedlist";
3
3
  import { FilterInfo } from "./filter";
4
4
  import { AggInfo } from "./agg";
5
5
  type PageFunc<T> = (req: PageReq) => Promise<PagedList<T>>;
6
+ type PageFunc2<T> = (offset?: number, limit?: number, agg?: string | null, filter?: string | null, orderBy?: string | null, select?: string | null, distinct?: boolean) => Promise<PagedList<T>>;
7
+ export declare function toPageFunc<T>(func: PageFunc2<T>): PageFunc<T>;
6
8
  export interface IdEntity {
7
9
  id: string | number;
8
10
  }
package/dist/api.d.ts.map CHANGED
@@ -1 +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;AAG3D,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;AACD,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"}
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,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAE7D;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"}
package/dist/api.js CHANGED
@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.toPageFunc = toPageFunc;
15
16
  exports.findBy = findBy;
16
17
  exports.findById = findById;
17
18
  exports.count = count;
@@ -21,6 +22,9 @@ exports.aggValue = aggValue;
21
22
  const filter_1 = require("./filter");
22
23
  const constant_1 = require("./constant");
23
24
  const default_1 = __importDefault(require("./default"));
25
+ function toPageFunc(func) {
26
+ return (req) => func(req.offset, req.limit, req.agg, req.filter, req.orderBy, req.select, req.distinct);
27
+ }
24
28
  function findBy(func, key, val) {
25
29
  return __awaiter(this, void 0, void 0, function* () {
26
30
  const res = yield func({
package/dist/api.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAcA,wBAWC;AACD,4BAEC;AACD,sBAOC;AACD,wBAGC;AACD,kBAiBC;AACD,4BAQC;AAjED,qCAAwD;AACxD,yCAAiC;AAEjC,wDAA+B;AAS/B,SAAsB,MAAM,CAAI,IAAiB,EAAE,GAAY,EAAE,GAAuC;;QACpG,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC;YACnB,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,IAAA,eAAM,EAAI,GAAG,EAAE,iBAAQ,CAAC,MAAM,EAAE,IAAA,cAAG,EAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE;SAC/D,CAAC,CAAC;QACH,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC;aAAM,CAAC;YACJ,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;CAAA;AACD,SAAsB,QAAQ,CAAqB,IAAiB,EAAE,EAAmB;;QACrF,OAAO,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAClC,CAAC;CAAA;AACD,SAAsB,KAAK,CAAI,IAAiB,EAAE,MAAkB;;QAChE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC;YACnB,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE;SAC7B,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,UAAU,CAAC;IAC1B,CAAC;CAAA;AACD,SAAsB,MAAM,CAAI,IAAiB,EAAE,OAAgB;;QAC/D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,OAAO,GAAG,CAAC,KAAK,CAAC;IACrB,CAAC;CAAA;AACD,SAAsB,GAAG;yDAAI,IAAiB,EAAE,OAAgB,EAAE,cAAsB,iBAAM,CAAC,QAAQ;QACnG,IAAI,QAAQ,GAAQ,EAAE,CAAC;QACvB,IAAI,MAAM,GAAG,CAAC,CAAC;QAEf,OAAO,IAAI,EAAE,CAAC;YACV,MAAM,GAAG,GAAG,MAAM,IAAI,iCACf,OAAO,KACV,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,IAChB,CAAC;YACH,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACtC,MAAM,IAAI,WAAW,CAAC;YACtB,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;gBACxC,MAAM;YACV,CAAC;QACL,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;CAAA;AACD,SAAsB,QAAQ,CAAI,IAAiB,EAAE,GAAY,EAAE,MAAyB;;QACxF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC;YACnB,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE;YAC1B,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;SACtB,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,GAAgB,CAAC;IAChC,CAAC;CAAA"}
1
+ {"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}
@@ -13,10 +13,11 @@ export interface BaseReq {
13
13
  filter?: string | null;
14
14
  orderBy?: string | null;
15
15
  select?: string | null;
16
+ distinct?: boolean;
16
17
  }
17
18
  export interface ListReq extends BaseReq {
18
- limit: number;
19
- offset: number;
19
+ limit?: number;
20
+ offset?: number;
20
21
  }
21
22
  export interface PageReq extends ListReq {
22
23
  agg?: string | null;
@@ -1 +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;CAC1B;AACD,MAAM,WAAW,OAAQ,SAAQ,OAAO;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAA;CACjB;AACD,MAAM,WAAW,OAAQ,SAAQ,OAAO;IACpC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB"}
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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ys.knife.query.js",
3
- "version": "0.0.10",
3
+ "version": "0.0.11",
4
4
  "description": "ys.knife.query.js是一个用于构建查询的基础类库,提供了丰富的API用于创建和管理查询表达式",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",