Prisma 6 compatibility, with working tests (help required)

package.json

@@ -19,26 +19,26 @@
     "typegraphql-prisma": "lib/generator.js"
   },
   "peerDependencies": {
-    "@prisma/client": "^5.18.0",
+    "@prisma/client": "^6.0.0",
     "@types/graphql-fields": "^1.3.9",
     "@types/node": "*",
     "graphql-fields": "^2.0.3",
     "graphql-scalars": "^1.23.0",
-    "prisma": "^5.18.0",
+    "prisma": "^6.0.0",
     "tslib": "^2.6.3",
     "type-graphql": "^1.1.1 || >=1.2.0-rc || >=2.0.0-beta || >=2.0.0-rc"
   },
   "dependencies": {
-    "@prisma/generator-helper": "^5.18.0",
-    "@prisma/internals": "^5.18.0",
+    "@prisma/generator-helper": "^6.3.1",
+    "@prisma/internals": "^6.3.1",
     "pluralize": "^8.0.0",
     "semver": "^7.6.3",
     "ts-morph": "^23.0.0",
     "tslib": "^2.6.3"
   },
   "devDependencies": {
     "@jest/types": "^29.6.3",
-    "@prisma/client": "^5.18.0",
+    "@prisma/client": "^6.3.1",
     "@types/graphql-fields": "^1.3.9",
     "@types/jest": "^29.5.12",
     "@types/node": "^22.1.0",
@@ -57,7 +57,7 @@
     "pg": "^8.12.0",
     "prettier": "^3.3.3",
     "prettier-2": "npm:prettier@^2",
-    "prisma": "^5.18.0",
+    "prisma": "^6.3.1",
     "reflect-metadata": "0.1.13",
     "ts-jest": "~29.2.4",
     "ts-node": "^10.9.2",

src/generator/config.ts

@@ -26,6 +26,7 @@ export const supportedMutationActions = [
   "updateOne",
   "deleteMany",
   "updateMany",
+  "updateManyAndReturn",
   "upsertOne",
 ] satisfies (keyof typeof DMMF.ModelAction)[];
 export type SupportedMutations = (typeof supportedMutationActions)[number];

src/generator/dmmf/transform.ts

@@ -304,6 +304,18 @@ export function getMappedOutputTypeName(
     return `CreateManyAndReturn${modelTypeName}`;
   }
 
+  if (
+    outputTypeName.startsWith("UpdateMany") &&
+    outputTypeName.endsWith("AndReturnOutputType")
+  ) {
+    const modelTypeName = dmmfDocument.getModelTypeName(
+      outputTypeName
+        .replace("UpdateMany", "")
+        .replace("AndReturnOutputType", ""),
+    );
+    return `UpdateManyAndReturn${modelTypeName}`;
+  }
+
   if (dmmfDocument.isModelName(outputTypeName)) {
     return dmmfDocument.getModelTypeName(outputTypeName)!;
   }

src/generator/dmmf/types.ts

@@ -90,7 +90,7 @@ export namespace DMMF {
   }>;
   export type FieldDefault = ReadonlyDeep<{
     name: string;
-    args: any[];
+    args: (string | number)[];
   }>;
   export type FieldDefaultScalar = string | boolean | number;
   export type Schema = ReadonlyDeep<{
@@ -247,6 +247,7 @@ export namespace DMMF {
     createManyAndReturn = "createManyAndReturn",
     updateOne = "updateOne",
     updateMany = "updateMany",
+    updateManyAndReturn = "updateManyAndReturn",
     upsertOne = "upsertOne",
     deleteOne = "deleteOne",
     deleteMany = "deleteMany",

src/generator/helpers.ts

@@ -179,6 +179,7 @@ function getInputKeywordPhrasePosition(inputTypeName: string) {
     "Upsert",
     "ScalarWhere",
     "Where",
+    "ScalarRelationFilter",
     "ListRelationFilter",
     "RelationFilter",
     "Filter",

tests/functional/__snapshots__/integration.ts.snap

@@ -100,12 +100,14 @@ type Mutation {
   createManyUser(data: [UserCreateManyInput!]!, skipDuplicates: Boolean): AffectedRowsOutput!
   createOnePost(data: PostCreateInput!): Post!
   createOneUser(data: UserCreateInput): User!
-  deleteManyPost(where: PostWhereInput): AffectedRowsOutput!
-  deleteManyUser(where: UserWhereInput): AffectedRowsOutput!
+  deleteManyPost(limit: Int, where: PostWhereInput): AffectedRowsOutput!
+  deleteManyUser(limit: Int, where: UserWhereInput): AffectedRowsOutput!
   deleteOnePost(where: PostWhereUniqueInput!): Post
   deleteOneUser(where: UserWhereUniqueInput!): User
-  updateManyPost(data: PostUpdateManyMutationInput!, where: PostWhereInput): AffectedRowsOutput!
-  updateManyUser(data: UserUpdateManyMutationInput!, where: UserWhereInput): AffectedRowsOutput!
+  updateManyAndReturnPost(data: PostUpdateManyMutationInput!, limit: Int, where: PostWhereInput): [UpdateManyAndReturnPost!]!
+  updateManyAndReturnUser(data: UserUpdateManyMutationInput!, limit: Int, where: UserWhereInput): [UpdateManyAndReturnUser!]!
+  updateManyPost(data: PostUpdateManyMutationInput!, limit: Int, where: PostWhereInput): AffectedRowsOutput!
+  updateManyUser(data: UserUpdateManyMutationInput!, limit: Int, where: UserWhereInput): AffectedRowsOutput!
   updateOnePost(data: PostUpdateInput!, where: PostWhereUniqueInput!): Post
   updateOneUser(data: UserUpdateInput!, where: UserWhereUniqueInput!): User
   upsertOnePost(create: PostCreateInput!, update: PostUpdateInput!, where: PostWhereUniqueInput!): Post!
@@ -481,7 +483,7 @@ input PostWhereInput {
   AND: [PostWhereInput!]
   NOT: [PostWhereInput!]
   OR: [PostWhereInput!]
-  author: UserRelationFilter
+  author: UserScalarRelationFilter
   authorId: IntFilter
   color: EnumColorFilter
   content: StringFilter
@@ -492,7 +494,7 @@ input PostWhereUniqueInput {
   AND: [PostWhereInput!]
   NOT: [PostWhereInput!]
   OR: [PostWhereInput!]
-  author: UserRelationFilter
+  author: UserScalarRelationFilter
   authorId: IntFilter
   color: EnumColorFilter
   content: StringFilter
@@ -601,6 +603,19 @@ input StringWithAggregatesFilter {
   startsWith: String
 }
 
+type UpdateManyAndReturnPost {
+  author: User!
+  authorId: Int!
+  color: Color!
+  content: String!
+  uuid: String!
+}
+
+type UpdateManyAndReturnUser {
+  id: Int!
+  name: String
+}
+
 type User {
   _count: UserCount
   id: Int!
@@ -702,16 +717,16 @@ input UserOrderByWithRelationInput {
   posts: PostOrderByRelationAggregateInput
 }
 
-input UserRelationFilter {
-  is: UserWhereInput
-  isNot: UserWhereInput
-}
-
 enum UserScalarFieldEnum {
   id
   name
 }
 
+input UserScalarRelationFilter {
+  is: UserWhereInput
+  isNot: UserWhereInput
+}
+
 input UserScalarWhereWithAggregatesInput {
   AND: [UserScalarWhereWithAggregatesInput!]
   NOT: [UserScalarWhereWithAggregatesInput!]
@@ -814,6 +829,7 @@ exports[`generator integration should generates TypeGraphQL classes files to out
         FindUniquePostResolver.ts
         GroupByPostResolver.ts
         PostCrudResolver.ts
+        UpdateManyAndReturnPostResolver.ts
         UpdateManyPostResolver.ts
         UpdateOnePostResolver.ts
         UpsertOnePostResolver.ts
@@ -830,6 +846,7 @@ exports[`generator integration should generates TypeGraphQL classes files to out
           FindUniquePostArgs.ts
           FindUniquePostOrThrowArgs.ts
           GroupByPostArgs.ts
+          UpdateManyAndReturnPostArgs.ts
           UpdateManyPostArgs.ts
           UpdateOnePostArgs.ts
           UpsertOnePostArgs.ts
@@ -847,6 +864,7 @@ exports[`generator integration should generates TypeGraphQL classes files to out
         FindUniqueUserOrThrowResolver.ts
         FindUniqueUserResolver.ts
         GroupByUserResolver.ts
+        UpdateManyAndReturnUserResolver.ts
         UpdateManyUserResolver.ts
         UpdateOneUserResolver.ts
         UpsertOneUserResolver.ts
@@ -864,6 +882,7 @@ exports[`generator integration should generates TypeGraphQL classes files to out
           FindUniqueUserArgs.ts
           FindUniqueUserOrThrowArgs.ts
           GroupByUserArgs.ts
+          UpdateManyAndReturnUserArgs.ts
           UpdateManyUserArgs.ts
           UpdateOneUserArgs.ts
           UpsertOneUserArgs.ts
@@ -934,7 +953,7 @@ exports[`generator integration should generates TypeGraphQL classes files to out
       UserMinOrderByAggregateInput.ts
       UserOrderByWithAggregationInput.ts
       UserOrderByWithRelationInput.ts
-      UserRelationFilter.ts
+      UserScalarRelationFilter.ts
       UserScalarWhereWithAggregatesInput.ts
       UserSumOrderByAggregateInput.ts
       UserUpdateInput.ts
@@ -958,6 +977,8 @@ exports[`generator integration should generates TypeGraphQL classes files to out
       PostMaxAggregate.ts
       PostMinAggregate.ts
       PostSumAggregate.ts
+      UpdateManyAndReturnPost.ts
+      UpdateManyAndReturnUser.ts
       UserAvgAggregate.ts
       UserCount.ts
       UserCountAggregate.ts