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

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 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)
 
 

package/dist/error.d.ts

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

package/dist/error.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValidationNotMethodPropertyError = exports.ValidationPropertyMissingError = exports.MidwayValidationError = void 0;
+exports.MidwayValidationError = void 0;
 const core_1 = require("@midwayjs/core");
 const ValidateErrorCode = (0, core_1.registerErrorCode)('validate', {
     VALIDATE_FAIL: 10000,
-    PROPERTY_MISSING: 10001,
-    NOT_METHOD_PROPERTY: 10002,
 });
 class MidwayValidationError extends core_1.MidwayHttpError {
     constructor(message, status, cause) {
@@ -15,16 +13,4 @@ class MidwayValidationError extends core_1.MidwayHttpError {
     }
 }
 exports.MidwayValidationError = MidwayValidationError;
-class ValidationPropertyMissingError extends core_1.MidwayError {
-    constructor(key) {
-        super(`Cannot find property of "${key}"`, ValidateErrorCode.PROPERTY_MISSING);
-    }
-}
-exports.ValidationPropertyMissingError = ValidationPropertyMissingError;
-class ValidationNotMethodPropertyError extends core_1.MidwayError {
-    constructor(key) {
-        super(`"${key}" is not a method property!`, ValidateErrorCode.NOT_METHOD_PROPERTY);
-    }
-}
-exports.ValidationNotMethodPropertyError = ValidationNotMethodPropertyError;
 //# sourceMappingURL=error.js.map

package/dist/service.d.ts

@@ -1,6 +1,7 @@
 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 {
     protected validateConfig: typeof DefaultConfig.validate;
     protected i18nConfig: any;
@@ -12,5 +13,11 @@ export declare class ValidateService {
         locale?: string;
         validationOptions?: Joi.ValidationOptions;
     }): 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

@@ -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 error_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.14",
+  "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.14",
+    "@midwayjs/i18n": "^3.0.0-beta.15",
     "joi": "^17.2.1"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-beta.14",
-    "@midwayjs/decorator": "^3.0.0-beta.14",
-    "@midwayjs/express": "^3.0.0-beta.14",
-    "@midwayjs/koa": "^3.0.0-beta.14",
-    "@midwayjs/mock": "^3.0.0-beta.14"
+    "@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": "95695ada36190cf376e93a1a8866b3fb6dde06bc"
+  "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,63 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.merge = exports.set = exports.reach = exports.overrideMethodProperty = void 0;
-const error_1 = require("./error");
-function overrideMethodProperty(object, key, method) {
-    const descriptor = Object.getOwnPropertyDescriptor(object, key);
-    if (!descriptor) {
-        throw new error_1.ValidationPropertyMissingError(key);
-    }
-    const superMethod = descriptor.value;
-    if (typeof superMethod !== 'function') {
-        throw new error_1.ValidationNotMethodPropertyError(key);
-    }
-    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