@steroidsjs/nest 1.4.30 → 1.4.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/nest",
-  "version": "1.4.30",
+  "version": "1.4.31",
   "scripts": {
     "build": "tsc && copyfiles ./{package.json,LICENSE,README.md} dist/",
     "watch": "tsc -p tsconfig-debug.json",

package/src/infrastructure/decorators/fields/DateField.d.ts

@@ -1,3 +1,9 @@
+import { ValidationArguments } from 'class-validator';
 import { IBaseFieldOptions } from './BaseField';
 export declare const normalizeDate: (value: any) => any;
-export declare function DateField(options?: IBaseFieldOptions): <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
+export declare const normalizeFunctionDate: (value: any, args?: ValidationArguments) => any;
+export interface IDateFieldOptions extends IBaseFieldOptions {
+    minDate?: string | Date | Function;
+    maxDate?: string | Date | Function;
+}
+export declare function DateField(options?: IDateFieldOptions): <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;

package/src/infrastructure/decorators/fields/DateField.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DateField = exports.normalizeDate = void 0;
+exports.DateField = exports.normalizeFunctionDate = exports.normalizeDate = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("typeorm");
 const class_validator_1 = require("class-validator");
 const date_fns_1 = require("date-fns");
 const BaseField_1 = require("./BaseField");
 const Transform_1 = require("../Transform");
-const normalizeDate = value => {
+const MinDate_1 = require("../validators/MinDate");
+const MaxDate_1 = require("../validators/MaxDate");
+const normalizeDate = (value) => {
     if (!value) {
         return value;
     }
@@ -17,6 +19,13 @@ const normalizeDate = value => {
     return (0, date_fns_1.formatISO9075)(value, { representation: 'date' });
 };
 exports.normalizeDate = normalizeDate;
+const normalizeFunctionDate = (value, args) => {
+    if (typeof value === 'function') {
+        value = value(args);
+    }
+    return (0, exports.normalizeDate)(value);
+};
+exports.normalizeFunctionDate = normalizeFunctionDate;
 function DateField(options = {}) {
     return (0, common_1.applyDecorators)(...[
         (0, BaseField_1.BaseField)(options, {
@@ -32,6 +41,14 @@ function DateField(options = {}) {
         (0, Transform_1.Transform)(({ value }) => (0, exports.normalizeDate)(value), Transform_1.TRANSFORM_TYPE_FROM_DB),
         (0, Transform_1.Transform)(({ value }) => (0, exports.normalizeDate)(value), Transform_1.TRANSFORM_TYPE_TO_DB),
         options.nullable && (0, class_validator_1.ValidateIf)((object, value) => value),
+        options.minDate && (0, MinDate_1.MinDate)(options.minDate, {
+            each: options.isArray,
+            message: (args) => `Выбрана дата раньше минимально допустимой (${typeof options.minDate === 'function' ? (0, exports.normalizeFunctionDate)(options.minDate, args) : (0, exports.normalizeDate)(options.minDate)})`,
+        }),
+        options.maxDate && (0, MaxDate_1.MaxDate)(options.maxDate, {
+            each: options.isArray,
+            message: (args) => `Выбрана дата позже максимально допустимой (${typeof options.maxDate === 'function' ? (0, exports.normalizeFunctionDate)(options.maxDate, args) : (0, exports.normalizeDate)(options.maxDate)})`,
+        }),
         (0, class_validator_1.IsISO8601)({
             message: 'Некорректный формат даты',
         }),

package/src/infrastructure/decorators/fields/DateField.js.map

@@ -1 +1 @@
-{"version":3,"file":"DateField.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/DateField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,qCAA+B;AAC/B,qDAAsD;AACtD,uCAAiD;AACjD,2CAAyD;AACzD,4CAAqF;AAE9E,MAAM,aAAa,GAAG,KAAK,CAAC,EAAE;IACjC,IAAI,CAAC,KAAK,EAAE;QACR,OAAO,KAAK,CAAC;KAChB;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC3B,KAAK,GAAG,IAAA,mBAAQ,EAAC,KAAK,CAAC,CAAC;KAC3B;IAED,OAAO,IAAA,wBAAa,EAAC,KAAK,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC;AAC5D,CAAC,CAAC;AATW,QAAA,aAAa,iBASxB;AAEF,SAAgB,SAAS,CAAC,UAA6B,EAAE;IACrD,OAAO,IAAA,wBAAe,EAClB,GAAG;QACC,IAAA,qBAAS,EAAC,OAAO,EAAE;YACf,aAAa,EAAE,WAAW;YAC1B,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,QAAQ;SACnB,CAAC;QACF,IAAA,gBAAM,EAAC;YACH,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,OAAO,CAAC,YAAY;YAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC;QACF,IAAA,qBAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,KAAK,CAAC,EAAE,kCAAsB,CAAC;QACpE,IAAA,qBAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,KAAK,CAAC,EAAE,gCAAoB,CAAC;QAClE,OAAO,CAAC,QAAQ,IAAI,IAAA,4BAAU,EAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;QACxD,IAAA,2BAAS,EAAC;YACN,OAAO,EAAE,0BAA0B;SACtC,CAAC;KACL,CAAC,MAAM,CAAC,OAAO,CAAC,CACpB,CAAC;AACN,CAAC;AArBD,8BAqBC"}
+{"version":3,"file":"DateField.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/DateField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,qCAA+B;AAC/B,qDAA2E;AAC3E,uCAAiD;AACjD,2CAAyD;AACzD,4CAAqF;AACrF,mDAA8C;AAC9C,mDAA8C;AAEvC,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,EAAE;IACnC,IAAI,CAAC,KAAK,EAAE;QACR,OAAO,KAAK,CAAC;KAChB;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC3B,KAAK,GAAG,IAAA,mBAAQ,EAAC,KAAK,CAAC,CAAC;KAC3B;IAED,OAAO,IAAA,wBAAa,EAAC,KAAK,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC;AAC5D,CAAC,CAAC;AATW,QAAA,aAAa,iBASxB;AAEK,MAAM,qBAAqB,GAAG,CAAC,KAAK,EAAE,IAA0B,EAAE,EAAE;IACvE,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;QAC7B,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;KACvB;IAED,OAAO,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;AAChC,CAAC,CAAC;AANW,QAAA,qBAAqB,yBAMhC;AAOF,SAAgB,SAAS,CAAC,UAA6B,EAAE;IACrD,OAAO,IAAA,wBAAe,EAClB,GAAG;QACC,IAAA,qBAAS,EAAC,OAAO,EAAE;YACf,aAAa,EAAE,WAAW;YAC1B,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,QAAQ;SACnB,CAAC;QACF,IAAA,gBAAM,EAAC;YACH,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,OAAO,CAAC,YAAY;YAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC;QACF,IAAA,qBAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,KAAK,CAAC,EAAE,kCAAsB,CAAC;QACpE,IAAA,qBAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,KAAK,CAAC,EAAE,gCAAoB,CAAC;QAClE,OAAO,CAAC,QAAQ,IAAI,IAAA,4BAAU,EAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;QACxD,OAAO,CAAC,OAAO,IAAI,IAAA,iBAAO,EAAC,OAAO,CAAC,OAAO,EAAE;YACxC,IAAI,EAAE,OAAO,CAAC,OAAO;YACrB,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,8CACf,OAAO,OAAO,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,IAAA,6BAAqB,EAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,qBAAa,EAAC,OAAO,CAAC,OAAO,CACxH,GAAG;SACN,CAAC;QACF,OAAO,CAAC,OAAO,IAAI,IAAA,iBAAO,EAAC,OAAO,CAAC,OAAO,EAAE;YACxC,IAAI,EAAE,OAAO,CAAC,OAAO;YACrB,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,8CACf,OAAO,OAAO,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,IAAA,6BAAqB,EAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,qBAAa,EAAC,OAAO,CAAC,OAAO,CACxH,GAAG;SACN,CAAC;QACF,IAAA,2BAAS,EAAC;YACN,OAAO,EAAE,0BAA0B;SACtC,CAAC;KACL,CAAC,MAAM,CAAC,OAAO,CAAC,CACpB,CAAC;AACN,CAAC;AAjCD,8BAiCC"}

package/src/infrastructure/decorators/fields/index.d.ts

@@ -11,6 +11,7 @@ import { IEmailFieldOptions } from './EmailField';
 import { IPhoneFieldOptions } from './PhoneField';
 import { IStringFieldOptions } from './StringField';
 import { IIntegerFieldOptions } from './IntegerField';
+import { IDateFieldOptions } from './DateField';
 export { BooleanField } from './BooleanField';
 export { CoordinateField } from './CoordinateField';
 export { CreateTimeField } from './CreateTimeField';
@@ -33,4 +34,4 @@ export { UpdateTimeField } from './UpdateTimeField';
 export { RelationField } from './RelationField';
 export { RelationIdField } from './RelationIdField';
 export { ImageField } from './ImageField';
-export declare type IAllFieldOptions = ICreateTimeFieldOptions & IDateTimeFieldColumnOptions & IDecimalFieldOptions & IEnumFieldOptions & IExtendFieldOptions & IFileField & IRelationFieldOptions & IRelationIdFieldOptions & IUpdateTimeFieldOptions & IEmailFieldOptions & IPhoneFieldOptions & IStringFieldOptions & IIntegerFieldOptions;
+export declare type IAllFieldOptions = ICreateTimeFieldOptions & IDateTimeFieldColumnOptions & IDecimalFieldOptions & IEnumFieldOptions & IExtendFieldOptions & IFileField & IRelationFieldOptions & IRelationIdFieldOptions & IUpdateTimeFieldOptions & IEmailFieldOptions & IPhoneFieldOptions & IStringFieldOptions & IIntegerFieldOptions & IDateFieldOptions;

package/src/infrastructure/decorators/fields/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/index.ts"],"names":[],"mappings":";;;AAcA,+CAA4C;AAApC,4GAAA,YAAY,OAAA;AACpB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,+CAA4C;AAApC,4GAAA,YAAY,OAAA;AACpB,2CAAwC;AAAhC,wGAAA,UAAU,OAAA;AAClB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,+CAA4C;AAApC,4GAAA,YAAY,OAAA;AACpB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,2CAAwC;AAAhC,wGAAA,UAAU,OAAA;AAClB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,6CAA0C;AAAlC,0GAAA,WAAW,OAAA;AACnB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,uCAAoC;AAA5B,oGAAA,QAAQ,OAAA;AAChB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,2CAAwC;AAAhC,wGAAA,UAAU,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/fields/index.ts"],"names":[],"mappings":";;;AAeA,+CAA4C;AAApC,4GAAA,YAAY,OAAA;AACpB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,+CAA4C;AAApC,4GAAA,YAAY,OAAA;AACpB,2CAAwC;AAAhC,wGAAA,UAAU,OAAA;AAClB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,+CAA4C;AAApC,4GAAA,YAAY,OAAA;AACpB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,2CAAwC;AAAhC,wGAAA,UAAU,OAAA;AAClB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,6CAA0C;AAAlC,0GAAA,WAAW,OAAA;AACnB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,uCAAoC;AAA5B,oGAAA,QAAQ,OAAA;AAChB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,2CAAwC;AAAhC,wGAAA,UAAU,OAAA"}

package/src/infrastructure/decorators/validators/MaxDate.d.ts

@@ -0,0 +1,2 @@
+import { ValidationOptions } from 'class-validator';
+export declare function MaxDate(maxDate: string | Date | Function, validationOptions?: ValidationOptions): (object: Object, propertyName: string) => void;

package/src/infrastructure/decorators/validators/MaxDate.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MaxDate = void 0;
+const class_validator_1 = require("class-validator");
+const DateField_1 = require("../fields/DateField");
+function MaxDate(maxDate, validationOptions) {
+    return function (object, propertyName) {
+        (0, class_validator_1.registerDecorator)({
+            name: 'minDate',
+            target: object.constructor,
+            propertyName,
+            constraints: [maxDate],
+            options: validationOptions,
+            validator: {
+                validate: function (value, args) {
+                    return new Date((0, DateField_1.normalizeDate)(value)) <= new Date((0, DateField_1.normalizeFunctionDate)(args.constraints[0], args));
+                },
+            },
+        });
+    };
+}
+exports.MaxDate = MaxDate;
+//# sourceMappingURL=MaxDate.js.map

package/src/infrastructure/decorators/validators/MaxDate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MaxDate.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/validators/MaxDate.ts"],"names":[],"mappings":";;;AAAA,qDAA0F;AAC1F,mDAAyE;AAEzE,SAAgB,OAAO,CAAC,OAAiC,EAAE,iBAAqC;IAC5F,OAAO,UAAU,MAAc,EAAE,YAAoB;QACjD,IAAA,mCAAiB,EAAC;YACd,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,WAAW,EAAE,CAAC,OAAO,CAAC;YACtB,OAAO,EAAE,iBAAiB;YAC1B,SAAS,EAAE;gBACP,QAAQ,EAAE,UAAU,KAAU,EAAE,IAAyB;oBACrD,OAAO,IAAI,IAAI,CAAC,IAAA,yBAAa,EAAC,KAAK,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAA,iCAAqB,EAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBACxG,CAAC;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC;AAfD,0BAeC"}

package/src/infrastructure/decorators/validators/MinDate.d.ts

@@ -0,0 +1,2 @@
+import { ValidationOptions } from 'class-validator';
+export declare function MinDate(minDate: string | Date | Function, validationOptions?: ValidationOptions): (object: Object, propertyName: string) => void;

package/src/infrastructure/decorators/validators/MinDate.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MinDate = void 0;
+const class_validator_1 = require("class-validator");
+const DateField_1 = require("../fields/DateField");
+function MinDate(minDate, validationOptions) {
+    return function (object, propertyName) {
+        (0, class_validator_1.registerDecorator)({
+            name: 'minDate',
+            target: object.constructor,
+            propertyName,
+            constraints: [minDate],
+            options: validationOptions,
+            validator: {
+                validate: function (value, args) {
+                    return new Date((0, DateField_1.normalizeDate)(value)) >= new Date((0, DateField_1.normalizeFunctionDate)(args.constraints[0], args));
+                },
+            },
+        });
+    };
+}
+exports.MinDate = MinDate;
+//# sourceMappingURL=MinDate.js.map

package/src/infrastructure/decorators/validators/MinDate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MinDate.js","sourceRoot":"","sources":["../../../../../src/infrastructure/decorators/validators/MinDate.ts"],"names":[],"mappings":";;;AAAA,qDAA0F;AAC1F,mDAAyE;AAEzE,SAAgB,OAAO,CAAC,OAAiC,EAAE,iBAAqC;IAC5F,OAAO,UAAU,MAAc,EAAE,YAAoB;QACjD,IAAA,mCAAiB,EAAC;YACd,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,WAAW,EAAE,CAAC,OAAO,CAAC;YACtB,OAAO,EAAE,iBAAiB;YAC1B,SAAS,EAAE;gBACP,QAAQ,EAAE,UAAU,KAAU,EAAE,IAAyB;oBACrD,OAAO,IAAI,IAAI,CAAC,IAAA,yBAAa,EAAC,KAAK,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAA,iCAAqB,EAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBACxG,CAAC;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC;AAfD,0BAeC"}