Skip to content

feat: more flexible "createRouter" typings #651

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 7 commits into from
Aug 27, 2023
Merged

feat: more flexible "createRouter" typings #651

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
edf6982
merge dev to main (#617)
ymc9 Aug 5, 2023
9c10d14
merge dev to main (#620)
ymc9 Aug 8, 2023
66eecc5
merge dev to main (#626)
ymc9 Aug 12, 2023
0a60ddc
merge dev to main (#630)
ymc9 Aug 14, 2023
1b4d839
merge dev to main (#637)
ymc9 Aug 16, 2023
02a4a17
merge dev to main (#644)
ymc9 Aug 23, 2023
4393354
feat: flexible createRouter typings
mateus-p Aug 26, 2023
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
16 changes: 9 additions & 7 deletions packages/plugins/trpc/src/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ function createAppRouter(

appRouter
.addFunction({
name: 'createRouter<Config extends BaseConfig>',
name: 'createRouter<Router extends RouterFactory<BaseConfig>, Proc extends ProcBuilder<BaseConfig>>',
parameters: [
{ name: 'router', type: 'RouterFactory<Config>' },
{ name: 'procedure', type: 'ProcBuilder<Config>' },
{ name: 'router', type: 'Router' },
{ name: 'procedure', type: 'Proc' },
],
isExported: true,
})
Expand All @@ -159,7 +159,9 @@ function createAppRouter(
moduleSpecifier: `./${model}.router`,
});

writer.writeLine(`${lowerCaseFirst(model)}: create${model}Router<Config>(router, procedure),`);
writer.writeLine(
`${lowerCaseFirst(model)}: create${model}Router<Router, Proc>(router, procedure),`
);
}
});
writer.write(');');
Expand Down Expand Up @@ -243,10 +245,10 @@ function generateModelCreateRouter(
}

const createRouterFunc = modelRouter.addFunction({
name: 'createRouter<Config extends BaseConfig>',
name: 'createRouter<Router extends RouterFactory<BaseConfig>, Proc extends ProcBuilder<BaseConfig>>',
parameters: [
{ name: 'router', type: 'RouterFactory<Config>' },
{ name: 'procedure', type: 'ProcBuilder<Config>' },
{ name: 'router', type: 'Router' },
{ name: 'procedure', type: 'Proc' },
],
isExported: true,
isDefaultExport: true,
Expand Down