From dcfa0a873973dd7b77f2c3a628be4f798b171375 Mon Sep 17 00:00:00 2001
From: ymc9 <104139426+ymc9@users.noreply.github.com>
Date: Thu, 22 Aug 2024 20:34:13 -0700
Subject: [PATCH] update

---
 packages/plugins/trpc/src/generator.ts        | 13 ++---
 packages/plugins/trpc/src/helpers.ts          | 52 +++++++++---------
 .../routers/generated/routers/Post.router.ts  | 54 +++++++++++++++----
 .../routers/generated/routers/User.router.ts  | 54 +++++++++++++++----
 .../api/routers/generated/routers/index.ts    |  9 ++--
 5 files changed, 121 insertions(+), 61 deletions(-)

diff --git a/packages/plugins/trpc/src/generator.ts b/packages/plugins/trpc/src/generator.ts
index 55acfd7b1..b8ae9ec37 100644
--- a/packages/plugins/trpc/src/generator.ts
+++ b/packages/plugins/trpc/src/generator.ts
@@ -178,7 +178,6 @@ function createAppRouter(
     }
 
     appRouter.addStatements(`
-
         export function db(ctx: any) {
             if (!ctx.prisma) {
                 throw new Error('Missing "prisma" field in trpc context');
@@ -195,14 +194,14 @@ function createAppRouter(
             parameters:
                 version === 'v10'
                     ? [
-                          { name: 'createTRPCRouter', type: 'RouterFactory<Config>' },
+                          { name: 'router', type: 'RouterFactory<Config>' },
                           { name: 'procedure', type: 'ProcBuilder<Config>' },
                       ]
                     : [],
             isExported: true,
         })
         .setBodyText((writer) => {
-            writer.write('return createTRPCRouter(');
+            writer.write(`return ${version === 'v10' ? 'router' : 'createTRPCRouter'}(`);
             writer.block(() => {
                 for (const modelOperation of filteredModelOperations) {
                     const { model, ...operations } = modelOperation;
@@ -229,9 +228,7 @@ function createAppRouter(
                     });
 
                     if (version === 'v10') {
-                        writer.writeLine(
-                            `${lowerCaseFirst(model)}: create${model}Router(createTRPCRouter, procedure),`
-                        );
+                        writer.writeLine(`${lowerCaseFirst(model)}: create${model}Router(router, procedure),`);
                     } else {
                         writer.writeLine(`${lowerCaseFirst(model)}: create${model}Router(),`);
                     }
@@ -352,7 +349,7 @@ function generateModelCreateRouter(
             ? modelRouter.addFunction({
                   name: 'createRouter<Config extends BaseConfig>',
                   parameters: [
-                      { name: 'createTRPCRouter', type: 'RouterFactory<Config>' },
+                      { name: 'router', type: 'RouterFactory<Config>' },
                       { name: 'procedure', type: 'ProcBuilder<Config>' },
                   ],
                   isExported: true,
@@ -383,7 +380,7 @@ function generateModelCreateRouter(
     }
 
     createRouterFunc.setBodyText((funcWriter) => {
-        funcWriter.write('return createTRPCRouter(');
+        funcWriter.write(`return ${version === 'v10' ? 'router' : 'createTRPCRouter'}(`);
         funcWriter.block(() => {
             for (const [opType, opNameWithModel] of Object.entries(operations)) {
                 if (isDelegateModel(dataModel) && (opType.startsWith('create') || opType.startsWith('upsert'))) {
diff --git a/packages/plugins/trpc/src/helpers.ts b/packages/plugins/trpc/src/helpers.ts
index f2a6dcac8..ca0ee55fc 100644
--- a/packages/plugins/trpc/src/helpers.ts
+++ b/packages/plugins/trpc/src/helpers.ts
@@ -197,49 +197,49 @@ export function generateRouterTyping(
 
     writer.block(() => {
         if (procType === 'query') {
-            const queryOptions =
-                version === 'v10'
-                    ? `UseTRPCQueryOptions<string, T, ${resultType}, TData, Error>`
-                    : `UseTRPCQueryOptions<T, ${resultType}, TData, Error>`;
-
-            const infiniteQueryOptions =
-                version === 'v10'
-                    ? `UseTRPCInfiniteQueryOptions<string, T, ${resultType}, Error>`
-                    : `UseTRPCInfiniteQueryOptions<T, ${resultType}, Error>`;
-
-            const infiniteQueryResult =
-                version === 'v10'
-                    ? `UseTRPCInfiniteQueryResult<${resultType}, ${errorType}>`
-                    : `UseTRPCInfiniteQueryResult<${resultType}, ${errorType}, T>`;
-
-            writer.writeLine(`
+            if (version === 'v10') {
+                writer.writeLine(`
                 useQuery: <T extends ${genericBase}, TData = ${resultType}>(
                     input: ${argsType},
-                    opts?: ${queryOptions}
+                    opts?: UseTRPCQueryOptions<string, T, ${resultType}, TData, Error>
                     ) => UseTRPCQueryResult<
                         TData,
                         ${errorType}
                     >;
                 useInfiniteQuery: <T extends ${genericBase}>(
                     input: Omit<${argsType}, 'cursor'>,
-                    opts?: ${infiniteQueryOptions}
-                    ) => ${infiniteQueryResult};`);
-
-            if (version !== 'v10') {
-                // v11 uses tanstack-query v5 and supports suspense queries
+                    opts?: UseTRPCInfiniteQueryOptions<string, T, ${resultType}, Error>
+                    ) => UseTRPCInfiniteQueryResult<
+                        ${resultType},
+                        ${errorType}
+                    >;
+                `);
+            } else {
                 writer.writeLine(`
-                useSuspenseQuery: <T extends ${genericBase}, TData = ${resultType}>(
+                useQuery: <T extends ${genericBase}, TData = ${resultType}>(
                     input: ${argsType},
-                    opts?: UseTRPCSuspenseQueryOptions<${resultType}, TData, Error>
-                    ) => UseTRPCSuspenseQueryResult<
+                    opts?: UseTRPCQueryOptions<${resultType}, TData, Error>
+                    ) => UseTRPCQueryResult<
                         TData,
                         ${errorType}
                     >;
+                useInfiniteQuery: <T extends ${genericBase}>(
+                    input: Omit<${argsType}, 'cursor'>,
+                    opts?: UseTRPCInfiniteQueryOptions<T, ${resultType}, Error>
+                    ) => UseTRPCInfiniteQueryResult<
+                        ${resultType},
+                        ${errorType},
+                        T
+                    >;
+                useSuspenseQuery: <T extends ${genericBase}, TData = ${resultType}>(
+                    input: ${argsType},
+                    opts?: UseTRPCSuspenseQueryOptions<${resultType}, TData, Error>
+                    ) => UseTRPCSuspenseQueryResult<TData, ${errorType}>;
                 useSuspenseInfiniteQuery: <T extends ${genericBase}>(
                     input: Omit<${argsType}, 'cursor'>,
                     opts?: UseTRPCSuspenseInfiniteQueryOptions<T, ${resultType}, Error>
                     ) => UseTRPCSuspenseInfiniteQueryResult<${resultType}, ${errorType}, T>;
-                    `);
+                `);
             }
         } else if (procType === 'mutation') {
             writer.writeLine(`
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/Post.router.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/Post.router.ts
index dd087c5de..3edfe9c94 100644
--- a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/Post.router.ts
+++ b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/Post.router.ts
@@ -8,8 +8,8 @@ import type { UseTRPCMutationOptions, UseTRPCMutationResult, UseTRPCQueryOptions
 import type { TRPCClientErrorLike } from '@trpc/client';
 import type { AnyRouter } from '@trpc/server';
 
-export default function createRouter<Config extends BaseConfig>(createTRPCRouter: RouterFactory<Config>, procedure: ProcBuilder<Config>) {
-    return createTRPCRouter({
+export default function createRouter<Config extends BaseConfig>(router: RouterFactory<Config>, procedure: ProcBuilder<Config>) {
+    return router({
 
         aggregate: procedure.input($Schema.PostInputSchema.aggregate).query(({ ctx, input }) => checkRead(db(ctx).post.aggregate(input as any))),
 
@@ -58,7 +58,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.PostAggregateArgs>(
             input: Omit<Prisma.Subset<T, Prisma.PostAggregateArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Prisma.GetPostAggregateType<T>, Error>
-        ) => UseTRPCInfiniteQueryResult<Prisma.GetPostAggregateType<T>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Prisma.GetPostAggregateType<T>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     createMany: {
 
@@ -128,7 +132,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.PostFindFirstArgs>(
             input: Omit<Prisma.SelectSubset<T, Prisma.PostFindFirstArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Prisma.PostGetPayload<T>, Error>
-        ) => UseTRPCInfiniteQueryResult<Prisma.PostGetPayload<T>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Prisma.PostGetPayload<T>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     findFirstOrThrow: {
 
@@ -142,7 +150,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.PostFindFirstOrThrowArgs>(
             input: Omit<Prisma.SelectSubset<T, Prisma.PostFindFirstOrThrowArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Prisma.PostGetPayload<T>, Error>
-        ) => UseTRPCInfiniteQueryResult<Prisma.PostGetPayload<T>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Prisma.PostGetPayload<T>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     findMany: {
 
@@ -156,7 +168,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.PostFindManyArgs>(
             input: Omit<Prisma.SelectSubset<T, Prisma.PostFindManyArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Array<Prisma.PostGetPayload<T>>, Error>
-        ) => UseTRPCInfiniteQueryResult<Array<Prisma.PostGetPayload<T>>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Array<Prisma.PostGetPayload<T>>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     findUnique: {
 
@@ -170,7 +186,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.PostFindUniqueArgs>(
             input: Omit<Prisma.SelectSubset<T, Prisma.PostFindUniqueArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Prisma.PostGetPayload<T>, Error>
-        ) => UseTRPCInfiniteQueryResult<Prisma.PostGetPayload<T>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Prisma.PostGetPayload<T>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     findUniqueOrThrow: {
 
@@ -184,7 +204,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.PostFindUniqueOrThrowArgs>(
             input: Omit<Prisma.SelectSubset<T, Prisma.PostFindUniqueOrThrowArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Prisma.PostGetPayload<T>, Error>
-        ) => UseTRPCInfiniteQueryResult<Prisma.PostGetPayload<T>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Prisma.PostGetPayload<T>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     groupBy: {
 
@@ -310,7 +334,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         >(
             input: Omit<Prisma.SubsetIntersection<T, Prisma.PostGroupByArgs, OrderByArg> & InputErrors, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, {} extends InputErrors ? Prisma.GetPostGroupByPayload<T> : InputErrors, Error>
-        ) => UseTRPCInfiniteQueryResult<{} extends InputErrors ? Prisma.GetPostGroupByPayload<T> : InputErrors, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            {} extends InputErrors ? Prisma.GetPostGroupByPayload<T> : InputErrors,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     updateMany: {
 
@@ -378,10 +406,14 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
                 ? number
                 : Prisma.GetScalarType<T['select'], Prisma.PostCountAggregateOutputType>
                 : number, Error>
-        ) => UseTRPCInfiniteQueryResult<'select' extends keyof T
+        ) => UseTRPCInfiniteQueryResult<
+            'select' extends keyof T
             ? T['select'] extends true
             ? number
             : Prisma.GetScalarType<T['select'], Prisma.PostCountAggregateOutputType>
-            : number, TRPCClientErrorLike<AppRouter>>;
+            : number,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
 }
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/User.router.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/User.router.ts
index d05935451..366ccfcb0 100644
--- a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/User.router.ts
+++ b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/User.router.ts
@@ -8,8 +8,8 @@ import type { UseTRPCMutationOptions, UseTRPCMutationResult, UseTRPCQueryOptions
 import type { TRPCClientErrorLike } from '@trpc/client';
 import type { AnyRouter } from '@trpc/server';
 
-export default function createRouter<Config extends BaseConfig>(createTRPCRouter: RouterFactory<Config>, procedure: ProcBuilder<Config>) {
-    return createTRPCRouter({
+export default function createRouter<Config extends BaseConfig>(router: RouterFactory<Config>, procedure: ProcBuilder<Config>) {
+    return router({
 
         aggregate: procedure.input($Schema.UserInputSchema.aggregate).query(({ ctx, input }) => checkRead(db(ctx).user.aggregate(input as any))),
 
@@ -58,7 +58,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.UserAggregateArgs>(
             input: Omit<Prisma.Subset<T, Prisma.UserAggregateArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Prisma.GetUserAggregateType<T>, Error>
-        ) => UseTRPCInfiniteQueryResult<Prisma.GetUserAggregateType<T>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Prisma.GetUserAggregateType<T>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     createMany: {
 
@@ -128,7 +132,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.UserFindFirstArgs>(
             input: Omit<Prisma.SelectSubset<T, Prisma.UserFindFirstArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Prisma.UserGetPayload<T>, Error>
-        ) => UseTRPCInfiniteQueryResult<Prisma.UserGetPayload<T>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Prisma.UserGetPayload<T>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     findFirstOrThrow: {
 
@@ -142,7 +150,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.UserFindFirstOrThrowArgs>(
             input: Omit<Prisma.SelectSubset<T, Prisma.UserFindFirstOrThrowArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Prisma.UserGetPayload<T>, Error>
-        ) => UseTRPCInfiniteQueryResult<Prisma.UserGetPayload<T>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Prisma.UserGetPayload<T>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     findMany: {
 
@@ -156,7 +168,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.UserFindManyArgs>(
             input: Omit<Prisma.SelectSubset<T, Prisma.UserFindManyArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Array<Prisma.UserGetPayload<T>>, Error>
-        ) => UseTRPCInfiniteQueryResult<Array<Prisma.UserGetPayload<T>>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Array<Prisma.UserGetPayload<T>>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     findUnique: {
 
@@ -170,7 +186,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.UserFindUniqueArgs>(
             input: Omit<Prisma.SelectSubset<T, Prisma.UserFindUniqueArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Prisma.UserGetPayload<T>, Error>
-        ) => UseTRPCInfiniteQueryResult<Prisma.UserGetPayload<T>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Prisma.UserGetPayload<T>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     findUniqueOrThrow: {
 
@@ -184,7 +204,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         useInfiniteQuery: <T extends Prisma.UserFindUniqueOrThrowArgs>(
             input: Omit<Prisma.SelectSubset<T, Prisma.UserFindUniqueOrThrowArgs>, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, Prisma.UserGetPayload<T>, Error>
-        ) => UseTRPCInfiniteQueryResult<Prisma.UserGetPayload<T>, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            Prisma.UserGetPayload<T>,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     groupBy: {
 
@@ -310,7 +334,11 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
         >(
             input: Omit<Prisma.SubsetIntersection<T, Prisma.UserGroupByArgs, OrderByArg> & InputErrors, 'cursor'>,
             opts?: UseTRPCInfiniteQueryOptions<string, T, {} extends InputErrors ? Prisma.GetUserGroupByPayload<T> : InputErrors, Error>
-        ) => UseTRPCInfiniteQueryResult<{} extends InputErrors ? Prisma.GetUserGroupByPayload<T> : InputErrors, TRPCClientErrorLike<AppRouter>>;
+        ) => UseTRPCInfiniteQueryResult<
+            {} extends InputErrors ? Prisma.GetUserGroupByPayload<T> : InputErrors,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
     updateMany: {
 
@@ -378,10 +406,14 @@ export interface ClientType<AppRouter extends AnyRouter, Context = AppRouter['_d
                 ? number
                 : Prisma.GetScalarType<T['select'], Prisma.UserCountAggregateOutputType>
                 : number, Error>
-        ) => UseTRPCInfiniteQueryResult<'select' extends keyof T
+        ) => UseTRPCInfiniteQueryResult<
+            'select' extends keyof T
             ? T['select'] extends true
             ? number
             : Prisma.GetScalarType<T['select'], Prisma.UserCountAggregateOutputType>
-            : number, TRPCClientErrorLike<AppRouter>>;
+            : number,
+            TRPCClientErrorLike<AppRouter>
+        >;
+
     };
 }
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/index.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/index.ts
index e3df84e9a..523f4b645 100644
--- a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/index.ts
+++ b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/index.ts
@@ -20,7 +20,6 @@ export type ProcBuilder<Config extends BaseConfig> = ProcedureBuilder<
     ProcedureParams<Config, any, any, any, UnsetMarker, UnsetMarker, any>
 >;
 
-
 export function db(ctx: any) {
     if (!ctx.prisma) {
         throw new Error('Missing "prisma" field in trpc context');
@@ -28,10 +27,10 @@ export function db(ctx: any) {
     return ctx.prisma as PrismaClient;
 }
 
-export function createRouter<Config extends BaseConfig>(createTRPCRouter: RouterFactory<Config>, procedure: ProcBuilder<Config>) {
-    return createTRPCRouter({
-        user: createUserRouter(createTRPCRouter, procedure),
-        post: createPostRouter(createTRPCRouter, procedure),
+export function createRouter<Config extends BaseConfig>(router: RouterFactory<Config>, procedure: ProcBuilder<Config>) {
+    return router({
+        user: createUserRouter(router, procedure),
+        post: createPostRouter(router, procedure),
     }
     );
 }