fix types

Author: devgioele

src/routers/__test__/nextRouter.test.ts

@@ -182,7 +182,7 @@ describe('NextRouter', () => {
     const defaultBirthDate = new Date()
     defaultBirthDate.setMilliseconds(0)
     const defaultNetWorth = BigInt(0xf8ffffffffffffffffffffffffff2fffn)
-    const defaultDarkMode: boolean | undefined = true
+    const defaultDarkMode = true as boolean
 
     const schema = z.object({
       search: z.string().optional().catch(undefined),

src/zod/routers/inMemory.ts

@@ -9,11 +9,10 @@ import {
   useQueryAndPagination as useQueryAndPaginationVanilla,
 } from '../../routers/inMemory'
 import { zodParser } from '../util'
-import { NonNullableRecord } from '../../utils'
 
 export const useQuery = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
+  TQuery extends AbstractQuery,
+  TSchemaOutput extends Partial<TQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput,
 >(
@@ -23,8 +22,8 @@ export const useQuery = <
 ) => useQueryVanilla(defaultQuery, zodParser(schemaQuery), options)
 
 export const useQueryAndPagination = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
+  TQuery extends AbstractQuery,
+  TSchemaOutput extends Partial<TQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput,
 >(

src/zod/routers/nextRouter.ts

@@ -9,12 +9,11 @@ import {
   useQueryAndPagination as useQueryAndPaginationVanilla,
 } from '../../routers/nextRouter'
 import { zodParser } from '../util'
-import { NonNullableRecord } from '../../utils'
 import { RouterWithHistoryOptions } from '../../routers/shared'
 
 export const useQuery = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
+  TQuery extends AbstractQuery,
+  TSchemaOutput extends Partial<TQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput,
 >(
@@ -24,8 +23,8 @@ export const useQuery = <
 ) => useQueryVanilla(defaultQuery, zodParser(schemaQuery), options)
 
 export const useQueryAndPagination = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
+  TQuery extends AbstractQuery,
+  TSchemaOutput extends Partial<TQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput,
 >(

src/zod/routers/reactRouter.ts

@@ -9,12 +9,11 @@ import {
   useQueryAndPagination as useQueryAndPaginationVanilla,
 } from '../../routers/reactRouter'
 import { zodParser } from '../util'
-import { NonNullableRecord } from '../../utils'
 import { RouterWithHistoryOptions } from '../../routers/shared'
 
 export const useQuery = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
+  TQuery extends AbstractQuery,
+  TSchemaOutput extends Partial<TQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput,
 >(
@@ -24,8 +23,8 @@ export const useQuery = <
 ) => useQueryVanilla(defaultQuery, zodParser(schemaQuery), options)
 
 export const useQueryAndPagination = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
+  TQuery extends AbstractQuery,
+  TSchemaOutput extends Partial<TQuery>,
   TSchemaDef extends ZodTypeDef = ZodTypeDef,
   TSchemaInput = TSchemaOutput,
 >(

src/zod/util.ts

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