starlight-server 1.7.0 → 1.7.1

package/dist/router/helpers.d.ts

@@ -1,5 +1,6 @@
 import { type Definition as ValidatorDefinition } from '@anjianshi/utils/validators/index.js';
 import { type BasicContext } from './index.js';
+import { ResponseUtils } from '../http/response.js';
 export declare class Helpers {
     readonly context: BasicContext;
     constructor(context: BasicContext);
@@ -54,6 +55,9 @@ export declare class Helpers {
     } : T_1 extends import("@anjianshi/utils/validators/factory.js").RecordDefinition ? Omit<T_1, "record"> & {
         record: import("@anjianshi/utils/validators/factory.js").ValidatorForDefinition<T_1["record"]>;
     } : T_1 : never : never>>;
+}
+export declare class ResponseUtilsWithHelpers extends ResponseUtils {
+    constructor(response: ResponseUtils);
     success(data?: unknown): void;
     failed(message: string, code?: string | number): void;
     failed<T>(message: string, code: string | number | undefined, data: T): void;

package/dist/router/helpers.js

@@ -1,6 +1,7 @@
 import { success, failed } from '@anjianshi/utils';
 import { getValidator, } from '@anjianshi/utils/validators/index.js';
 import { HTTPError } from '../index.js';
+import { ResponseUtils } from '../http/response.js';
 export class Helpers {
     context;
     constructor(context) {
@@ -27,10 +28,15 @@ export class Helpers {
             return result.data;
         throw new HTTPError(400, result.message);
     }
+}
+export class ResponseUtilsWithHelpers extends ResponseUtils {
+    constructor(response) {
+        super(response.nodeResponse, response.logger, response.jsonReplacer);
+    }
     success(data) {
-        this.context.response.json(success(data));
+        this.json(success(data));
     }
     failed(message, code, data) {
-        this.context.response.json(failed(message, code, data));
+        this.json(failed(message, code, data));
     }
 }

package/dist/router/index.d.ts

@@ -2,18 +2,16 @@ import { type OptionalFields } from '@anjianshi/utils';
 import { type CORSRule } from '../http/cors.js';
 import { type Request, type ResponseUtils } from '../http/index.js';
 import { Swagger, type Method } from '../swagger/index.js';
-import { Helpers } from './helpers.js';
+import { Helpers, ResponseUtilsWithHelpers } from './helpers.js';
 import { type PathParameters } from './match-path.js';
 type HelpersInst = InstanceType<typeof Helpers>;
 export interface BasicContext {
     request: Request;
-    response: ResponseUtils;
+    response: ResponseUtilsWithHelpers;
     pathParameters: PathParameters;
     validatePathParameters: HelpersInst['validatePathParameters'];
     validateQuery: HelpersInst['validateQuery'];
     validateBody: HelpersInst['validateBody'];
-    success: HelpersInst['success'];
-    failed: HelpersInst['failed'];
 }
 /** 使用者可自行补充 Context 定义  */
 export interface Context extends BasicContext {
@@ -67,6 +65,6 @@ export declare class Router {
      * 请求处理
      * ----------------------
      */
-    readonly handle: (request: Request, response: ResponseUtils) => Promise<void>;
+    readonly handle: (request: Request, originResponse: ResponseUtils) => Promise<void>;
 }
 export {};

package/dist/router/index.js

@@ -2,7 +2,7 @@ import { joinPath } from '@anjianshi/utils';
 import { getPreflightRequestMethod, handleCORS } from '../http/cors.js';
 import { HTTPError } from '../http/index.js';
 import { Swagger } from '../swagger/index.js';
-import { Helpers } from './helpers.js';
+import { Helpers, ResponseUtilsWithHelpers } from './helpers.js';
 import { matchPath } from './match-path.js';
 export class Router {
     /**
@@ -78,7 +78,8 @@ export class Router {
      * 请求处理
      * ----------------------
      */
-    handle = async (request, response) => {
+    handle = async (request, originResponse) => {
+        const response = new ResponseUtilsWithHelpers(originResponse);
         const pathMatchedRoutes = matchPath(this.routes.map(route => route.path), request.path).map(result => ({ route: this.routes[result.index], parameters: result.parameters }));
         if (!pathMatchedRoutes.length)
             throw new HTTPError(404); // 没有路径匹配的路由
@@ -108,8 +109,6 @@ export class Router {
             validatePathParameters: helpers.validatePathParameters.bind(helpers),
             validateQuery: helpers.validateQuery.bind(helpers),
             validateBody: helpers.validateBody.bind(helpers),
-            success: helpers.success.bind(helpers),
-            failed: helpers.failed.bind(helpers),
         });
         const result = await this.executor(basicContext, matched.route);
         if (result !== undefined)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starlight-server",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Simple But Powerful Node.js HTTP Server",
   "type": "module",
   "keywords": [

package/src/router/helpers.ts

@@ -5,6 +5,7 @@ import {
 } from '@anjianshi/utils/validators/index.js'
 import { HTTPError } from '@/index.js'
 import { type BasicContext } from './index.js'
+import { ResponseUtils } from '@/http/response.js'
 
 export class Helpers {
   constructor(readonly context: BasicContext) {}
@@ -35,14 +36,20 @@ export class Helpers {
     if (result.success) return result.data
     throw new HTTPError(400, result.message)
   }
+}
+
+export class ResponseUtilsWithHelpers extends ResponseUtils {
+  constructor(response: ResponseUtils) {
+    super(response.nodeResponse, response.logger, response.jsonReplacer)
+  }
 
   success(data?: unknown) {
-    this.context.response.json(success(data))
+    this.json(success(data))
   }
 
   failed(message: string, code?: string | number): void
   failed<T>(message: string, code: string | number | undefined, data: T): void
   failed<T>(message: string, code?: string | number, data?: T) {
-    this.context.response.json(failed(message, code, data))
+    this.json(failed(message, code, data))
   }
 }

package/src/router/index.ts

@@ -2,19 +2,17 @@ import { type OptionalFields, joinPath } from '@anjianshi/utils'
 import { getPreflightRequestMethod, handleCORS, type CORSRule } from '@/http/cors.js'
 import { HTTPError, type Request, type ResponseUtils } from '@/http/index.js'
 import { Swagger, type Method } from '@/swagger/index.js'
-import { Helpers } from './helpers.js'
+import { Helpers, ResponseUtilsWithHelpers } from './helpers.js'
 import { matchPath, type PathParameters } from './match-path.js'
 
 type HelpersInst = InstanceType<typeof Helpers>
 export interface BasicContext {
   request: Request
-  response: ResponseUtils
+  response: ResponseUtilsWithHelpers
   pathParameters: PathParameters
   validatePathParameters: HelpersInst['validatePathParameters']
   validateQuery: HelpersInst['validateQuery']
   validateBody: HelpersInst['validateBody']
-  success: HelpersInst['success']
-  failed: HelpersInst['failed']
 }
 
 /** 使用者可自行补充 Context 定义  */
@@ -109,7 +107,9 @@ export class Router {
    * 请求处理
    * ----------------------
    */
-  readonly handle = async (request: Request, response: ResponseUtils) => {
+  readonly handle = async (request: Request, originResponse: ResponseUtils) => {
+    const response = new ResponseUtilsWithHelpers(originResponse)
+
     const pathMatchedRoutes = matchPath(
       this.routes.map(route => route.path),
       request.path,
@@ -144,8 +144,6 @@ export class Router {
       validatePathParameters: helpers.validatePathParameters.bind(helpers),
       validateQuery: helpers.validateQuery.bind(helpers),
       validateBody: helpers.validateBody.bind(helpers),
-      success: helpers.success.bind(helpers),
-      failed: helpers.failed.bind(helpers),
     })
 
     const result = await (this.executor(basicContext, matched.route) as Promise<unknown>)