@midwayjs/validate 3.0.0-beta.11 → 3.0.0-beta.15

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.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07)
+
+
+### Features
+
+* add info middleware ([#1530](https://github.com/midwayjs/midway/issues/1530)) ([7077f1d](https://github.com/midwayjs/midway/commit/7077f1d84355633a1c2fced35bfcc2152f42a7ac))
+
+
+
+
+
+# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04)
+
+
+### Bug Fixes
+
+* cos config definition & 3.x doc update ([#1515](https://github.com/midwayjs/midway/issues/1515)) ([0ac7ac5](https://github.com/midwayjs/midway/commit/0ac7ac5805b7ab8873f8792fc1712a74e3223172))
+
+
+
+
+
+# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30)
+
+**Note:** Version bump only for package @midwayjs/validate
+
+
+
+
+
+# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28)
+
+
+### Features
+
+* custom error code & add @Files/@Fields ([#1438](https://github.com/midwayjs/midway/issues/1438)) ([b0032af](https://github.com/midwayjs/midway/commit/b0032afd2fa9ea0416fe69f4bd0c1a58bea5314e))
+* support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9))
+
+
+
+
+
 # [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21)
 
 **Note:** Version bump only for package @midwayjs/validate

package/dist/error.d.ts

@@ -0,0 +1,5 @@
+import { MidwayHttpError } from '@midwayjs/core';
+export declare class MidwayValidationError extends MidwayHttpError {
+    constructor(message: any, status: any, cause: any);
+}
+//# sourceMappingURL=error.d.ts.map

package/dist/error.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MidwayValidationError = void 0;
+const core_1 = require("@midwayjs/core");
+const ValidateErrorCode = (0, core_1.registerErrorCode)('validate', {
+    VALIDATE_FAIL: 10000,
+});
+class MidwayValidationError extends core_1.MidwayHttpError {
+    constructor(message, status, cause) {
+        super(message, status, ValidateErrorCode.VALIDATE_FAIL, {
+            cause,
+        });
+    }
+}
+exports.MidwayValidationError = MidwayValidationError;
+//# sourceMappingURL=error.js.map

package/dist/index.d.ts

@@ -3,4 +3,5 @@ export * from './decorator/rule';
 export * from './decorator/validate';
 export * from './dtoHelper';
 export * from './service';
+export * from './error';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -17,4 +17,5 @@ __exportStar(require("./decorator/rule"), exports);
 __exportStar(require("./decorator/validate"), exports);
 __exportStar(require("./dtoHelper"), exports);
 __exportStar(require("./service"), exports);
+__exportStar(require("./error"), exports);
 //# sourceMappingURL=index.js.map

package/dist/service.d.ts

@@ -1,16 +1,23 @@
 import * as DefaultConfig from './config/config.default';
 import * as Joi from 'joi';
 import { MidwayI18nServiceSingleton } from '@midwayjs/i18n';
+import { ObjectSchema } from 'joi';
 export declare class ValidateService {
-    validateConfig: typeof DefaultConfig.validate;
-    i18nConfig: any;
-    i18nService: MidwayI18nServiceSingleton;
-    messages: {};
-    init(): Promise<void>;
-    validate(ClzType: new (...args: any[]) => any, value: any, options?: {
+    protected validateConfig: typeof DefaultConfig.validate;
+    protected i18nConfig: any;
+    protected i18nService: MidwayI18nServiceSingleton;
+    protected messages: {};
+    protected init(): Promise<void>;
+    validate<T extends new (...args: any[]) => any>(ClzType: T, value: any, options?: {
         errorStatus?: number;
         locale?: string;
         validationOptions?: Joi.ValidationOptions;
-    }): Joi.ValidationResult<any>;
+    }): Joi.ValidationResult<T>;
+    validateWithSchema<T>(schema: ObjectSchema<any>, value: any, options?: {
+        errorStatus?: number;
+        locale?: string;
+        validationOptions?: Joi.ValidationOptions;
+    }): Joi.ValidationResult<T>;
+    getSchema<T extends new (...args: any[]) => any>(ClzType: T): ObjectSchema<any>;
 }
 //# sourceMappingURL=service.d.ts.map

package/dist/service.js

@@ -13,9 +13,9 @@ exports.ValidateService = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const DefaultConfig = require("./config/config.default");
 const constants_1 = require("./constants");
-const core_1 = require("@midwayjs/core");
 const Joi = require("joi");
 const i18n_1 = require("@midwayjs/i18n");
+const error_1 = require("./error");
 let ValidateService = class ValidateService {
     constructor() {
         this.messages = {};
@@ -26,8 +26,8 @@ let ValidateService = class ValidateService {
             this.messages[(0, i18n_1.formatLocale)(locale)] = Object.fromEntries(this.i18nService.getLocaleMapping(locale, 'validate'));
         });
     }
-    validate(ClzType, value, options) {
-        var _a, _b;
+    validate(ClzType, value, options = {}) {
+        var _a, _b, _c;
         options.validationOptions = options.validationOptions || {};
         options.validationOptions.errors = options.validationOptions.errors || {};
         options.validationOptions.errors.language = (0, i18n_1.formatLocale)(this.i18nService.getAvailableLocale(options.validationOptions.errors.language ||
@@ -36,17 +36,40 @@ let ValidateService = class ValidateService {
         const rules = (0, decorator_1.getClassExtendedMetadata)(constants_1.RULES_KEY, ClzType);
         if (rules) {
             const schema = Joi.object(rules);
-            const result = schema.validate(value, Object.assign(this.validateConfig.validationOptions, {
+            const result = schema.validate(value, Object.assign((_a = this.validateConfig.validationOptions) !== null && _a !== void 0 ? _a : {}, {
                 messages: this.messages,
-            }, (_a = options.validationOptions) !== null && _a !== void 0 ? _a : {}));
+            }, (_b = options.validationOptions) !== null && _b !== void 0 ? _b : {}));
             if (result.error) {
-                throw new core_1.MidwayValidationError(result.error.message, (_b = options === null || options === void 0 ? void 0 : options.errorStatus) !== null && _b !== void 0 ? _b : this.validateConfig.errorStatus, 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);
             }
             else {
                 return result;
             }
         }
     }
+    validateWithSchema(schema, value, options = {}) {
+        var _a, _b, _c;
+        options.validationOptions = options.validationOptions || {};
+        options.validationOptions.errors = options.validationOptions.errors || {};
+        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 : {}, {
+            messages: this.messages,
+        }, (_b = options.validationOptions) !== null && _b !== void 0 ? _b : {}));
+        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);
+        }
+        else {
+            return result;
+        }
+    }
+    getSchema(ClzType) {
+        const rules = (0, decorator_1.getClassExtendedMetadata)(constants_1.RULES_KEY, ClzType);
+        if (rules) {
+            return Joi.object(rules);
+        }
+    }
 };
 __decorate([
     (0, decorator_1.Config)('validate'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/validate",
-  "version": "3.0.0-beta.11",
+  "version": "3.0.0-beta.15",
   "description": "Midway Component for mongoose",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -23,15 +23,15 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/i18n": "^3.0.0-beta.11",
+    "@midwayjs/i18n": "^3.0.0-beta.15",
     "joi": "^17.2.1"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-beta.11",
-    "@midwayjs/decorator": "^3.0.0-beta.11",
-    "@midwayjs/express": "^3.0.0-beta.11",
-    "@midwayjs/koa": "^3.0.0-beta.11",
-    "@midwayjs/mock": "^3.0.0-beta.11"
+    "@midwayjs/core": "^3.0.0-beta.15",
+    "@midwayjs/decorator": "^3.0.0-beta.15",
+    "@midwayjs/express": "^3.0.0-beta.15",
+    "@midwayjs/koa": "^3.0.0-beta.15",
+    "@midwayjs/mock": "^3.0.0-beta.15"
   },
-  "gitHead": "a2b066fd500e815e799e7f421cd216f12e0e9f8e"
+  "gitHead": "6b9778557289d9e8b562c7ce6127736db1248973"
 }

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.

package/dist/util.d.ts

@@ -1,5 +0,0 @@
-export declare function overrideMethodProperty(object: Record<any, any>, key: string, method: (superMethod: any) => any): void;
-export declare function reach(target: object, path: string): any;
-export declare function set<T extends object>(target: T, path: string, value: any): T;
-export declare function merge(target: object, source: object): object;
-//# sourceMappingURL=util.d.ts.map

package/dist/util.js

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.merge = exports.set = exports.reach = exports.overrideMethodProperty = void 0;
-function overrideMethodProperty(object, key, method) {
-    const descriptor = Object.getOwnPropertyDescriptor(object, key);
-    if (!descriptor) {
-        throw new Error(`Cannot find property of "${key}"`);
-    }
-    const superMethod = descriptor.value;
-    if (typeof superMethod !== 'function') {
-        throw new Error(`"${key}" is not a method property!`);
-    }
-    Object.defineProperty(object, key, {
-        ...descriptor,
-        value: function overridedMethod() {
-            // eslint-disable-next-line prefer-rest-params
-            return method.call(this, superMethod).apply(this, arguments);
-        },
-    });
-}
-exports.overrideMethodProperty = overrideMethodProperty;
-function reach(target, path) {
-    for (const key of path.split('.')) {
-        if (target && target[key] !== undefined) {
-            target = target[key];
-        }
-        else {
-            return;
-        }
-    }
-    return target;
-}
-exports.reach = reach;
-function set(target, path, value) {
-    path.split('.').reduce((res, path, index, array) => {
-        if (index === array.length - 1) {
-            res[path] = value;
-        }
-        else {
-            res[path] = typeof res[path] === 'object' ? res[path] : {};
-        }
-        return res[path];
-    }, target);
-    return target;
-}
-exports.set = set;
-function merge(target, source) {
-    for (const key in source) {
-        try {
-            target[key] =
-                typeof source[key] === 'object'
-                    ? { ...merge(target[key], source[key]) }
-                    : source[key];
-        }
-        catch (e) {
-            target[key] = source[key];
-        }
-    }
-    return target;
-}
-exports.merge = merge;
-//# sourceMappingURL=util.js.map