use schema as definition of query

Author: devgioele

src/zod/routers/inMemory.ts

@@ -1,34 +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 { NonNullableRecord } from '../../utils'
 import { zodParser } from '../util'
 
-export const useQuery = <
-  TQuery extends AbstractQuery,
-  TSchemaOutput extends Partial<TQuery>,
-  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 AbstractQuery,
-  TSchemaOutput extends Partial<TQuery>,
-  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,35 +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 { RouterWithHistoryOptions } from '../../routers/shared'
+import { NonNullableRecord } from '../../utils'
 
-export const useQuery = <
-  TQuery extends AbstractQuery,
-  TSchemaOutput extends Partial<TQuery>,
-  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 AbstractQuery,
-  TSchemaOutput extends Partial<TQuery>,
-  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,35 +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 { RouterWithHistoryOptions } from '../../routers/shared'
+import { NonNullableRecord } from '../../utils'
 
-export const useQuery = <
-  TQuery extends AbstractQuery,
-  TSchemaOutput extends Partial<TQuery>,
-  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 AbstractQuery,
-  TSchemaOutput extends Partial<TQuery>,
-  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,14 +1,9 @@
-import { ZodType, ZodTypeDef } from 'zod'
+import { z } from 'zod'
 import { AbstractQuery, ParseQuery } from '../engine/query'
 
 export const zodParser =
-  <
-    Output extends AbstractQuery,
-    TSchemaOutput extends ReturnType<ParseQuery<Output>>,
-    TSchemaDef extends ZodTypeDef,
-    TSchemaInput,
-  >(
-    schema: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
+  <Output extends AbstractQuery, TSchema extends z.ZodType<Output>>(
+    schema: TSchema,
   ): ParseQuery<Output> =>
   (q) =>
     schema.parse(q)