Address PR review feedback (#3339)

Recognize type-annotated `const adminRouter: AppRouter = t.router(`
bindings so identifier mounts still compose.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Gergo Magyar 2026-09-21 08:03:48 +00:00
parent 016eb214e6
commit 8601f85f56
2 changed files with 14 additions and 1 deletions

View file

@ -405,7 +405,7 @@ const ROUTER_OPEN_RE =
// Same-file `const adminRouter = t.router({` / `createTRPCRouter(` / bare `router(`.
const ROUTER_BINDING_RE =
/(?:export\s+)?(?:const|let|var)\s+(\w+)\s*=\s*(?:(?:t|trpc|tRPC)\s*\.\s*router|createTRPCRouter|router)\s*\(/;
/(?:export\s+)?(?:const|let|var)\s+(\w+)(?:\s*:\s*[^=]+)?\s*=\s*(?:(?:t|trpc|tRPC)\s*\.\s*router|createTRPCRouter|router)\s*\(/;
// Identifier composition: `admin: adminRouter,` / last-property `admin: adminRouter`.
// Optional `as` / `satisfies` tail (`admin: adminRouter as const`) still mounts.

View file

@ -546,6 +546,19 @@ describe('extractTrpcRoutes', () => {
expect(paths(source)).toEqual(['GET /trpc/admin.list', 'GET /trpc/health']);
});
it('type-annotated router bindings still compose identifier mounts', () => {
const source = [
"import { initTRPC } from '@trpc/server';",
'const t = initTRPC.create();',
'const publicProcedure = t.procedure;',
'const adminRouter: AppRouter = t.router({',
' list: publicProcedure.query(() => null),',
'});',
'export const appRouter = t.router({ admin: adminRouter });',
].join('\n');
expect(paths(source)).toEqual(['GET /trpc/admin.list']);
});
it('identifier mount still composes with an inline nest inside the subrouter', () => {
const source = [
"import { initTRPC } from '@trpc/server';",