@jayfong/x-server 2.17.3 → 2.19.0

package/lib/_cjs/core/handler.js

@@ -1,10 +1,12 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.Handler = void 0;
 var _lzString = _interopRequireDefault(require("lz-string"));
 var _vtils = require("vtils");
+var vae = _interopRequireWildcard(require("vtils/vae"));
 var _validator = require("vtils/validator");
 var _http_error = require("../core/http_error");
 var _dispose = require("../services/dispose");
@@ -17,6 +19,7 @@ class Handler {
   constructor(options) {
     this.options = options;
     this.requestDataSchema = void 0;
+    this.requestDataSchemaVae = void 0;
     this.handle = async (data, ctx) => {
       // 前置 hook
       if (Handler.hooks.length) {
@@ -29,7 +32,26 @@ class Handler {
     };
     this.handleHttp = async (data, ctx) => {
       // 请求数据验证
-      if (this.requestDataSchema) {
+      // vae
+      if (this.requestDataSchemaVae) {
+        const res = this.requestDataSchemaVae.parse(
+        // @ts-ignore
+        data, {
+          abortEarly: true,
+          preserveUnknownKeys: false
+        });
+        if (res.success) {
+          // @ts-ignore
+          data = res.data;
+        } else {
+          throw new _http_error.HttpError.BadRequest(
+          // TODO: 暂时兼容编译bug
+          // @ts-ignore
+          res.issues[0].message);
+        }
+      }
+      // yup
+      else if (this.requestDataSchema) {
         try {
           data = await this.requestDataSchema.validate(data, {
             abortEarly: true,
@@ -113,7 +135,9 @@ class Handler {
         dispose.dispose();
       });
     };
-    if (options.requestDataSchema) {
+    if (options.requestDataSchemaVae) {
+      this.requestDataSchemaVae = typeof options.requestDataSchemaVae === 'function' ? options.requestDataSchemaVae(vae.v) : options.requestDataSchemaVae;
+    } else if (options.requestDataSchema) {
       this.requestDataSchema = options.requestDataSchema(_validator.yup);
     }
   }

package/lib/core/handler.d.ts

@@ -1,8 +1,10 @@
+import * as vae from 'vtils/vae';
 import type { XHandler } from './types';
 export type { HandlerMethodMap, HandlerPath, HandlerPayloadMap, HandlerResultMap } from '.x/routes';
 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;
+    readonly requestDataSchemaVae: vae.VaeSchemaOf<TReqData> | undefined;
     constructor(options: XHandler.Options<TReqData, TResData, TReqMethod>);
     handle: XHandler.Handle<TReqData, TResData, TReqMethod>;
     private handleHttp;

package/lib/core/handler.js

@@ -1,5 +1,6 @@
 import LZString from 'lz-string';
 import { DataPacker } from 'vtils';
+import * as vae from 'vtils/vae';
 import { getZhCN, yup } from 'vtils/validator';
 import { HttpError } from "../core/http_error";
 import { DisposeService } from "../services/dispose";
@@ -13,6 +14,7 @@ export class Handler {
   constructor(options) {
     this.options = options;
     this.requestDataSchema = void 0;
+    this.requestDataSchemaVae = void 0;
     this.handle = async (data, ctx) => {
       // 前置 hook
       if (Handler.hooks.length) {
@@ -25,7 +27,26 @@ export class Handler {
     };
     this.handleHttp = async (data, ctx) => {
       // 请求数据验证
-      if (this.requestDataSchema) {
+      // vae
+      if (this.requestDataSchemaVae) {
+        const res = this.requestDataSchemaVae.parse(
+        // @ts-ignore
+        data, {
+          abortEarly: true,
+          preserveUnknownKeys: false
+        });
+        if (res.success) {
+          // @ts-ignore
+          data = res.data;
+        } else {
+          throw new HttpError.BadRequest(
+          // TODO: 暂时兼容编译bug
+          // @ts-ignore
+          res.issues[0].message);
+        }
+      }
+      // yup
+      else if (this.requestDataSchema) {
         try {
           data = await this.requestDataSchema.validate(data, {
             abortEarly: true,
@@ -109,7 +130,9 @@ export class Handler {
         dispose.dispose();
       });
     };
-    if (options.requestDataSchema) {
+    if (options.requestDataSchemaVae) {
+      this.requestDataSchemaVae = typeof options.requestDataSchemaVae === 'function' ? options.requestDataSchemaVae(vae.v) : options.requestDataSchemaVae;
+    } else if (options.requestDataSchema) {
       this.requestDataSchema = options.requestDataSchema(yup);
     }
   }

package/lib/core/types.d.ts

@@ -1,17 +1,18 @@
 /// <reference types="node" />
-import { BasePlugin } from '../plugins/base';
-import { BaseService } from '../services/base';
+import type { MultipartFile } from '@fastify/multipart';
+import type { SocketStream } from '@fastify/websocket';
+import type { Queue } from 'bull';
 import { CronJob } from 'cron';
 import { FastifyReply, FastifyRequest, FastifyServerOptions } from 'fastify';
-import { yup } from 'vtils/validator';
+import type { IncomingHttpHeaders } from 'http';
+import type { MsValue } from 'vtils';
 import type { AsyncOrSync, LiteralUnion, OneOrMore, RequiredDeep } from 'vtils/types';
+import * as vae from 'vtils/vae';
+import { yup } from 'vtils/validator';
+import { BasePlugin } from '../plugins/base';
+import { BaseService } from '../services/base';
 import type { DisposeService } from '../services/dispose';
 import type { Handler } from './handler';
-import type { IncomingHttpHeaders } from 'http';
-import type { MsValue } from 'vtils';
-import type { MultipartFile } from '@fastify/multipart';
-import type { Queue } from 'bull';
-import type { SocketStream } from '@fastify/websocket';
 export declare namespace XServer {
     type Mode = 'development' | 'production';
     interface Route {
@@ -128,9 +129,13 @@ export declare namespace XHandler {
          */
         responseContentType?: LiteralUnion<'text/html', string>;
         /**
-         * 请求数据验证结构
+         * 请求数据验证结构(yup)
          */
         requestDataSchema?: (_: typeof yup) => yup.GetSchema<RequiredDeep<TReqData>>;
+        /**
+         * 请求数据验证结构(vae)
+         */
+        requestDataSchemaVae?: vae.VaeSchemaOf<TReqData> | ((_: typeof vae.v) => vae.VaeSchemaOf<TReqData>);
         /**
          * 处理器
          */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.17.3",
+  "version": "2.19.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -67,7 +67,7 @@
     "tsx": "^3.12.7",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
-    "vtils": "^4.87.0",
+    "vtils": "^4.90.0",
     "yaml": "^2.3.1",
     "yargs": "^17.4.1"
   },