@midwayjs/validate 3.5.3 → 3.7.0

package/dist/configuration.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValidateConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
 const constants_1 = require("./constants");
 const util = require("util");
@@ -24,7 +23,7 @@ let ValidateConfiguration = class ValidateConfiguration {
         this.decoratorService.registerMethodHandler(constants_1.VALIDATE_KEY, options => {
             var _a;
             // get param types from method
-            const paramTypes = (0, decorator_1.getMethodParamTypes)(options.target, options.propertyName);
+            const paramTypes = (0, core_1.getMethodParamTypes)(options.target, options.propertyName);
             const validateOptions = (_a = options.metadata) === null || _a === void 0 ? void 0 : _a.options;
             // add aspect method
             return {
@@ -48,15 +47,15 @@ let ValidateConfiguration = class ValidateConfiguration {
     }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
 ], ValidateConfiguration.prototype, "decoratorService", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", service_1.ValidateService)
 ], ValidateConfiguration.prototype, "validateService", void 0);
 ValidateConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'validate',
         imports: [i18n],
         importConfigs: [

package/dist/decorator/rule.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuleType = exports.Rule = void 0;
 const joi = require("joi");
 exports.RuleType = joi;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const constants_1 = require("../constants");
 function Rule(rule, options = { required: true }) {
     return function (...args) {
@@ -12,9 +12,9 @@ function Rule(rule, options = { required: true }) {
             const [target, propertyKey] = args;
             if (!joi.isSchema(rule)) {
                 rule = joi
-                    .object((0, decorator_1.getClassMetadata)(constants_1.RULES_KEY, rule))
+                    .object((0, core_1.getClassMetadata)(constants_1.RULES_KEY, rule))
                     .meta({ id: rule.name });
-                if ((0, decorator_1.getPropertyType)(target, propertyKey).name === 'Array') {
+                if ((0, core_1.getPropertyType)(target, propertyKey).name === 'Array') {
                     rule = joi.array().items(rule);
                     if (options.min) {
                         rule = rule.min(options.min);
@@ -27,20 +27,20 @@ function Rule(rule, options = { required: true }) {
                     rule = rule.required();
                 }
             }
-            (0, decorator_1.attachClassMetadata)(constants_1.RULES_KEY, rule, target, propertyKey);
+            (0, core_1.attachClassMetadata)(constants_1.RULES_KEY, rule, target, propertyKey);
         }
         else {
             //类的装饰器
-            const rules = (0, decorator_1.getClassMetadata)(constants_1.RULES_KEY, rule);
+            const rules = (0, core_1.getClassMetadata)(constants_1.RULES_KEY, rule);
             if (rules) {
-                let currentRule = (0, decorator_1.getClassMetadata)(constants_1.RULES_KEY, args[0]);
+                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, decorator_1.saveClassMetadata)(constants_1.RULES_KEY, currentRule, args[0]);
+                (0, core_1.saveClassMetadata)(constants_1.RULES_KEY, currentRule, args[0]);
             }
         }
     };

package/dist/decorator/validate.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Validate = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const constants_1 = require("../constants");
 function Validate(options = {}) {
-    return (0, decorator_1.createCustomMethodDecorator)(constants_1.VALIDATE_KEY, {
+    return (0, core_1.createCustomMethodDecorator)(constants_1.VALIDATE_KEY, {
         options,
     });
 }

package/dist/dtoHelper.js

@@ -1,31 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OmitDto = exports.PickDto = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const constants_1 = require("./constants");
 function PickDto(dto, keys) {
     const pickedDto = function () { };
     pickedDto.prototype = dto.prototype;
-    const fatherRule = (0, decorator_1.getClassExtendedMetadata)(constants_1.RULES_KEY, dto);
+    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, decorator_1.saveClassMetadata)(constants_1.RULES_KEY, pickedRule, pickedDto);
+    (0, core_1.saveClassMetadata)(constants_1.RULES_KEY, pickedRule, pickedDto);
     return pickedDto;
 }
 exports.PickDto = PickDto;
 function OmitDto(dto, keys) {
     const pickedDto = function () { };
     pickedDto.prototype = dto.prototype;
-    const fatherRule = (0, decorator_1.getClassExtendedMetadata)(constants_1.RULES_KEY, dto);
+    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, decorator_1.saveClassMetadata)(constants_1.RULES_KEY, pickedRule, pickedDto);
+    (0, core_1.saveClassMetadata)(constants_1.RULES_KEY, pickedRule, pickedDto);
     return pickedDto;
 }
 exports.OmitDto = OmitDto;

package/dist/service.js

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSchema = exports.ValidateService = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const DefaultConfig = require("./config/config.default");
 const constants_1 = require("./constants");
 const Joi = require("joi");
@@ -33,7 +33,7 @@ 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 rules = (0, decorator_1.getClassExtendedMetadata)(constants_1.RULES_KEY, ClzType);
+        const rules = (0, core_1.getClassExtendedMetadata)(constants_1.RULES_KEY, ClzType);
         if (rules) {
             const schema = Joi.object(rules);
             const result = schema.validate(value, Object.assign((_a = this.validateConfig.validationOptions) !== null && _a !== void 0 ? _a : {}, {
@@ -69,30 +69,30 @@ let ValidateService = class ValidateService {
     }
 };
 __decorate([
-    (0, decorator_1.Config)('validate'),
+    (0, core_1.Config)('validate'),
     __metadata("design:type", Object)
 ], ValidateService.prototype, "validateConfig", void 0);
 __decorate([
-    (0, decorator_1.Config)('i18n'),
+    (0, core_1.Config)('i18n'),
     __metadata("design:type", Object)
 ], ValidateService.prototype, "i18nConfig", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", i18n_1.MidwayI18nServiceSingleton)
 ], ValidateService.prototype, "i18nService", void 0);
 __decorate([
-    (0, decorator_1.Init)(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], ValidateService.prototype, "init", null);
 ValidateService = __decorate([
-    (0, decorator_1.Provide)(),
-    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
+    (0, core_1.Provide)(),
+    (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], ValidateService);
 exports.ValidateService = ValidateService;
 function getSchema(ClzType) {
-    const rules = (0, decorator_1.getClassExtendedMetadata)(constants_1.RULES_KEY, ClzType);
+    const rules = (0, core_1.getClassExtendedMetadata)(constants_1.RULES_KEY, ClzType);
     if (rules) {
         return Joi.object(rules);
     }

package/index.d.ts

@@ -1,5 +1,6 @@
-export * from './dist/index';
+import '@midwayjs/i18n';
 import * as Joi from 'joi';
+export * from './dist/index';
 
 declare module '@midwayjs/core/dist/interface' {
   interface MidwayConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/validate",
-  "version": "3.5.3",
+  "version": "3.7.0",
   "description": "Midway Component for mongoose",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -23,15 +23,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/i18n": "^3.5.3",
+    "@midwayjs/i18n": "^3.7.0",
     "joi": "^17.2.1"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.5.3",
-    "@midwayjs/decorator": "^3.4.11",
-    "@midwayjs/express": "^3.5.3",
-    "@midwayjs/koa": "^3.5.3",
-    "@midwayjs/mock": "^3.5.3"
+    "@midwayjs/core": "^3.7.0",
+    "@midwayjs/express": "^3.7.0",
+    "@midwayjs/koa": "^3.7.0",
+    "@midwayjs/mock": "^3.7.0"
   },
-  "gitHead": "32356484664846984f6d3d65a3a75dea015e8dcc"
+  "gitHead": "99386083ee26b386fd508b9c892091c914e77535"
 }