@steroidsjs/nest 2.1.1 → 2.2.0

package/infrastructure/applications/rest/config.d.ts

@@ -1,13 +1,13 @@
 import { IRestAppModuleConfig } from './IRestAppModuleConfig';
-import { ValidationExceptionFilterCustom } from './filters/ValidationExceptionFilterCustom';
 import { RequestExecutionExceptionFilter } from './filters/RequestExecutionExceptionFilter';
 import { GracefulController } from "./graceful/GracefulController";
 import { GracefulService } from "./graceful/GracefulService";
+import { ValidationExceptionFilter } from '../../filters/ValidationExceptionFilter';
 declare const _default: {
     module: (config: IRestAppModuleConfig) => {
         providers: (typeof GracefulService | {
             provide: string;
-            useClass: typeof ValidationExceptionFilterCustom;
+            useClass: typeof ValidationExceptionFilter;
         } | {
             provide: string;
             useClass: typeof RequestExecutionExceptionFilter;

package/infrastructure/applications/rest/config.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@nestjs/core");
 const config_1 = require("../base/config");
-const ValidationExceptionFilterCustom_1 = require("./filters/ValidationExceptionFilterCustom");
 const RequestExecutionExceptionFilter_1 = require("./filters/RequestExecutionExceptionFilter");
 const GracefulController_1 = require("./graceful/GracefulController");
 const GracefulService_1 = require("./graceful/GracefulService");
+const ValidationExceptionFilter_1 = require("../../filters/ValidationExceptionFilter");
 exports.default = Object.assign(Object.assign({}, config_1.default), { module: (config) => (Object.assign(Object.assign({}, config_1.default.module(config)), { providers: [
             {
                 provide: core_1.APP_FILTER,
-                useClass: ValidationExceptionFilterCustom_1.ValidationExceptionFilterCustom,
+                useClass: ValidationExceptionFilter_1.ValidationExceptionFilter,
             },
             {
                 provide: core_1.APP_FILTER,

package/infrastructure/applications/rest/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/infrastructure/applications/rest/config.ts"],"names":[],"mappings":";;AAAA,uCAAwC;AACxC,2CAAwC;AAExC,+FAA0F;AAC1F,+FAA0F;AAC1F,sEAAiE;AACjE,gEAA2D;AAE3D,kDACO,gBAAU,KACb,MAAM,EAAE,CAAC,MAA4B,EAAE,EAAE,CAAC,iCACnC,gBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,KAC5B,SAAS,EAAE;YACP;gBACI,OAAO,EAAE,iBAAU;gBACnB,QAAQ,EAAE,iEAA+B;aAC5C;YACD;gBACI,OAAO,EAAE,iBAAU;gBACnB,QAAQ,EAAE,iEAA+B;aAC5C;YACD,MAAM,CAAC,eAAe,IAAI,iCAAe;SAC5C,CAAC,MAAM,CAAC,OAAO,CAAC,EACjB,WAAW,EAAE;YACT,MAAM,CAAC,eAAe,IAAI,uCAAkB;SAC/C,CAAC,MAAM,CAAC,OAAO,CAAC,IACnB,IACJ"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/infrastructure/applications/rest/config.ts"],"names":[],"mappings":";;AAAA,uCAAwC;AACxC,2CAAwC;AAExC,+FAA0F;AAC1F,sEAAiE;AACjE,gEAA2D;AAC3D,uFAAkF;AAElF,kDACO,gBAAU,KACb,MAAM,EAAE,CAAC,MAA4B,EAAE,EAAE,CAAC,iCACnC,gBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,KAC5B,SAAS,EAAE;YACP;gBACI,OAAO,EAAE,iBAAU;gBACnB,QAAQ,EAAE,qDAAyB;aACtC;YACD;gBACI,OAAO,EAAE,iBAAU;gBACnB,QAAQ,EAAE,iEAA+B;aAC5C;YACD,MAAM,CAAC,eAAe,IAAI,iCAAe;SAC5C,CAAC,MAAM,CAAC,OAAO,CAAC,EACjB,WAAW,EAAE;YACT,MAAM,CAAC,eAAe,IAAI,uCAAkB;SAC/C,CAAC,MAAM,CAAC,OAAO,CAAC,IACnB,IACJ"}

package/infrastructure/decorators/fields/TextField.js

@@ -7,25 +7,32 @@ const lodash_1 = require("lodash");
 const class_validator_1 = require("class-validator");
 const BaseField_1 = require("./BaseField");
 function TextField(options = {}) {
-    return (0, common_1.applyDecorators)((0, BaseField_1.BaseField)(options, {
-        decoratorName: 'TextField',
-        appType: 'text',
-        jsType: 'string',
-    }), (0, typeorm_1.Column)({
-        type: 'text',
-        length: options.max,
-        default: options.defaultValue,
-        nullable: options.nullable,
-    }), (0, class_validator_1.IsString)({
-        each: options.isArray,
-        message: options.isStringConstraintMessage || 'Должна быть строка',
-    }), !options.required && (0, class_validator_1.IsOptional)(), typeof options.min === 'number' && (0, class_validator_1.MinLength)(options.min, {
-        message: `Длина строка должна быть не менее ${options.min}` || options.minConstraintMessage,
-        each: options.isArray,
-    }), typeof options.max === 'number' && (0, class_validator_1.MaxLength)((0, lodash_1.toInteger)(options.max), {
-        message: `Длина строка должна быть не более ${options.max}` || options.maxConstraintMessage,
-        each: options.isArray,
-    }));
+    return (0, common_1.applyDecorators)(...[
+        (0, BaseField_1.BaseField)(options, {
+            decoratorName: 'TextField',
+            appType: 'text',
+            jsType: 'string',
+        }),
+        (0, typeorm_1.Column)({
+            type: 'text',
+            length: options.max,
+            default: options.defaultValue,
+            nullable: options.nullable,
+        }),
+        (0, class_validator_1.IsString)({
+            each: options.isArray,
+            message: options.isStringConstraintMessage || 'Должна быть строка',
+        }),
+        !options.required && (0, class_validator_1.IsOptional)(),
+        typeof options.min === 'number' && (0, class_validator_1.MinLength)(options.min, {
+            message: `Длина строка должна быть не менее ${options.min}` || options.minConstraintMessage,
+            each: options.isArray,
+        }),
+        typeof options.max === 'number' && (0, class_validator_1.MaxLength)((0, lodash_1.toInteger)(options.max), {
+            message: `Длина строка должна быть не более ${options.max}` || options.maxConstraintMessage,
+            each: options.isArray,
+        }),
+    ].filter(Boolean));
 }
 exports.TextField = TextField;
 //# sourceMappingURL=TextField.js.map

package/infrastructure/decorators/fields/TextField.js.map

@@ -1 +1 @@
-{"version":3,"file":"TextField.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/TextField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,iDAA2C;AAC3C,mCAA+C;AAC/C,qDAA2E;AAC3E,2CAAyD;AAQzD,SAAgB,SAAS,CAAC,UAA6B,EAAE;IACrD,OAAO,IAAA,wBAAe,EAClB,IAAA,qBAAS,EAAC,OAAO,EAAE;QACf,aAAa,EAAE,WAAW;QAC1B,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,QAAQ;KACnB,CAAC,EACF,IAAA,gBAAM,EAAC;QACH,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,OAAO,CAAC,GAAG;QACnB,OAAO,EAAE,OAAO,CAAC,YAAY;QAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC7B,CAAC,EACF,IAAA,0BAAQ,EAAC;QACL,IAAI,EAAE,OAAO,CAAC,OAAO;QACrB,OAAO,EAAE,OAAO,CAAC,yBAAyB,IAAI,oBAAoB;KACrE,CAAC,EACF,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAA,4BAAU,GAAE,EACjC,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,IAAI,IAAA,2BAAS,EAAC,OAAO,CAAC,GAAG,EAAE;QACtD,OAAO,EAAE,qCAAqC,OAAO,CAAC,GAAG,EAAE,IAAI,OAAO,CAAC,oBAAoB;QAC3F,IAAI,EAAE,OAAO,CAAC,OAAO;KACxB,CAAC,EACF,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,IAAI,IAAA,2BAAS,EAAC,IAAA,kBAAU,EAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAClE,OAAO,EAAE,qCAAqC,OAAO,CAAC,GAAG,EAAE,IAAI,OAAO,CAAC,oBAAoB;QAC3F,IAAI,EAAE,OAAO,CAAC,OAAO;KACxB,CAAC,CAEL,CAAC;AACN,CAAC;AA5BD,8BA4BC"}
+{"version":3,"file":"TextField.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/TextField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,iDAA2C;AAC3C,mCAA+C;AAC/C,qDAA2E;AAC3E,2CAAyD;AAQzD,SAAgB,SAAS,CAAC,UAA6B,EAAE;IACrD,OAAO,IAAA,wBAAe,EAAC,GAAG;QACtB,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,MAAM,EAAE,OAAO,CAAC,GAAG;YACnB,OAAO,EAAE,OAAO,CAAC,YAAY;YAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC;QACF,IAAA,0BAAQ,EAAC;YACL,IAAI,EAAE,OAAO,CAAC,OAAO;YACrB,OAAO,EAAE,OAAO,CAAC,yBAAyB,IAAI,oBAAoB;SACrE,CAAC;QACF,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAA,4BAAU,GAAE;QACjC,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,IAAI,IAAA,2BAAS,EAAC,OAAO,CAAC,GAAG,EAAE;YACtD,OAAO,EAAE,qCAAqC,OAAO,CAAC,GAAG,EAAE,IAAI,OAAO,CAAC,oBAAoB;YAC3F,IAAI,EAAE,OAAO,CAAC,OAAO;SACxB,CAAC;QACF,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,IAAI,IAAA,2BAAS,EAAC,IAAA,kBAAU,EAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAClE,OAAO,EAAE,qCAAqC,OAAO,CAAC,GAAG,EAAE,IAAI,OAAO,CAAC,oBAAoB;YAC3F,IAAI,EAAE,OAAO,CAAC,OAAO;SACxB,CAAC;KACL,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACvB,CAAC;AA3BD,8BA2BC"}

package/infrastructure/filters/ValidationExceptionFilter.d.ts

@@ -1,6 +1,5 @@
 import { ExceptionFilter, ArgumentsHost } from '@nestjs/common';
-import { ValidationException } from '../../usecases/exceptions/ValidationException';
+import { ValidationException } from '../../usecases/exceptions';
 export declare class ValidationExceptionFilter implements ExceptionFilter {
-    parseErrors(errors: any): any;
     catch(exception: ValidationException, host: ArgumentsHost): void;
 }

package/infrastructure/filters/ValidationExceptionFilter.js

@@ -8,38 +8,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValidationExceptionFilter = void 0;
 const common_1 = require("@nestjs/common");
-const class_validator_1 = require("class-validator");
-const ValidationException_1 = require("../../usecases/exceptions/ValidationException");
+const exceptions_1 = require("../../usecases/exceptions");
 let ValidationExceptionFilter = class ValidationExceptionFilter {
-    parseErrors(errors) {
-        if (Array.isArray(errors) && errors[0] instanceof class_validator_1.ValidationError) {
-            return errors.reduce((result, item) => {
-                var _a;
-                if (item.constraints) {
-                    result[item.property] = [].concat(Object.values(item.constraints));
-                }
-                if (((_a = item.children) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-                    result[item.property] = this.parseErrors(item.children);
-                }
-                return result;
-            }, {});
-        }
-        return errors;
-    }
     catch(exception, host) {
         const ctx = host.switchToHttp();
         const response = ctx.getResponse();
-        const errors = this.parseErrors(exception.errors);
         response
             .status(common_1.HttpStatus.OK)
             .json({
             statusCode: common_1.HttpStatus.BAD_REQUEST,
-            errors,
+            errors: exception.errors,
         });
     }
 };
 ValidationExceptionFilter = __decorate([
-    (0, common_1.Catch)(ValidationException_1.ValidationException)
+    (0, common_1.Catch)(exceptions_1.ValidationException)
 ], ValidationExceptionFilter);
 exports.ValidationExceptionFilter = ValidationExceptionFilter;
 //# sourceMappingURL=ValidationExceptionFilter.js.map

package/infrastructure/filters/ValidationExceptionFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"ValidationExceptionFilter.js","sourceRoot":"","sources":["../../../src/infrastructure/filters/ValidationExceptionFilter.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAiF;AAEjF,qDAAgD;AAChD,uFAAkF;AAG3E,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAClC,WAAW,CAAC,MAAM;QACd,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,YAAY,iCAAe,EAAE;YAC/D,OAAO,MAAM,CAAC,MAAM,CAChB,CAAC,MAAW,EAAE,IAAI,EAAE,EAAE;;gBAClB,IAAI,IAAI,CAAC,WAAW,EAAE;oBAClB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;iBACtE;gBACD,IAAI,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,IAAG,CAAC,EAAE;oBAC3B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC3D;gBACD,OAAO,MAAM,CAAC;YAClB,CAAC,EACD,EAAE,CACL,CAAC;SACL;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,SAA8B,EAAE,IAAmB;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAY,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAElD,QAAQ;aAEH,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC;aACrB,IAAI,CAAC;YACF,UAAU,EAAE,mBAAU,CAAC,WAAW;YAClC,MAAM;SACT,CAAC,CAAC;IACX,CAAC;CACJ,CAAA;AAhCY,yBAAyB;IADrC,IAAA,cAAK,EAAC,yCAAmB,CAAC;GACd,yBAAyB,CAgCrC;AAhCY,8DAAyB"}
+{"version":3,"file":"ValidationExceptionFilter.js","sourceRoot":"","sources":["../../../src/infrastructure/filters/ValidationExceptionFilter.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAiF;AAEjF,0DAA8D;AAGvD,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAClC,KAAK,CAAC,SAA8B,EAAE,IAAmB;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAY,CAAC;QAE7C,QAAQ;aAEH,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC;aACrB,IAAI,CAAC;YACF,UAAU,EAAE,mBAAU,CAAC,WAAW;YAClC,MAAM,EAAE,SAAS,CAAC,MAAM;SAC3B,CAAC,CAAC;IACX,CAAC;CACJ,CAAA;AAbY,yBAAyB;IADrC,IAAA,cAAK,EAAC,gCAAmB,CAAC;GACd,yBAAyB,CAarC;AAbY,8DAAyB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/nest",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "scripts": {
     "script": "nps",
     "watch": "nps watch",
@@ -60,4 +60,4 @@
     "typescript": "^4.9.4",
     "class-validator": "^0.14.0"
   }
-}
+}