fix: Generic static This.

Vincit · Sep 25, 2024 · bf76780 · bf76780
1 parent 85f0a10
commit bf76780
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/typings/objection/index.d.ts b/typings/objection/index.d.ts
@@ -1423,6 +1423,19 @@ declare namespace Objection {
     new (): T;
   }
 
+  interface PrototypeType<T> extends Function {
+    prototype: T;
+  }
+
+  interface ConstructorFunctionType<T = any> extends PrototypeType<T> {
+    new (...args: any[]): T;
+  }
+
+  // for internal use on generic static this deduction, copied from https://github.com/microsoft/TypeScript/issues/5863#issuecomment-1483978415
+  type ConstructorType<T = unknown, Static extends Record<string, any> = PrototypeType<T>> = (ConstructorFunctionType<T> | PrototypeType<T>) & {
+    [Key in keyof Static]: Static[Key];
+  };  
+
   export interface ModelConstructor<M extends Model> extends Constructor<M> {}
 
   export interface ModelClass<M extends Model> extends ModelConstructor<M> {
@@ -1573,7 +1586,7 @@ declare namespace Objection {
     ): QueryBuilderType<M>;
 
     static relatedQuery<M extends Model, K extends keyof M>(
-      this: Constructor<M>,
+      this: ConstructorType<M>,
       relationName: K,
       trxOrKnex?: TransactionOrKnex,
     ): ArrayRelatedQueryBuilder<M[K]>;