fix: InferLoaderData now works if loader has three generics

imp-dance · imp-dance · commit 71e07f098860 · 2022-10-24T00:29:49.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ryfylke-react/rtk-query-loader",
-  "version": "0.3.1",
+  "version": "0.3.15",
   "description": "Lets you create loaders that contain multiple RTK queries.",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
diff --git a/src/types.ts b/src/types.ts
@@ -65,7 +65,8 @@ export type ComponentWithLoaderData<
 
 export type InferLoaderData<T> = T extends Loader<
   any | never,
-  infer X
+  infer X,
+  any | never
 >
   ? X
   : never;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ryfylke-react/rtk-query-loader",`
`3`		`- "version": "0.3.1",`
	`3`	`+ "version": "0.3.15",`
`4`	`4`	`"description": "Lets you create loaders that contain multiple RTK queries.",`
`5`	`5`	`"main": "./dist/cjs/index.js",`
`6`	`6`	`"module": "./dist/esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ export type ComponentWithLoaderData<`
`65`	`65`
`66`	`66`	`export type InferLoaderData<T> = T extends Loader<`
`67`	`67`	`any \| never,`
`68`		`- infer X`
	`68`	`+ infer X,`
	`69`	`+ any \| never`
`69`	`70`	`>`
`70`	`71`	`? X`
`71`	`72`	`: never;`