@thinkbun/middleware 1.0.0 → 1.0.2

package/CHANGELOG.md

@@ -0,0 +1,17 @@
+# @thinkbun/middleware
+
+## 1.0.2
+
+### Patch Changes
+
+- 替换 ajv 为 typebox 进行数据校验
+- Updated dependencies
+  - @thinkbun/core@1.0.5
+
+## 1.0.1
+
+### Patch Changes
+
+- 完善功能
+- Updated dependencies
+  - @thinkbun/core@1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thinkbun/middleware",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "module": "src/index.ts",
   "type": "module",
   "devDependencies": {
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "picocolors": "^1.1.1",
-    "@thinkbun/core": "workspace:*"
+    "@thinkbun/core": "1.0.4"
   },
   "publishConfig": {
     "access": "public"

package/src/index.ts

@@ -3,15 +3,12 @@ import { cors as _cors, type CorsOptions } from './middlewares/cors';
 import { errorHandler as _errorHandler, type ErrorHandlerOptions } from './middlewares/errorHandler';
 import { logger as _logger, type LoggerOptions } from './middlewares/logger';
 import { staticServe as _staticServe, type StaticOptions } from './middlewares/static';
-import { validator as _validator, type ValidatorOptions, type ValidationRule } from './middlewares/validator';
 
 // 重新导出各个中间件
 export { _errorHandler as errorHandler };
 export type { ErrorHandlerOptions };
 export { _logger as logger };
 export type { LoggerOptions };
-export { _validator as validator };
-export type { ValidatorOptions, ValidationRule };
 export { _cors as cors };
 export type { CorsOptions };
 export { _staticServe as staticServe };
@@ -24,7 +21,6 @@ export type { Middleware, Context } from '@thinkbun/core';
 export const middlewares = {
   errorHandler: _errorHandler,
   logger: _logger,
-  validator: _validator,
   cors: _cors,
   staticServe: _staticServe,
 };

package/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
+  "include": [
+    "src/**/*",
+    "package.json"
+  ]
 }

package/src/middlewares/validator.ts

@@ -1,187 +0,0 @@
-import { BadRequestError, type Context, type Middleware, type RouteSchema } from '@thinkbun/core';
-import Ajv from 'ajv';
-import addFormats from 'ajv-formats';
-
-// 使用与核心框架相同的Ajv配置
-const ajv = addFormats(
-  new Ajv({
-    coerceTypes: true, // 自动类型转换
-    useDefaults: true, // 使用默认值
-    removeAdditional: false, // 保留额外属性
-    allErrors: true, // 返回所有错误
-  }),
-  [
-    'date-time',
-    'time',
-    'date',
-    'email',
-    'hostname',
-    'ipv4',
-    'ipv6',
-    'uri',
-    'uri-reference',
-    'uuid',
-    'uri-template',
-    'json-pointer',
-    'relative-json-pointer',
-    'regex',
-  ],
-);
-
-export interface ValidationRule {
-  /**
-   * 路由路径
-   * @example '/api/users'
-   */
-  path: string;
-  /**
-   * HTTP方法
-   * @example 'POST'
-   */
-  method: string;
-  /**
-   * 验证模式
-   */
-  schema: RouteSchema;
-}
-
-export interface ValidatorOptions {
-  /**
-   * 验证规则列表
-   */
-  rules: ValidationRule[];
-  /**
-   * 自定义错误处理函数
-   * @param error 验证错误
-   * @param ctx 请求上下文
-   * @returns 返回自定义的Response对象或抛出错误使用默认处理
-   */
-  errorHandler?: (error: Error, ctx: Context) => Response | never;
-}
-
-export function validator(options: ValidatorOptions): Middleware {
-  if (!options.rules || options.rules.length === 0) {
-    throw new Error('Validator middleware requires at least one validation rule');
-  }
-
-  // 编译所有验证规则
-  const compiledRules = options.rules.map((rule) => {
-    const compiled: any = {};
-
-    if (rule.schema.query) {
-      compiled.query = ajv.compile(rule.schema.query);
-    }
-
-    if (rule.schema.body) {
-      compiled.body = ajv.compile(rule.schema.body);
-    }
-
-    if (rule.schema.params) {
-      compiled.params = ajv.compile(rule.schema.params);
-    }
-
-    if (rule.schema.headers) {
-      compiled.headers = ajv.compile(rule.schema.headers);
-    }
-
-    return {
-      ...rule,
-      compiled,
-    };
-  });
-
-  return async (ctx: Context, next: () => Promise<Response | Context | void>): Promise<Response | Context | void> => {
-    // 查找匹配的验证规则
-    const matchingRules = compiledRules.filter(
-      (rule) => rule.path === ctx.path && rule.method.toUpperCase() === ctx.method.toUpperCase(),
-    );
-
-    if (matchingRules.length === 0) {
-      // 没有匹配的验证规则，继续执行后续中间件
-      return await next();
-    }
-
-    // 使用第一个匹配的规则
-    const rule = matchingRules[0]!; // 类型断言，因为已经确保matchingRules.length > 0
-    const errors: any[] = [];
-
-    // 验证查询参数
-    if (rule.compiled.query) {
-      const query = Object.fromEntries(ctx.url.searchParams);
-      if (!rule.compiled.query(query)) {
-        errors.push(
-          ...rule.compiled.query.errors!.map((err: any) => ({
-            ...err,
-            source: 'query',
-          })),
-        );
-      }
-    }
-
-    // 验证路由参数
-    if (rule.compiled.params) {
-      if (!rule.compiled.params(ctx.params)) {
-        errors.push(
-          ...rule.compiled.params.errors!.map((err: any) => ({
-            ...err,
-            source: 'params',
-          })),
-        );
-      }
-    }
-
-    // 验证请求头
-    if (rule.compiled.headers) {
-      const headers = Object.fromEntries(ctx.headers);
-      if (!rule.compiled.headers(headers)) {
-        errors.push(
-          ...rule.compiled.headers.errors!.map((err: any) => ({
-            ...err,
-            source: 'headers',
-          })),
-        );
-      }
-    }
-
-    // 验证请求体
-    if (rule.compiled.body && ctx.method !== 'GET' && ctx.method !== 'HEAD') {
-      try {
-        const body = await ctx.body();
-        if (!rule.compiled.body(body)) {
-          errors.push(
-            ...rule.compiled.body.errors!.map((err: any) => ({
-              ...err,
-              source: 'body',
-            })),
-          );
-        }
-      } catch (error) {
-        // 如果无法解析请求体，添加错误信息
-        errors.push({
-          keyword: 'invalid_body',
-          message: 'Invalid request body',
-          source: 'body',
-        });
-      }
-    }
-
-    // 如果有验证错误
-    if (errors.length > 0) {
-      const error = new BadRequestError(errors);
-
-      // 使用自定义错误处理（如果提供）
-      if (options.errorHandler) {
-        const response = options.errorHandler(error, ctx);
-        if (response) {
-          return response;
-        }
-      }
-
-      // 抛出错误，由错误处理中间件处理
-      throw error;
-    }
-
-    // 验证通过，继续执行后续中间件
-    return await next();
-  };
-}