prisma-laravel-migrate 3.1.12 → 3.1.14

package/.idea/copilot.data.migration.agent.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AgentMigrationStateService">
+    <option name="migrationStatus" value="COMPLETED" />
+  </component>
+</project>

package/.idea/material_theme_project_new.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MaterialThemeProjectNewConfig">
+    <option name="metadata">
+      <MTProjectMetadataState>
+        <option name="migrated" value="true" />
+        <option name="pristineConfig" value="false" />
+        <option name="userId" value="-21b54065:19ba513a2b7:-7ffe" />
+      </MTProjectMetadataState>
+    </option>
+  </component>
+</project>

package/dist/cli/cli.js

@@ -1444,7 +1444,7 @@ var StubModelPrinter = class {
 
 // src/generator/lib/relationship/types.ts
 var getModel = (dmmf, name) => dmmf.datamodel.models.find((m) => m.name === name);
-var dbNameOf = (m) => decorate(m.dbName ?? m.name, { tablePrefix: getConfig("model")?.tablePrefix, tableSuffix: getConfig("model")?.tableSuffix });
+var dbNameOf = (m) => decorate(m.dbName ?? m.name, getConfig("model"));
 var conventionalPivotName = (a, b) => [a, b].map((s) => s.toLowerCase()).sort().join("_");
 var objRels = (m) => m.fields.filter((f) => f.kind === "object");
 var getPrimaryKeyFields = (m) => {
@@ -1814,10 +1814,7 @@ function buildRelationsForModel(dmmf, model) {
           type: "belongsToMany",
           mode: "explicit",
           modelClass: `${keys.target}::class`,
-          pivotTable: decorate(keys.pivotTable, {
-            tablePrefix: getConfig("model", "tablePrefix"),
-            tableSuffix: getConfig("model", "tableSuffix")
-          }),
+          pivotTable: keys.pivotTable,
           pivotLocal: keys.pivotLocal,
           pivotForeign: keys.pivotForeign,
           pivotColumns: keys.pivotColumns,
@@ -1835,10 +1832,7 @@ function buildRelationsForModel(dmmf, model) {
           type: "belongsToMany",
           mode: "implicit",
           modelClass: `${keys.target}::class`,
-          pivotTable: decorate(keys.pivotTable, {
-            tablePrefix: getConfig("model", "tablePrefix"),
-            tableSuffix: getConfig("model", "tableSuffix")
-          }),
+          pivotTable: keys.pivotTable,
           localKey: keys.local,
           foreignKey: keys.foreign,
           targetModelName: keys.target
@@ -1912,25 +1906,28 @@ function parseTypeDirective(doc) {
 }
 function parseAppendsDirective(doc) {
   if (!doc) return void 0;
-  const m = doc.match(/@appends\s*(\{[^}]*\}|\([^)]*\)|[^\r\n]*)/);
+  const m = doc.match(/@appends\s*(?::\s*)?(\{[^}]*\}|\([^)]*\)|[^\r\n]*)/i);
   if (!m) return void 0;
-  let body = m[1].trim();
+  let body = (m[1] ?? "").trim();
   if (body.startsWith("{") && body.endsWith("}") || body.startsWith("(") && body.endsWith(")")) {
     body = body.slice(1, -1).trim();
   }
+  if (body.startsWith(":")) body = body.slice(1).trim();
   if (!body) return void 0;
   const entries = [];
   for (const raw of body.split(",")) {
     const token = raw.trim();
     if (!token) continue;
-    const [nameRaw, typeRaw] = token.split(":").map((s) => s.trim());
-    if (!nameRaw) continue;
-    const name = nameRaw;
-    const type = typeRaw && typeRaw.length ? typeRaw : void 0;
-    entries.push({ name, type });
-  }
-  if (!entries.length) return void 0;
-  return { entries };
+    const idx = token.indexOf(":");
+    const name = (idx === -1 ? token : token.slice(0, idx)).trim();
+    const type = (idx === -1 ? "" : token.slice(idx + 1)).trim();
+    if (!name) continue;
+    entries.push({
+      name,
+      type: type.length ? type : void 0
+    });
+  }
+  return entries.length ? { entries } : void 0;
 }
 function getModelTypeDirective(model) {
   return parseTypeDirective(model.documentation);
@@ -2003,7 +2000,7 @@ var PrismaToLaravelModelGenerator = class {
           type: field.type
         };
       });
-      const guarded = guardedSet.size || properties.some((p) => p.guarded) ? [...guardedSet, ...properties.filter((p) => p.guarded).map((p) => p.name)] : hasToken("guarded", modelDoc) ? [] : void 0;
+      const guarded = guardedSet.size || properties.some((p) => p.guarded) ? Array.from(/* @__PURE__ */ new Set([...guardedSet, ...properties.filter((p) => p.guarded).map((p) => p.name)])) : hasToken("guarded", modelDoc) ? [] : void 0;
       const relations = this.extractRelationsFromModel(model);
       const interfaces = {};
       for (const prop of properties) {
@@ -2065,7 +2062,6 @@ var PrismaToLaravelModelGenerator = class {
         docblockProps.push(`@property ${type} $${p.name}`);
       }
       for (const rel of relations) {
-        if (rel.pivotTable) ;
         const type = rel.type === "hasMany" || rel.type === "belongsToMany" ? `\\Illuminate\\Support\\Collection<int, ${rel.modelClass}>` : rel.modelClass;
         docblockProps.push(`@property ${type} $${rel.name}`);
       }

package/dist/cli/models.index.js

@@ -284,7 +284,7 @@ var StubModelPrinter = class {
 
 // src/generator/lib/relationship/types.ts
 var getModel = (dmmf, name) => dmmf.datamodel.models.find((m) => m.name === name);
-var dbNameOf = (m) => decorate(m.dbName ?? m.name, { tablePrefix: getConfig("model")?.tablePrefix, tableSuffix: getConfig("model")?.tableSuffix });
+var dbNameOf = (m) => decorate(m.dbName ?? m.name, getConfig("model"));
 var conventionalPivotName = (a, b) => [a, b].map((s) => s.toLowerCase()).sort().join("_");
 var objRels = (m) => m.fields.filter((f) => f.kind === "object");
 var getPrimaryKeyFields = (m) => {
@@ -654,10 +654,7 @@ function buildRelationsForModel(dmmf, model) {
           type: "belongsToMany",
           mode: "explicit",
           modelClass: `${keys.target}::class`,
-          pivotTable: decorate(keys.pivotTable, {
-            tablePrefix: getConfig("model", "tablePrefix"),
-            tableSuffix: getConfig("model", "tableSuffix")
-          }),
+          pivotTable: keys.pivotTable,
           pivotLocal: keys.pivotLocal,
           pivotForeign: keys.pivotForeign,
           pivotColumns: keys.pivotColumns,
@@ -675,10 +672,7 @@ function buildRelationsForModel(dmmf, model) {
           type: "belongsToMany",
           mode: "implicit",
           modelClass: `${keys.target}::class`,
-          pivotTable: decorate(keys.pivotTable, {
-            tablePrefix: getConfig("model", "tablePrefix"),
-            tableSuffix: getConfig("model", "tableSuffix")
-          }),
+          pivotTable: keys.pivotTable,
           localKey: keys.local,
           foreignKey: keys.foreign,
           targetModelName: keys.target
@@ -742,25 +736,28 @@ function buildRelationsForModel(dmmf, model) {
 // src/generator/ts/directives.ts
 function parseAppendsDirective(doc) {
   if (!doc) return void 0;
-  const m = doc.match(/@appends\s*(\{[^}]*\}|\([^)]*\)|[^\r\n]*)/);
+  const m = doc.match(/@appends\s*(?::\s*)?(\{[^}]*\}|\([^)]*\)|[^\r\n]*)/i);
   if (!m) return void 0;
-  let body = m[1].trim();
+  let body = (m[1] ?? "").trim();
   if (body.startsWith("{") && body.endsWith("}") || body.startsWith("(") && body.endsWith(")")) {
     body = body.slice(1, -1).trim();
   }
+  if (body.startsWith(":")) body = body.slice(1).trim();
   if (!body) return void 0;
   const entries = [];
   for (const raw of body.split(",")) {
     const token = raw.trim();
     if (!token) continue;
-    const [nameRaw, typeRaw] = token.split(":").map((s) => s.trim());
-    if (!nameRaw) continue;
-    const name = nameRaw;
-    const type = typeRaw && typeRaw.length ? typeRaw : void 0;
-    entries.push({ name, type });
+    const idx = token.indexOf(":");
+    const name = (idx === -1 ? token : token.slice(0, idx)).trim();
+    const type = (idx === -1 ? "" : token.slice(idx + 1)).trim();
+    if (!name) continue;
+    entries.push({
+      name,
+      type: type.length ? type : void 0
+    });
   }
-  if (!entries.length) return void 0;
-  return { entries };
+  return entries.length ? { entries } : void 0;
 }
 
 // src/generator/modeler/generator.ts
@@ -824,7 +821,7 @@ var PrismaToLaravelModelGenerator = class {
           type: field.type
         };
       });
-      const guarded = guardedSet.size || properties.some((p) => p.guarded) ? [...guardedSet, ...properties.filter((p) => p.guarded).map((p) => p.name)] : hasToken("guarded", modelDoc) ? [] : void 0;
+      const guarded = guardedSet.size || properties.some((p) => p.guarded) ? Array.from(/* @__PURE__ */ new Set([...guardedSet, ...properties.filter((p) => p.guarded).map((p) => p.name)])) : hasToken("guarded", modelDoc) ? [] : void 0;
       const relations = this.extractRelationsFromModel(model);
       const interfaces = {};
       for (const prop of properties) {
@@ -886,7 +883,6 @@ var PrismaToLaravelModelGenerator = class {
         docblockProps.push(`@property ${type} $${p.name}`);
       }
       for (const rel of relations) {
-        if (rel.pivotTable) ;
         const type = rel.type === "hasMany" || rel.type === "belongsToMany" ? `\\Illuminate\\Support\\Collection<int, ${rel.modelClass}>` : rel.modelClass;
         docblockProps.push(`@property ${type} $${rel.name}`);
       }

package/dist/cli/ts.index.js

@@ -96,25 +96,28 @@ function parseTypeDirective(doc) {
 }
 function parseAppendsDirective(doc) {
   if (!doc) return void 0;
-  const m = doc.match(/@appends\s*(\{[^}]*\}|\([^)]*\)|[^\r\n]*)/);
+  const m = doc.match(/@appends\s*(?::\s*)?(\{[^}]*\}|\([^)]*\)|[^\r\n]*)/i);
   if (!m) return void 0;
-  let body = m[1].trim();
+  let body = (m[1] ?? "").trim();
   if (body.startsWith("{") && body.endsWith("}") || body.startsWith("(") && body.endsWith(")")) {
     body = body.slice(1, -1).trim();
   }
+  if (body.startsWith(":")) body = body.slice(1).trim();
   if (!body) return void 0;
   const entries = [];
   for (const raw of body.split(",")) {
     const token = raw.trim();
     if (!token) continue;
-    const [nameRaw, typeRaw] = token.split(":").map((s) => s.trim());
-    if (!nameRaw) continue;
-    const name = nameRaw;
-    const type = typeRaw && typeRaw.length ? typeRaw : void 0;
-    entries.push({ name, type });
-  }
-  if (!entries.length) return void 0;
-  return { entries };
+    const idx = token.indexOf(":");
+    const name = (idx === -1 ? token : token.slice(0, idx)).trim();
+    const type = (idx === -1 ? "" : token.slice(idx + 1)).trim();
+    if (!name) continue;
+    entries.push({
+      name,
+      type: type.length ? type : void 0
+    });
+  }
+  return entries.length ? { entries } : void 0;
 }
 function getModelTypeDirective(model) {
   return parseTypeDirective(model.documentation);
@@ -225,7 +228,7 @@ function getStubPath(pathString, folder) {
 
 // src/generator/lib/relationship/types.ts
 var getModel = (dmmf, name) => dmmf.datamodel.models.find((m) => m.name === name);
-var dbNameOf = (m) => decorate(m.dbName ?? m.name, { tablePrefix: getConfig("model")?.tablePrefix, tableSuffix: getConfig("model")?.tableSuffix });
+var dbNameOf = (m) => decorate(m.dbName ?? m.name, getConfig("model"));
 var conventionalPivotName = (a, b) => [a, b].map((s) => s.toLowerCase()).sort().join("_");
 var objRels = (m) => m.fields.filter((f) => f.kind === "object");
 var getPrimaryKeyFields = (m) => {
@@ -595,10 +598,7 @@ function buildRelationsForModel(dmmf, model) {
           type: "belongsToMany",
           mode: "explicit",
           modelClass: `${keys.target}::class`,
-          pivotTable: decorate(keys.pivotTable, {
-            tablePrefix: getConfig("model", "tablePrefix"),
-            tableSuffix: getConfig("model", "tableSuffix")
-          }),
+          pivotTable: keys.pivotTable,
           pivotLocal: keys.pivotLocal,
           pivotForeign: keys.pivotForeign,
           pivotColumns: keys.pivotColumns,
@@ -616,10 +616,7 @@ function buildRelationsForModel(dmmf, model) {
           type: "belongsToMany",
           mode: "implicit",
           modelClass: `${keys.target}::class`,
-          pivotTable: decorate(keys.pivotTable, {
-            tablePrefix: getConfig("model", "tablePrefix"),
-            tableSuffix: getConfig("model", "tableSuffix")
-          }),
+          pivotTable: keys.pivotTable,
           localKey: keys.local,
           foreignKey: keys.foreign,
           targetModelName: keys.target

package/dist/index.js

@@ -1504,7 +1504,7 @@ var StubModelPrinter = class {
 
 // src/generator/lib/relationship/types.ts
 var getModel = (dmmf, name) => dmmf.datamodel.models.find((m) => m.name === name);
-var dbNameOf = (m) => decorate(m.dbName ?? m.name, { tablePrefix: getConfig("model")?.tablePrefix, tableSuffix: getConfig("model")?.tableSuffix });
+var dbNameOf = (m) => decorate(m.dbName ?? m.name, getConfig("model"));
 var conventionalPivotName = (a, b) => [a, b].map((s) => s.toLowerCase()).sort().join("_");
 var objRels = (m) => m.fields.filter((f) => f.kind === "object");
 var getPrimaryKeyFields = (m) => {
@@ -1874,10 +1874,7 @@ function buildRelationsForModel(dmmf, model) {
           type: "belongsToMany",
           mode: "explicit",
           modelClass: `${keys.target}::class`,
-          pivotTable: decorate(keys.pivotTable, {
-            tablePrefix: getConfig("model", "tablePrefix"),
-            tableSuffix: getConfig("model", "tableSuffix")
-          }),
+          pivotTable: keys.pivotTable,
           pivotLocal: keys.pivotLocal,
           pivotForeign: keys.pivotForeign,
           pivotColumns: keys.pivotColumns,
@@ -1895,10 +1892,7 @@ function buildRelationsForModel(dmmf, model) {
           type: "belongsToMany",
           mode: "implicit",
           modelClass: `${keys.target}::class`,
-          pivotTable: decorate(keys.pivotTable, {
-            tablePrefix: getConfig("model", "tablePrefix"),
-            tableSuffix: getConfig("model", "tableSuffix")
-          }),
+          pivotTable: keys.pivotTable,
           localKey: keys.local,
           foreignKey: keys.foreign,
           targetModelName: keys.target
@@ -1972,25 +1966,28 @@ function parseTypeDirective(doc) {
 }
 function parseAppendsDirective(doc) {
   if (!doc) return void 0;
-  const m = doc.match(/@appends\s*(\{[^}]*\}|\([^)]*\)|[^\r\n]*)/);
+  const m = doc.match(/@appends\s*(?::\s*)?(\{[^}]*\}|\([^)]*\)|[^\r\n]*)/i);
   if (!m) return void 0;
-  let body = m[1].trim();
+  let body = (m[1] ?? "").trim();
   if (body.startsWith("{") && body.endsWith("}") || body.startsWith("(") && body.endsWith(")")) {
     body = body.slice(1, -1).trim();
   }
+  if (body.startsWith(":")) body = body.slice(1).trim();
   if (!body) return void 0;
   const entries = [];
   for (const raw of body.split(",")) {
     const token = raw.trim();
     if (!token) continue;
-    const [nameRaw, typeRaw] = token.split(":").map((s) => s.trim());
-    if (!nameRaw) continue;
-    const name = nameRaw;
-    const type = typeRaw && typeRaw.length ? typeRaw : void 0;
-    entries.push({ name, type });
-  }
-  if (!entries.length) return void 0;
-  return { entries };
+    const idx = token.indexOf(":");
+    const name = (idx === -1 ? token : token.slice(0, idx)).trim();
+    const type = (idx === -1 ? "" : token.slice(idx + 1)).trim();
+    if (!name) continue;
+    entries.push({
+      name,
+      type: type.length ? type : void 0
+    });
+  }
+  return entries.length ? { entries } : void 0;
 }
 function getModelTypeDirective(model) {
   return parseTypeDirective(model.documentation);
@@ -2063,7 +2060,7 @@ var PrismaToLaravelModelGenerator = class {
           type: field.type
         };
       });
-      const guarded = guardedSet.size || properties.some((p) => p.guarded) ? [...guardedSet, ...properties.filter((p) => p.guarded).map((p) => p.name)] : hasToken("guarded", modelDoc) ? [] : void 0;
+      const guarded = guardedSet.size || properties.some((p) => p.guarded) ? Array.from(/* @__PURE__ */ new Set([...guardedSet, ...properties.filter((p) => p.guarded).map((p) => p.name)])) : hasToken("guarded", modelDoc) ? [] : void 0;
       const relations = this.extractRelationsFromModel(model);
       const interfaces = {};
       for (const prop of properties) {
@@ -2125,7 +2122,6 @@ var PrismaToLaravelModelGenerator = class {
         docblockProps.push(`@property ${type} $${p.name}`);
       }
       for (const rel of relations) {
-        if (rel.pivotTable) ;
         const type = rel.type === "hasMany" || rel.type === "belongsToMany" ? `\\Illuminate\\Support\\Collection<int, ${rel.modelClass}>` : rel.modelClass;
         docblockProps.push(`@property ${type} $${rel.name}`);
       }

package/package.json

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