Refactor type exports in FirebaseFunction and FirebaseRequest for improved type inference

Author: stevenkellner

src/admin/functions/FirebaseFunction.ts

@@ -24,10 +24,6 @@ export abstract class FirebaseFunction<Parameters, ReturnType> {
 
 export namespace FirebaseFunction {
 
-    export type Parameters<Function extends FirebaseFunction<any, any>> = Function extends FirebaseFunction<infer Parameters, any> ? Parameters : never;
-
-    export type ReturnType<Function extends FirebaseFunction<any, any>> = Function extends FirebaseFunction<any, infer ReturnType> ? ReturnType : never;
-
     export type Constructor<Parameters, ReturnType> = new () => FirebaseFunction<Parameters, ReturnType>;
 
     export class ConstructorWrapper<Parameters, ReturnType> {
@@ -38,6 +34,16 @@ export namespace FirebaseFunction {
         ) {}
     }
 
+    export type Parameters<Function extends FirebaseFunction<any, any> | Constructor<any, any> | ConstructorWrapper<any, any>> =
+        Function extends FirebaseFunction<infer Parameters, any> ? Parameters :
+            Function extends Constructor<infer Parameters, any> ? Parameters :
+                Function extends ConstructorWrapper<infer Parameters, any> ? Parameters : never;
+
+    export type ReturnType<Function extends FirebaseFunction<any, any> | Constructor<any, any> | ConstructorWrapper<any, any> > =
+        Function extends FirebaseFunction<any, infer ReturnType> ? ReturnType :
+            Function extends Constructor<any, infer ReturnType> ? ReturnType :
+                Function extends ConstructorWrapper<any, infer ReturnType> ? ReturnType : never;
+
     export function create<Parameters, ReturnType>(
         // eslint-disable-next-line @typescript-eslint/naming-convention
         FirebaseFunction: FirebaseFunction.Constructor<Parameters, ReturnType>,

src/admin/functions/FirebaseRequest.ts

@@ -21,10 +21,6 @@ export abstract class FirebaseRequest<Parameters, ReturnType> {
 
 export namespace FirebaseRequest {
 
-    export type Parameters<Function extends FirebaseRequest<any, any>> = Function extends FirebaseRequest<infer Parameters, any> ? Parameters : never;
-
-    export type ReturnType<Function extends FirebaseRequest<any, any>> = Function extends FirebaseRequest<any, infer ReturnType> ? ReturnType : never;
-
     export type Constructor<Parameters, ReturnType> = new () => FirebaseRequest<Parameters, ReturnType>;
 
     export class ConstructorWrapper<Parameters, ReturnType> {
@@ -35,6 +31,16 @@ export namespace FirebaseRequest {
         ) {}
     }
 
+    export type Parameters<Request extends FirebaseRequest<any, any> | Constructor<any, any> | ConstructorWrapper<any, any>> =
+        Request extends FirebaseRequest<infer Parameters, any> ? Parameters :
+            Request extends Constructor<infer Parameters, any> ? Parameters :
+                Request extends ConstructorWrapper<infer Parameters, any> ? Parameters : never;
+
+    export type ReturnType<Request extends FirebaseRequest<any, any> | Constructor<any, any> | ConstructorWrapper<any, any> > =
+        Request extends FirebaseRequest<any, infer ReturnType> ? ReturnType :
+            Request extends Constructor<any, infer ReturnType> ? ReturnType :
+                Request extends ConstructorWrapper<any, infer ReturnType> ? ReturnType : never;
+
     export function create<Parameters, ReturnType>(
         // eslint-disable-next-line @typescript-eslint/naming-convention
         FirebaseRequest: FirebaseRequest.Constructor<Parameters, ReturnType>,