@midwayjs/validate 3.20.5 → 4.0.0-beta.1

package/dist/configuration.js

@@ -37,6 +37,7 @@ let ValidateConfiguration = class ValidateConfiguration {
         ]);
     }
 };
+exports.ValidateConfiguration = ValidateConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
@@ -51,7 +52,7 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], ValidateConfiguration.prototype, "init", null);
-ValidateConfiguration = __decorate([
+exports.ValidateConfiguration = ValidateConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'validate',
         imports: [i18n],
@@ -62,5 +63,4 @@ ValidateConfiguration = __decorate([
         ],
     })
 ], ValidateConfiguration);
-exports.ValidateConfiguration = ValidateConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/decorator/rule.d.ts

@@ -1,16 +1,4 @@
 import * as Joi from 'joi';
-/**
- * @deprecated
- */
-export interface RuleOptions {
-    required?: boolean;
-    min?: number;
-    max?: number;
-}
-export declare function Rule(rule: Joi.AnySchema<any>): PropertyDecorator & ClassDecorator;
-/**
- * @deprecated
- */
-export declare function Rule(rule: new (...args: any[]) => any, options?: RuleOptions): PropertyDecorator & ClassDecorator;
+export declare function Rule(rule: Joi.AnySchema<any>): PropertyDecorator;
 export { Joi as RuleType };
 //# sourceMappingURL=rule.d.ts.map

package/dist/decorator/rule.js

@@ -5,37 +5,10 @@ const Joi = require("joi");
 exports.RuleType = Joi;
 const core_1 = require("@midwayjs/core");
 const constants_1 = require("../constants");
-function Rule(rule, options = { required: true }) {
+function Rule(rule) {
     return function (target, propertyKey) {
         if (propertyKey) {
-            // property decorator
-            if (!Joi.isSchema(rule)) {
-                // 老代码，待废弃
-                rule = Joi.object((0, core_1.getClassMetadata)(constants_1.RULES_KEY, rule)).meta({
-                    id: rule.name,
-                });
-                if ((0, core_1.getPropertyType)(target, propertyKey).name === 'Array') {
-                    rule = Joi.array().items(rule);
-                    if (options.min) {
-                        rule = rule.min(options.min);
-                    }
-                    if (options.max) {
-                        rule = rule.max(options.max);
-                    }
-                }
-                if (options.required) {
-                    rule = rule.required();
-                }
-            }
-            (0, core_1.attachClassMetadata)(constants_1.RULES_KEY, rule, target, propertyKey);
-        }
-        else {
-            // class decorator
-            if (Joi.isSchema(rule)) {
-                // TODO 下一个大版本，metadata 这里要完全重构，临时先加一个后缀
-                // mix schema with property
-                // saveClassMetadata(RULES_CLASS_KEY + '_EXT', rule, target);
-            }
+            core_1.MetadataManager.defineMetadata(constants_1.RULES_KEY, rule, target, propertyKey);
         }
     };
 }

package/dist/decorator/valid.js

@@ -12,7 +12,7 @@ function Valid(schemaOrPipes, pipes) {
     else {
         pipes = pipes || [];
     }
-    return (0, core_1.createCustomParamDecorator)(constants_1.VALID_KEY, {
+    return core_1.DecoratorManager.createCustomParamDecorator(constants_1.VALID_KEY, {
         schema: schemaOrPipes,
     }, {
         pipes: [pipe_1.DecoratorValidPipe, ...pipes],

package/dist/decorator/validate.js

@@ -5,7 +5,7 @@ const core_1 = require("@midwayjs/core");
 const constants_1 = require("../constants");
 function Validate(options = {}) {
     return (target, methodName, descriptor) => {
-        (0, core_1.savePropertyMetadata)(constants_1.VALIDATE_KEY, options, target, methodName);
+        core_1.MetadataManager.defineMetadata(constants_1.VALIDATE_KEY, options, target, methodName);
     };
 }
 exports.Validate = Validate;

package/dist/dtoHelper.js

@@ -6,26 +6,22 @@ const constants_1 = require("./constants");
 function PickDto(dto, keys) {
     const pickedDto = function () { };
     pickedDto.prototype = dto.prototype;
-    const fatherRule = (0, core_1.getClassExtendedMetadata)(constants_1.RULES_KEY, dto);
-    const pickedRule = {};
-    for (const key of keys) {
-        if (fatherRule[key]) {
-            pickedRule[key] = fatherRule[key];
-        }
-    }
-    (0, core_1.saveClassMetadata)(constants_1.RULES_KEY, pickedRule, pickedDto);
+    core_1.MetadataManager.copyMetadata(dto, pickedDto, {
+        metadataFilter: (key, propertyName) => {
+            return key === constants_1.RULES_KEY && keys.includes(propertyName);
+        },
+    });
     return pickedDto;
 }
 exports.PickDto = PickDto;
 function OmitDto(dto, keys) {
     const pickedDto = function () { };
     pickedDto.prototype = dto.prototype;
-    const fatherRule = (0, core_1.getClassExtendedMetadata)(constants_1.RULES_KEY, dto);
-    const pickedRule = Object.assign({}, fatherRule);
-    for (const key of keys) {
-        delete pickedRule[key];
-    }
-    (0, core_1.saveClassMetadata)(constants_1.RULES_KEY, pickedRule, pickedDto);
+    core_1.MetadataManager.copyMetadata(dto, pickedDto, {
+        metadataFilter: (key, propertyName) => {
+            return key === constants_1.RULES_KEY && !keys.includes(propertyName);
+        },
+    });
     return pickedDto;
 }
 exports.OmitDto = OmitDto;

package/dist/pipe.js

@@ -36,8 +36,7 @@ class AbstractValidationPipe {
         return value;
     }
     parseValidationOptions(options) {
-        const validateOptions = (0, core_1.getPropertyMetadata)(constants_1.VALIDATE_KEY, options.target, options.methodName) ||
-            {};
+        const validateOptions = core_1.MetadataManager.getMetadata(constants_1.VALIDATE_KEY, options.target, options.methodName) || {};
         if (!validateOptions.locale) {
             const maybeCtx = options.target[core_1.REQUEST_OBJ_CTX_KEY];
             if (maybeCtx && maybeCtx.getAttr) {
@@ -50,20 +49,20 @@ class AbstractValidationPipe {
         return undefined;
     }
 }
+exports.AbstractValidationPipe = AbstractValidationPipe;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", service_1.ValidateService)
 ], AbstractValidationPipe.prototype, "validateService", void 0);
-exports.AbstractValidationPipe = AbstractValidationPipe;
 let ValidationPipe = class ValidationPipe extends AbstractValidationPipe {
     transform(value, options) {
         return this.validate(value, options);
     }
 };
-ValidationPipe = __decorate([
+exports.ValidationPipe = ValidationPipe;
+exports.ValidationPipe = ValidationPipe = __decorate([
     (0, core_1.Pipe)()
 ], ValidationPipe);
-exports.ValidationPipe = ValidationPipe;
 class ParsePipe extends AbstractValidationPipe {
     transform(value, options) {
         return this.validateWithSchema(value, options, options.metadata['schema'] || this.getSchema());
@@ -72,37 +71,37 @@ class ParsePipe extends AbstractValidationPipe {
 exports.ParsePipe = ParsePipe;
 let DecoratorValidPipe = class DecoratorValidPipe extends ParsePipe {
 };
-DecoratorValidPipe = __decorate([
+exports.DecoratorValidPipe = DecoratorValidPipe;
+exports.DecoratorValidPipe = DecoratorValidPipe = __decorate([
     (0, core_1.Pipe)()
 ], DecoratorValidPipe);
-exports.DecoratorValidPipe = DecoratorValidPipe;
 let ParseIntPipe = class ParseIntPipe extends ParsePipe {
     getSchema() {
         return Joi.number().integer().required();
     }
 };
-ParseIntPipe = __decorate([
+exports.ParseIntPipe = ParseIntPipe;
+exports.ParseIntPipe = ParseIntPipe = __decorate([
     (0, core_1.Pipe)()
 ], ParseIntPipe);
-exports.ParseIntPipe = ParseIntPipe;
 let ParseBoolPipe = class ParseBoolPipe extends ParsePipe {
     getSchema() {
         return Joi.boolean().required();
     }
 };
-ParseBoolPipe = __decorate([
+exports.ParseBoolPipe = ParseBoolPipe;
+exports.ParseBoolPipe = ParseBoolPipe = __decorate([
     (0, core_1.Pipe)()
 ], ParseBoolPipe);
-exports.ParseBoolPipe = ParseBoolPipe;
 let ParseFloatPipe = class ParseFloatPipe extends ParsePipe {
     getSchema() {
         return Joi.number().required();
     }
 };
-ParseFloatPipe = __decorate([
+exports.ParseFloatPipe = ParseFloatPipe;
+exports.ParseFloatPipe = ParseFloatPipe = __decorate([
     (0, core_1.Pipe)()
 ], ParseFloatPipe);
-exports.ParseFloatPipe = ParseFloatPipe;
 class DefaultValuePipe {
     constructor(defaultValue) {
         this.defaultValue = defaultValue;

package/dist/service.js

@@ -31,7 +31,6 @@ let ValidateService = class ValidateService {
         return this.validateWithSchema(objectSchema, value, options);
     }
     validateWithSchema(schema, value, options = {}) {
-        var _a, _b, _c;
         if (!schema) {
             return undefined;
         }
@@ -40,11 +39,11 @@ let ValidateService = class ValidateService {
         options.validationOptions.errors.language = (0, i18n_1.formatLocale)(this.i18nService.getAvailableLocale(options.validationOptions.errors.language ||
             options.locale ||
             this.i18nConfig.defaultLocale, 'validate'));
-        const result = schema.validate(value, Object.assign({}, (_a = this.validateConfig.validationOptions) !== null && _a !== void 0 ? _a : {}, {
+        const result = schema.validate(value, Object.assign({}, this.validateConfig.validationOptions ?? {}, {
             messages: this.messages,
-        }, (_b = options.validationOptions) !== null && _b !== void 0 ? _b : {}));
+        }, options.validationOptions ?? {}));
         if (result.error) {
-            throw new error_1.MidwayValidationError(result.error.message, (_c = options === null || options === void 0 ? void 0 : options.errorStatus) !== null && _c !== void 0 ? _c : this.validateConfig.errorStatus, result.error);
+            throw new error_1.MidwayValidationError(result.error.message, options?.errorStatus ?? this.validateConfig.errorStatus, result.error);
         }
         else {
             return result;
@@ -54,6 +53,7 @@ let ValidateService = class ValidateService {
         return getSchema(ClzType);
     }
 };
+exports.ValidateService = ValidateService;
 __decorate([
     (0, core_1.Config)('validate'),
     __metadata("design:type", Object)
@@ -72,13 +72,12 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], ValidateService.prototype, "init", null);
-ValidateService = __decorate([
+exports.ValidateService = ValidateService = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], ValidateService);
-exports.ValidateService = ValidateService;
 function getSchema(ClzType) {
-    const rules = (0, core_1.getClassExtendedMetadata)(constants_1.RULES_KEY, ClzType);
+    const rules = core_1.MetadataManager.getPropertiesWithMetadata(constants_1.RULES_KEY, ClzType);
     if (rules) {
         return Joi.object(rules);
     }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/validate",
-  "version": "3.20.5",
+  "version": "4.0.0-beta.1",
   "description": "Midway Component for mongoose",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "ci": "npm run test"
   },
   "keywords": [],
@@ -23,14 +23,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/i18n": "^3.20.5",
+    "@midwayjs/i18n": "^4.0.0-beta.1",
     "joi": "17.13.3"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.20.4",
-    "@midwayjs/express": "^3.20.4",
-    "@midwayjs/koa": "^3.20.5",
-    "@midwayjs/mock": "^3.20.4"
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/express": "^4.0.0-beta.1",
+    "@midwayjs/koa": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1"
   },
-  "gitHead": "7ce57281bd3ef5d18dc50b47ff9bffb8a27c071e"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.