Skip to content

fix: remove componentless routes from routes in _RouteFileInfoMap #686

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
23 changes: 16 additions & 7 deletions src/codegen/generateRouteFileInfoMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,28 @@ function generateRouteFileInfoLines(
routeNames: string[]
childrenNamedViews: string[] | null
}> {
const children = node.children.size > 0 ? node.getChildrenDeepSorted() : null
const deepChildren =
node.children.size > 0 ? node.getChildrenDeepSorted() : null

const childrenNamedViews = children
const deepChildrenNamedViews = deepChildren
? Array.from(
new Set(
children.flatMap((child) => Array.from(child.value.components.keys()))
deepChildren.flatMap((child) =>
Array.from(child.value.components.keys())
)
)
)
: null

const routeNames = [node, ...node.getChildrenDeepSorted()]
// an unnamed route cannot be accessed in types
.filter((node): node is TreeNode & { name: string } => !!node.name)
const routeNames: Array<Extract<TreeNode['name'], string>> = [
node,
...(deepChildren ?? []),
]
// unnamed routes and routes that don't correspond to certain components cannot be accessed in types
.filter(
(node): node is TreeNode & { name: string } =>
node.value.components.size > 0 && !!node.name
)
.map((node) => node.name)

// Most of the time we only have one view, but with named views we can have multiple.
Expand All @@ -86,7 +95,7 @@ function generateRouteFileInfoLines(
: Array.from(node.value.components.values()).map((file) => ({
key: relative(rootDir, file).replaceAll('\\', '/'),
routeNames,
childrenNamedViews,
childrenNamedViews: deepChildrenNamedViews,
}))

const childrenRouteInfo = node
Expand Down
Loading