fix(api-error): fix ApiErrorHandler cannot detected

- fix ApiErrorHandler isSelected function - change ApiError constructor: $option > option
maeumjs · Feb 23, 2024 · 8671ec2 · 8671ec2
1 parent 0b2f0aa
commit 8671ec2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/errors/ApiError.ts b/src/errors/ApiError.ts
@@ -46,7 +46,7 @@ export class ApiError<TDATA_TYPE = unknown> extends Error {
       | Error
       | ApiError<TDATA_TYPE>
       | (TPartialApiErrorReplyArgs<TDATA_TYPE> & {
-          $option?: Partial<IApiErrorOption>;
+          option?: Partial<IApiErrorOption>;
         }),
   ) {
     if (typeof args === 'string') {
@@ -82,7 +82,7 @@ export class ApiError<TDATA_TYPE = unknown> extends Error {
       this.#option = option;
     } else {
       const reply = ApiError.getRestErrorReply(args);
-      const option = ApiError.getRestErrorOption(args?.$option);
+      const option = ApiError.getRestErrorOption(args?.option);
 
       super(reply.message);
 

diff --git a/src/errors/__tests__/rest.error.test.ts b/src/errors/__tests__/rest.error.test.ts
@@ -112,7 +112,7 @@ describe('RestError', () => {
         header: { 'accept-language': 'en' },
         logging: { info: 'message' },
       };
-      const err = new ApiError({ ...reply, $option: option });
+      const err = new ApiError({ ...reply, option });
       expect(err.reply).toMatchObject(reply);
       expect(err.option).toMatchObject(option);
     });

diff --git a/src/handlers/ApiErrorHandler.ts b/src/handlers/ApiErrorHandler.ts
@@ -16,7 +16,7 @@ export class ApiErrorHandler extends HTTPErrorHandler {
       return false;
     }
 
-    if (args.err instanceof ApiError) {
+    if (!(args.err instanceof ApiError)) {
       return false;
     }
 
@@ -58,6 +58,10 @@ export class ApiErrorHandler extends HTTPErrorHandler {
           ? EncryptContiner.it.encrypt(code)
           : code;
 
+      if (typeof payload === 'object') {
+        return { code: encrypted, ...payload, message };
+      }
+
       return { code: encrypted, payload, message };
     }
 

diff --git a/src/handlers/SchemaErrorHandler.ts b/src/handlers/SchemaErrorHandler.ts
@@ -1,3 +1,4 @@
+import { ApiError } from '#/errors/ApiError';
 import { HTTPErrorHandler } from '#/handlers/HTTPErrorHandler';
 import type { THTTPErrorHandlerParameters } from '#/handlers/interfaces/THTTPErrorHandlerParameters';
 import { getSourceLocation } from '#/modules/getSourceLocation';
@@ -26,7 +27,8 @@ export class SchemaErrorHandler extends HTTPErrorHandler {
   protected preHook(args: THTTPErrorHandlerParameters): void {
     super.preHook(args);
 
-    args.reply.status(args.err.statusCode ?? httpStatusCodes.BAD_REQUEST);
+    const statusCode = args.err instanceof ApiError ? args.err.reply.status : args.err.statusCode;
+    args.reply.status(statusCode ?? httpStatusCodes.BAD_REQUEST);
   }
 
   protected postHook = noop;