-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
refactor(router-core): rework the conditions under which a beforeLoad is executed or skipped #4993
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.
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
Open
Sheraff
wants to merge
12
commits into
main
Choose a base branch
from
refactor-router-core-before-load-skip-or-execute
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
66daf9d
refactor(router-core): rework the conditions under which a beforeLoad…
Sheraff 98b5c3a
ci: apply automated fixes
autofix-ci[bot] fad30e8
more tests
Sheraff c729162
ci: apply automated fixes
autofix-ci[bot] f68f3d6
more tests
Sheraff 0b56d04
fix test setup: use new memory history for every test
Sheraff 67c7e04
add loader tests for exec vs. skip
Sheraff c177e0b
add skip loader test when staleTime
Sheraff 2a291e0
ci: apply automated fixes
autofix-ci[bot] 1bfb9f4
add onStay test
Sheraff be1b634
ci: apply automated fixes
autofix-ci[bot] 360177f
minor changes to onStay test
Sheraff File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,366 @@ | ||
import { describe, expect, test, vi } from 'vitest' | ||
import { createMemoryHistory } from '@tanstack/history' | ||
import { | ||
BaseRootRoute, | ||
BaseRoute, | ||
RouterCore, | ||
notFound, | ||
redirect, | ||
} from '../src' | ||
import type { RouteOptions } from '../src' | ||
|
||
type AnyRouteOptions = RouteOptions<any> | ||
type BeforeLoad = NonNullable<AnyRouteOptions['beforeLoad']> | ||
type Loader = NonNullable<AnyRouteOptions['loader']> | ||
|
||
describe('beforeLoad skip or exec', () => { | ||
const setup = ({ beforeLoad }: { beforeLoad?: BeforeLoad }) => { | ||
const rootRoute = new BaseRootRoute({}) | ||
|
||
const fooRoute = new BaseRoute({ | ||
getParentRoute: () => rootRoute, | ||
path: '/foo', | ||
beforeLoad, | ||
}) | ||
|
||
const barRoute = new BaseRoute({ | ||
getParentRoute: () => rootRoute, | ||
path: '/bar', | ||
}) | ||
|
||
const routeTree = rootRoute.addChildren([fooRoute, barRoute]) | ||
|
||
const router = new RouterCore({ | ||
routeTree, | ||
history: createMemoryHistory(), | ||
}) | ||
|
||
return router | ||
} | ||
|
||
test('baseline', async () => { | ||
const beforeLoad = vi.fn() | ||
const router = setup({ beforeLoad }) | ||
await router.load() | ||
expect(beforeLoad).toHaveBeenCalledTimes(0) | ||
}) | ||
|
||
test('exec on regular nav', async () => { | ||
const beforeLoad = vi.fn(() => Promise.resolve({ hello: 'world' })) | ||
const router = setup({ beforeLoad }) | ||
const navigation = router.navigate({ to: '/foo' }) | ||
expect(beforeLoad).toHaveBeenCalledTimes(1) | ||
expect(router.state.pendingMatches).toEqual( | ||
expect.arrayContaining([expect.objectContaining({ id: '/foo' })]), | ||
) | ||
await navigation | ||
expect(router.state.location.pathname).toBe('/foo') | ||
expect(router.state.matches).toEqual( | ||
expect.arrayContaining([ | ||
expect.objectContaining({ | ||
id: '/foo', | ||
context: { | ||
hello: 'world', | ||
}, | ||
}), | ||
]), | ||
) | ||
expect(beforeLoad).toHaveBeenCalledTimes(1) | ||
}) | ||
|
||
test('exec if resolved preload (success)', async () => { | ||
const beforeLoad = vi.fn() | ||
const router = setup({ beforeLoad }) | ||
await router.preloadRoute({ to: '/foo' }) | ||
expect(router.state.cachedMatches).toEqual( | ||
expect.arrayContaining([expect.objectContaining({ id: '/foo' })]), | ||
) | ||
await sleep(10) | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(beforeLoad).toHaveBeenCalledTimes(2) | ||
}) | ||
|
||
test('exec if pending preload (success)', async () => { | ||
const beforeLoad = vi.fn(() => sleep(100)) | ||
const router = setup({ beforeLoad }) | ||
router.preloadRoute({ to: '/foo' }) | ||
await Promise.resolve() | ||
expect(router.state.cachedMatches).toEqual( | ||
expect.arrayContaining([expect.objectContaining({ id: '/foo' })]), | ||
) | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(beforeLoad).toHaveBeenCalledTimes(2) | ||
}) | ||
|
||
test('exec if rejected preload (notFound)', async () => { | ||
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => { | ||
if (preload) throw notFound() | ||
await Promise.resolve() | ||
}) | ||
const router = setup({ | ||
beforeLoad, | ||
}) | ||
await router.preloadRoute({ to: '/foo' }) | ||
await sleep(10) | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(beforeLoad).toHaveBeenCalledTimes(2) | ||
}) | ||
|
||
test('exec if pending preload (notFound)', async () => { | ||
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => { | ||
await sleep(100) | ||
if (preload) throw notFound() | ||
}) | ||
const router = setup({ | ||
beforeLoad, | ||
}) | ||
router.preloadRoute({ to: '/foo' }) | ||
await Promise.resolve() | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(beforeLoad).toHaveBeenCalledTimes(2) | ||
}) | ||
|
||
test('exec if rejected preload (redirect)', async () => { | ||
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => { | ||
if (preload) throw redirect({ to: '/bar' }) | ||
await Promise.resolve() | ||
}) | ||
const router = setup({ | ||
beforeLoad, | ||
}) | ||
await router.preloadRoute({ to: '/foo' }) | ||
await sleep(10) | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(router.state.location.pathname).toBe('/foo') | ||
expect(beforeLoad).toHaveBeenCalledTimes(2) | ||
}) | ||
|
||
test('exec if pending preload (redirect)', async () => { | ||
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => { | ||
await sleep(100) | ||
if (preload) throw redirect({ to: '/bar' }) | ||
}) | ||
const router = setup({ | ||
beforeLoad, | ||
}) | ||
router.preloadRoute({ to: '/foo' }) | ||
await Promise.resolve() | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(router.state.location.pathname).toBe('/foo') | ||
expect(beforeLoad).toHaveBeenCalledTimes(2) | ||
}) | ||
|
||
test('exec if rejected preload (error)', async () => { | ||
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => { | ||
if (preload) throw new Error('error') | ||
await Promise.resolve() | ||
}) | ||
const router = setup({ | ||
beforeLoad, | ||
}) | ||
await router.preloadRoute({ to: '/foo' }) | ||
await sleep(10) | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(beforeLoad).toHaveBeenCalledTimes(2) | ||
}) | ||
|
||
test('exec if pending preload (error)', async () => { | ||
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => { | ||
await sleep(100) | ||
if (preload) throw new Error('error') | ||
}) | ||
const router = setup({ | ||
beforeLoad, | ||
}) | ||
router.preloadRoute({ to: '/foo' }) | ||
await Promise.resolve() | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(beforeLoad).toHaveBeenCalledTimes(2) | ||
}) | ||
}) | ||
|
||
describe('loader skip or exec', () => { | ||
const setup = ({ loader }: { loader?: Loader }) => { | ||
const rootRoute = new BaseRootRoute({}) | ||
|
||
const fooRoute = new BaseRoute({ | ||
getParentRoute: () => rootRoute, | ||
path: '/foo', | ||
loader, | ||
}) | ||
|
||
const barRoute = new BaseRoute({ | ||
getParentRoute: () => rootRoute, | ||
path: '/bar', | ||
}) | ||
|
||
const routeTree = rootRoute.addChildren([fooRoute, barRoute]) | ||
|
||
const router = new RouterCore({ | ||
routeTree, | ||
history: createMemoryHistory(), | ||
}) | ||
|
||
return router | ||
} | ||
|
||
test('baseline', async () => { | ||
const loader = vi.fn() | ||
const router = setup({ loader }) | ||
await router.load() | ||
expect(loader).toHaveBeenCalledTimes(0) | ||
}) | ||
|
||
test('exec on regular nav', async () => { | ||
const loader = vi.fn(() => Promise.resolve({ hello: 'world' })) | ||
const router = setup({ loader }) | ||
const navigation = router.navigate({ to: '/foo' }) | ||
expect(loader).toHaveBeenCalledTimes(1) | ||
expect(router.state.pendingMatches).toEqual( | ||
expect.arrayContaining([expect.objectContaining({ id: '/foo' })]), | ||
) | ||
await navigation | ||
expect(router.state.location.pathname).toBe('/foo') | ||
expect(router.state.matches).toEqual( | ||
expect.arrayContaining([ | ||
expect.objectContaining({ | ||
id: '/foo', | ||
loaderData: { | ||
hello: 'world', | ||
}, | ||
}), | ||
]), | ||
) | ||
expect(loader).toHaveBeenCalledTimes(1) | ||
}) | ||
|
||
test('exec if resolved preload (success)', async () => { | ||
const loader = vi.fn() | ||
const router = setup({ loader }) | ||
await router.preloadRoute({ to: '/foo' }) | ||
expect(router.state.cachedMatches).toEqual( | ||
expect.arrayContaining([expect.objectContaining({ id: '/foo' })]), | ||
) | ||
await sleep(10) | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(loader).toHaveBeenCalledTimes(2) | ||
}) | ||
|
||
test('skip if pending preload (success)', async () => { | ||
const loader = vi.fn(() => sleep(100)) | ||
const router = setup({ loader }) | ||
router.preloadRoute({ to: '/foo' }) | ||
await Promise.resolve() | ||
expect(router.state.cachedMatches).toEqual( | ||
expect.arrayContaining([expect.objectContaining({ id: '/foo' })]), | ||
) | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(loader).toHaveBeenCalledTimes(1) | ||
}) | ||
|
||
test('exec if rejected preload (notFound)', async () => { | ||
const loader = vi.fn<Loader>(async ({ preload }) => { | ||
if (preload) throw notFound() | ||
await Promise.resolve() | ||
}) | ||
const router = setup({ | ||
loader, | ||
}) | ||
await router.preloadRoute({ to: '/foo' }) | ||
await sleep(10) | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(loader).toHaveBeenCalledTimes(2) | ||
}) | ||
|
||
test('skip if pending preload (notFound)', async () => { | ||
const loader = vi.fn<Loader>(async ({ preload }) => { | ||
await sleep(100) | ||
if (preload) throw notFound() | ||
}) | ||
const router = setup({ | ||
loader, | ||
}) | ||
router.preloadRoute({ to: '/foo' }) | ||
await Promise.resolve() | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(loader).toHaveBeenCalledTimes(1) | ||
}) | ||
|
||
test('exec if rejected preload (redirect)', async () => { | ||
const loader = vi.fn<Loader>(async ({ preload }) => { | ||
if (preload) throw redirect({ to: '/bar' }) | ||
await Promise.resolve() | ||
}) | ||
const router = setup({ | ||
loader, | ||
}) | ||
await router.preloadRoute({ to: '/foo' }) | ||
await sleep(10) | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(router.state.location.pathname).toBe('/foo') | ||
expect(loader).toHaveBeenCalledTimes(2) | ||
}) | ||
|
||
test('skip if pending preload (redirect)', async () => { | ||
const loader = vi.fn<Loader>(async ({ preload }) => { | ||
await sleep(100) | ||
if (preload) throw redirect({ to: '/bar' }) | ||
}) | ||
const router = setup({ | ||
loader, | ||
}) | ||
router.preloadRoute({ to: '/foo' }) | ||
await Promise.resolve() | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(router.state.location.pathname).toBe('/bar') | ||
expect(loader).toHaveBeenCalledTimes(1) | ||
}) | ||
|
||
test('exec if rejected preload (error)', async () => { | ||
const loader = vi.fn<Loader>(async ({ preload }) => { | ||
if (preload) throw new Error('error') | ||
await Promise.resolve() | ||
}) | ||
const router = setup({ | ||
loader, | ||
}) | ||
await router.preloadRoute({ to: '/foo' }) | ||
await sleep(10) | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(loader).toHaveBeenCalledTimes(2) | ||
}) | ||
|
||
test('skip if pending preload (error)', async () => { | ||
const loader = vi.fn<Loader>(async ({ preload }) => { | ||
await sleep(100) | ||
if (preload) throw new Error('error') | ||
}) | ||
const router = setup({ | ||
loader, | ||
}) | ||
router.preloadRoute({ to: '/foo' }) | ||
await Promise.resolve() | ||
await router.navigate({ to: '/foo' }) | ||
|
||
expect(loader).toHaveBeenCalledTimes(1) | ||
}) | ||
}) | ||
|
||
function sleep(ms: number) { | ||
return new Promise((resolve) => setTimeout(resolve, ms)) | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.