prismadoc 1.0.32 → 1.0.33

package/dist/entities/dto-generator.js

@@ -14,9 +14,11 @@ export class DocGenDto {
     classValidators = new Set();
     enums = new Set();
     enumImportPath;
-    constructor(model, enumImportPath) {
+    mainEnumNames;
+    constructor(model, enumImportPath, mainEnumNames) {
         this.name = model.name;
         this.enumImportPath = enumImportPath ?? "@prisma/client";
+        this.mainEnumNames = mainEnumNames ?? new Set();
         this.classValidators.add("IsString");
         this.classValidators.add("IsNotEmpty");
         for (const field of model.fields) {
@@ -45,7 +47,14 @@ export class DocGenDto {
             .join("\n\n");
         if (this.enums.size > 0) {
             this.classValidators.add("IsEnum");
-            this.imports.add(`import { ${Array.from(this.enums)} } from '${this.enumImportPath}';`);
+            const localEnums = Array.from(this.enums).filter((e) => !this.mainEnumNames.has(e));
+            const prismaEnums = Array.from(this.enums).filter((e) => this.mainEnumNames.has(e));
+            if (localEnums.length > 0) {
+                this.imports.add(`import { ${localEnums.join(", ")} } from '${this.enumImportPath}';`);
+            }
+            if (prismaEnums.length > 0) {
+                this.imports.add(`import { ${prismaEnums.join(", ")} } 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");

package/dist/entities/model.js

@@ -10,13 +10,13 @@ export class DocGenModel {
     exports;
     file;
     servicePrefix;
-    constructor(model, servicePrefix) {
+    constructor(model, servicePrefix, mainEnumNames) {
         this.name = model.name;
         this.fields = model.fields;
         this.servicePrefix = servicePrefix;
         const enumImportPath = servicePrefix ? "../enums" : undefined;
         this.response = new DocGenResponse(model);
-        this.dto = new DocGenDto(model, enumImportPath);
+        this.dto = new DocGenDto(model, enumImportPath, mainEnumNames);
         const kebabName = Helper.toKebab(this.name);
         const fileName = servicePrefix ? `${servicePrefix}.${kebabName}` : kebabName;
         this.exports = [`export * from './types/${fileName}'`];

package/dist/main.js

@@ -68,10 +68,15 @@ export class DocGen {
         }
     }
     async processExternalSchema(name, prismaSchema, mainPrismaDataModel, mainModelNames, mainEnumNames) {
-        // Remove blocos datasource/generator do schema externo para evitar duplicatas
-        const cleanedExternal = prismaSchema
+        // Remove blocos datasource/generator e definições duplicadas do schema externo
+        const allMainNames = new Set([...mainModelNames, ...mainEnumNames]);
+        let cleanedExternal = prismaSchema
             .replaceAll(/datasource\s+\w+\s*\{[^}]*\}/g, "")
             .replaceAll(/generator\s+\w+\s*\{[^}]*\}/g, "");
+        // Remove models/enums que já existem no schema principal
+        for (const typeName of allMainNames) {
+            cleanedExternal = cleanedExternal.replaceAll(new RegExp(`(?:model|enum)\\s+${typeName}\\s*\\{[^}]*\\}`, "g"), "");
+        }
         // Combina com o schema principal para que o Prisma resolva todos os tipos
         const combined = mainPrismaDataModel + "\n" + cleanedExternal;
         const { datamodel } = await this.getDMMFSafe(combined);
@@ -97,7 +102,7 @@ export class DocGen {
             enumFile.save();
         }
         for (const model of externalModels) {
-            const docModel = new DocGenModel(model, servicePrefix);
+            const docModel = new DocGenModel(model, servicePrefix, mainEnumNames);
             serviceIndexExports.push(...docModel.exports);
             docModel.save();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prismadoc",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "description": "Auto generates ApiProperties from schema.prisma",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",