starlight-server 1.9.0 → 1.9.2

package/dist/router/helpers.d.ts

@@ -69,7 +69,8 @@ declare class ResponseUtilsHelpers {
      * 支持传入第二个方法来对数据内容进行格式化：
      * response.success(formatSuccess(result, formatter)) => response.success(result, formatter)
      */
-    success(data?: unknown, formatter?: <T, R>(data: T) => R): void;
+    success(): void;
+    success<T>(data: T, formatter?: (data: T) => unknown): void;
     /**
      * 输出失败结果
      */
@@ -80,7 +81,7 @@ declare class ResponseUtilsHelpers {
      * 支持传入第二个方法来对成功结果的数据内容进行格式化：
      * response.result(formatSuccess(result, formatter)) => response.result(result, formatter)
      */
-    result(result: Result<unknown, unknown>, formatterForSuccess?: <T, R>(data: T) => R): void;
+    result<T>(result: Result<T, unknown>, formatterForSuccess?: (data: T) => unknown): void;
 }
 export type ResponseUtilsWithHelpers = ResponseUtils & ResponseUtilsHelpers;
 export declare function getResponseUtilsWithHelpers(response: ResponseUtils): ResponseUtilsWithHelpers;

package/dist/router/helpers.js

@@ -46,18 +46,15 @@ class ResponseUtilsHelpers {
     constructor(response) {
         this.response = response;
     }
-    // 原本这里想做成调用方法后直接结束 handler
-    // 但因为 TypeScript 的限制，无法正确处理类方法的 never 返回值，所以作罢
-    // https://github.com/microsoft/TypeScript/issues/36753
-    /**
-     * 输出成功结果
-     * 支持传入第二个方法来对数据内容进行格式化：
-     * response.success(formatSuccess(result, formatter)) => response.success(result, formatter)
-     */
     success(data, formatter) {
-        if (data instanceof Promise)
-            throw new Error('不能用 promise 作为响应内容');
-        this.result(success(data), formatter);
+        if (data === undefined) {
+            this.result(success());
+        }
+        else {
+            if (data instanceof Promise)
+                throw new Error('不能用 promise 作为响应内容');
+            this.result(success(data), formatter);
+        }
     }
     failed(message, code, data) {
         if (data instanceof Promise)
@@ -71,9 +68,11 @@ class ResponseUtilsHelpers {
      */
     result(result, formatterForSuccess) {
         if (formatterForSuccess) {
-            result = formatSuccess(result, formatterForSuccess);
+            this.response.json(formatSuccess(result, formatterForSuccess));
+        }
+        else {
+            this.response.json(result);
         }
-        this.response.json(result);
     }
 }
 export function getResponseUtilsWithHelpers(response) {

package/package.json

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

package/src/router/helpers.ts

@@ -70,9 +70,15 @@ class ResponseUtilsHelpers {
    * 支持传入第二个方法来对数据内容进行格式化：
    * response.success(formatSuccess(result, formatter)) => response.success(result, formatter)
    */
-  success(data?: unknown, formatter?: <T, R>(data: T) => R): void {
-    if (data instanceof Promise) throw new Error('不能用 promise 作为响应内容')
-    this.result(success(data), formatter)
+  success(): void
+  success<T>(data: T, formatter?: (data: T) => unknown): void
+  success<T>(data?: T, formatter?: (data: T) => unknown): void {
+    if (data === undefined) {
+      this.result(success())
+    } else {
+      if (data instanceof Promise) throw new Error('不能用 promise 作为响应内容')
+      this.result(success(data), formatter)
+    }
   }
 
   /**
@@ -90,11 +96,12 @@ class ResponseUtilsHelpers {
    * 支持传入第二个方法来对成功结果的数据内容进行格式化：
    * response.result(formatSuccess(result, formatter)) => response.result(result, formatter)
    */
-  result(result: Result<unknown, unknown>, formatterForSuccess?: <T, R>(data: T) => R): void {
+  result<T>(result: Result<T, unknown>, formatterForSuccess?: (data: T) => unknown): void {
     if (formatterForSuccess) {
-      result = formatSuccess(result, formatterForSuccess)
+      this.response.json(formatSuccess(result, formatterForSuccess))
+    } else {
+      this.response.json(result)
     }
-    this.response.json(result)
   }
 }