starlight-server 1.7.3 → 1.7.4

package/dist/router/helpers.d.ts

@@ -64,12 +64,10 @@ export declare function getRequestWithHelpers(request: Request, pathParameters:
 declare class ResponseUtilsHelpers {
     readonly response: ResponseUtils;
     constructor(response: ResponseUtils);
-    success(data?: unknown): never;
-    failed(message: string, code?: string | number): never;
-    failed<T>(message: string, code: string | number | undefined, data: T): never;
-    maySuccess(result: MaySuccess<unknown, unknown>): never;
-}
-export declare class ResponseFinish {
+    success(data?: unknown): void;
+    failed(message: string, code?: string | number): void;
+    failed<T>(message: string, code: string | number | undefined, data: T): void;
+    maySuccess(result: MaySuccess<unknown, unknown>): void;
 }
 export type ResponseUtilsWithHelpers = ResponseUtils & ResponseUtilsHelpers;
 export declare function getResponseUtilsWithHelpers(response: ResponseUtils): ResponseUtilsWithHelpers;

package/dist/router/helpers.js

@@ -46,23 +46,21 @@ class ResponseUtilsHelpers {
     constructor(response) {
         this.response = response;
     }
-    // 输出成功结果，并结束响应处理
+    // 原本这里想做成调用方法后直接结束 handler
+    // 但因为 TypeScript 的限制，无法正确处理类方法的 never 返回值，所以作罢
+    // https://github.com/microsoft/TypeScript/issues/36753
+    // 输出成功结果
     success(data) {
         this.maySuccess(success(data));
     }
     failed(message, code, data) {
         this.maySuccess(failed(message, code, data));
     }
-    // 输出 MaySuccess 对象，并结束响应处理
+    // 输出 MaySuccess 对象
     maySuccess(result) {
         this.response.json(result);
-        throw new ResponseFinish();
     }
 }
-// 通过捕获此对象实现提前结束响应处理
-// eslint-disable-next-line @typescript-eslint/no-extraneous-class
-export class ResponseFinish {
-}
 export function getResponseUtilsWithHelpers(response) {
     const helpers = new ResponseUtilsHelpers(response);
     return new Proxy(response, {

package/dist/router/index.d.ts

@@ -2,7 +2,7 @@ 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 { type RequestWithHelpers, type ResponseUtilsWithHelpers, ResponseFinish } from './helpers.js';
+import { type RequestWithHelpers, type ResponseUtilsWithHelpers } from './helpers.js';
 import { type PathParameters } from './match-path.js';
 export interface BasicContext {
     pathParameters: PathParameters;
@@ -21,8 +21,6 @@ export interface Route {
     /** 此接口的 CORS 规则 */
     cors?: CORSRule;
 }
-/** handler 里抛出此异常可提前结束请求处理 */
-export { ResponseFinish };
 export declare class Router {
     /**
      * ----------------------

package/dist/router/index.js

@@ -2,10 +2,8 @@ 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 { getRequestWithHelpers, getResponseUtilsWithHelpers, ResponseFinish, } from './helpers.js';
+import { getRequestWithHelpers, getResponseUtilsWithHelpers, } from './helpers.js';
 import { matchPath } from './match-path.js';
-/** handler 里抛出此异常可提前结束请求处理 */
-export { ResponseFinish };
 export class Router {
     /**
      * ----------------------
@@ -108,14 +106,8 @@ export class Router {
             request: requestWithHelpers,
             response: responseWithHelpers,
         });
-        try {
-            const result = await this.executor(basicContext, matched.route);
-            if (result !== undefined)
-                throw new Error('route handler 不应该有返回值');
-        }
-        catch (error) {
-            if (!(error instanceof ResponseFinish))
-                throw error;
-        }
+        const result = await this.executor(basicContext, matched.route);
+        if (result !== undefined)
+            throw new Error('route handler 不应该有返回值');
     };
 }

package/package.json

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

package/src/router/helpers.ts

@@ -59,29 +59,28 @@ export function getRequestWithHelpers(request: Request, pathParameters: PathPara
 class ResponseUtilsHelpers {
   constructor(readonly response: ResponseUtils) {}
 
-  // 输出成功结果，并结束响应处理
-  success(data?: unknown): never {
+  // 原本这里想做成调用方法后直接结束 handler
+  // 但因为 TypeScript 的限制，无法正确处理类方法的 never 返回值，所以作罢
+  // https://github.com/microsoft/TypeScript/issues/36753
+
+  // 输出成功结果
+  success(data?: unknown) {
     this.maySuccess(success(data))
   }
 
-  // 输出失败结果，并结束响应处理
-  failed(message: string, code?: string | number): never
-  failed<T>(message: string, code: string | number | undefined, data: T): never
+  // 输出失败结果
+  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.maySuccess(failed(message, code, data))
   }
 
-  // 输出 MaySuccess 对象，并结束响应处理
-  maySuccess(result: MaySuccess<unknown, unknown>): never {
+  // 输出 MaySuccess 对象
+  maySuccess(result: MaySuccess<unknown, unknown>): void {
     this.response.json(result)
-    throw new ResponseFinish()
   }
 }
 
-// 通过捕获此对象实现提前结束响应处理
-// eslint-disable-next-line @typescript-eslint/no-extraneous-class
-export class ResponseFinish {}
-
 export type ResponseUtilsWithHelpers = ResponseUtils & ResponseUtilsHelpers
 
 export function getResponseUtilsWithHelpers(response: ResponseUtils) {

package/src/router/index.ts

@@ -7,7 +7,6 @@ import {
   getResponseUtilsWithHelpers,
   type RequestWithHelpers,
   type ResponseUtilsWithHelpers,
-  ResponseFinish,
 } from './helpers.js'
 import { matchPath, type PathParameters } from './match-path.js'
 
@@ -30,9 +29,6 @@ export interface Route {
   cors?: CORSRule
 }
 
-/** handler 里抛出此异常可提前结束请求处理 */
-export { ResponseFinish }
-
 export class Router {
   /**
    * ----------------------
@@ -147,11 +143,7 @@ export class Router {
       response: responseWithHelpers,
     })
 
-    try {
-      const result = await (this.executor(basicContext, matched.route) as Promise<unknown>)
-      if (result !== undefined) throw new Error('route handler 不应该有返回值')
-    } catch (error) {
-      if (!(error instanceof ResponseFinish)) throw error
-    }
+    const result = await (this.executor(basicContext, matched.route) as Promise<unknown>)
+    if (result !== undefined) throw new Error('route handler 不应该有返回值')
   }
 }