Fix type of Base argument to createError (#106)

fastify · Jun 6, 2023 · 5c4b26e · 5c4b26e
1 parent 137a6eb
commit 5c4b26e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1,22 +1,22 @@
-declare function createError<C extends string, SC extends number, Arg extends unknown[] = [any?, any?, any?]> (
+declare function createError<C extends string, SC extends number, Arg extends unknown[] = [any?, any?, any?], Err extends Error = Error> (
   code: C,
   message: string,
   statusCode: SC,
-  Base?: Error
+  Base?: new () => Err
 ): createError.FastifyErrorConstructor<{ code: C, statusCode: SC }, Arg>
 
-declare function createError<C extends string, Arg extends unknown[] = [any?, any?, any?]> (
+declare function createError<C extends string, Arg extends unknown[] = [any?, any?, any?], Err extends Error = Error> (
   code: C,
   message: string,
   statusCode?: number,
-  Base?: Error
+  Base?: new () => Err
 ): createError.FastifyErrorConstructor<{ code: C }, Arg>
 
-declare function createError<Arg extends unknown[] = [any?, any?, any?]> (
+declare function createError<Arg extends unknown[] = [any?, any?, any?], Err extends Error = Error> (
   code: string,
   message: string,
   statusCode?: number,
-  Base?: Error
+  Base?: new () => Err
 ): createError.FastifyErrorConstructor<{ code: string }, Arg>
 
 type CreateError = typeof createError

diff --git a/types/index.test-d.ts b/types/index.test-d.ts
@@ -65,3 +65,7 @@ expectError(new CustomTypedArgError6('a', 'b'))
 expectError(new CustomTypedArgError6('a', 'b', 'c'))
 CustomTypedArgError6('a', 'b', 'c', 'd')
 expectError(new CustomTypedArgError6('a', 'b', 'c', 'd', 'e'))
+
+
+const CustomErrorWithErrorConstructor = createError('ERROR_CODE', 'message', 500, TypeError)
+expectType<FastifyErrorConstructor<{ code: 'ERROR_CODE', statusCode: 500 }>>(CustomErrorWithErrorConstructor)