nest-prisma_doc-gen 1.0.8 → 1.0.10

package/dist/entities/dto-generator.js

@@ -40,7 +40,7 @@ export class DocGenDto {
             .join("\n\n");
         if (this.enums.size > 0) {
             this.classValidators.add("IsEnum");
-            this.imports.add(`import { ${Array.from(this.enums)} } from '../enums';`);
+            this.imports.add(`import { ${Array.from(this.enums)} } from '@prisma/client';`);
         }
         this.imports.add(`import { ${Array.from(this.classValidators)} } from 'src/utils/validators';`);
         return [

package/dist/entities/entity-generator.js

@@ -35,7 +35,7 @@ export class DocGenEntity {
         })
             .join("\n\n");
         if (this.enums.size > 0) {
-            this.imports.add(`import { ${Array.from(this.enums)} } from '../enums';`);
+            this.imports.add(`import { ${Array.from(this.enums)} } from '@prisma/client';`);
         }
         return [
             `${Array.from(this.imports).join("\n")}`,

package/dist/main.js

@@ -3,11 +3,11 @@ import * as path from "node:path";
 import { DocEnums, DocGenEnum } from "./entities/enum.js";
 import { DocGenModel } from "./entities/model.js";
 import { DocFields } from "./field.type.js";
-import { Helper } from "./utils/helpers.js";
 import prismaPkg from "@prisma/internals";
+import { PrismaUtils } from "./utils/prisma-utils.js";
 const { getDMMF } = prismaPkg;
 const ROOT = process.cwd();
-const PRISMA_DIR = path.join(ROOT, "prisma");
+const PRISMA_DIR = path.join(ROOT, "src");
 export class DocGen {
     datamodel;
     properties;
@@ -15,8 +15,9 @@ export class DocGen {
     fields;
     models;
     async init() {
-        const prismaDataModel = await Helper.readPrismaFolderDatamodel(PRISMA_DIR);
+        const prismaDataModel = await PrismaUtils.readPrismaFolderDatamodel(PRISMA_DIR);
         const { datamodel } = await getDMMF({ datamodel: prismaDataModel });
+        console.log(datamodel);
         this.enums = new DocEnums(datamodel.enums.map(({ dbName, name, values }) => {
             return new DocGenEnum({
                 dbName: dbName ?? "",

package/dist/utils/helpers.js

@@ -1,5 +1,3 @@
-import { promises as fs } from "node:fs";
-import * as path from "node:path";
 export class Helper {
     static prismaScalarToTs(s) {
         switch (s) {
@@ -83,44 +81,38 @@ export class Helper {
             hasDate: model.fields.some((field) => field.kind === "scalar" && field.type === "DateTime"),
         };
     }
-    static async readPrismaFolderDatamodel(dir) {
-        const files = [];
-        const entries = await fs.readdir(dir, { withFileTypes: true });
-        const mainSchemaPath = path.join(dir, "schema.prisma");
-        try {
-            const mainStat = await fs.stat(mainSchemaPath);
-            if (mainStat.isFile())
-                files.push(mainSchemaPath);
-        }
-        catch { }
-        // varrer demais itens (exceto migrations e o schema.prisma já incluído)
-        for (const entry of entries) {
-            if (entry.name === "migrations")
-                continue;
-            const full = path.join(dir, entry.name);
-            if (entry.isDirectory()) {
-                const nested = await this.readPrismaFolderDatamodel(full);
-                if (nested.trim())
-                    files.push(`\n// ---- ${full} ----\n${nested}`);
-            }
-            else if (entry.isFile() && entry.name.endsWith(".prisma") && full !== mainSchemaPath) {
-                const content = await fs.readFile(full, "utf-8");
-                files.push(`\n// ---- ${full} ----\n${content}`);
-            }
-        }
-        // se não houver nada além de subpastas, retorna o que juntou nelas
-        if (!files.length)
-            return "";
-        // quando schema.prisma existe, ele já está no topo do array
-        if (files[0] === mainSchemaPath) {
-            const head = await fs.readFile(mainSchemaPath, "utf-8");
-            const tail = files.slice(1).join("\n");
-            return `${head}\n${tail}`;
-        }
-        // caso não exista schema.prisma, apenas concatena
-        const contents = await Promise.all(files.map(async (f) => (f.startsWith("\n// ---- ") ? f : fs.readFile(f, "utf-8"))));
-        return contents.join("\n");
-    }
+    // static async readPrismaFolderDatamodel(dir: string): Promise<string> {
+    //   const files: string[] = [];
+    //   const entries = await fs.readdir(dir, { withFileTypes: true });
+    //   const mainSchemaPath = path.join(dir, "schema.prisma");
+    //   try {
+    //     const mainStat = await fs.stat(mainSchemaPath);
+    //     if (mainStat.isFile()) files.push(mainSchemaPath);
+    //   } catch {}
+    //   // varrer demais itens (exceto migrations e o schema.prisma já incluído)
+    //   for (const entry of entries) {
+    //     if (entry.name === "migrations") continue;
+    //     const full = path.join(dir, entry.name);
+    //     if (entry.isDirectory()) {
+    //       const nested = await this.readPrismaFolderDatamodel(full);
+    //       if (nested.trim()) files.push(`\n// ---- ${full} ----\n${nested}`);
+    //     } else if (entry.isFile() && entry.name.endsWith(".prisma") && full !== mainSchemaPath) {
+    //       const content = await fs.readFile(full, "utf-8");
+    //       files.push(`\n// ---- ${full} ----\n${content}`);
+    //     }
+    //   }
+    //   // se não houver nada além de subpastas, retorna o que juntou nelas
+    //   if (!files.length) return "";
+    //   // quando schema.prisma existe, ele já está no topo do array
+    //   if (files[0] === mainSchemaPath) {
+    //     const head = await fs.readFile(mainSchemaPath, "utf-8");
+    //     const tail = files.slice(1).join("\n");
+    //     return `${head}\n${tail}`;
+    //   }
+    //   // caso não exista schema.prisma, apenas concatena
+    //   const contents = await Promise.all(files.map(async (f) => (f.startsWith("\n// ---- ") ? f : fs.readFile(f, "utf-8"))));
+    //   return contents.join("\n");
+    // }
     findTypeForField(field) {
         if (field.kind === "scalar") {
             const base = Helper.prismaScalarToTs(field.type);

package/dist/utils/prisma-utils.js

@@ -0,0 +1,42 @@
+import { promises as fs } from "fs";
+import * as path from "path";
+export class PrismaUtils {
+    static async readPrismaFolderDatamodel(dir) {
+        const prismaFiles = [];
+        // percorre recursivamente e guarda TODOS os .prisma (exceto dentro de migrations)
+        const walk = async (currentDir) => {
+            const entries = await fs.readdir(currentDir, { withFileTypes: true });
+            for (const entry of entries) {
+                if (entry.name === "migrations")
+                    continue;
+                const fullPath = path.join(currentDir, entry.name);
+                if (entry.isDirectory()) {
+                    await walk(fullPath);
+                }
+                else if (entry.isFile() && entry.name.endsWith(".prisma")) {
+                    prismaFiles.push(fullPath);
+                }
+            }
+        };
+        await walk(dir);
+        if (!prismaFiles.length)
+            return "";
+        // garantir que main.prisma (se existir) venha primeiro
+        prismaFiles.sort((a, b) => {
+            const aIsMain = path.basename(a) === "main.prisma";
+            const bIsMain = path.basename(b) === "main.prisma";
+            if (aIsMain && !bIsMain)
+                return -1;
+            if (!aIsMain && bIsMain)
+                return 1;
+            // fallback: ordem alfabética estável
+            return a.localeCompare(b);
+        });
+        const chunks = [];
+        for (const file of prismaFiles) {
+            const content = await fs.readFile(file, "utf-8");
+            chunks.push(`\n// ---- ${file} ----\n${content}`);
+        }
+        return chunks.join("\n");
+    }
+}

package/package.json

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