improve router types

Author: devgioele

src/zod/routers/inMemory.ts

@@ -6,11 +6,11 @@ import {
   useQueryAndPagination as useQueryAndPaginationVanilla,
 } from '../../routers/inMemory'
 import { zodParser } from '../util'
+import { NonNullableRecord } from '../../utils'
 
 export const useQuery = <
-  TQuery extends AbstractQuery,
-  // TODO: `TSchemaOutput` should not just extend `Partial<TQuery>`, but be exactly `Partial<TQuery>`, with not additional keys
-  TSchemaOutput extends Partial<TQuery> = Partial<TQuery>,
+  TQuery extends NonNullableRecord<TSchemaOutput>,
+  TSchemaOutput extends Partial<AbstractQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput
 >(
@@ -19,8 +19,8 @@ export const useQuery = <
 ) => useQueryVanilla(defaultQuery, zodParser(schemaQuery))
 
 export const useQueryAndPagination = <
-  TQuery extends AbstractQuery,
-  TSchemaOutput extends Partial<TQuery> = Partial<TQuery>,
+  TQuery extends NonNullableRecord<TSchemaOutput>,
+  TSchemaOutput extends Partial<AbstractQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput
 >(

src/zod/routers/nextRouter.ts

@@ -6,11 +6,11 @@ import {
   useQueryAndPagination as useQueryAndPaginationVanilla,
 } from '../../routers/nextRouter'
 import { zodParser } from '../util'
+import { NonNullableRecord } from '../../utils'
 
 export const useQuery = <
-  TQuery extends AbstractQuery,
-  // TODO: `TSchemaOutput` should not just extend `Partial<TQuery>`, but be exactly `Partial<TQuery>`, with not additional keys
-  TSchemaOutput extends Partial<TQuery> = Partial<TQuery>,
+  TQuery extends NonNullableRecord<TSchemaOutput>,
+  TSchemaOutput extends Partial<AbstractQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput
 >(
@@ -19,8 +19,8 @@ export const useQuery = <
 ) => useQueryVanilla(defaultQuery, zodParser(schemaQuery))
 
 export const useQueryAndPagination = <
-  TQuery extends AbstractQuery,
-  TSchemaOutput extends Partial<TQuery> = Partial<TQuery>,
+  TQuery extends NonNullableRecord<TSchemaOutput>,
+  TSchemaOutput extends Partial<AbstractQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput
 >(

src/zod/routers/reactRouter.ts

@@ -6,11 +6,11 @@ import {
   useQueryAndPagination as useQueryAndPaginationVanilla,
 } from '../../routers/reactRouter'
 import { zodParser } from '../util'
+import { NonNullableRecord } from '../../utils'
 
 export const useQuery = <
-  TQuery extends AbstractQuery,
-  // TODO: `TSchemaOutput` should not just extend `Partial<TQuery>`, but be exactly `Partial<TQuery>`, with not additional keys
-  TSchemaOutput extends Partial<TQuery> = Partial<TQuery>,
+  TQuery extends NonNullableRecord<TSchemaOutput>,
+  TSchemaOutput extends Partial<AbstractQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput
 >(
@@ -19,8 +19,8 @@ export const useQuery = <
 ) => useQueryVanilla(defaultQuery, zodParser(schemaQuery))
 
 export const useQueryAndPagination = <
-  TQuery extends AbstractQuery,
-  TSchemaOutput extends Partial<TQuery> = Partial<TQuery>,
+  TQuery extends NonNullableRecord<TSchemaOutput>,
+  TSchemaOutput extends Partial<AbstractQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput
 >(

src/zod/util.ts

@@ -2,13 +2,8 @@ import { ZodType, ZodTypeDef } from 'zod'
 import { AbstractQuery, ParseQuery } from '../engine/query'
 
 export const zodParser =
-  <
-    TQuery extends AbstractQuery,
-    Output extends Partial<TQuery>,
-    Def extends ZodTypeDef,
-    Input
-  >(
+  <Output extends Partial<AbstractQuery>, Def extends ZodTypeDef, Input>(
     schema: ZodType<Output, Def, Input>
-  ): ParseQuery<TQuery> =>
+  ): ParseQuery<Output> =>
   (q) =>
     schema.parse(q)