Skip to content

Fix types #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devgioele merged 2 commits into from
Jul 31, 2023
Merged

Fix types #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f4ecc2
fix types
Jul 28, 2023
1db9292
use schema as definition of query
Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/routers/__test__/nextRouter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
32 changes: 9 additions & 23 deletions src/zod/routers/inMemory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>,
) =>
Expand Down
32 changes: 9 additions & 23 deletions src/zod/routers/nextRouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>,
) =>
Expand Down
32 changes: 9 additions & 23 deletions src/zod/routers/reactRouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>,
) =>
Expand Down
6 changes: 3 additions & 3 deletions src/zod/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)