@jayfong/x-server 1.14.0 → 1.14.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.14.1](https://github.com/jfWorks/x-server/compare/v1.14.0...v1.14.1) (2022-04-26)
+
+
+### Bug Fixes
+
+* requestDataSchema ([8b4f910](https://github.com/jfWorks/x-server/commit/8b4f910b1e9efbc082571b9ef407d7baf31b6319))
+
 ## [1.14.0](https://github.com/jfWorks/x-server/compare/v1.13.1...v1.14.0) (2022-04-26)
 
 

package/lib/_cjs/core/handler.js

@@ -9,9 +9,12 @@ var _dispose = require("../services/dispose");
 
 var _http_error = require("../core/http_error");
 
+var _validator = require("vtils/validator");
+
 class Handler {
   constructor(options) {
     this.options = options;
+    this.requestDataSchema = void 0;
 
     this.handle = async (data, ctx) => {
       // 前置 hook
@@ -27,11 +30,10 @@ class Handler {
     };
 
     this.handleHttp = async (data, ctx) => {
-      // 输入验证
-      if (this.options.requestDataSchema) {
+      // 请求数据验证
+      if (this.requestDataSchema) {
         try {
-          data = await this.options.requestDataSchema.validate( // @ts-ignore
-          data, {
+          data = await this.requestDataSchema.validate(data, {
             strict: true,
             abortEarly: true,
             stripUnknown: true
@@ -92,6 +94,10 @@ class Handler {
         dispose.dispose();
       });
     };
+
+    if (options.requestDataSchema) {
+      this.requestDataSchema = options.requestDataSchema(_validator.yup);
+    }
   }
 
   static addHook(hook) {

package/lib/core/handler.d.ts

@@ -1,6 +1,7 @@
 import type { XHandler } from './types';
 export declare class Handler<TReqData extends any = void, TResData extends any = void, TReqMethod extends XHandler.Method = XHandler.Method> {
     readonly options: XHandler.Options<TReqData, TResData, TReqMethod>;
+    private requestDataSchema;
     constructor(options: XHandler.Options<TReqData, TResData, TReqMethod>);
     handle: XHandler.Handle<TReqData, TResData, TReqMethod>;
     private handleHttp;

package/lib/core/handler.js

@@ -1,9 +1,11 @@
 import { DataPacker } from 'vtils';
 import { DisposeService } from "../services/dispose";
 import { HttpError } from "../core/http_error";
+import { yup } from 'vtils/validator';
 export class Handler {
   constructor(options) {
     this.options = options;
+    this.requestDataSchema = void 0;
 
     this.handle = async (data, ctx) => {
       // 前置 hook
@@ -19,11 +21,10 @@ export class Handler {
     };
 
     this.handleHttp = async (data, ctx) => {
-      // 输入验证
-      if (this.options.requestDataSchema) {
+      // 请求数据验证
+      if (this.requestDataSchema) {
         try {
-          data = await this.options.requestDataSchema.validate( // @ts-ignore
-          data, {
+          data = await this.requestDataSchema.validate(data, {
             strict: true,
             abortEarly: true,
             stripUnknown: true
@@ -84,6 +85,10 @@ export class Handler {
         dispose.dispose();
       });
     };
+
+    if (options.requestDataSchema) {
+      this.requestDataSchema = options.requestDataSchema(yup);
+    }
   }
 
   static addHook(hook) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",