nicot 1.0.40 → 1.0.42

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.
@@ -108,6 +108,15 @@ const EnumColumn = (targetEnum, options = {}) => {
108
108
  exports.EnumColumn = EnumColumn;
109
109
  const BoolColumn = (options = {}) => (0, merge_1.MergePropertyDecorators)([
110
110
  (0, typeorm_1.Index)(),
111
+ (0, class_transformer_1.Transform)((v) => {
112
+ const trueValues = ['true', '1', 'yes', 'on', true, 1];
113
+ const falseValues = ['false', '0', 'no', 'off', false, 0];
114
+ if (trueValues.indexOf(v.value) !== -1)
115
+ return true;
116
+ if (falseValues.indexOf(v.value) !== -1)
117
+ return false;
118
+ return undefined;
119
+ }),
111
120
  (0, typeorm_1.Column)('boolean', columnDecoratorOptions(options)),
112
121
  validatorDecorator(options),
113
122
  swaggerDecorator(options, { type: Boolean }),
@@ -1 +1 @@
1
- {"version":3,"file":"property.js","sourceRoot":"","sources":["../../../src/decorators/property.ts"],"names":[],"mappings":";;;AACA,6CAAkE;AAElE,mCAAkD;AAClD,qCAAwC;AACxC,qDASyB;AAOzB,yDAA4C;AAC5C,8CAAsD;AACtD,kDAA+C;AAS/C,SAAS,gBAAgB,CACvB,OAA4B,EAC5B,WAA+B,EAAE;IAEjC,OAAO,IAAA,qBAAW,EAAC;QACjB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,IAAI,IAAI;QACrD,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,GAAG,QAAQ;QACX,GAAG,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC;KAClC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,OAA4B;IACtD,MAAM,IAAI,GAAwB,EAAE,CAAC;IACrC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;QACrB,IAAI,CAAC,IAAI,CAAC,IAAA,4BAAU,GAAE,CAAC,CAAC;KACzB;IACD,OAAO,IAAA,+BAAuB,EAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAOD,SAAS,sBAAsB,CAC7B,OAA2B;IAE3B,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,IAAI,IAAI;QACtD,OAAO,EAAE,OAAO,CAAC,WAAW;QAC5B,GAAG,OAAO,CAAC,YAAY;KACxB,CAAC;AACJ,CAAC;AAEM,MAAM,YAAY,GAAG,CAC1B,MAAc,EACd,UAA4D,EAAE,EAC3C,EAAE;IACrB,OAAO,IAAA,+BAAuB,EAAC;QAC7B,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,GAAG,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC;QACjE,IAAA,0BAAQ,GAAE;QACV,IAAA,2BAAS,EAAC,MAAM,CAAC;QACjB,kBAAkB,CAAC,OAAO,CAAC;QAC3B,gBAAgB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;KAC/D,CAAC,CAAC;AACL,CAAC,CAAC;AAXW,QAAA,YAAY,gBAWvB;AAEK,MAAM,SAAS,GAAG,CACvB,IAAyB,EACzB,UAEI,EAAE,EACa,EAAE;IACrB,MAAM,IAAI,GAAG;QACX,IAAA,gBAAM,EAAC,IAAI,EAAE;YACX,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,0BAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtE,GAAG,sBAAsB,CAAC,OAAO,CAAC;SACnC,CAAC;QACF,IAAA,uBAAK,GAAE;QACP,kBAAkB,CAAC,OAAO,CAAC;QAC3B,gBAAgB,CAAC,OAAO,EAAE;YACxB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;SAC1C,CAAC;KACH,CAAC;IACF,IAAI,OAAO,CAAC,QAAQ,EAAE;QACpB,IAAI,CAAC,IAAI,CAAC,IAAA,qBAAG,EAAC,CAAC,CAAC,CAAC,CAAC;KACnB;IACD,OAAO,IAAA,+BAAuB,EAAC,IAAI,CAAC,CAAC;AACvC,CAAC,CAAC;AAxBW,QAAA,SAAS,aAwBpB;AAEK,MAAM,WAAW,GAAG,CACzB,IAA6B,EAC7B,UAEI,EAAE,EACa,EAAE;IACrB,MAAM,IAAI,GAAG;QACX,IAAA,gBAAM,EAAC,IAAI,EAAE;YACX,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,GAAG,sBAAsB,CAAC,OAAO,CAAC;SACnC,CAAC;QACF,IAAA,0BAAQ,GAAE;QACV,kBAAkB,CAAC,OAAO,CAAC;QAC3B,gBAAgB,CAAC,OAAO,EAAE;YACxB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;SAC1C,CAAC;KACH,CAAC;IACF,IAAI,OAAO,CAAC,QAAQ,EAAE;QACpB,IAAI,CAAC,IAAI,CAAC,IAAA,qBAAG,EAAC,CAAC,CAAC,CAAC,CAAC;KACnB;IACD,OAAO,IAAA,+BAAuB,EAAC,IAAI,CAAC,CAAC;AACvC,CAAC,CAAC;AAvBW,QAAA,WAAW,eAuBtB;AAEK,MAAM,UAAU,GAAG,CACxB,UAAiC,EAAE,EAChB,EAAE;IACrB,OAAO,IAAA,+BAAuB,EAAC;QAC7B,IAAA,gBAAM,EAAC,WAAW,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACpD,IAAA,wBAAM,GAAE;QACR,kBAAkB,CAAC,OAAO,CAAC;QAC3B,gBAAgB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC;AATW,QAAA,UAAU,cASrB;AAEK,MAAM,UAAU,GAAG,CACxB,UAA6B,EAC7B,UAA8B,EAAE,EACb,EAAE;IACrB,OAAO,IAAA,+BAAuB,EAAC;QAC7B,IAAA,eAAK,GAAE;QACP,IAAA,gBAAM,EAAC,MAAM,EAAE;YACb,IAAI,EAAE,UAAU;YAChB,GAAG,sBAAsB,CAAC,OAAO,CAAC;SACnC,CAAC;QACF,IAAA,wBAAM,EAAC,UAAU,CAAC;QAClB,kBAAkB,CAAC,OAAO,CAAC;QAC3B,gBAAgB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;KAC9D,CAAC,CAAC;AACL,CAAC,CAAC;AAdW,QAAA,UAAU,cAcrB;AAEK,MAAM,UAAU,GAAG,CACxB,UAAoC,EAAE,EACnB,EAAE,CACrB,IAAA,+BAAuB,EAAC;IACtB,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,SAAS,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAClD,kBAAkB,CAAC,OAAO,CAAC;IAC3B,gBAAgB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;CAC7C,CAAC,CAAC;AARQ,QAAA,UAAU,cAQlB;AAEE,MAAM,SAAS,GAAG,CACvB,UAA+B,EAAE,EACd,EAAE,CACrB,IAAA,+BAAuB,EAAC;IACtB,IAAA,2BAAO,GAAE;IACT,gBAAgB,CAAC,OAAO,CAAC;IACzB,mBAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,iBAAiB,CAAC;CACnD,CAAC,CAAC;AAPQ,QAAA,SAAS,aAOjB"}
1
+ {"version":3,"file":"property.js","sourceRoot":"","sources":["../../../src/decorators/property.ts"],"names":[],"mappings":"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"}
@@ -4,3 +4,4 @@ export declare const QueryEqual: () => import("typed-reflector").AllDecorators;
4
4
  export declare const QueryLike: () => import("typed-reflector").AllDecorators;
5
5
  export declare const QuerySearch: () => import("typed-reflector").AllDecorators;
6
6
  export declare const QueryEqualZeroNullable: () => import("typed-reflector").AllDecorators;
7
+ export declare const QueryMatchBoolean: () => import("typed-reflector").AllDecorators;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.QueryEqualZeroNullable = exports.QuerySearch = exports.QueryLike = exports.QueryEqual = exports.QueryCondition = void 0;
3
+ exports.QueryMatchBoolean = exports.QueryEqualZeroNullable = exports.QuerySearch = exports.QueryLike = exports.QueryEqual = exports.QueryCondition = void 0;
4
4
  const metadata_1 = require("../utility/metadata");
5
5
  const utility_1 = require("../utility");
6
6
  const QueryCondition = (cond) => metadata_1.Metadata.set('queryCondition', cond, 'queryConditionFields');
@@ -13,4 +13,6 @@ const QuerySearch = () => (0, exports.QueryCondition)(utility_1.applyQueryProper
13
13
  exports.QuerySearch = QuerySearch;
14
14
  const QueryEqualZeroNullable = () => (0, exports.QueryCondition)(utility_1.applyQueryPropertyZeroNullable);
15
15
  exports.QueryEqualZeroNullable = QueryEqualZeroNullable;
16
+ const QueryMatchBoolean = () => (0, exports.QueryCondition)(utility_1.applyQueryMatchBoolean);
17
+ exports.QueryMatchBoolean = QueryMatchBoolean;
16
18
  //# sourceMappingURL=query.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/decorators/query.ts"],"names":[],"mappings":";;;AACA,kDAA+C;AAC/C,wCAKoB;AAEb,MAAM,cAAc,GAAG,CAAC,IAAe,EAAE,EAAE,CAChD,mBAAQ,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC;AADlD,QAAA,cAAc,kBACoC;AACxD,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAc,EAAC,4BAAkB,CAAC,CAAC;AAAtD,QAAA,UAAU,cAA4C;AAC5D,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAc,EAAC,gCAAsB,CAAC,CAAC;AAAzD,QAAA,SAAS,aAAgD;AAC/D,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAc,EAAC,kCAAwB,CAAC,CAAC;AAA7D,QAAA,WAAW,eAAkD;AAEnE,MAAM,sBAAsB,GAAG,GAAG,EAAE,CACzC,IAAA,sBAAc,EAAC,wCAA8B,CAAC,CAAC;AADpC,QAAA,sBAAsB,0BACc"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/decorators/query.ts"],"names":[],"mappings":";;;AACA,kDAA+C;AAC/C,wCAMoB;AAEb,MAAM,cAAc,GAAG,CAAC,IAAe,EAAE,EAAE,CAChD,mBAAQ,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC;AADlD,QAAA,cAAc,kBACoC;AACxD,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAc,EAAC,4BAAkB,CAAC,CAAC;AAAtD,QAAA,UAAU,cAA4C;AAC5D,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAc,EAAC,gCAAsB,CAAC,CAAC;AAAzD,QAAA,SAAS,aAAgD;AAC/D,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAc,EAAC,kCAAwB,CAAC,CAAC;AAA7D,QAAA,WAAW,eAAkD;AAEnE,MAAM,sBAAsB,GAAG,GAAG,EAAE,CACzC,IAAA,sBAAc,EAAC,wCAA8B,CAAC,CAAC;AADpC,QAAA,sBAAsB,0BACc;AAE1C,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAc,EAAC,gCAAsB,CAAC,CAAC;AAAjE,QAAA,iBAAiB,qBAAgD"}
@@ -1,5 +1,10 @@
1
1
  import { SelectQueryBuilder } from 'typeorm';
2
- export declare function applyQueryProperty<T>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, ...fields: (keyof T & string)[]): void;
3
- export declare function applyQueryPropertyLike<T>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, ...fields: (keyof T & string)[]): void;
4
- export declare function applyQueryPropertySearch<T>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, ...fields: (keyof T & string)[]): void;
5
- export declare function applyQueryPropertyZeroNullable<T>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, ...fields: (keyof T & string)[]): void;
2
+ export declare function createQueryCondition(cond: <T>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, field: keyof T & string) => void | SelectQueryBuilder<any> | string | {
3
+ query: string;
4
+ params: Record<string, any>;
5
+ }): <T>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, ...fields: (keyof T & string)[]) => SelectQueryBuilder<T>;
6
+ export declare const applyQueryProperty: <T>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, ...fields: (keyof T & string)[]) => SelectQueryBuilder<T>;
7
+ export declare const applyQueryPropertyLike: <T>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, ...fields: (keyof T & string)[]) => SelectQueryBuilder<T>;
8
+ export declare const applyQueryPropertySearch: <T>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, ...fields: (keyof T & string)[]) => SelectQueryBuilder<T>;
9
+ export declare const applyQueryPropertyZeroNullable: <T>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, ...fields: (keyof T & string)[]) => SelectQueryBuilder<T>;
10
+ export declare const applyQueryMatchBoolean: <T>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, ...fields: (keyof T & string)[]) => SelectQueryBuilder<T>;
@@ -1,51 +1,49 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.applyQueryPropertyZeroNullable = exports.applyQueryPropertySearch = exports.applyQueryPropertyLike = exports.applyQueryProperty = void 0;
4
- function applyQueryProperty(obj, qb, entityName, ...fields) {
5
- for (const field of fields) {
6
- if (obj[field] == null) {
7
- continue;
3
+ exports.applyQueryMatchBoolean = exports.applyQueryPropertyZeroNullable = exports.applyQueryPropertySearch = exports.applyQueryPropertyLike = exports.applyQueryProperty = exports.createQueryCondition = void 0;
4
+ function createQueryCondition(cond) {
5
+ return (obj, qb, entityName, ...fields) => {
6
+ for (const field of fields) {
7
+ if (obj[field] == null) {
8
+ continue;
9
+ }
10
+ const ret = cond(obj, qb, entityName, field);
11
+ if (typeof ret === 'string') {
12
+ qb.andWhere(ret);
13
+ }
14
+ else if (typeof ret === 'object' && typeof ret['query'] === 'string') {
15
+ const _ret = ret;
16
+ qb.andWhere(_ret.query, _ret.params);
17
+ }
8
18
  }
9
- qb.andWhere(`${entityName}.${field} = :${field}`, { [field]: obj[field] });
10
- }
19
+ return qb;
20
+ };
11
21
  }
12
- exports.applyQueryProperty = applyQueryProperty;
13
- function applyQueryPropertyLike(obj, qb, entityName, ...fields) {
14
- for (const field of fields) {
15
- if (obj[field] == null) {
16
- continue;
17
- }
18
- qb.andWhere(`${entityName}.${field} like (:${field} || '%')`, {
19
- [field]: obj[field],
20
- });
22
+ exports.createQueryCondition = createQueryCondition;
23
+ exports.applyQueryProperty = createQueryCondition((obj, qb, entityName, field) => qb.andWhere(`${entityName}.${field} = :${field}`, { [field]: obj[field] }));
24
+ exports.applyQueryPropertyLike = createQueryCondition((obj, qb, entityName, field) => qb.andWhere(`${entityName}.${field} like (:${field} || '%')`, {
25
+ [field]: obj[field],
26
+ }));
27
+ exports.applyQueryPropertySearch = createQueryCondition((obj, qb, entityName, field) => qb.andWhere(`${entityName}.${field} like ('%' || :${field} || '%')`, {
28
+ [field]: obj[field],
29
+ }));
30
+ exports.applyQueryPropertyZeroNullable = createQueryCondition((obj, qb, entityName, field) => {
31
+ if ([0, '0'].indexOf(obj[field]) !== -1) {
32
+ qb.andWhere(`${entityName}.${field} IS NULL`);
21
33
  }
22
- }
23
- exports.applyQueryPropertyLike = applyQueryPropertyLike;
24
- function applyQueryPropertySearch(obj, qb, entityName, ...fields) {
25
- for (const field of fields) {
26
- if (obj[field] == null) {
27
- continue;
28
- }
29
- qb.andWhere(`${entityName}.${field} like ('%' || :${field} || '%')`, {
34
+ else {
35
+ qb.andWhere(`${entityName}.${field} = :${field}`, {
30
36
  [field]: obj[field],
31
37
  });
32
38
  }
33
- }
34
- exports.applyQueryPropertySearch = applyQueryPropertySearch;
35
- function applyQueryPropertyZeroNullable(obj, qb, entityName, ...fields) {
36
- for (const field of fields) {
37
- if (obj[field] === undefined) {
38
- // Nothing
39
- }
40
- else if ([0, '0'].indexOf(obj[field]) !== -1) {
41
- qb.andWhere(`${entityName}.${field} IS NULL`);
42
- }
43
- else {
44
- qb.andWhere(`${entityName}.${field} = :${field}`, {
45
- [field]: obj[field],
46
- });
47
- }
39
+ });
40
+ exports.applyQueryMatchBoolean = createQueryCondition((obj, qb, entityName, field) => {
41
+ const value = obj[field];
42
+ if (value === true || value === 'true' || value === 1 || value === '1') {
43
+ qb.andWhere(`${entityName}.${field} = TRUE`);
48
44
  }
49
- }
50
- exports.applyQueryPropertyZeroNullable = applyQueryPropertyZeroNullable;
45
+ if (value === false || value === 'false' || value === 0 || value === '0') {
46
+ qb.andWhere(`${entityName}.${field} = FALSE`);
47
+ }
48
+ });
51
49
  //# sourceMappingURL=query.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/utility/query.ts"],"names":[],"mappings":";;;AAEA,SAAgB,kBAAkB,CAChC,GAAM,EACN,EAAyB,EACzB,UAAkB,EAClB,GAAG,MAA4B;IAE/B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE;YACtB,SAAS;SACV;QACD,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,OAAO,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KAC5E;AACH,CAAC;AAZD,gDAYC;AACD,SAAgB,sBAAsB,CACpC,GAAM,EACN,EAAyB,EACzB,UAAkB,EAClB,GAAG,MAA4B;IAE/B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE;YACtB,SAAS;SACV;QACD,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,WAAW,KAAK,UAAU,EAAE;YAC5D,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC;SACpB,CAAC,CAAC;KACJ;AACH,CAAC;AAdD,wDAcC;AAED,SAAgB,wBAAwB,CACtC,GAAM,EACN,EAAyB,EACzB,UAAkB,EAClB,GAAG,MAA4B;IAE/B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE;YACtB,SAAS;SACV;QACD,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,kBAAkB,KAAK,UAAU,EAAE;YACnE,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC;SACpB,CAAC,CAAC;KACJ;AACH,CAAC;AAdD,4DAcC;AAED,SAAgB,8BAA8B,CAC5C,GAAM,EACN,EAAyB,EACzB,UAAkB,EAClB,GAAG,MAA4B;IAE/B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE;YAC5B,UAAU;SACX;aAAM,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;YACrD,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,UAAU,CAAC,CAAC;SAC/C;aAAM;YACL,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,OAAO,KAAK,EAAE,EAAE;gBAChD,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC;aACpB,CAAC,CAAC;SACJ;KACF;AACH,CAAC;AAjBD,wEAiBC"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/utility/query.ts"],"names":[],"mappings":";;;AAEA,SAAgB,oBAAoB,CAClC,IASkD;IAElD,OAAO,CACL,GAAM,EACN,EAAyB,EACzB,UAAkB,EAClB,GAAG,MAA4B,EAC/B,EAAE;QACF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE;gBACtB,SAAS;aACV;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;YAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC3B,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aAClB;iBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE;gBACtE,MAAM,IAAI,GAAG,GAAqD,CAAC;gBACnE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aACtC;SACF;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC;AAhCD,oDAgCC;AAEY,QAAA,kBAAkB,GAAG,oBAAoB,CACpD,CAAC,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,CAC7B,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,OAAO,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAC7E,CAAC;AAEW,QAAA,sBAAsB,GAAG,oBAAoB,CACxD,CAAC,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,CAC7B,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,WAAW,KAAK,UAAU,EAAE;IAC5D,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC;CACpB,CAAC,CACL,CAAC;AAEW,QAAA,wBAAwB,GAAG,oBAAoB,CAC1D,CAAC,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,CAC7B,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,kBAAkB,KAAK,UAAU,EAAE;IACnE,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC;CACpB,CAAC,CACL,CAAC;AAEW,QAAA,8BAA8B,GAAG,oBAAoB,CAChE,CAAC,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IAC7B,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;QAC9C,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,UAAU,CAAC,CAAC;KAC/C;SAAM;QACL,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,OAAO,KAAK,EAAE,EAAE;YAChD,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC;SACpB,CAAC,CAAC;KACJ;AACH,CAAC,CACF,CAAC;AAEW,QAAA,sBAAsB,GAAG,oBAAoB,CACxD,CAAC,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;IAC7B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAQ,CAAC;IAChC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,GAAG,EAAE;QACtE,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,SAAS,CAAC,CAAC;KAC9C;IACD,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,GAAG,EAAE;QACxE,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,UAAU,CAAC,CAAC;KAC/C;AACH,CAAC,CACF,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "nicot",
3
3
  "description": "Nest.js interacting with class-validator + OpenAPI + TypeORM for Nest.js Restful API development.",
4
- "version": "1.0.40",
4
+ "version": "1.0.42",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
7
7
  "scripts": {