prisma-laravel-migrate 3.1.3 → 3.1.5

package/dist/cli/cli.js

@@ -2667,20 +2667,49 @@ var TsPrinter = class {
     }).join("\n");
   }
   /**
-   * Merge & dedupe imports from multiple model contexts.
-   */
+  * Merge & dedupe imports from multiple model contexts.
+  *
+  * We re-parse the per-model import lines into TsImport objects so that
+  * `normalizeTsImports` can group everything by `from` and merge type lists.
+  */
   collectImports(ctxs) {
-    const set = /* @__PURE__ */ new Set();
+    const collected = [];
+    const importRe = /^import\s*\{\s*([^}]+)\}\s*from\s*(['"])([^'"]+)\2;?$/;
     for (const ctx of ctxs) {
       const raw = (ctx.imports || "").replace(/\r\n/g, "\n");
       if (!raw.trim()) continue;
       for (const line of raw.split("\n")) {
         const trimmed = line.trim();
         if (!trimmed) continue;
-        set.add(trimmed);
+        const m = importRe.exec(trimmed);
+        if (!m) {
+          if (trimmed.startsWith("import ")) {
+            collected.push({
+              from: trimmed,
+              // sentinel; will emit as-is below
+              types: []
+              // no types
+            });
+          }
+          continue;
+        }
+        const typeList = m[1].split(",").map((t) => t.trim()).filter(Boolean);
+        const from = m[3];
+        collected.push({ from, types: typeList });
       }
     }
-    return Array.from(set).join("\n");
+    const rawLines = collected.filter((imp) => !imp.types?.length && imp.from.startsWith("import ")).map((imp) => imp.from);
+    const structured = collected.filter(
+      (imp) => imp.types && imp.types.length && !imp.from.startsWith("import ")
+    );
+    const normalized = this.normalizeTsImports(structured);
+    const structuredLines = normalized.map(
+      (i) => `import { ${i.types.join(", ")} } from ${JSON.stringify(i.from)};`
+    );
+    const allLines = Array.from(
+      /* @__PURE__ */ new Set([...rawLines, ...structuredLines])
+    );
+    return allLines.join("\n");
   }
   // ---------------------------------------------------------------------------
   // MODEL RENDERING (DEFAULT)
@@ -2950,12 +2979,9 @@ async function generateTypesFromPrisma(options) {
     groups,
     // TS-specific
     outputDir: pick("outputDir") ?? getDefaultTsOutDir(generator),
-    /**
-     * declaration now only affects enums:
-     *  - true  → enums.d.ts
-     *  - false → enums.ts
-     */
+    // enums-only knobs
     declaration: pick("declaration", false),
+    noEmitEnums: pick("noEmitEnums", false),
     shape: pick("shape", "interface"),
     scalarMap: pick("scalarMap"),
     nullableAsOptional: pick("nullableAsOptional", false),
@@ -2996,13 +3022,11 @@ async function generateTypesFromPrisma(options) {
   });
   const modelExt = ".d.ts";
   const enumExt = cfg.declaration ? ".d.ts" : ".ts";
-  if (enums.length) {
+  if (!cfg.noEmitEnums && enums.length) {
     const enumsCode = printer.printEnums(enums);
     if (enumsCode.trim()) {
-      const enumsPath = path13.join(
-        tsOutDir,
-        `${cfg.enumsFileName ?? "enums"}${enumExt}`
-      );
+      const enumsBase = cfg.enumsFileName || "enums";
+      const enumsPath = path13.join(tsOutDir, `${enumsBase}${enumExt}`);
       await writeWithMerge(
         enumsPath,
         enumsCode,

package/dist/cli/ts.index.js

@@ -511,20 +511,49 @@ var TsPrinter = class {
     }).join("\n");
   }
   /**
-   * Merge & dedupe imports from multiple model contexts.
-   */
+  * Merge & dedupe imports from multiple model contexts.
+  *
+  * We re-parse the per-model import lines into TsImport objects so that
+  * `normalizeTsImports` can group everything by `from` and merge type lists.
+  */
   collectImports(ctxs) {
-    const set = /* @__PURE__ */ new Set();
+    const collected = [];
+    const importRe = /^import\s*\{\s*([^}]+)\}\s*from\s*(['"])([^'"]+)\2;?$/;
     for (const ctx of ctxs) {
       const raw = (ctx.imports || "").replace(/\r\n/g, "\n");
       if (!raw.trim()) continue;
       for (const line of raw.split("\n")) {
         const trimmed = line.trim();
         if (!trimmed) continue;
-        set.add(trimmed);
+        const m = importRe.exec(trimmed);
+        if (!m) {
+          if (trimmed.startsWith("import ")) {
+            collected.push({
+              from: trimmed,
+              // sentinel; will emit as-is below
+              types: []
+              // no types
+            });
+          }
+          continue;
+        }
+        const typeList = m[1].split(",").map((t) => t.trim()).filter(Boolean);
+        const from = m[3];
+        collected.push({ from, types: typeList });
       }
     }
-    return Array.from(set).join("\n");
+    const rawLines = collected.filter((imp) => !imp.types?.length && imp.from.startsWith("import ")).map((imp) => imp.from);
+    const structured = collected.filter(
+      (imp) => imp.types && imp.types.length && !imp.from.startsWith("import ")
+    );
+    const normalized = this.normalizeTsImports(structured);
+    const structuredLines = normalized.map(
+      (i) => `import { ${i.types.join(", ")} } from ${JSON.stringify(i.from)};`
+    );
+    const allLines = Array.from(
+      /* @__PURE__ */ new Set([...rawLines, ...structuredLines])
+    );
+    return allLines.join("\n");
   }
   // ---------------------------------------------------------------------------
   // MODEL RENDERING (DEFAULT)
@@ -907,12 +936,9 @@ async function generateTypesFromPrisma(options) {
     groups,
     // TS-specific
     outputDir: pick("outputDir") ?? getDefaultTsOutDir(generator),
-    /**
-     * declaration now only affects enums:
-     *  - true  → enums.d.ts
-     *  - false → enums.ts
-     */
+    // enums-only knobs
     declaration: pick("declaration", false),
+    noEmitEnums: pick("noEmitEnums", false),
     shape: pick("shape", "interface"),
     scalarMap: pick("scalarMap"),
     nullableAsOptional: pick("nullableAsOptional", false),
@@ -953,13 +979,11 @@ async function generateTypesFromPrisma(options) {
   });
   const modelExt = ".d.ts";
   const enumExt = cfg.declaration ? ".d.ts" : ".ts";
-  if (enums.length) {
+  if (!cfg.noEmitEnums && enums.length) {
     const enumsCode = printer.printEnums(enums);
     if (enumsCode.trim()) {
-      const enumsPath = path7.join(
-        tsOutDir,
-        `${cfg.enumsFileName ?? "enums"}${enumExt}`
-      );
+      const enumsBase = cfg.enumsFileName || "enums";
+      const enumsPath = path7.join(tsOutDir, `${enumsBase}${enumExt}`);
       await writeWithMerge(
         enumsPath,
         enumsCode,

package/dist/index.js

@@ -2662,20 +2662,49 @@ var TsPrinter = class {
     }).join("\n");
   }
   /**
-   * Merge & dedupe imports from multiple model contexts.
-   */
+  * Merge & dedupe imports from multiple model contexts.
+  *
+  * We re-parse the per-model import lines into TsImport objects so that
+  * `normalizeTsImports` can group everything by `from` and merge type lists.
+  */
   collectImports(ctxs) {
-    const set = /* @__PURE__ */ new Set();
+    const collected = [];
+    const importRe = /^import\s*\{\s*([^}]+)\}\s*from\s*(['"])([^'"]+)\2;?$/;
     for (const ctx of ctxs) {
       const raw = (ctx.imports || "").replace(/\r\n/g, "\n");
       if (!raw.trim()) continue;
       for (const line of raw.split("\n")) {
         const trimmed = line.trim();
         if (!trimmed) continue;
-        set.add(trimmed);
+        const m = importRe.exec(trimmed);
+        if (!m) {
+          if (trimmed.startsWith("import ")) {
+            collected.push({
+              from: trimmed,
+              // sentinel; will emit as-is below
+              types: []
+              // no types
+            });
+          }
+          continue;
+        }
+        const typeList = m[1].split(",").map((t) => t.trim()).filter(Boolean);
+        const from = m[3];
+        collected.push({ from, types: typeList });
       }
     }
-    return Array.from(set).join("\n");
+    const rawLines = collected.filter((imp) => !imp.types?.length && imp.from.startsWith("import ")).map((imp) => imp.from);
+    const structured = collected.filter(
+      (imp) => imp.types && imp.types.length && !imp.from.startsWith("import ")
+    );
+    const normalized = this.normalizeTsImports(structured);
+    const structuredLines = normalized.map(
+      (i) => `import { ${i.types.join(", ")} } from ${JSON.stringify(i.from)};`
+    );
+    const allLines = Array.from(
+      /* @__PURE__ */ new Set([...rawLines, ...structuredLines])
+    );
+    return allLines.join("\n");
   }
   // ---------------------------------------------------------------------------
   // MODEL RENDERING (DEFAULT)
@@ -2945,12 +2974,9 @@ async function generateTypesFromPrisma(options) {
     groups,
     // TS-specific
     outputDir: pick("outputDir") ?? getDefaultTsOutDir(generator),
-    /**
-     * declaration now only affects enums:
-     *  - true  → enums.d.ts
-     *  - false → enums.ts
-     */
+    // enums-only knobs
     declaration: pick("declaration", false),
+    noEmitEnums: pick("noEmitEnums", false),
     shape: pick("shape", "interface"),
     scalarMap: pick("scalarMap"),
     nullableAsOptional: pick("nullableAsOptional", false),
@@ -2991,13 +3017,11 @@ async function generateTypesFromPrisma(options) {
   });
   const modelExt = ".d.ts";
   const enumExt = cfg.declaration ? ".d.ts" : ".ts";
-  if (enums.length) {
+  if (!cfg.noEmitEnums && enums.length) {
     const enumsCode = printer.printEnums(enums);
     if (enumsCode.trim()) {
-      const enumsPath = path9.join(
-        tsOutDir,
-        `${cfg.enumsFileName ?? "enums"}${enumExt}`
-      );
+      const enumsBase = cfg.enumsFileName || "enums";
+      const enumsPath = path9.join(tsOutDir, `${enumsBase}${enumExt}`);
       await writeWithMerge(
         enumsPath,
         enumsCode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-laravel-migrate",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "description": "Generate laravel migrations and/or models using prisma files",
   "bin": {
     "prisma-laravel-migrations": "./dist/cli/migrator.index.js",