Skip to content

feat: ability to merge routers with same alias #43

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

Closed
qodeboy wants to merge 1 commit into from
Closed

feat: ability to merge routers with same alias #43

Show file tree
Hide file tree
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
47 changes: 41 additions & 6 deletions packages/nestjs-trpc/lib/generators/__tests__/router.generator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@ import { Test, TestingModule } from '@nestjs/testing';
import { RouterGenerator } from '../router.generator';
import { DecoratorGenerator } from '../decorator.generator';
import { Project, SourceFile } from 'ts-morph';
import { RoutersFactoryMetadata, } from '../../interfaces/factory.interface';
import {
DecoratorGeneratorMetadata,
ProcedureGeneratorMetadata,
RouterGeneratorMetadata,
} from '../../interfaces/generator.interface';
import { RoutersFactoryMetadata } from '../../interfaces/factory.interface';
import { DecoratorGeneratorMetadata, RouterGeneratorMetadata } from '../../interfaces/generator.interface';
import { Query, Mutation } from '../../decorators';
import { z } from 'zod';
import { ProcedureGenerator } from '../procedure.generator';
Expand Down Expand Up @@ -178,5 +174,44 @@ describe('RouterGenerator', () => {
'})'
);
});

it.only('should generate merged router string from metadata', () => {
const mockRouterMetadata: Array<RouterGeneratorMetadata> = [
{
name: 'TestRouter',
alias: 'test',
procedures: [
{
name: 'testQuery',
decorators: [{ name: 'Query', arguments: {} }],
},
{
name: 'testMutation',
decorators: [{ name: 'Mutation', arguments: {} }],
},
],
},
{
name: 'TestRouter',
alias: 'test',
procedures: [
{
name: 'testQueryExtended',
decorators: [{ name: 'Query', arguments: {} }],
},
],
},
];

const result = routerGenerator.generateRoutersStringFromMetadata(mockRouterMetadata);

expect(result).toBe(
'test: t.router({ ' +
'testQuery: publicProcedure.query(async () => "PLACEHOLDER_DO_NOT_REMOVE" as any ),\n' +
'testMutation: publicProcedure.mutation(async () => "PLACEHOLDER_DO_NOT_REMOVE" as any ),\n ' +
'testQueryExtended: publicProcedure.query(async () => "PLACEHOLDER_DO_NOT_REMOVE" as any ) ' +
'})'
);
});
});
});
18 changes: 14 additions & 4 deletions packages/nestjs-trpc/lib/generators/router.generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,20 @@ export class RouterGenerator {
public generateRoutersStringFromMetadata(
routers: Array<RouterGeneratorMetadata>,
): string {
return routers
.map((router) => {
const { name, procedures, alias } = router;
return `${alias ?? camelCase(name)}: t.router({ ${procedures
const routersMap: { [key: string]: ProcedureGeneratorMetadata[] } = {};

routers.forEach((router) => {
const { name, procedures, alias } = router;
const routerName = alias ?? camelCase(name);

routersMap[routerName] = (routersMap[routerName] ?? []).concat(
procedures,
);
});

return Object.entries(routersMap)
.map(([routerName, procedures]) => {
return `${routerName}: t.router({ ${procedures
.map(this.procedureGenerator.generateProcedureString)
.join(',\n')} })`;
})
Expand Down