Skip to content

refactor #13501

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
pcattori merged 1 commit into from
Apr 30, 2025
Merged

refactor #13501

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 6 additions & 12 deletions packages/react-router-dev/typegen/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import type { Context } from "./context";
import { getTypesDir, getTypesPath } from "./paths";
import * as Params from "./params";
import * as Route from "./route";
import type { RouteManifestEntry } from "../config/routes";

export async function run(rootDirectory: string, { mode }: { mode: string }) {
const ctx = await createContext({ rootDirectory, mode, watch: false });
Expand Down Expand Up @@ -109,24 +108,19 @@ function register(ctx: Context) {

const { t } = Babel;

const fullpaths: Record<string, RouteManifestEntry[]> = {};
for (const route of Object.values(ctx.config.routes)) {
// skip pathless (layout) routes
if (route.id !== "root" && !route.path) continue;

const fullpaths = new Set<string>();
Object.values(ctx.config.routes).forEach((route) => {
if (route.id !== "root" && !route.path) return;
const lineage = Route.lineage(ctx.config.routes, route);
const fullpath = Route.fullpath(lineage);
const existing = fullpaths[fullpath];
if (!existing || existing.length < lineage.length) {
fullpaths[fullpath] = lineage;
}
}
fullpaths.add(fullpath);
});

const typeParams = t.tsTypeAliasDeclaration(
t.identifier("Params"),
null,
t.tsTypeLiteral(
Object.keys(fullpaths).map((fullpath) => {
Array.from(fullpaths).map((fullpath) => {
const params = Params.parse(fullpath);
return t.tsPropertySignature(
t.stringLiteral(fullpath),
Expand Down