Skip to content

Commit 4640931

Browse files
author
devgioele
committed
let zod routers forward options
1 parent ad4594c commit 4640931

3 files changed

Lines changed: 50 additions & 21 deletions

File tree

‎src/zod/routers/inMemory.ts‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import { ZodType, ZodTypeDef } from 'zod'
2-
import { PaginationQuery, AbstractQuery } from '../../engine'
2+
import {
3+
PaginationQuery,
4+
AbstractQuery,
5+
AbstractQueryOptions,
6+
} from '../../engine'
37
import {
48
useQuery as useQueryVanilla,
59
usePagination as usePaginationVanilla,
@@ -15,8 +19,9 @@ export const useQuery = <
1519
TSchemaInput = TSchemaOutput
1620
>(
1721
defaultQuery: TQuery,
18-
schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>
19-
) => useQueryVanilla(defaultQuery, zodParser(schemaQuery))
22+
schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
23+
options?: Partial<AbstractQueryOptions>
24+
) => useQueryVanilla(defaultQuery, zodParser(schemaQuery), options)
2025

2126
export const useQueryAndPagination = <
2227
TQuery extends NonNullableRecord<TSchemaOutput>,
@@ -26,13 +31,17 @@ export const useQueryAndPagination = <
2631
>(
2732
defaultQuery: TQuery,
2833
schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
29-
defaultPagination?: PaginationQuery
34+
defaultPagination?: PaginationQuery,
35+
options?: Partial<AbstractQueryOptions>
3036
) =>
3137
useQueryAndPaginationVanilla(
3238
defaultQuery,
3339
zodParser(schemaQuery),
34-
defaultPagination
40+
defaultPagination,
41+
options
3542
)
3643

37-
export const usePagination = (defaultPagination?: PaginationQuery) =>
38-
usePaginationVanilla(defaultPagination)
44+
export const usePagination = (
45+
defaultPagination?: PaginationQuery,
46+
options?: Partial<AbstractQueryOptions>
47+
) => usePaginationVanilla(defaultPagination, options)

‎src/zod/routers/nextRouter.ts‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
import { ZodType, ZodTypeDef } from 'zod'
2-
import { PaginationQuery, AbstractQuery } from '../../engine'
2+
import {
3+
PaginationQuery,
4+
AbstractQuery,
5+
AbstractQueryOptions,
6+
} from '../../engine'
37
import {
48
useQuery as useQueryVanilla,
59
usePagination as usePaginationVanilla,
610
useQueryAndPagination as useQueryAndPaginationVanilla,
11+
NextRouterOptions,
712
} from '../../routers/nextRouter'
813
import { zodParser } from '../util'
914
import { NonNullableRecord } from '../../utils'
@@ -15,8 +20,9 @@ export const useQuery = <
1520
TSchemaInput = TSchemaOutput
1621
>(
1722
defaultQuery: TQuery,
18-
schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>
19-
) => useQueryVanilla(defaultQuery, zodParser(schemaQuery))
23+
schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
24+
options?: Partial<AbstractQueryOptions & NextRouterOptions>
25+
) => useQueryVanilla(defaultQuery, zodParser(schemaQuery), options)
2026

2127
export const useQueryAndPagination = <
2228
TQuery extends NonNullableRecord<TSchemaOutput>,
@@ -26,13 +32,17 @@ export const useQueryAndPagination = <
2632
>(
2733
defaultQuery: TQuery,
2834
schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
29-
defaultPagination?: PaginationQuery
35+
defaultPagination?: PaginationQuery,
36+
options?: Partial<AbstractQueryOptions & NextRouterOptions>
3037
) =>
3138
useQueryAndPaginationVanilla(
3239
defaultQuery,
3340
zodParser(schemaQuery),
34-
defaultPagination
41+
defaultPagination,
42+
options
3543
)
3644

37-
export const usePagination = (defaultPagination?: PaginationQuery) =>
38-
usePaginationVanilla(defaultPagination)
45+
export const usePagination = (
46+
defaultPagination?: PaginationQuery,
47+
options?: Partial<AbstractQueryOptions & NextRouterOptions>
48+
) => usePaginationVanilla(defaultPagination, options)

‎src/zod/routers/reactRouter.ts‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
import { ZodType, ZodTypeDef } from 'zod'
2-
import { PaginationQuery, AbstractQuery } from '../../engine'
2+
import {
3+
PaginationQuery,
4+
AbstractQuery,
5+
AbstractQueryOptions,
6+
} from '../../engine'
37
import {
48
useQuery as useQueryVanilla,
59
usePagination as usePaginationVanilla,
610
useQueryAndPagination as useQueryAndPaginationVanilla,
11+
ReactRouterOptions,
712
} from '../../routers/reactRouter'
813
import { zodParser } from '../util'
914
import { NonNullableRecord } from '../../utils'
@@ -15,8 +20,9 @@ export const useQuery = <
1520
TSchemaInput = TSchemaOutput
1621
>(
1722
defaultQuery: TQuery,
18-
schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>
19-
) => useQueryVanilla(defaultQuery, zodParser(schemaQuery))
23+
schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
24+
options?: Partial<AbstractQueryOptions & ReactRouterOptions>
25+
) => useQueryVanilla(defaultQuery, zodParser(schemaQuery), options)
2026

2127
export const useQueryAndPagination = <
2228
TQuery extends NonNullableRecord<TSchemaOutput>,
@@ -26,13 +32,17 @@ export const useQueryAndPagination = <
2632
>(
2733
defaultQuery: TQuery,
2834
schemaQuery: ZodType<TSchemaOutput, TSchemaDef, TSchemaInput>,
29-
defaultPagination?: PaginationQuery
35+
defaultPagination?: PaginationQuery,
36+
options?: Partial<AbstractQueryOptions & ReactRouterOptions>
3037
) =>
3138
useQueryAndPaginationVanilla(
3239
defaultQuery,
3340
zodParser(schemaQuery),
34-
defaultPagination
41+
defaultPagination,
42+
options
3543
)
3644

37-
export const usePagination = (defaultPagination?: PaginationQuery) =>
38-
usePaginationVanilla(defaultPagination)
45+
export const usePagination = (
46+
defaultPagination?: PaginationQuery,
47+
options?: Partial<AbstractQueryOptions & ReactRouterOptions>
48+
) => usePaginationVanilla(defaultPagination, options)

0 commit comments

Comments
 (0)