Merge pull request #14 from aboutbits/fix-types

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

@@ -1,35 +1,21 @@
-import { ZodType, ZodTypeDef } from 'zod'
-import {
-  PaginationQuery,
-  AbstractQuery,
-  AbstractQueryOptions,
-} from '../../engine'
+import { z } from 'zod'
+import { PaginationQuery, AbstractQueryOptions } from '../../engine'
 import {
   useQuery as useQueryVanilla,
   useQueryAndPagination as useQueryAndPaginationVanilla,
 } from '../../routers/inMemory'
-import { zodParser } from '../util'
 import { NonNullableRecord } from '../../utils'
+import { zodParser } from '../util'
 
-export const useQuery = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
-  TSchemaDef extends ZodTypeDef = ZodTypeDef,
-  TSchemaInput = TSchemaOutput,
->(
-  defaultQuery: TQuery,
-  schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
+export const useQuery = <TSchema extends z.ZodTypeAny>(
+  defaultQuery: NonNullableRecord<z.output<TSchema>>,
+  schemaQuery: TSchema,
   options?: Partial<AbstractQueryOptions>,
 ) => useQueryVanilla(defaultQuery, zodParser(schemaQuery), options)
 
-export const useQueryAndPagination = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
-  TSchemaDef extends ZodTypeDef = ZodTypeDef,
-  TSchemaInput = TSchemaOutput,
->(
-  defaultQuery: TQuery,
-  schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
+export const useQueryAndPagination = <TSchema extends z.ZodTypeAny>(
+  defaultQuery: NonNullableRecord<z.output<TSchema>>,
+  schemaQuery: TSchema,
   defaultPagination?: PaginationQuery,
   options?: Partial<AbstractQueryOptions>,
 ) =>

src/zod/routers/nextRouter.ts

@@ -1,36 +1,22 @@
-import { ZodType, ZodTypeDef } from 'zod'
-import {
-  PaginationQuery,
-  AbstractQuery,
-  AbstractQueryOptions,
-} from '../../engine'
+import { z } from 'zod'
+import { PaginationQuery, AbstractQueryOptions } from '../../engine'
 import {
   useQuery as useQueryVanilla,
   useQueryAndPagination as useQueryAndPaginationVanilla,
 } from '../../routers/nextRouter'
 import { zodParser } from '../util'
-import { NonNullableRecord } from '../../utils'
 import { RouterWithHistoryOptions } from '../../routers/shared'
+import { NonNullableRecord } from '../../utils'
 
-export const useQuery = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
-  TSchemaDef extends ZodTypeDef = ZodTypeDef,
-  TSchemaInput = TSchemaOutput,
->(
-  defaultQuery: TQuery,
-  schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
+export const useQuery = <TSchema extends z.ZodTypeAny>(
+  defaultQuery: NonNullableRecord<z.output<TSchema>>,
+  schemaQuery: TSchema,
   options?: Partial<AbstractQueryOptions & RouterWithHistoryOptions>,
 ) => useQueryVanilla(defaultQuery, zodParser(schemaQuery), options)
 
-export const useQueryAndPagination = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
-  TSchemaDef extends ZodTypeDef = ZodTypeDef,
-  TSchemaInput = TSchemaOutput,
->(
-  defaultQuery: TQuery,
-  schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
+export const useQueryAndPagination = <TSchema extends z.ZodTypeAny>(
+  defaultQuery: NonNullableRecord<z.output<TSchema>>,
+  schemaQuery: TSchema,
   defaultPagination?: PaginationQuery,
   options?: Partial<AbstractQueryOptions & RouterWithHistoryOptions>,
 ) =>

src/zod/routers/reactRouter.ts

@@ -1,36 +1,22 @@
-import { ZodType, ZodTypeDef } from 'zod'
-import {
-  PaginationQuery,
-  AbstractQuery,
-  AbstractQueryOptions,
-} from '../../engine'
+import { z } from 'zod'
+import { PaginationQuery, AbstractQueryOptions } from '../../engine'
 import {
   useQuery as useQueryVanilla,
   useQueryAndPagination as useQueryAndPaginationVanilla,
 } from '../../routers/reactRouter'
 import { zodParser } from '../util'
-import { NonNullableRecord } from '../../utils'
 import { RouterWithHistoryOptions } from '../../routers/shared'
+import { NonNullableRecord } from '../../utils'
 
-export const useQuery = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
-  TSchemaDef extends ZodTypeDef = ZodTypeDef,
-  TSchemaInput = TSchemaOutput,
->(
-  defaultQuery: TQuery,
-  schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
+export const useQuery = <TSchema extends z.ZodTypeAny>(
+  defaultQuery: NonNullableRecord<z.output<TSchema>>,
+  schemaQuery: TSchema,
   options?: Partial<AbstractQueryOptions & RouterWithHistoryOptions>,
 ) => useQueryVanilla(defaultQuery, zodParser(schemaQuery), options)
 
-export const useQueryAndPagination = <
-  TQuery extends NonNullableRecord<TSchemaOutput>,
-  TSchemaOutput extends Partial<AbstractQuery>,
-  TSchemaDef extends ZodTypeDef = ZodTypeDef,
-  TSchemaInput = TSchemaOutput,
->(
-  defaultQuery: TQuery,
-  schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
+export const useQueryAndPagination = <TSchema extends z.ZodTypeAny>(
+  defaultQuery: NonNullableRecord<z.output<TSchema>>,
+  schemaQuery: TSchema,
   defaultPagination?: PaginationQuery,
   options?: Partial<AbstractQueryOptions & RouterWithHistoryOptions>,
 ) =>

src/zod/util.ts

@@ -1,9 +1,9 @@
-import { ZodType, ZodTypeDef } from 'zod'
+import { z } 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, TSchema extends z.ZodType<Output>>(
+    schema: TSchema,
   ): ParseQuery<Output> =>
   (q) =>
     schema.parse(q)