nest-prisma_doc-gen 1.0.20 → 1.0.22

package/dist/entities/dto-generator.js

@@ -6,7 +6,7 @@ export class DocGenDto {
     name;
     // file: DocGenFile;
     fields = [];
-    imports = new Set([`${Static.AUTO_GENERATED_COMMENT}`, `import { ApiProperty } from '@nestjs/swagger'`]);
+    imports = new Set([`${Static.AUTO_GENERATED_COMMENT}`, `import { ApiProperty, IntersectionType } from '@nestjs/swagger'`]);
     classValidators = new Set();
     enums = new Set();
     constructor(model) {
@@ -32,7 +32,9 @@ export class DocGenDto {
             else if (field.isEnum) {
                 this.enums.add(field.type);
             }
-            return field.build();
+            return `class ${Helper.capitalizeFirstSafe(field.name)}Dto {
+          ${field.build()}
+        }`;
         })
             .join("\n\n");
         if (this.enums.size > 0) {
@@ -40,10 +42,11 @@ export class DocGenDto {
             this.imports.add(`import { ${Array.from(this.enums)} } from '@prisma/client';`);
         }
         this.imports.add(`import { ${Array.from(this.classValidators)} } from '${config.validatorPath}';`);
+        const intersections = this.fields.map((field) => Helper.capitalizeFirstSafe(field.name) + "Dto");
         return [
             `${Array.from(this.imports).join("\n")}`,
-            `class ${this.name}Dto {
-        ${sanitizedFields}
+            `${sanitizedFields}`,
+            `class ${this.name}Dto extends IntersectionType(${intersections.join(",")}) {
       }`,
             `class ${this.name}Id {
         @ApiProperty({ type: 'string', example: 'cmfxu4njg000008l52v7t8qze', required: true })

package/dist/entities/model.js

@@ -15,11 +15,47 @@ export class DocGenModel {
         this.response = new DocGenResponse(model);
         this.dto = new DocGenDto(model);
         this.exports = [`export * from './types/${Helper.toKebab(this.name)}'`];
+        const teste = new Map();
+        const bla = [...this.dto.fields, ...this.response.fields];
+        bla.forEach((field) => {
+            let a = teste.get(field.name);
+            if (!a) {
+                a = [];
+                teste.set(field.name, a);
+            }
+            a.push(field.fieldType);
+        });
+        const fdm = `
+            export namespace Input {
+          ${Array.from(teste)
+            .map(([fieldName, fieldTypes]) => {
+            const name = Helper.capitalizeFirstSafe(fieldName);
+            const types = fieldTypes.map((type) => Helper.capitalizeFirstSafe(type));
+            return `
+              export namespace ${name} {
+                ${types
+                .map((type) => {
+                return `
+                    export type ${type} = ${name + type}
+                    export const ${type} = ${name + type}
+                  `;
+            })
+                .join(";")}
+              }
+            `;
+        })
+            .join(";")}
+        }
+    `;
         const intaaa = `
       export namespace ${this.name} {
+        export const Dto = ${this.name}Dto;
         export type Dto = ${this.name}Dto;
+        export const Res = ${this.name}Res;
         export type Res = ${this.name}Res;
+        export const Id = ${this.name}Id;
         export type Id = ${this.name}Id;
+            ${fdm}
       }
     `;
         const data = [this.dto.build(), this.response.build(), intaaa].join("");

package/dist/entities/response-generator.js

@@ -1,3 +1,4 @@
+import { Helper } from "../utils/helpers.js";
 import { DocGenField } from "./field.js";
 export class DocGenResponse {
     name;
@@ -18,13 +19,12 @@ export class DocGenResponse {
             if (field.isEnum) {
                 this.enums.add(field.type);
             }
-            return field.build();
+            return `class ${Helper.capitalizeFirstSafe(field.name)}Res {
+          ${field.build()}
+        }`;
         })
             .join("\n\n");
-        return [
-            `class ${this.name}Res {
-        ${sanitizedFields}
-      }`,
-        ].join("\n\n");
+        const intersections = this.fields.map((field) => Helper.capitalizeFirstSafe(field.name) + "Res");
+        return [`${sanitizedFields}`, `class ${this.name}Res extends IntersectionType(${intersections.join(",")}) {}`].join("\n\n");
     }
 }

package/dist/file.js

@@ -2,7 +2,6 @@ import { promises as fs } from "node:fs";
 import * as path from "node:path";
 import * as prettier from "prettier";
 const ROOT = process.cwd();
-console.log(ROOT);
 const OUT_DIR = path.join(ROOT, "src/types/docgen");
 export class DocGenFile {
     outDir;

package/dist/main.js

@@ -6,7 +6,7 @@ import prismaPkg from "@prisma/internals";
 import { PrismaUtils } from "./utils/prisma-utils.js";
 import { DocGenGeneric } from "./entities/generic.js";
 import { DocGenFile } from "./file.js";
-import { Helper } from "./utils/helpers.js";
+// import { Helper } from "./utils/helpers.js";
 const { getDMMF } = prismaPkg;
 const ROOT = process.cwd();
 const PRISMA_DIR = path.join(ROOT, "src");
@@ -18,7 +18,7 @@ export class DocGen {
     models;
     generic = new DocGenGeneric();
     indexFile;
-    fieldFile;
+    // fieldFile!: DocGenFile;
     async init() {
         const prismaDataModel = await PrismaUtils.readPrismaFolderDatamodel(PRISMA_DIR);
         const { datamodel } = await getDMMF({ datamodel: prismaDataModel });
@@ -37,19 +37,19 @@ export class DocGen {
     build() {
         this.generic.build();
         this.fields.file.save();
-        const indexFileData = [`export * from './fields.types'`];
+        const indexFileData = [];
         const fields = [];
-        const enumsSet = new Set();
-        const classValidatorsSet = new Set();
+        // const enumsSet = new Set<string>();
+        // const classValidatorsSet = new Set<string>();
         for (const model of this.models) {
             indexFileData.push(...model.exports);
             fields.push(...model.dto.fields);
-            for (const e of model.dto.enums) {
-                enumsSet.add(e);
-            }
-            for (const classValidator of model.dto.classValidators) {
-                classValidatorsSet.add(classValidator);
-            }
+            // for (const e of model.dto.enums) {
+            //   enumsSet.add(e);
+            // }
+            // for (const classValidator of model.dto.classValidators) {
+            //   classValidatorsSet.add(classValidator);
+            // }
             model.save();
         }
         indexFileData.push("export * as DG from 'src/types/docgen/index';");
@@ -59,43 +59,43 @@ export class DocGen {
                 continue;
             fieldMap.set(field.name, field);
         }
-        const imports = new Set([`import { ApiProperty } from '@nestjs/swagger'`]);
-        const validators = `import { ${Array.from(classValidatorsSet)} } from 'src/_nest/validators';`;
-        const exportTypes = [];
-        const fieldClasses = Array.from(fieldMap)
-            .map(([_, field]) => {
-            field.isRequired = true;
-            const name = Helper.capitalizeFirstSafe(field.name);
-            exportTypes.push(`
-          export type ${name} = ${name}Dto
-        `);
-            return `
-          class ${name}Dto {
-            ${field.build()}
-          }
-        `;
-        })
-            .join("\n");
-        imports.add(`import { ${Array.from(enumsSet)} } from '@prisma/client';`);
-        imports.add(validators);
-        const teste = `
-      export namespace Input {
-        ${exportTypes.join(";")}
-      }
-    `;
-        const fieldFileContent = [Array.from(imports).join("\n"), fieldClasses, teste];
-        this.fieldFile = new DocGenFile({
-            fileName: "fields.types.ts",
-            dir: "",
-            data: fieldFileContent.join("\n"),
-        });
+        // const imports = new Set([`import { ApiProperty } from '@nestjs/swagger'`]);
+        // const validators = `import { ${Array.from(classValidatorsSet)} } from 'src/_nest/validators';`;
+        // const exportTypes: string[] = [];
+        // const fieldClasses = Array.from(fieldMap)
+        //   .map(([_, field]) => {
+        //     field.isRequired = true;
+        //     const name = Helper.capitalizeFirstSafe(field.name);
+        //     exportTypes.push(`
+        //       export const ${name} = ${name}Dto
+        //     `);
+        //     return `
+        //       class ${name}Dto {
+        //         ${field.build()}
+        //       }
+        //     `;
+        //   })
+        //   .join("\n");
+        // imports.add(`import { ${Array.from(enumsSet)} } from '@prisma/client';`);
+        // imports.add(validators);
+        // const teste = `
+        //   export namespace Input {
+        //     ${exportTypes.join(";")}
+        //   }
+        // `;
+        // const fieldFileContent = [Array.from(imports).join("\n"), fieldClasses, teste];
+        // this.fieldFile = new DocGenFile({
+        //   fileName: "fields.types.ts",
+        //   dir: "",
+        //   data: fieldFileContent.join("\n"),
+        // });
         this.indexFile = new DocGenFile({
             fileName: "index.ts",
             dir: "",
             data: indexFileData.join("\n"),
         });
         this.indexFile.save();
-        this.fieldFile.save();
+        // this.fieldFile.save();
     }
 }
 const generator = new DocGen();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nest-prisma_doc-gen",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "Auto generates ApiProperties from schema.prisma",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",