@midwayjs/validate 3.0.0-beta.2 → 3.0.0-beta.6

package/CHANGELOG.md

@@ -3,6 +3,48 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+
+### Bug Fixes
+
+* class transformer method missing ([#1387](https://github.com/midwayjs/midway/issues/1387)) ([074e839](https://github.com/midwayjs/midway/commit/074e8393598dc95e2742f735df75a2191c5fe25d))
+
+
+
+
+
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+**Note:** Version bump only for package @midwayjs/validate
+
+
+
+
+
+# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
+
+
+### Features
+
+* add i18n ([#1375](https://github.com/midwayjs/midway/issues/1375)) ([bffefe0](https://github.com/midwayjs/midway/commit/bffefe07afe45777d49b5a76b9ab17fc2b9d9a55))
+* auto transform args to type ([#1372](https://github.com/midwayjs/midway/issues/1372)) ([bb3f7d2](https://github.com/midwayjs/midway/commit/bb3f7d2028a034e1926d9df554849332354c3762))
+
+
+
+
+
+# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
+
+
+### Features
+
+* add component and framework config definition ([#1367](https://github.com/midwayjs/midway/issues/1367)) ([b2fe615](https://github.com/midwayjs/midway/commit/b2fe6157f99659471ff1333eca0b86bb889f61a3))
+
+
+
+
+
 # [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16)
 
 **Note:** Version bump only for package @midwayjs/validate

package/dist/config.default.d.ts

@@ -0,0 +1,5 @@
+export declare const validate: {
+    allowUnknown: boolean;
+    errorStatus: number;
+};
+//# sourceMappingURL=config.default.d.ts.map

package/dist/config.default.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validate = void 0;
+exports.validate = {
+    allowUnknown: false,
+    errorStatus: 422,
+};
+//# sourceMappingURL=config.default.js.map

package/dist/configuration.d.ts

@@ -1,6 +1,16 @@
 import { MidwayDecoratorService } from '@midwayjs/core';
+import * as Joi from 'joi';
+import * as DefaultConfig from './config.default';
+export declare class ValidateService {
+    validateConfig: typeof DefaultConfig.validate;
+    validate(ClzType: new (...args: any[]) => any, value: any, options?: {
+        errorStatus?: number;
+        validateOptions?: Joi.ValidationOptions;
+    }): Joi.ValidationResult;
+}
 export declare class ValidateConfiguration {
     decoratorService: MidwayDecoratorService;
+    validateService: ValidateService;
     init(): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -9,14 +9,39 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValidateConfiguration = void 0;
+exports.ValidateConfiguration = exports.ValidateService = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
 const constants_1 = require("./constants");
 const Joi = require("joi");
-const class_transformer_1 = require("class-transformer");
 const util = require("util");
+const DefaultConfig = require("./config.default");
 const debug = util.debuglog('midway:debug');
+let ValidateService = class ValidateService {
+    validate(ClzType, value, options) {
+        var _a;
+        const rules = (0, decorator_1.getClassExtendedMetadata)(constants_1.RULES_KEY, ClzType);
+        if (rules) {
+            const schema = Joi.object(rules);
+            const result = schema.validate(value);
+            if (result.error) {
+                throw new core_1.MidwayValidationError(result.error.message, (_a = options === null || options === void 0 ? void 0 : options.errorStatus) !== null && _a !== void 0 ? _a : this.validateConfig.errorStatus, result.error);
+            }
+            else {
+                return result;
+            }
+        }
+    }
+};
+__decorate([
+    (0, decorator_1.Config)('validate'),
+    __metadata("design:type", Object)
+], ValidateService.prototype, "validateConfig", void 0);
+ValidateService = __decorate([
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
+], ValidateService);
+exports.ValidateService = ValidateService;
 let ValidateConfiguration = class ValidateConfiguration {
     async init() {
         debug(`[validate]: Register @validate "${constants_1.VALIDATE_KEY}" handler"`);
@@ -28,20 +53,9 @@ let ValidateConfiguration = class ValidateConfiguration {
                 before: (joinPoint) => {
                     for (let i = 0; i < paramTypes.length; i++) {
                         const item = paramTypes[i];
-                        const rules = (0, decorator_1.getClassExtendedMetadata)(constants_1.RULES_KEY, item);
-                        if (rules) {
-                            const schema = Joi.object(rules);
-                            const result = schema.validate(joinPoint.args[i]);
-                            if (result.error) {
-                                throw result.error;
-                            }
-                            else {
-                                joinPoint.args[i] = result.value;
-                            }
-                            // passed
-                            if (options.metadata.isTransform) {
-                                joinPoint.args[i] = (0, class_transformer_1.plainToClass)(item, joinPoint.args[i]);
-                            }
+                        const result = this.validateService.validate(item, joinPoint.args[i], options.metadata);
+                        if (result && result.value) {
+                            joinPoint.args[i] = result.value;
                         }
                     }
                 },
@@ -53,6 +67,10 @@ __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
 ], ValidateConfiguration.prototype, "decoratorService", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", ValidateService)
+], ValidateConfiguration.prototype, "validateService", void 0);
 __decorate([
     (0, decorator_1.Init)(),
     __metadata("design:type", Function),
@@ -62,6 +80,11 @@ __decorate([
 ValidateConfiguration = __decorate([
     (0, decorator_1.Configuration)({
         namespace: 'validate',
+        importConfigs: [
+            {
+                default: DefaultConfig,
+            },
+        ],
     })
 ], ValidateConfiguration);
 exports.ValidateConfiguration = ValidateConfiguration;

package/dist/decorator/validate.d.ts

@@ -1,2 +1,5 @@
-export declare function Validate(isTransform?: boolean): MethodDecorator;
+export interface ValidateOptions {
+    errorStatus?: number;
+}
+export declare function Validate(options?: ValidateOptions): MethodDecorator;
 //# sourceMappingURL=validate.d.ts.map

package/dist/decorator/validate.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Validate = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const constants_1 = require("../constants");
-function Validate(isTransform = true) {
+function Validate(options = {}) {
     return (0, decorator_1.createCustomMethodDecorator)(constants_1.VALIDATE_KEY, {
-        isTransform,
+        options,
     });
 }
 exports.Validate = Validate;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { ValidateConfiguration as Configuration } from './configuration';
+export { ValidateConfiguration as Configuration, ValidateService, } from './configuration';
 export * from './decorator/rule';
 export * from './decorator/validate';
 export * from './dtoHelper';

package/dist/index.js

@@ -10,9 +10,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Configuration = void 0;
+exports.ValidateService = exports.Configuration = void 0;
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.ValidateConfiguration; } });
+Object.defineProperty(exports, "ValidateService", { enumerable: true, get: function () { return configuration_1.ValidateService; } });
 __exportStar(require("./decorator/rule"), exports);
 __exportStar(require("./decorator/validate"), exports);
 __exportStar(require("./dtoHelper"), exports);

package/index.d.ts

@@ -0,0 +1,9 @@
+export * from './dist/index';
+
+import { validate } from './dist/config.default';
+
+declare module '@midwayjs/core/dist/interface' {
+  interface MidwayConfig {
+    validate?: validate;
+  }
+}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@midwayjs/validate",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.6",
   "description": "Midway Component for mongoose",
   "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
     "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
@@ -14,20 +14,20 @@
   "author": "czy88840616@gmail.com",
   "files": [
     "dist/**/*.js",
-    "dist/**/*.d.ts"
+    "dist/**/*.d.ts",
+    "index.d.ts"
   ],
   "engines": {
     "node": ">=12"
   },
   "license": "MIT",
   "dependencies": {
-    "class-transformer": "^0.3.1",
     "joi": "^17.2.1"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-beta.2",
-    "@midwayjs/decorator": "^3.0.0-beta.2",
-    "@midwayjs/mock": "^3.0.0-beta.2"
+    "@midwayjs/core": "^3.0.0-beta.6",
+    "@midwayjs/decorator": "^3.0.0-beta.6",
+    "@midwayjs/mock": "^3.0.0-beta.6"
   },
-  "gitHead": "7f07de960da1155a9f7df554e1789c7a97bdd3fe"
+  "gitHead": "e4595d30b369e36bef21b36f2b3737d8bc2f802d"
 }