Fix multiline docs being concatenated

experiments/prisma/generated/client/schema.prisma

@@ -59,6 +59,9 @@ enum PostKind {
 }
 
 model post {
+  /// first line of comment
+  /// second line of comment
+  /// third line of comment
   uuid      String    @id @default(uuid())
   createdAt DateTime  @default(now())
   updatedAt DateTime  @updatedAt

experiments/prisma/generated/type-graphql/dmmf.json

@@ -222,7 +222,8 @@
               "args": []
             },
             "isGenerated": false,
-            "isUpdatedAt": false
+            "isUpdatedAt": false,
+            "documentation": "first line of comment\nsecond line of comment\nthird line of comment"
           },
           {
             "name": "createdAt",

experiments/prisma/generated/type-graphql/models/MainUser.ts

@@ -6,13 +6,17 @@ import { Post } from "../models/Post";
 import { Role } from "../enums/Role";
 import { MainUserCount } from "../resolvers/outputs/MainUserCount";
 
-/** User model doc */
+/**
+ * User model doc
+ */
 @TypeGraphQL.ObjectType({
   isAbstract: true,
   description: "User model doc"
 })
 export class MainUser {
-  /** User model field doc */
+  /**
+   * User model field doc
+   */
   @TypeGraphQL.Field(_type => TypeGraphQL.ID, {
     nullable: false,
     description: "User model field doc"
@@ -24,7 +28,9 @@ export class MainUser {
   })
   email!: string;
 
-  /** renamed field doc */
+  /**
+   * renamed field doc
+   */
   name!: string | null;
 
   @TypeGraphQL.Field(_type => TypeGraphQL.Int, {
@@ -63,7 +69,9 @@ export class MainUser {
   })
   _count?: MainUserCount | null;
 
-  /** renamed field doc */
+  /**
+   * renamed field doc
+   */
   @TypeGraphQL.Field(_type => String, {
     nullable: true,
     description: "renamed field doc"

experiments/prisma/generated/type-graphql/models/Post.ts

@@ -9,8 +9,14 @@ import { PostKind } from "../enums/PostKind";
   isAbstract: true
 })
 export class Post {
+  /**
+   * first line of comment
+   * second line of comment
+   * third line of comment
+   */
   @TypeGraphQL.Field(_type => TypeGraphQL.ID, {
-    nullable: false
+    nullable: false,
+    description: "first line of comment\nsecond line of comment\nthird line of comment"
   })
   uuid!: string;
 

experiments/prisma/generated/type-graphql/prisma-client-dmmf.json

@@ -222,7 +222,8 @@
               "args": []
             },
             "isGenerated": false,
-            "isUpdatedAt": false
+            "isUpdatedAt": false,
+            "documentation": "first line of comment\\nsecond line of comment\\nthird line of comment"
           },
           {
             "name": "createdAt",

experiments/prisma/schema.prisma

@@ -59,6 +59,9 @@ enum PostKind {
 }
 
 model post {
+  /// first line of comment
+  /// second line of comment
+  /// third line of comment
   uuid      String    @id @default(uuid())
   createdAt DateTime  @default(now())
   updatedAt DateTime  @updatedAt

src/generator/enum.ts

@@ -4,6 +4,7 @@ import path from "path";
 import { generateTypeGraphQLImport } from "./imports";
 import { enumsFolderName } from "./config";
 import { DMMF } from "./dmmf/types";
+import { convertNewLines } from "./helpers";
 
 export default function generateEnumFromDef(
   project: Project,
@@ -21,7 +22,7 @@ export default function generateEnumFromDef(
     isExported: true,
     name: enumDef.typeName,
     ...(enumDef.docs && {
-      docs: [{ description: enumDef.docs }],
+      docs: [{ description: convertNewLines(enumDef.docs) }],
     }),
     members: enumDef.valuesMap.map<OptionalKind<EnumMemberStructure>>(
       ({ name, value }) => ({

src/generator/helpers.ts

@@ -233,13 +233,25 @@ export function cleanDocsString(
   cleanedDocs = cleanedDocs.replace(modelAttributeRegex, "");
   cleanedDocs = cleanedDocs.replace(fieldAttributeRegex, "");
   cleanedDocs = cleanedDocs.split('"').join('\\"');
-  cleanedDocs = cleanedDocs.split("\r").join("");
-  cleanedDocs = cleanedDocs.split("\\r").join("");
-  cleanedDocs = cleanedDocs.split("\n").join("");
-  cleanedDocs = cleanedDocs.split("\\n").join("");
+  if (cleanedDocs.endsWith("\r")) {
+    cleanedDocs = cleanedDocs.slice(0, -1);
+  }
+  if (cleanedDocs.endsWith("\\r")) {
+    cleanedDocs = cleanedDocs.slice(0, -2);
+  }
+  if (cleanedDocs.endsWith("\n")) {
+    cleanedDocs = cleanedDocs.slice(0, -1);
+  }
+  if (cleanedDocs.endsWith("\\n")) {
+    cleanedDocs = cleanedDocs.slice(0, -2);
+  }
   return cleanedDocs;
 }
 
+export function convertNewLines(str: string) {
+  return str.split("\\n").join("\n");
+}
+
 export function toUnixPath(maybeWindowsPath: string) {
   return maybeWindowsPath.split("\\").join("/");
 }

src/generator/model-type-class.ts

@@ -19,6 +19,7 @@ import {
 import { modelsFolderName } from "./config";
 import { DMMF } from "./dmmf/types";
 import { DmmfDocument } from "./dmmf/dmmf-document";
+import { convertNewLines } from "./helpers";
 
 export default function generateObjectTypeClassFromModel(
   project: Project,
@@ -109,7 +110,7 @@ export default function generateObjectTypeClassFromModel(
                 ]),
           ],
           ...(field.docs && {
-            docs: [{ description: field.docs }],
+            docs: [{ description: `\n${convertNewLines(field.docs)}` }],
           }),
         };
       }),
@@ -166,12 +167,12 @@ export default function generateObjectTypeClassFromModel(
               : `return this.${field.name} ?? null;`,
           ],
           ...(field.docs && {
-            docs: [{ description: field.docs }],
+            docs: [{ description: `\n${convertNewLines(field.docs)}` }],
           }),
         };
       }),
     ...(model.docs && {
-      docs: [{ description: model.docs }],
+      docs: [{ description: `\n${convertNewLines(model.docs)}` }],
     }),
   });
 }

tests/regression/__snapshots__/models.ts.snap

@@ -37,7 +37,9 @@ import { DecimalJSScalar } from \\"../scalars\\";
 import { Post } from \\"../models/Post\\";
 import { UserCount } from \\"../resolvers/outputs/UserCount\\";
 
-/** User model doc */
+/**
+ * User model doc
+ */
 @TypeGraphQL.ObjectType({
   isAbstract: true,
   description: \\"User model doc\\"
@@ -48,7 +50,9 @@ export class User {
   })
   id!: number;
 
-  /** field doc */
+  /**
+   * field doc
+   */
   @TypeGraphQL.Field(_type => String, {
     nullable: false,
     description: \\"field doc\\"
@@ -60,7 +64,20 @@ export class User {
   })
   intField!: number;
 
-  /** relation doc */
+  /**
+   * multiline doc 1
+   * multiline doc 2
+   */
+  @TypeGraphQL.Field(_type => Boolean, {
+    nullable: false,
+    description: \\"multiline doc 1
+            multiline doc 2\\"
+  })
+  boolField!: boolean;
+
+  /**
+   * relation doc
+   */
   posts?: Post[];
 
   @TypeGraphQL.Field(_type => UserCount, {
@@ -241,7 +258,9 @@ export class User {
   })
   dateOfBirth!: Date;
 
-  /** renamed field docs */
+  /**
+   * renamed field docs
+   */
   name!: string;
 
   balance!: number | null;
@@ -253,7 +272,9 @@ export class User {
   })
   _count?: UserCount | null;
 
-  /** renamed field docs */
+  /**
+   * renamed field docs
+   */
   @TypeGraphQL.Field(_type => String, {
     nullable: false,
     description: \\"renamed field docs\\"

tests/regression/models.ts

@@ -104,6 +104,9 @@ describe("models", () => {
         stringField String
         // field comment
         intField    Int
+        /// multiline doc 1
+        /// multiline doc 2
+        boolField   Boolean
         /// relation doc
         posts       Post[]
       }