fix for microsoft/TypeScript#33460

Vincit · Sep 25, 2019 · 46c3105 · 46c3105
1 parent f1e210b
commit 46c3105
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "pg": "^7.12.1",
     "prettier": "1.18.2",
     "sqlite3": "^4.1.0",
-    "typescript": "3.5.3",
+    "typescript": "^3.6.3",
     "vuepress": "1.0.4"
   },
   "nyc": {

diff --git a/typings/objection/index.d.ts b/typings/objection/index.d.ts
@@ -202,14 +202,13 @@ declare namespace Objection {
   /**
    * Just like PartialModelObject but this is applied recursively to relations.
    */
-  type PartialModelGraph<T> = {
+  type PartialModelGraph<M, T = M & GraphParameters> = {
     [K in NonFunctionPropertyNames<T>]?: Exclude<T[K], undefined> extends Model
       ? PartialModelGraph<Exclude<T[K], undefined>>
       : Exclude<T[K], undefined> extends Array<infer I>
       ? (I extends Model ? PartialModelGraph<I>[] : (T[K] | NonPrimitiveValue))
       : (T[K] | NonPrimitiveValue);
-  } &
-    GraphParameters;
+  };
 
   /**
    * Extracts the model type from a query builder type QB.