Skip to content

tests: fix type tests for Link, make sure type tests fail in ci and add type tests for union to and difference in params #1418

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
merged 4 commits into from
Apr 4, 2024
Merged

tests: fix type tests for Link, make sure type tests fail in ci and add type tests for union to and difference in params #1418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f302e4
tests: fix type tests for Link, make sure type tests fail in ci and a…
chorobin Apr 2, 2024
92d8df8
Merge remote-tracking branch 'origin/main' into f/add-union-link-type…
chorobin Apr 2, 2024
5d3b7dc
Merge remote-tracking branch 'origin/main' into f/add-union-link-type…
chorobin Apr 4, 2024
e58250f
tests: refactor tests to only include scenario and group expects
chorobin Apr 4, 2024
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
15 changes: 7 additions & 8 deletions packages/react-router/src/link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,9 @@ export type Last<T extends Array<any>> = T extends [...infer _, infer L]
? L
: never

export type RemoveTrailingSlashes<T> = T extends '/'
? T
: T extends `${infer R}/`
? RemoveTrailingSlashes<R>
: T
export type RemoveTrailingSlashes<T> = T extends `${infer R}/`
? RemoveTrailingSlashes<R>
: T

export type RemoveLeadingSlashes<T> = T extends `/${infer R}`
? RemoveLeadingSlashes<R>
Expand Down Expand Up @@ -217,10 +215,11 @@ export type ResolveRoute<
? TFrom
: ResolveRelativePath<TFrom, TTo>
>,
> =
RouteByPath<TRouteTree, `${TPath & string}/`> extends never
> = TPath extends string
? RouteByPath<TRouteTree, `${TPath}/`> extends never
? RouteByPath<TRouteTree, TPath>
: RouteByPath<TRouteTree, `${TPath & string}/`>
: RouteByPath<TRouteTree, `${TPath}/`>
: never

type PostProcessParams<
T,
Expand Down
9 changes: 5 additions & 4 deletions packages/react-router/tests/fileRoute.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
createFileRoute,
createLazyRoute,
createLazyFileRoute,
LazyRoute,
} from '../src'

describe('createFileRoute has the same hooks as getRouteApi', () => {
Expand All @@ -16,7 +17,7 @@ describe('createFileRoute has the same hooks as getRouteApi', () => {
it.each(hookNames.map((name) => [name]))(
'should have the "%s" hook defined',
(hookName) => {
expect(route[hookName]).toBeDefined()
expect(hookName as keyof LazyRoute<any>).toBeDefined()
},
)
})
Expand All @@ -30,20 +31,20 @@ describe('createLazyFileRoute has the same hooks as getRouteApi', () => {
it.each(hookNames.map((name) => [name]))(
'should have the "%s" hook defined',
(hookName) => {
expect(route[hookName]).toBeDefined()
expect(route[hookName as keyof LazyRoute<any>]).toBeDefined()
},
)
})

describe('createLazyRoute has the same hooks as getRouteApi', () => {
const routeApi = getRouteApi('foo')
const hookNames = Object.keys(routeApi).filter((key) => key.startsWith('use'))
const route = createLazyRoute({})({})
const hookNames = Object.keys(routeApi).filter((key) => key.startsWith('use'))

it.each(hookNames.map((name) => [name]))(
'should have the "%s" hook defined',
(hookName) => {
expect(route[hookName]).toBeDefined()
expect(route[hookName as keyof LazyRoute<any>]).toBeDefined()
},
)
})
Loading