@midwayjs/validate 3.10.4 → 3.10.6

package/dist/configuration.js

@@ -30,7 +30,7 @@ let ValidateConfiguration = class ValidateConfiguration {
         await container.getAsync(pipe_1.ParseIntPipe);
         await container.getAsync(pipe_1.ParseBoolPipe);
         await container.getAsync(pipe_1.ParseFloatPipe);
-        await container.getAsync(pipe_1.DefaultValidPipe);
+        await container.getAsync(pipe_1.DecoratorValidPipe);
         this.decoratorService.registerParameterHandler(constants_1.VALID_KEY, ({ parameterIndex, originParamType, originArgs, metadata }) => {
             if (!metadata.schema) {
                 metadata.schema = this.validateService.getSchema(originParamType);

package/dist/constants.d.ts

@@ -1,4 +1,5 @@
 export declare const RULES_KEY = "common:rules";
+export declare const RULES_CLASS_KEY = "common:class_rules";
 export declare const VALIDATE_KEY = "common:validate";
 export declare const VALID_KEY = "validate:valid";
 //# sourceMappingURL=constants.d.ts.map

package/dist/constants.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VALID_KEY = exports.VALIDATE_KEY = exports.RULES_KEY = void 0;
+exports.VALID_KEY = exports.VALIDATE_KEY = exports.RULES_CLASS_KEY = exports.RULES_KEY = void 0;
 exports.RULES_KEY = 'common:rules';
+exports.RULES_CLASS_KEY = 'common:class_rules';
 exports.VALIDATE_KEY = 'common:validate';
 exports.VALID_KEY = 'validate:valid';
 //# sourceMappingURL=constants.js.map

package/dist/decorator/rule.d.ts

@@ -1,9 +1,16 @@
-import * as joi from 'joi';
+import * as Joi from 'joi';
+/**
+ * @deprecated
+ */
 export interface RuleOptions {
     required?: boolean;
     min?: number;
     max?: number;
 }
-export declare function Rule(rule: any, options?: RuleOptions): (...args: any[]) => void;
-export { joi as RuleType };
+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 { Joi as RuleType };
 //# sourceMappingURL=rule.d.ts.map

package/dist/decorator/rule.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuleType = exports.Rule = void 0;
-const joi = require("joi");
-exports.RuleType = joi;
+const Joi = require("joi");
+exports.RuleType = Joi;
 const core_1 = require("@midwayjs/core");
 const constants_1 = require("../constants");
 function Rule(rule, options = { required: true }) {
-    return function (...args) {
-        if (args[1]) {
-            // 函数装饰器
-            const [target, propertyKey] = args;
-            if (!joi.isSchema(rule)) {
-                rule = joi
-                    .object((0, core_1.getClassMetadata)(constants_1.RULES_KEY, rule))
-                    .meta({ id: rule.name });
+    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);
+                    rule = Joi.array().items(rule);
                     if (options.min) {
                         rule = rule.min(options.min);
                     }
@@ -30,17 +30,11 @@ function Rule(rule, options = { required: true }) {
             (0, core_1.attachClassMetadata)(constants_1.RULES_KEY, rule, target, propertyKey);
         }
         else {
-            //类的装饰器
-            const rules = (0, core_1.getClassMetadata)(constants_1.RULES_KEY, rule);
-            if (rules) {
-                let currentRule = (0, core_1.getClassMetadata)(constants_1.RULES_KEY, args[0]);
-                currentRule = currentRule !== null && currentRule !== void 0 ? currentRule : {};
-                Object.keys(rules).map(item => {
-                    if (!currentRule[item]) {
-                        currentRule[item] = rules[item];
-                    }
-                });
-                (0, core_1.saveClassMetadata)(constants_1.RULES_KEY, currentRule, args[0]);
+            // class decorator
+            if (Joi.isSchema(rule)) {
+                // TODO 下一个大版本，metadata 这里要完全重构，临时先加一个后缀
+                // mix schema with property
+                // saveClassMetadata(RULES_CLASS_KEY + '_EXT', rule, target);
             }
         }
     };

package/dist/decorator/valid.js

@@ -8,7 +8,7 @@ function Valid(schema) {
     return (0, core_1.createCustomParamDecorator)(constants_1.VALID_KEY, {
         schema,
     }, {
-        pipes: [pipe_1.DefaultValidPipe],
+        pipes: [pipe_1.DecoratorValidPipe],
     });
 }
 exports.Valid = Valid;

package/dist/pipe.d.ts

@@ -16,7 +16,7 @@ export declare class ValidationPipe extends AbstractValidationPipe {
 declare abstract class ParsePipe extends AbstractValidationPipe {
     transform(value: any, options: TransformOptions): any;
 }
-export declare class DefaultValidPipe extends ParsePipe {
+export declare class DecoratorValidPipe extends ParsePipe {
 }
 export declare class ParseIntPipe extends ParsePipe {
     getSchema(): Joi.AnySchema<any>;

package/dist/pipe.js

@@ -9,7 +9,7 @@ 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.DefaultValuePipe = exports.ParseFloatPipe = exports.ParseBoolPipe = exports.ParseIntPipe = exports.DefaultValidPipe = exports.ValidationPipe = exports.AbstractValidationPipe = void 0;
+exports.DefaultValuePipe = exports.ParseFloatPipe = exports.ParseBoolPipe = exports.ParseIntPipe = exports.DecoratorValidPipe = exports.ValidationPipe = exports.AbstractValidationPipe = void 0;
 const core_1 = require("@midwayjs/core");
 const service_1 = require("./service");
 const i18n = require("@midwayjs/i18n");
@@ -69,12 +69,12 @@ class ParsePipe extends AbstractValidationPipe {
         return this.validateWithSchema(value, options, options.metadata['schema'] || this.getSchema());
     }
 }
-let DefaultValidPipe = class DefaultValidPipe extends ParsePipe {
+let DecoratorValidPipe = class DecoratorValidPipe extends ParsePipe {
 };
-DefaultValidPipe = __decorate([
+DecoratorValidPipe = __decorate([
     (0, core_1.Pipe)()
-], DefaultValidPipe);
-exports.DefaultValidPipe = DefaultValidPipe;
+], DecoratorValidPipe);
+exports.DecoratorValidPipe = DecoratorValidPipe;
 let ParseIntPipe = class ParseIntPipe extends ParsePipe {
     getSchema() {
         return Joi.number().integer().required();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/validate",
-  "version": "3.10.4",
+  "version": "3.10.6",
   "description": "Midway Component for mongoose",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -23,14 +23,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/i18n": "^3.10.4",
+    "@midwayjs/i18n": "^3.10.6",
     "joi": "^17.2.1"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.10.4",
-    "@midwayjs/express": "^3.10.4",
-    "@midwayjs/koa": "^3.10.4",
-    "@midwayjs/mock": "^3.10.4"
+    "@midwayjs/core": "^3.10.6",
+    "@midwayjs/express": "^3.10.6",
+    "@midwayjs/koa": "^3.10.6",
+    "@midwayjs/mock": "^3.10.6"
   },
-  "gitHead": "fb3b02bfe884e3477f81d34fc9941f2701e826f3"
+  "gitHead": "9d5babd57efe4c24415fcb3511bc4ca7c1bcb1b2"
 }