@midwayjs/validate 4.0.0-alpha.1 → 4.0.0-beta.10

package/README.md

@@ -9,4 +9,4 @@ Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 
-[MIT]((http://github.com/midwayjs/midway/blob/master/LICENSE))
+[MIT](https://github.com/midwayjs/midway/blob/master/LICENSE)

package/dist/configuration.js

@@ -17,6 +17,8 @@ const i18n = require("@midwayjs/i18n");
 const pipe_1 = require("./pipe");
 const constants_1 = require("./constants");
 let ValidateConfiguration = class ValidateConfiguration {
+    decoratorService;
+    validateService;
     async init() {
         this.decoratorService.registerParameterHandler(constants_1.VALID_KEY, ({ parameterIndex, originParamType, originArgs, metadata }) => {
             if (!metadata.schema) {
@@ -31,12 +33,6 @@ let ValidateConfiguration = class ValidateConfiguration {
         await container.getAsync(pipe_1.ParseBoolPipe);
         await container.getAsync(pipe_1.ParseFloatPipe);
         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);
-            }
-            return originArgs[parameterIndex];
-        });
         // register web param default pipe
         this.decoratorService.registerParameterPipes(core_1.WEB_ROUTER_PARAM_KEY, [
             pipe_1.ValidationPipe,

package/dist/decorator/rule.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RuleType = exports.Rule = void 0;
+exports.RuleType = void 0;
+exports.Rule = Rule;
 const Joi = require("joi");
 exports.RuleType = Joi;
 const core_1 = require("@midwayjs/core");
@@ -12,5 +13,4 @@ function Rule(rule) {
         }
     };
 }
-exports.Rule = Rule;
 //# sourceMappingURL=rule.js.map

package/dist/decorator/valid.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Valid = void 0;
+exports.Valid = Valid;
 const core_1 = require("@midwayjs/core");
 const constants_1 = require("../constants");
 const pipe_1 = require("../pipe");
@@ -18,5 +18,4 @@ function Valid(schemaOrPipes, pipes) {
         pipes: [pipe_1.DecoratorValidPipe, ...pipes],
     });
 }
-exports.Valid = Valid;
 //# sourceMappingURL=valid.js.map

package/dist/decorator/validate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Validate = void 0;
+exports.Validate = Validate;
 const core_1 = require("@midwayjs/core");
 const constants_1 = require("../constants");
 function Validate(options = {}) {
@@ -8,5 +8,4 @@ function Validate(options = {}) {
         core_1.MetadataManager.defineMetadata(constants_1.VALIDATE_KEY, options, target, methodName);
     };
 }
-exports.Validate = Validate;
 //# sourceMappingURL=validate.js.map

package/dist/dtoHelper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OmitDto = exports.PickDto = void 0;
+exports.PickDto = PickDto;
+exports.OmitDto = OmitDto;
 const core_1 = require("@midwayjs/core");
 const constants_1 = require("./constants");
 function PickDto(dto, keys) {
@@ -13,7 +14,6 @@ function PickDto(dto, keys) {
     });
     return pickedDto;
 }
-exports.PickDto = PickDto;
 function OmitDto(dto, keys) {
     const pickedDto = function () { };
     pickedDto.prototype = dto.prototype;
@@ -24,5 +24,4 @@ function OmitDto(dto, keys) {
     });
     return pickedDto;
 }
-exports.OmitDto = OmitDto;
 //# sourceMappingURL=dtoHelper.js.map

package/dist/pipe.js

@@ -16,6 +16,7 @@ const i18n = require("@midwayjs/i18n");
 const constants_1 = require("./constants");
 const Joi = require("joi");
 class AbstractValidationPipe {
+    validateService;
     validateWithSchema(value, options, schema) {
         const validateOptions = this.parseValidationOptions(options);
         const result = this.validateService.validateWithSchema(schema, value, validateOptions);
@@ -26,7 +27,10 @@ class AbstractValidationPipe {
     }
     validate(value, options) {
         const validateOptions = this.parseValidationOptions(options);
-        if (options.metaType.isBaseType) {
+        if (options.metaType.isBaseType ||
+            !options.metaType.originDesign ||
+            options.metadata?.type === 'files_stream' ||
+            options.metadata?.type === 'file_stream') {
             return value;
         }
         const result = this.validateService.validate(options.metaType.originDesign, value, validateOptions);
@@ -103,6 +107,7 @@ exports.ParseFloatPipe = ParseFloatPipe = __decorate([
     (0, core_1.Pipe)()
 ], ParseFloatPipe);
 class DefaultValuePipe {
+    defaultValue;
     constructor(defaultValue) {
         this.defaultValue = defaultValue;
     }

package/dist/service.js

@@ -9,7 +9,8 @@ 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.getSchema = exports.ValidateService = void 0;
+exports.ValidateService = void 0;
+exports.getSchema = getSchema;
 const core_1 = require("@midwayjs/core");
 const DefaultConfig = require("./config/config.default");
 const constants_1 = require("./constants");
@@ -17,9 +18,10 @@ const Joi = require("joi");
 const i18n_1 = require("@midwayjs/i18n");
 const error_1 = require("./error");
 let ValidateService = class ValidateService {
-    constructor() {
-        this.messages = {};
-    }
+    validateConfig;
+    i18nConfig;
+    i18nService;
+    messages = {};
     async init() {
         const locales = Object.keys(DefaultConfig.i18n.localeTable);
         locales.forEach(locale => {
@@ -82,5 +84,4 @@ function getSchema(ClzType) {
         return Joi.object(rules);
     }
 }
-exports.getSchema = getSchema;
 //# sourceMappingURL=service.js.map

package/locales/zh_CN.json

@@ -1,5 +1,5 @@
 {
-  "alternatives.all": "{{#label}} 不能匹配上所以可选项",
+  "alternatives.all": "{{#label}} 不能匹配上所有可选项",
   "alternatives.any": "{{#label}} 不能匹配上任何可选项",
   "alternatives.match": "{{#label}} 不能匹配上任何可选项",
   "alternatives.one": "{{#label}} 匹配超过一个可选项",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/validate",
-  "version": "4.0.0-alpha.1",
-  "description": "Midway Component for mongoose",
+  "version": "4.0.0-beta.10",
+  "description": "Midway Component for validation (using @midwayjs/validation first)",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
@@ -19,18 +19,18 @@
     "index.d.ts"
   ],
   "engines": {
-    "node": ">=12"
+    "node": ">=20"
   },
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/i18n": "^4.0.0-alpha.1",
+    "@midwayjs/i18n": "^4.0.0-beta.10",
     "joi": "17.13.3"
   },
   "devDependencies": {
-    "@midwayjs/core": "^4.0.0-alpha.1",
-    "@midwayjs/express": "^4.0.0-alpha.1",
-    "@midwayjs/koa": "^4.0.0-alpha.1",
-    "@midwayjs/mock": "^4.0.0-alpha.1"
+    "@midwayjs/core": "^4.0.0-beta.10",
+    "@midwayjs/express": "^4.0.0-beta.10",
+    "@midwayjs/koa": "^4.0.0-beta.10",
+    "@midwayjs/mock": "^4.0.0-beta.10"
   },
-  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
+  "gitHead": "1b1856629913703f67304155aaf611ec936a81ac"
 }