fix: throw helpers return type (never)

skarab42 · Apr 9, 2022 · 87c1fa4 · 87c1fa4
1 parent e9ac1a8
commit 87c1fa4
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -35,8 +35,12 @@ export type NewPojoError<TErrorTypes extends PojoErrorTypes> = <
   ...args: [...Parameters<TErrorTypes[TType]>]
 ) => PojoErrorInstance<TErrorTypes, TType>;
 
-export type ThrowPojoError<TErrorTypes extends PojoErrorTypes> =
-  NewPojoError<TErrorTypes>;
+export type ThrowPojoError<TErrorTypes extends PojoErrorTypes> = <
+  TType extends keyof TErrorTypes,
+>(
+  type: TType,
+  ...args: [...Parameters<TErrorTypes[TType]>]
+) => never;
 
 export type NewPojoErrorWithCause<TErrorTypes extends PojoErrorTypes> = <
   TType extends keyof TErrorTypes,
@@ -46,16 +50,21 @@ export type NewPojoErrorWithCause<TErrorTypes extends PojoErrorTypes> = <
   ...args: [...Parameters<TErrorTypes[TType]>]
 ) => PojoErrorInstance<TErrorTypes, TType>;
 
-export type ThrowPojoErrorWithCause<TErrorTypes extends PojoErrorTypes> =
-  NewPojoErrorWithCause<TErrorTypes>;
+export type ThrowPojoErrorWithCause<TErrorTypes extends PojoErrorTypes> = <
+  TType extends keyof TErrorTypes,
+>(
+  cause: Error,
+  type: TType,
+  ...args: [...Parameters<TErrorTypes[TType]>]
+) => never;
 
 export type PojoFactory<TErrorTypes extends PojoErrorTypes> = {
   type: Unwrap<PojoEnum<TErrorTypes>>;
   errors: TErrorTypes;
   new: NewPojoError<TErrorTypes>;
   newFrom: NewPojoErrorWithCause<TErrorTypes>;
   throw: ThrowPojoError<TErrorTypes>;
-  throwFrom: NewPojoErrorWithCause<TErrorTypes>;
+  throwFrom: ThrowPojoErrorWithCause<TErrorTypes>;
   is: <TType extends keyof TErrorTypes>(
     type: TType,
     error: unknown,
@@ -197,15 +206,15 @@ export function factory<TErrorTypes extends PojoErrorTypes>(
   function throwError<TType extends keyof TErrorTypes>(
     type: TType,
     ...args: [...Parameters<TErrorTypes[TType]>]
-  ): PojoErrorInstance<TErrorTypes, TType> {
+  ): never {
     throw newError(type, ...args);
   }
 
   function throwFromError<TType extends keyof TErrorTypes>(
     cause: Error,
     type: TType,
     ...args: [...Parameters<TErrorTypes[TType]>]
-  ): PojoErrorInstance<TErrorTypes, TType> {
+  ): never {
     throw newFromError(cause, type, ...args);
   }