nicot 1.0.25 → 1.0.27

package/README.md

@@ -22,46 +22,53 @@ Those decorators would all decorate the following, with the SAME settings.
 @Entity()
 export class User extends IdBase() {
   @Index()
+  @QueryLike() // queries as 'where name LIKE :name%'
   @StringColumn(5, {
     required: true,
     description: 'User name',
   })
   name: string;
 
+  @QueryEqual() // queries as 'where age = :age'
   @IntColumn('int', { unsigned: true, description: 'User age', default: 20 })
   age: number;
 
   @EnumColumn(Gender, { description: 'User gender' })
   gender: Gender;
-  
+
   @NotColumn()
   somethingElse: any; // Would not come from client input, and would not go into OpenAPI document.
-  
+
   // possible optional override operations
-  
+
   override isValidInCreate() { // Custom before-create check.
     if (!this.name.length) {
       return 'Name cannot be empty!';
     }
   }
-  
+
   override isValidInUpdate() { // Custom before-update check.
     if (this.name && !this.name.length) {
       return 'Name cannot be empty!';
     }
   }
-  
+
   override async beforeCreate() {
     this.name = this.name.toLowerCase(); // Do something before create.
   }
-  
+
   override async afterCreate() {
     this.name = this.name.toUpperCase(); // Do something after create before sending to user.
   }
-  
-  override async beforeGet() {}
-  override async afterGet() {}
-  override async beforeUpdate() {}
+
+  override async beforeGet() {
+  }
+
+  override async afterGet() {
+  }
+
+  override async beforeUpdate() {
+  }
 }
 ```
 

package/dist/src/bases/page-settings.d.ts

@@ -9,6 +9,7 @@ export interface PageSettingsFactory {
 export interface QueryWise<T> {
     applyQuery(qb: SelectQueryBuilder<T>, entityName: string): void;
 }
+export declare type QueryCond = <T extends PageSettingsDto>(obj: T, qb: SelectQueryBuilder<T>, entityName: string, key: keyof T & string) => any;
 export declare class PageSettingsDto implements PageSettingsWise, PageSettingsFactory, QueryWise<PageSettingsDto> {
     pageCount: number;
     recordsPerPage: number;

package/dist/src/bases/page-settings.js

@@ -13,6 +13,7 @@ exports.PageSettingsDto = void 0;
 const decorators_1 = require("../decorators");
 const class_validator_1 = require("class-validator");
 const swagger_1 = require("@nestjs/swagger");
+const metadata_1 = require("../utility/metadata");
 class PageSettingsDto {
     getActualPageSettings() {
         return {
@@ -30,6 +31,13 @@ class PageSettingsDto {
         return (this.getPageCount() - 1) * this.getRecordsPerPage();
     }
     applyQuery(qb, entityName) {
+        const queryFields = metadata_1.reflector.getArray('queryConditionFields', this);
+        for (const field of queryFields) {
+            const condition = metadata_1.reflector.get('queryCondition', this, field);
+            if (condition) {
+                condition(this, qb, entityName, field);
+            }
+        }
         qb.take(this.getRecordsPerPage()).skip(this.getStartingFrom());
     }
 }

package/dist/src/bases/page-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"page-settings.js","sourceRoot":"","sources":["../../../src/bases/page-settings.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA4C;AAE5C,qDAAoD;AACpD,6CAA8C;AAe9C,MAAa,eAAe;IAyB1B,qBAAqB;QACnB,OAAO;YACL,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;YAC9B,cAAc,EAAE,IAAI,CAAC,iBAAiB,EAAE;SACzC,CAAC;IACJ,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC;IACnC,CAAC;IAED,eAAe;QACb,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC9D,CAAC;IAED,UAAU,CAAC,EAAuC,EAAE,UAAkB;QACpE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IACjE,CAAC;CACF;AAnCC;IATC,IAAA,wBAAW,GAAE;IACb,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,EAAC;QACX,WAAW,EAAE,gCAAgC;QAC7C,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,CAAC;KACX,CAAC;;kDACgB;AAWlB;IATC,IAAA,wBAAW,GAAE;IACb,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,EAAC;QACX,WAAW,EAAE,mBAAmB;QAChC,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,CAAC;KACX,CAAC;;uDACqB;AAvBzB,0CA+CC"}
+{"version":3,"file":"page-settings.js","sourceRoot":"","sources":["../../../src/bases/page-settings.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA4C;AAE5C,qDAAoD;AACpD,6CAA8C;AAC9C,kDAAgD;AAsBhD,MAAa,eAAe;IAyB1B,qBAAqB;QACnB,OAAO;YACL,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;YAC9B,cAAc,EAAE,IAAI,CAAC,iBAAiB,EAAE;SACzC,CAAC;IACJ,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC;IACnC,CAAC;IAED,eAAe;QACb,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC9D,CAAC;IAED,UAAU,CAAC,EAAuC,EAAE,UAAkB;QACpE,MAAM,WAAW,GAAG,oBAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;QACrE,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE;YAC/B,MAAM,SAAS,GAAG,oBAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAC/D,IAAI,SAAS,EAAE;gBACb,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,KAA8B,CAAC,CAAC;aACjE;SACF;QACD,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IACjE,CAAC;CACF;AA1CC;IATC,IAAA,wBAAW,GAAE;IACb,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,EAAC;QACX,WAAW,EAAE,gCAAgC;QAC7C,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,CAAC;KACX,CAAC;;kDACgB;AAWlB;IATC,IAAA,wBAAW,GAAE;IACb,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,EAAC;QACX,WAAW,EAAE,mBAAmB;QAChC,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,CAAC;KACX,CAAC;;uDACqB;AAvBzB,0CAsDC"}

package/dist/src/bases/time-base.js.map

@@ -1 +1 @@
-{"version":3,"file":"time-base.js","sourceRoot":"","sources":["../../../src/bases/time-base.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA+E;AAC/E,8CAA0C;AAC1C,mDAAkD;AAgBlD,MAAa,QACX,SAAQ,+BAAe;IAevB,eAAe;QACb,OAAO;IACT,CAAC;IAED,gEAAgE;IAChE,KAAK,CAAC,YAAY,KAAmB,CAAC;IAEtC,gEAAgE;IAChE,KAAK,CAAC,WAAW,KAAmB,CAAC;IAErC,gEAAgE;IAChE,KAAK,CAAC,SAAS,KAAmB,CAAC;IAEnC,gEAAgE;IAChE,KAAK,CAAC,QAAQ,KAAmB,CAAC;IAElC,eAAe;QACb,OAAO;IACT,CAAC;IAED,gEAAgE;IAChE,KAAK,CAAC,YAAY,KAAmB,CAAC;CACvC;AAhCC;IAFC,IAAA,0BAAgB,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACnC,IAAA,sBAAS,GAAE;8BACA,IAAI;4CAAC;AAIjB;IAFC,IAAA,0BAAgB,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACnC,IAAA,sBAAS,GAAE;8BACA,IAAI;4CAAC;AAIjB;IAFC,IAAA,0BAAgB,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACnC,IAAA,sBAAS,GAAE;8BACA,IAAI;4CAAC;AAdnB,4BAsCC"}
+{"version":3,"file":"time-base.js","sourceRoot":"","sources":["../../../src/bases/time-base.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAKiB;AACjB,8CAA0C;AAC1C,mDAAkD;AAgBlD,MAAa,QACX,SAAQ,+BAAe;IAevB,eAAe;QACb,OAAO;IACT,CAAC;IAED,gEAAgE;IAChE,KAAK,CAAC,YAAY,KAAmB,CAAC;IAEtC,gEAAgE;IAChE,KAAK,CAAC,WAAW,KAAmB,CAAC;IAErC,gEAAgE;IAChE,KAAK,CAAC,SAAS,KAAmB,CAAC;IAEnC,gEAAgE;IAChE,KAAK,CAAC,QAAQ,KAAmB,CAAC;IAElC,eAAe;QACb,OAAO;IACT,CAAC;IAED,gEAAgE;IAChE,KAAK,CAAC,YAAY,KAAmB,CAAC;CACvC;AAhCC;IAFC,IAAA,0BAAgB,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACnC,IAAA,sBAAS,GAAE;8BACA,IAAI;4CAAC;AAIjB;IAFC,IAAA,0BAAgB,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACnC,IAAA,sBAAS,GAAE;8BACA,IAAI;4CAAC;AAIjB;IAFC,IAAA,0BAAgB,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACnC,IAAA,sBAAS,GAAE;8BACA,IAAI;4CAAC;AAdnB,4BAsCC"}

package/dist/src/decorators/index.d.ts

@@ -3,3 +3,4 @@ export * from './merge';
 export * from './property';
 export * from './restful';
 export * from './pipes';
+export * from './query';

package/dist/src/decorators/index.js

@@ -19,4 +19,5 @@ __exportStar(require("./merge"), exports);
 __exportStar(require("./property"), exports);
 __exportStar(require("./restful"), exports);
 __exportStar(require("./pipes"), exports);
+__exportStar(require("./query"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/decorators/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decorators/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,0CAAwB;AACxB,6CAA2B;AAC3B,4CAA0B;AAC1B,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decorators/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,0CAAwB;AACxB,6CAA2B;AAC3B,4CAA0B;AAC1B,0CAAwB;AACxB,0CAAwB"}

package/dist/src/decorators/query.d.ts

@@ -0,0 +1,5 @@
+import { QueryCond } from '../bases';
+export declare const QueryCondition: (cond: QueryCond) => import("typed-reflector").AllDecorators;
+export declare const QueryEqual: () => import("typed-reflector").AllDecorators;
+export declare const QueryLike: () => import("typed-reflector").AllDecorators;
+export declare const QuerySearch: () => import("typed-reflector").AllDecorators;

package/dist/src/decorators/query.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QuerySearch = exports.QueryLike = exports.QueryEqual = exports.QueryCondition = void 0;
+const metadata_1 = require("../utility/metadata");
+const utility_1 = require("../utility");
+const QueryCondition = (cond) => metadata_1.Metadata.set('queryCondition', cond, 'queryConditionFields');
+exports.QueryCondition = QueryCondition;
+const QueryEqual = () => (0, exports.QueryCondition)(utility_1.applyQueryProperty);
+exports.QueryEqual = QueryEqual;
+const QueryLike = () => (0, exports.QueryCondition)(utility_1.applyQueryPropertyLike);
+exports.QueryLike = QueryLike;
+const QuerySearch = () => (0, exports.QueryCondition)(utility_1.applyQueryPropertySearch);
+exports.QuerySearch = QuerySearch;
+//# sourceMappingURL=query.js.map

package/dist/src/decorators/query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/decorators/query.ts"],"names":[],"mappings":";;;AACA,kDAA+C;AAC/C,wCAIoB;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"}

package/dist/src/dto/import-entry.js

@@ -38,7 +38,7 @@ function ImportDataDto(type) {
     const dtoClass = (0, insert_field_1.InsertField)(ImportDataBaseDto, {
         data: { type: [type], options: { description: 'Import data' } },
     }, `${(0, insert_field_1.getClassFromClassOrArray)(type).name}ImportData`);
-    (0, class_transformer_1.Type)(() => dtoClass)(dtoClass.prototype, 'data');
+    (0, class_transformer_1.Type)(() => type)(dtoClass.prototype, 'data');
     return dtoClass;
 }
 exports.ImportDataDto = ImportDataDto;

package/dist/src/dto/import-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-entry.js","sourceRoot":"","sources":["../../../src/dto/import-entry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,yDAAyC;AACzC,qDAAiD;AACjD,0DAKiC;AAEjC,MAAa,kBAAkB;CAG9B;AADC;IADC,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;kDAC7C;AAFjB,gDAGC;AAOD,SAAgB,cAAc,CAAyB,IAAO;IAC5D,OAAO,IAAA,0BAAW,EAChB,kBAAkB,EAClB;QACE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE;KAC1D,EACD,GAAG,IAAA,uCAAwB,EAAC,IAAI,CAAC,CAAC,IAAI,aAAa,CACpD,CAAC;AACJ,CAAC;AARD,wCAQC;AAED,MAAa,iBAAiB;CAG7B;AADC;IADC,IAAA,gCAAc,GAAE;;+CACP;AAFZ,8CAGC;AAED,SAAgB,aAAa,CAAqB,IAAO;IACvD,MAAM,QAAQ,GAAG,IAAA,0BAAW,EAC1B,iBAAiB,EACjB;QACE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE;KAChE,EACD,GAAG,IAAA,uCAAwB,EAAC,IAAI,CAAC,CAAC,IAAI,YAAY,CACnD,CAAC;IACF,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACjD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAVD,sCAUC"}
+{"version":3,"file":"import-entry.js","sourceRoot":"","sources":["../../../src/dto/import-entry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,yDAAyC;AACzC,qDAAiD;AACjD,0DAKiC;AAEjC,MAAa,kBAAkB;CAG9B;AADC;IADC,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;kDAC7C;AAFjB,gDAGC;AAOD,SAAgB,cAAc,CAAyB,IAAO;IAC5D,OAAO,IAAA,0BAAW,EAChB,kBAAkB,EAClB;QACE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE;KAC1D,EACD,GAAG,IAAA,uCAAwB,EAAC,IAAI,CAAC,CAAC,IAAI,aAAa,CACpD,CAAC;AACJ,CAAC;AARD,wCAQC;AAED,MAAa,iBAAiB;CAG7B;AADC;IADC,IAAA,gCAAc,GAAE;;+CACP;AAFZ,8CAGC;AAED,SAAgB,aAAa,CAAqB,IAAO;IACvD,MAAM,QAAQ,GAAG,IAAA,0BAAW,EAC1B,iBAAiB,EACjB;QACE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE;KAChE,EACD,GAAG,IAAA,uCAAwB,EAAC,IAAI,CAAC,CAAC,IAAI,YAAY,CACnD,CAAC;IACF,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC7C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAVD,sCAUC"}

package/dist/src/utility/metadata.d.ts

@@ -1,13 +1,17 @@
 import { MetadataSetter, Reflector } from 'typed-reflector';
-export interface SpecificFields {
+import { QueryCond } from '../bases';
+interface SpecificFields {
     notColumn: boolean;
     notWritable: boolean;
     notChangeable: boolean;
 }
-declare type MetadataArrayMap = {
-    [K in keyof SpecificFields as `${K}Fields`]: string;
+interface MetadataMap extends SpecificFields {
+    queryCondition: QueryCond;
+}
+declare type FieldsMap = {
+    [K in keyof MetadataMap as `${K}Fields`]: string;
 };
-export declare const Metadata: MetadataSetter<SpecificFields, MetadataArrayMap>;
-export declare const reflector: Reflector<SpecificFields, MetadataArrayMap>;
+export declare const Metadata: MetadataSetter<MetadataMap, FieldsMap>;
+export declare const reflector: Reflector<MetadataMap, FieldsMap>;
 export declare function getSpecificFields(obj: any, type: keyof SpecificFields): string[];
 export {};

package/dist/src/utility/metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/utility/metadata.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAS/C,QAAA,QAAQ,GAAG,IAAI,gCAAc,EAAoC,CAAC;AAClE,QAAA,SAAS,GAAG,IAAI,2BAAS,EAAoC,CAAC;AAE3E,SAAgB,iBAAiB,CAAC,GAAQ,EAAE,IAA0B;IACpE,OAAO,iBAAS;SACb,QAAQ,CAAC,GAAG,IAAI,QAAQ,EAAE,GAAG,CAAC;SAC9B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAS,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AACxD,CAAC;AAJD,8CAIC"}
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/utility/metadata.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAmB/C,QAAA,QAAQ,GAAG,IAAI,gCAAc,EAAiC,CAAC;AAC/D,QAAA,SAAS,GAAG,IAAI,2BAAS,EAAiC,CAAC;AAExE,SAAgB,iBAAiB,CAAC,GAAQ,EAAE,IAA0B;IACpE,OAAO,iBAAS;SACb,QAAQ,CAAC,GAAG,IAAI,QAAQ,EAAE,GAAG,CAAC;SAC9B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAS,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AACxD,CAAC;AAJD,8CAIC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nicot",
   "description": "Nest.js interacting with class-validator + OpenAPI + TypeORM for Nest.js Restful API development.",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {