Update the aggregate resolver return type

paljs · Mar 12, 2024 · 39ea091 · 39ea091
1 parent 87d2bd8
commit 39ea091
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/packages/generator/src/sdl/GenerateTypes.ts b/packages/generator/src/sdl/GenerateTypes.ts
@@ -7,6 +7,7 @@ export class GenerateTypes {
     `import * as Client from '@prisma/client'`,
     `import { Context } from './context'`,
     `import { GraphQLResolveInfo } from 'graphql';`,
+    `import { GetAggregateResult } from '@prisma/client/runtime/library';`,
     `type Resolver<T extends {}, A extends {}, R extends any> = (parent: T,args: A, context: Context, info: GraphQLResolveInfo) => Promise<R>;`,
     `type NoExpand<T> = T extends unknown ? T : never;`,
     `type AtLeast<O extends object, K extends string> = NoExpand<
@@ -48,13 +49,17 @@ export class GenerateTypes {
       case 'scalar':
         return `${this.scalar[options.type as string]}${options.isList ? '[]' : ''}`;
       default: {
-        const type = options.type.toString().startsWith('Aggregate')
-          ? `Prisma.Get${options.type.toString().replace('Aggregate', '')}AggregateType<${options.type}Args>`
-          : options.type.toString() === 'AffectedRowsOutput'
-          ? 'Prisma.BatchPayload'
-          : !this.isModel(options.type.toString()) && !input
-          ? `Prisma.${options.type}`
-          : options.type;
+        if (options.type.toString().startsWith('Aggregate')) {
+          return `GetAggregateResult<Client.Prisma.$${options.type.toString().replace('Aggregate', '')}Payload, ${
+            options.type
+          }Args>`;
+        }
+        const type =
+          options.type.toString() === 'AffectedRowsOutput'
+            ? 'Prisma.BatchPayload'
+            : !this.isModel(options.type.toString()) && !input
+            ? `Prisma.${options.type}`
+            : options.type;
         return `${!input ? 'Client.' : ''}${type}${options.isList ? '[]' : ''}`;
       }
     }

diff --git a/packages/generator/tests/SDL/__snapshots__/generateSDLTypescript.test.ts.snap b/packages/generator/tests/SDL/__snapshots__/generateSDLTypescript.test.ts.snap
@@ -7,6 +7,8 @@ import { Context } from './context'
 
 import { GraphQLResolveInfo } from 'graphql'
 
+import { GetAggregateResult } from '@prisma/client/runtime/library'
+
 type Resolver<T extends {}, A extends {}, R extends any> = (
   parent: T,
   args: A,
@@ -82,7 +84,7 @@ export type Query = { [key: string]: Resolver<any, any, any> } & {
   aggregateUser?: Resolver<
     {},
     AggregateUserArgs,
-    Client.Prisma.GetUserAggregateType<AggregateUserArgs>
+    GetAggregateResult<Client.Prisma.$UserPayload, AggregateUserArgs>
   >
   groupByUser?: Resolver<
     {},
@@ -106,7 +108,7 @@ export type Query = { [key: string]: Resolver<any, any, any> } & {
   aggregatePost?: Resolver<
     {},
     AggregatePostArgs,
-    Client.Prisma.GetPostAggregateType<AggregatePostArgs>
+    GetAggregateResult<Client.Prisma.$PostPayload, AggregatePostArgs>
   >
   groupByPost?: Resolver<
     {},