prisma-laravel-migrate 0.0.8 → 0.0.9

package/README.md

@@ -2,7 +2,7 @@
 
 A generator plugin that translates your **Prisma schema** into Laravel‑ready  
 **Database Migrations**, **Eloquent Models**, and **Enum classes**.  
-Built in strict TypeScript with fully‑customisable stubs, grouping, and marker‑based updates.
+Built in strict TypeScript with fully‑customisable stubs, grouping, and smart merge updates.
 
 ---
 
@@ -21,24 +21,24 @@ Add both generator blocks to **`schema.prisma`**:
 
 ```prisma
 generator migrate {
-  provider    = "prisma-laravel-migrations"
-  stubDir     = "./prisma/stubs"
-  output      = "database/migrations"     // fallback
-  outputDir   = "database/migrations"     // takes precedence
-  startMarker = "// <prisma-laravel:start>"
-  endMarker   = "// <prisma-laravel:end>"
-  noEmit      = false
-  groups      = "./prisma/group-stubs.js"
+  provider  = "prisma-laravel-migrate"
+  stubDir   = "./prisma/stubs"
+
+  output    = "database/migrations"   // fallback
+  outputDir = "database/migrations"   // takes precedence
+
+  noEmit    = false                   // skip writing if true
+  groups    = "./prisma/group-stubs.js"
 }
 
 generator modeler {
   provider      = "prisma-laravel-models"
   stubDir       = "./prisma/stubs"
+
   output        = "app/Models"
-  outputDir     = "app/Models"            // overrides output
+  outputDir     = "app/Models"        // overrides output
   outputEnumDir = "app/Enums"
-  startMarker   = "// <prisma-laravel:start>"
-  endMarker     = "// <prisma-laravel:end>"
+
   noEmit        = false
   groups        = "./prisma/group-stubs.js"
 }
@@ -48,22 +48,19 @@ generator modeler {
 
 | Key | Notes |
 | --- | --- |
-| `outputDir / output` | Destination folder (`outputDir` takes precedence). |
-| `outputEnumDir` | (modeler) directory for PHP enum classes. |
-| `stubDir` | Root stubs folder (`migration/`, `model/`, `enum/`). |
-| `startMarker/endMarker` | Region markers the generator will update. |
-| `groups` | JS module exporting stub‑group mappings. |
-| `noEmit` | If `true`, generator parses but **writes no** files. |
-
+| `outputDir / output` | Destination folder (`outputDir` overrides `output`). |
+| `outputEnumDir` | (modeler) directory for generated enum classes. |
+| `stubDir` | Root stub folder (`migration/`, `model/`, `enum/`). |
+| `groups` | JS module that maps stub files to table groups. |
+| `noEmit` | If `true`, generator parses but **writes no** files (dry‑run). |
 
-### 🔀 `groups` – Stub Grouping
+---
 
-Use **`groups`** in the generator block to map multiple tables (or enums)
-to a shared stub template:
+## 🔀 `groups` – Stub Grouping
 
 ```prisma
 generator migrate {
-  provider = "prisma-laravel-models"
+  provider = "prisma-laravel-migrate"
   stubDir  = "./prisma/stubs"
   groups   = "./prisma/group-stubs.js"
 }
@@ -72,20 +69,14 @@ generator migrate {
 `prisma/group-stubs.js`
 
 ```js
-/**
- * Each object links one stub file (relative to stubDir/<type>/)
- * to an array of tables (or enums) that should use it.
- */
 module.exports = [
   {
-    // Auth domain
-    stubFile: "auth.stub",          // stubs/migration/auth.stub
-    tables: ["users", "accounts", "password_resets"]
+    stubFile: "auth.stub",                // stubs/migration/auth.stub
+    tables:   ["users","accounts","password_resets"]
   },
   {
-    // Billing domain
-    stubFile: "billing.stub",       // stubs/migration/billing.stub
-    tables: ["invoices", "transactions"]
+    stubFile: "billing.stub",             // stubs/migration/billing.stub
+    tables:   ["invoices","transactions"]
   }
 ];
 ```
@@ -96,12 +87,11 @@ module.exports = [
 2. Matching group stub (`stubFile`)
 3. `stubs/<type>/index.stub` (default)
 
-
 ---
 
 ## 📁 Stub Folder Layout
 
-```
+```text
 prisma/stubs/
 ├── migration/index.stub
 ├── model/index.stub
@@ -109,17 +99,17 @@ prisma/stubs/
 └── enum/index.stub
 ```
 
-Create a table‑specific override with  
+Add table‑specific overrides at  
 `stubs/<type>/<table>.stub` (e.g. `stubs/model/users.stub`).
 
 ---
 
 ## 🔧 CLI Commands
 
-| Command | What it does |
+| Command | Purpose |
 | --- | --- |
 | `init` | Inject generator blocks & scaffold stub folders |
-| `customize` | Create per‑table stub overrides |
+| `customize` | Create per-table stub overrides |
 | `gen` | Run `prisma generate` then Laravel generators |
 
 ### init
@@ -130,80 +120,69 @@ npx prisma-laravel-cli init --schema=prisma/schema.prisma
 
 ### customize
 
-Generate override stubs.
-
 ```bash
-npx prisma-laravel-cli customize \
-  -t <types> \
-  -n <names> \
-  [--force] \
-  [--config <path>]
+npx prisma-laravel-cli customize   -t migration,model   -n users,accounts   --force
 ```
 
 | Flag | Description |
 | --- | --- |
-| `-t, --type` | **Required.** Comma‑separated list of stub types.<br>Valid values: `migration`, `model`, `enum`. You may combine `migration,model`; `enum` must be used alone. |
-| `-n, --names` | **Required.** Comma‑separated table or enum names (e.g. `users,accounts`). |
+| `-t, --type` | **Required.** Stub types (`migration`, `model`, `enum`). `enum` may not mix. |
+| `-n, --names` | **Required.** Table or enum names (`users,accounts`). |
 | `--force` | Overwrite existing stub files. |
-| `--config` | Path to an alternate CLI config file (custom stubDir/groups). |
-
-**Behaviour**
-
-1. Checks `<stubDir>/<type>/<name>.stub`.
-2. If missing, copies from `index.stub` → that path and logs:  
-  `➡️ Created stubs/<type>/<name>.stub from index.stub`
-3. If present and `--force` **not** set:  
-  `⏭️ Skipped existing stubs/<type>/<name>.stub`
-4. With `--force`, overwrites and logs creation.
-
-**Example**
-
-```bash
-# migration + model overrides for two tables
-npx prisma-laravel-cli customize -t migration,model -n users,accounts
-```
+| `--config` | Alternate CLI config path. |
 
 ### gen
 
 ```bash
-# run prisma generate then Laravel generators
 npx prisma-laravel-cli gen --config=prisma/laravel.config.js
-
 # skip prisma generate step
 npx prisma-laravel-cli gen --config=prisma/laravel.config.js --skipGenerate
 ```
 
-`prisma/laravel.config.js` example:
+`prisma/laravel.config.js`
 
 ```js
 module.exports = {
   migrator: {
     outputDir: "database/migrations",
-    stubDir: "prisma/stubs",
-    groups: "./prisma/group-stubs.js",
+    stubDir:   "prisma/stubs",
+    groups:    "./prisma/group-stubs.js"
   },
   modeler: {
-    outputDir: "app/Models",
+    outputDir:     "app/Models",
     outputEnumDir: "app/Enums",
-    stubDir: "prisma/stubs",
-    groups: "./prisma/group-stubs.js",
-  },
+    stubDir:       "prisma/stubs",
+    groups:        "./prisma/group-stubs.js"
+  }
 };
 ```
 
 ---
 
-## ✨ Stub Customization Notes
+## 🔄 How updates are applied
+
+1. Generator builds a **full new file** from your schema & stubs.
+2. Performs a **git‑style 3‑way merge** (using `node-diff3`):
+  - **base** = last generator output (`.prisma-laravel/backups/...`)
+  - **ours** = file on disk (user edits)
+  - **theirs** = freshly generated file
+3. Non‑conflicting changes merge automatically; conflicts are wrapped with  
+  `<<<<<<<`, `=======`, `>>>>>>>`.
+4. New `use …;` imports are merged, duplicates skipped.
+5. Baseline copy is updated in the backups folder.
+
+Delete the marker block **and** set `noEmit = true` to stop updates for a file.
+
+---
+
+## ✨ Stub Customisation Notes
 
-Stubs are **JS template literals**. Escape \\` and \\${ } if you want them literally.
+Stubs are **JavaScript template literals**. Escape \` and \${ } if you want them literally.
 
-> **Full custom model stubs**  
-> If you plan to hand-craft **all** the internal sections yourself
-> (fillable, hidden, casts, etc.), remove the `${content}` placeholder
-> but **keep** the `// <prisma-laravel:start>` and
-> `// <prisma-laravel:end>` markers so the generator still knows where
-> to inject future updates.  
-> Remove the markers only if you never want the file touched again
+> **Fully custom model stubs**  
+> If you remove the `${content}` placeholder **and** the marker block, the
+> generator leaves the file untouched.  
+> Keep the markers if you want automated updates but customised surroundings.
 
 ---
 

package/dist/diff-writer/backupPath.js

@@ -0,0 +1,14 @@
+import path from "path";
+import { mkdirSync, existsSync } from "fs";
+/** project-level hidden folder */
+const BACKUP_ROOT = path.resolve(process.cwd(), ".prisma-laravel", "backups");
+/** Returns `<root>/.prisma-laravel/backups/<relative-to-cwd>.bak` */
+export function backupPathFor(targetFile) {
+    const rel = path.relative(process.cwd(), targetFile);
+    const full = path.join(BACKUP_ROOT, rel + ".bak");
+    const dir = path.dirname(full);
+    if (!existsSync(dir))
+        mkdirSync(dir, { recursive: true });
+    return full;
+}
+//# sourceMappingURL=backupPath.js.map

package/dist/diff-writer/writer.js

@@ -0,0 +1,37 @@
+// writeWithMerge.ts
+import { existsSync, readFileSync, writeFileSync } from "fs";
+import * as diff3 from "node-diff3";
+import { backupPathFor } from "./backupPath.js";
+/**
+ * Git-style 3-way merge writer.
+ * @param filePath      Destination file
+ * @param newContent    Freshly generated FULL text
+ * @param overwrite     Skip write if false and file exists
+ */
+export function writeWithMerge(filePath, newContent, overwrite = true) {
+    if (!overwrite && existsSync(filePath))
+        return;
+    const bakPath = backupPathFor(filePath);
+    const base = existsSync(bakPath) ? readFileSync(bakPath, "utf-8") : null;
+    /* initial write */
+    if (!existsSync(filePath)) {
+        writeFileSync(filePath, newContent, "utf-8");
+        writeFileSync(bakPath, newContent, "utf-8");
+        return;
+    }
+    const mine = readFileSync(filePath, "utf-8");
+    if (mine === newContent)
+        return; // already up-to-date
+    /* no baseline yet → save current as baseline, overwrite */
+    if (!base) {
+        writeFileSync(bakPath, mine, "utf-8");
+        writeFileSync(filePath, newContent, "utf-8");
+        return;
+    }
+    /* diff3 merge */
+    const merged = diff3
+        .merge(mine.split(/\r?\n/), base.split(/\r?\n/), newContent.split(/\r?\n/), { stringSeparator: "\n" }).result.join("\n");
+    writeFileSync(filePath, merged, "utf-8");
+    writeFileSync(bakPath, newContent, "utf-8"); // update baseline
+}
+//# sourceMappingURL=writer.js.map

package/dist/generator/migrator/index.js

@@ -2,9 +2,9 @@ import { existsSync, mkdirSync, readdirSync } from "fs";
 import path from "path";
 import { PrismaToLaravelMigrationGenerator } from "./PrismaToLaravelMigrationGenerator.js";
 import { StubMigrationPrinter } from "../../printer/migrations.js";
-import { writeWithMarkers } from "../../generator/utils.js";
 import { fileURLToPath } from "url";
 import { sortMigrations } from "./sort.js";
+import { writeWithMerge } from "diff-writer/writer.js";
 export async function generateLaravelSchema(options) {
     const { dmmf, generator } = options;
     // 0) Pull config values (all come in as strings)
@@ -75,9 +75,9 @@ export async function generateLaravelSchema(options) {
             : `${timestamp}_create_${mig.tableName}_table.php`;
         const filePath = path.join(baseOut, fileName);
         // 3) Extract full & generated parts from your printer
-        const { fullContent: content, columns: generated } = printer.printMigration(mig);
+        const { fullContent: content } = printer.printMigration(mig);
         // 4) Write with markers as before
-        writeWithMarkers(filePath, content, generated, cfg.startMarker, cfg.endMarker, cfg.overwriteExisting ?? false);
+        writeWithMerge(filePath, content, cfg.overwriteExisting ?? false);
     });
     return migrations;
 }

package/dist/generator/modeler/index.js

@@ -1,9 +1,10 @@
 import { existsSync, mkdirSync } from "fs";
 import path from "path";
-import { buildModelContent, writeWithMarkers } from "../utils.js";
+import { buildModelContent } from "../utils.js";
 import { StubModelPrinter } from "../../printer/models.js";
 import { PrismaToLaravelModelGenerator } from "./generator.js";
 import { fileURLToPath } from "url";
+import { writeWithMerge } from "diff-writer/writer.js";
 export async function generateLaravelModels(options) {
     const { dmmf, generator } = options;
     // 0) Pull config values
@@ -63,7 +64,7 @@ export async function generateLaravelModels(options) {
     for (const enumDef of enums) {
         const enumPhp = printer.printEnum(enumDef);
         const enumFile = path.join(enumsDir, `${enumDef.name}.php`);
-        writeWithMarkers(enumFile, enumPhp, enumDef.values.map(v => `    case ${v} = '${v}';`).join('\n'), cfg.startMarker, cfg.endMarker, cfg.overwriteExisting ?? false);
+        writeWithMerge(enumFile, enumPhp, cfg.overwriteExisting ?? false);
     }
     // 5) Write model files
     for (const model of models) {
@@ -72,7 +73,7 @@ export async function generateLaravelModels(options) {
         const content = buildModelContent(model);
         const modelPhp = printer.printModel(model, enums, content);
         const modelFile = path.join(modelsDir, `${model.className}.php`);
-        writeWithMarkers(modelFile, modelPhp, content, cfg.startMarker, cfg.endMarker, cfg.overwriteExisting ?? false);
+        writeWithMerge(modelFile, modelPhp, cfg.overwriteExisting ?? false);
     }
     return { models, enums };
 }

package/dist/generator/utils.js

@@ -1,6 +1,6 @@
 import { NativeToMigrationTypeMap } from "./migrator/column-maps.js";
 import { MigrationTypes } from "./migrator/migrationTypes.js";
-import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { existsSync } from 'fs';
 import path from "path";
 /**
  * Given a Prisma field default, return the PHP code fragment
@@ -143,38 +143,6 @@ export function buildModelContent(model) {
  */
 export function formatStub(stub) {
     return stub;
-    // escape backslashes first
-    // .replace(/\\/g, '\\\\')
-    // then escape any backticks
-    // .replace(/`/g, '\\`');
-}
-/**
- * Safely write or update a file by replacing the region between
- * startMarker and endMarker if both exist, otherwise overwrite the whole file.
- *
- * @param filePath      Path to the target file
- * @param fullContent   The full text to write if markers are missing
- * @param generated     The text to inject between the markers
- * @param startMarker   Literal string marking the region start
- * @param endMarker     Literal string marking the region end
- * @param overwrite     If false and file exists, do nothing
- */
-export function writeWithMarkers(filePath, fullContent, generated, startMarker, endMarker, overwrite) {
-    // If the file exists but we're *not* overwriting, skip entirely
-    if (existsSync(filePath) && !overwrite)
-        return;
-    if (existsSync(filePath)) {
-        const existing = readFileSync(filePath, 'utf-8');
-        // If both markers are present, do an in‐place replace
-        if (existing.includes(startMarker) && existing.includes(endMarker)) {
-            const escaped = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-            const re = new RegExp(`${escaped(startMarker)}[\\s\\S]*?${escaped(endMarker)}`, 'm');
-            const updated = existing.replace(re, `${startMarker}\n${generated}\n${endMarker}`);
-            return writeFileSync(filePath, updated, 'utf-8');
-        }
-    }
-    // Otherwise write the full content (which itself can include the markers)
-    writeFileSync(filePath, fullContent, 'utf-8');
 }
 export function resolveStub(cfg, type, tableName) {
     if (!cfg.stubDir)

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/global.ts","../src/index.ts","../src/test.ts","../src/cli/index.ts","../src/cli/models.index.ts","../src/generator/utils.ts","../src/generator/migrator/prismatolaravelmigrationgenerator.ts","../src/generator/migrator/actions-map.ts","../src/generator/migrator/column-definition-types.ts","../src/generator/migrator/column-definition.ts","../src/generator/migrator/column-maps.ts","../src/generator/migrator/index.ts","../src/generator/migrator/migrationtypes.ts","../src/generator/migrator/rule-definition.ts","../src/generator/migrator/rules.ts","../src/generator/migrator/sort.ts","../src/generator/modeler/generator.ts","../src/generator/modeler/index.ts","../src/generator/modeler/types.ts","../src/printer/migrations.ts","../src/printer/models.ts"],"version":"5.7.2"}
+{"root":["../src/global.ts","../src/index.ts","../src/test.ts","../src/cli/index.ts","../src/cli/models.index.ts","../src/diff-writer/backuppath.ts","../src/diff-writer/writer.ts","../src/generator/utils.ts","../src/generator/migrator/prismatolaravelmigrationgenerator.ts","../src/generator/migrator/actions-map.ts","../src/generator/migrator/column-definition-types.ts","../src/generator/migrator/column-definition.ts","../src/generator/migrator/column-maps.ts","../src/generator/migrator/index.ts","../src/generator/migrator/migrationtypes.ts","../src/generator/migrator/rule-definition.ts","../src/generator/migrator/rules.ts","../src/generator/migrator/sort.ts","../src/generator/modeler/generator.ts","../src/generator/modeler/index.ts","../src/generator/modeler/types.ts","../src/printer/migrations.ts","../src/printer/models.ts"],"version":"5.7.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-laravel-migrate",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Generate laravel migrations and/or models using prisma files",
   "bin": {
     "prisma-laravel-migrations": "./dist/cli/index.js",
@@ -43,7 +43,9 @@
     "@types/node": "^24.0.3",
     "change-case": "^5.4.4",
     "dayjs": "^1.11.13",
+    "diff3": "^0.0.4",
     "jest": "^30.0.2",
+    "node-diff3": "^3.1.2",
     "pluralize": "^8.0.0",
     "prettier": "^3.5.3",
     "ts-node": "^10.9.2",