prisma-laravel-migrate 3.1.19 → 3.1.21

package/dist/cli/cli.js

@@ -1102,11 +1102,10 @@ async function writeWithMerge(filePath, theirs, type, overwrite = true, currentP
   const readPath = currentPath ?? filePath;
   if (!overwrite && existsSync(filePath)) return;
   const doFormat = (code) => {
-    const globalCfg = getConfig(type);
-    const typeCfg = globalCfg ?? {};
+    const typeCfg = getConfig(type);
     const usePrettier = !!typeCfg.prettier;
     if (!usePrettier || !code) return code;
-    const parser = typeCfg.parser ?? (type === "ts" ? "typescript" : "php");
+    const parser = type == "typescript" ? "typescript" : "php";
     return prettify(code, {
       parser,
       filepathHint: filePath
@@ -1691,6 +1690,11 @@ function deriveMethodName(modelName, kind) {
 
 // src/generator/lib/relationship/index.ts
 var pivotOtherEndpointFor = (thisModelName, candidate) => {
+  if (candidate.documentation?.includes("@entity")) {
+    const entities = listFrom(candidate.documentation ?? "", "@entity");
+    if (entities.length > 0) return void 0;
+    if (entities.includes(thisModelName)) return void 0;
+  }
   const rels = objRels(candidate).filter(
     (r) => (r.relationFromFields?.length ?? 0) > 0
   );
@@ -1810,7 +1814,7 @@ function buildRelationsForModel(dmmf, model) {
         }
         const rawChain = chainParts.length ? chainParts.join("->") : "";
         defs.push({
-          name: f.name.replace(/Id$/, ""),
+          name: (f.dbName ?? f.name).replace(/Id$/, ""),
           type: "belongsToMany",
           mode: "explicit",
           modelClass: `${keys.target}::class`,
@@ -1828,7 +1832,7 @@ function buildRelationsForModel(dmmf, model) {
         });
       } else if (keys.kind === "belongsToMany" && keys.mode === "implicit") {
         defs.push({
-          name: f.name.replace(/Id$/, ""),
+          name: (f.dbName ?? f.name).replace(/Id$/, ""),
           type: "belongsToMany",
           mode: "implicit",
           modelClass: `${keys.target}::class`,
@@ -1848,7 +1852,7 @@ function buildRelationsForModel(dmmf, model) {
     const otherOwnsFK = (counterpart?.relationFromFields?.length ?? 0) > 0;
     if (thisOwnsFK) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "belongsTo",
         modelClass: `${f.type}::class`,
         foreignKey: f.relationFromFields ?? [],
@@ -1861,7 +1865,7 @@ function buildRelationsForModel(dmmf, model) {
     counterpart ? isUniqueOn(related, counterpart.relationFromFields ?? []) : false;
     if (otherOwnsFK && counterpartIsSingle) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "hasOne",
         modelClass: `${f.type}::class`,
         foreignKey: counterpart.relationFromFields ?? [],
@@ -1872,7 +1876,7 @@ function buildRelationsForModel(dmmf, model) {
     }
     if (otherOwnsFK) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "hasMany",
         modelClass: `${f.type}::class`,
         foreignKey: counterpart.relationFromFields ?? [],
@@ -1946,9 +1950,10 @@ var PrismaToLaravelModelGenerator = class {
   }
   primitiveTypes = [PrismaTypes.BigInt, PrismaTypes.Int, PrismaTypes.String, PrismaTypes.Boolean, PrismaTypes.Bool];
   generateAll() {
+    const { namespace: baseNamespace, modelNamespace, enumNamespace } = getConfig("model") ?? {};
     const enums = this.dmmf.datamodel.enums.map((e) => ({
       name: e.name,
-      namespace: getConfig("model")?.namespace ?? "App",
+      namespace: enumNamespace ?? baseNamespace ?? "App",
       // filled in by printer
       values: e.values.map((v) => v.name)
     }));
@@ -1986,7 +1991,7 @@ var PrismaToLaravelModelGenerator = class {
           phpType = phpType.split("\\").pop();
         }
         return {
-          name: field.name,
+          name: field.dbName ?? field.name,
           phpType,
           fillable,
           hidden,
@@ -2065,13 +2070,13 @@ var PrismaToLaravelModelGenerator = class {
         const type = rel.type === "hasMany" || rel.type === "belongsToMany" ? `\\Illuminate\\Support\\Collection<int, ${rel.modelClass}>` : rel.modelClass;
         docblockProps.push(`@property ${type} $${rel.name}`);
       }
+      const namespace = modelNamespace ?? baseNamespace ?? "App";
       return {
         className: model.name,
         tableName: model.dbName ?? model.name,
         guarded,
         properties,
-        namespace: getConfig("model")?.namespace ?? "App",
-        // filled in by printer
+        namespace,
         relations,
         enums,
         interfaces,
@@ -2288,7 +2293,9 @@ async function generateLaravelModels(options) {
     modelStubPath: pick("modelStubPath"),
     noEmit: pick("noEmit", false),
     allowedPivotExtraFields: pick("allowedPivotExtraFields", []),
-    namespace: pick("namespace", "App")
+    namespace: pick("namespace", "App"),
+    modelNamespace: pick("modelNamespace"),
+    enumNamespace: pick("enumNamespace")
   };
   addToConfig("model", cfg);
   const modelsDir = cfg.outputDir ? path13.resolve(process.cwd(), cfg.outputDir) : path13.resolve(process.cwd(), getOutDir2(generator));
@@ -3270,7 +3277,7 @@ async function generateTypesFromPrisma(options) {
       await writeWithMerge(
         enumsPath,
         enumsCode,
-        "ts",
+        "typescript",
         cfg.overwriteExisting
       );
     }
@@ -3293,7 +3300,7 @@ async function generateTypesFromPrisma(options) {
     await writeWithMerge(
       mainPath,
       mainFile,
-      "ts",
+      "typescript",
       cfg.overwriteExisting
     );
   }
@@ -3308,7 +3315,7 @@ async function generateTypesFromPrisma(options) {
     await writeWithMerge(
       filePath,
       code,
-      "ts",
+      "typescript",
       cfg.overwriteExisting
     );
   });

package/dist/cli/migrator.index.js

@@ -1013,11 +1013,10 @@ async function writeWithMerge(filePath, theirs, type, overwrite = true, currentP
   const readPath = currentPath ?? filePath;
   if (!overwrite && existsSync(filePath)) return;
   const doFormat = (code) => {
-    const globalCfg = getConfig(type);
-    const typeCfg = globalCfg ?? {};
+    const typeCfg = getConfig(type);
     const usePrettier = !!typeCfg.prettier;
     if (!usePrettier || !code) return code;
-    const parser = typeCfg.parser ?? ("php");
+    const parser = "php";
     return prettify(code, {
       parser,
       filepathHint: filePath

package/dist/cli/models.index.js

@@ -84,7 +84,7 @@ function addToConfig(key, value) {
 function getConfig(key, property) {
   const cfg = config;
   const section = cfg[key];
-  return property ? section?.[property] : section;
+  return section;
 }
 var isForModel = (t) => (t & 1 /* Model */) !== 0;
 function parseTargetDirective(tag, doc, defaultFlags = 1 /* Model */) {
@@ -531,6 +531,11 @@ function deriveMethodName(modelName, kind) {
 
 // src/generator/lib/relationship/index.ts
 var pivotOtherEndpointFor = (thisModelName, candidate) => {
+  if (candidate.documentation?.includes("@entity")) {
+    const entities = listFrom(candidate.documentation ?? "", "@entity");
+    if (entities.length > 0) return void 0;
+    if (entities.includes(thisModelName)) return void 0;
+  }
   const rels = objRels(candidate).filter(
     (r) => (r.relationFromFields?.length ?? 0) > 0
   );
@@ -650,7 +655,7 @@ function buildRelationsForModel(dmmf, model) {
         }
         const rawChain = chainParts.length ? chainParts.join("->") : "";
         defs.push({
-          name: f.name.replace(/Id$/, ""),
+          name: (f.dbName ?? f.name).replace(/Id$/, ""),
           type: "belongsToMany",
           mode: "explicit",
           modelClass: `${keys.target}::class`,
@@ -668,7 +673,7 @@ function buildRelationsForModel(dmmf, model) {
         });
       } else if (keys.kind === "belongsToMany" && keys.mode === "implicit") {
         defs.push({
-          name: f.name.replace(/Id$/, ""),
+          name: (f.dbName ?? f.name).replace(/Id$/, ""),
           type: "belongsToMany",
           mode: "implicit",
           modelClass: `${keys.target}::class`,
@@ -688,7 +693,7 @@ function buildRelationsForModel(dmmf, model) {
     const otherOwnsFK = (counterpart?.relationFromFields?.length ?? 0) > 0;
     if (thisOwnsFK) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "belongsTo",
         modelClass: `${f.type}::class`,
         foreignKey: f.relationFromFields ?? [],
@@ -701,7 +706,7 @@ function buildRelationsForModel(dmmf, model) {
     counterpart ? isUniqueOn(related, counterpart.relationFromFields ?? []) : false;
     if (otherOwnsFK && counterpartIsSingle) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "hasOne",
         modelClass: `${f.type}::class`,
         foreignKey: counterpart.relationFromFields ?? [],
@@ -712,7 +717,7 @@ function buildRelationsForModel(dmmf, model) {
     }
     if (otherOwnsFK) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "hasMany",
         modelClass: `${f.type}::class`,
         foreignKey: counterpart.relationFromFields ?? [],
@@ -767,9 +772,10 @@ var PrismaToLaravelModelGenerator = class {
   }
   primitiveTypes = [PrismaTypes.BigInt, PrismaTypes.Int, PrismaTypes.String, PrismaTypes.Boolean, PrismaTypes.Bool];
   generateAll() {
+    const { namespace: baseNamespace, modelNamespace, enumNamespace } = getConfig("model") ?? {};
     const enums = this.dmmf.datamodel.enums.map((e) => ({
       name: e.name,
-      namespace: getConfig("model")?.namespace ?? "App",
+      namespace: enumNamespace ?? baseNamespace ?? "App",
       // filled in by printer
       values: e.values.map((v) => v.name)
     }));
@@ -807,7 +813,7 @@ var PrismaToLaravelModelGenerator = class {
           phpType = phpType.split("\\").pop();
         }
         return {
-          name: field.name,
+          name: field.dbName ?? field.name,
           phpType,
           fillable,
           hidden,
@@ -886,13 +892,13 @@ var PrismaToLaravelModelGenerator = class {
         const type = rel.type === "hasMany" || rel.type === "belongsToMany" ? `\\Illuminate\\Support\\Collection<int, ${rel.modelClass}>` : rel.modelClass;
         docblockProps.push(`@property ${type} $${rel.name}`);
       }
+      const namespace = modelNamespace ?? baseNamespace ?? "App";
       return {
         className: model.name,
         tableName: model.dbName ?? model.name,
         guarded,
         properties,
-        namespace: getConfig("model")?.namespace ?? "App",
-        // filled in by printer
+        namespace,
         relations,
         enums,
         interfaces,
@@ -1047,11 +1053,10 @@ async function writeWithMerge(filePath, theirs, type, overwrite = true, currentP
   const readPath = filePath;
   if (!overwrite && existsSync(filePath)) return;
   const doFormat = (code) => {
-    const globalCfg = getConfig(type);
-    const typeCfg = globalCfg ?? {};
+    const typeCfg = getConfig(type);
     const usePrettier = !!typeCfg.prettier;
     if (!usePrettier || !code) return code;
-    const parser = typeCfg.parser ?? ("php");
+    const parser = "php";
     return prettify(code, {
       parser,
       filepathHint: filePath
@@ -1294,7 +1299,9 @@ async function generateLaravelModels(options) {
     modelStubPath: pick("modelStubPath"),
     noEmit: pick("noEmit", false),
     allowedPivotExtraFields: pick("allowedPivotExtraFields", []),
-    namespace: pick("namespace", "App")
+    namespace: pick("namespace", "App"),
+    modelNamespace: pick("modelNamespace"),
+    enumNamespace: pick("enumNamespace")
   };
   addToConfig("model", cfg);
   const modelsDir = cfg.outputDir ? path7.resolve(process.cwd(), cfg.outputDir) : path7.resolve(process.cwd(), getOutDir(generator));

package/dist/cli/ts.index.js

@@ -479,6 +479,11 @@ function deriveMethodName(modelName, kind) {
 
 // src/generator/lib/relationship/index.ts
 var pivotOtherEndpointFor = (thisModelName, candidate) => {
+  if (candidate.documentation?.includes("@entity")) {
+    const entities = listFrom(candidate.documentation ?? "", "@entity");
+    if (entities.length > 0) return void 0;
+    if (entities.includes(thisModelName)) return void 0;
+  }
   const rels = objRels(candidate).filter(
     (r) => (r.relationFromFields?.length ?? 0) > 0
   );
@@ -598,7 +603,7 @@ function buildRelationsForModel(dmmf, model) {
         }
         const rawChain = chainParts.length ? chainParts.join("->") : "";
         defs.push({
-          name: f.name.replace(/Id$/, ""),
+          name: (f.dbName ?? f.name).replace(/Id$/, ""),
           type: "belongsToMany",
           mode: "explicit",
           modelClass: `${keys.target}::class`,
@@ -616,7 +621,7 @@ function buildRelationsForModel(dmmf, model) {
         });
       } else if (keys.kind === "belongsToMany" && keys.mode === "implicit") {
         defs.push({
-          name: f.name.replace(/Id$/, ""),
+          name: (f.dbName ?? f.name).replace(/Id$/, ""),
           type: "belongsToMany",
           mode: "implicit",
           modelClass: `${keys.target}::class`,
@@ -636,7 +641,7 @@ function buildRelationsForModel(dmmf, model) {
     const otherOwnsFK = (counterpart?.relationFromFields?.length ?? 0) > 0;
     if (thisOwnsFK) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "belongsTo",
         modelClass: `${f.type}::class`,
         foreignKey: f.relationFromFields ?? [],
@@ -649,7 +654,7 @@ function buildRelationsForModel(dmmf, model) {
     counterpart ? isUniqueOn(related, counterpart.relationFromFields ?? []) : false;
     if (otherOwnsFK && counterpartIsSingle) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "hasOne",
         modelClass: `${f.type}::class`,
         foreignKey: counterpart.relationFromFields ?? [],
@@ -660,7 +665,7 @@ function buildRelationsForModel(dmmf, model) {
     }
     if (otherOwnsFK) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "hasMany",
         modelClass: `${f.type}::class`,
         foreignKey: counterpart.relationFromFields ?? [],
@@ -1541,11 +1546,10 @@ async function writeWithMerge(filePath, theirs, type, overwrite = true, currentP
   const readPath = filePath;
   if (!overwrite && existsSync(filePath)) return;
   const doFormat = (code) => {
-    const globalCfg = getConfig(type);
-    const typeCfg = globalCfg ?? {};
+    const typeCfg = getConfig(type);
     const usePrettier = !!typeCfg.prettier;
     if (!usePrettier || !code) return code;
-    const parser = typeCfg.parser ?? ("typescript" );
+    const parser = "typescript" ;
     return prettify(code, {
       parser,
       filepathHint: filePath
@@ -1724,7 +1728,7 @@ async function generateTypesFromPrisma(options) {
       await writeWithMerge(
         enumsPath,
         enumsCode,
-        "ts",
+        "typescript",
         cfg.overwriteExisting
       );
     }
@@ -1747,7 +1751,7 @@ async function generateTypesFromPrisma(options) {
     await writeWithMerge(
       mainPath,
       mainFile,
-      "ts",
+      "typescript",
       cfg.overwriteExisting
     );
   }
@@ -1762,7 +1766,7 @@ async function generateTypesFromPrisma(options) {
     await writeWithMerge(
       filePath,
       code,
-      "ts",
+      "typescript",
       cfg.overwriteExisting
     );
   });

package/dist/index.js

@@ -1166,11 +1166,10 @@ async function writeWithMerge(filePath, theirs, type, overwrite = true, currentP
   const readPath = currentPath ?? filePath;
   if (!overwrite && existsSync(filePath)) return;
   const doFormat = (code) => {
-    const globalCfg = getConfig(type);
-    const typeCfg = globalCfg ?? {};
+    const typeCfg = getConfig(type);
     const usePrettier = !!typeCfg.prettier;
     if (!usePrettier || !code) return code;
-    const parser = typeCfg.parser ?? (type === "ts" ? "typescript" : "php");
+    const parser = type == "typescript" ? "typescript" : "php";
     return prettify(code, {
       parser,
       filepathHint: filePath
@@ -1751,6 +1750,11 @@ function deriveMethodName(modelName, kind) {
 
 // src/generator/lib/relationship/index.ts
 var pivotOtherEndpointFor = (thisModelName, candidate) => {
+  if (candidate.documentation?.includes("@entity")) {
+    const entities = listFrom(candidate.documentation ?? "", "@entity");
+    if (entities.length > 0) return void 0;
+    if (entities.includes(thisModelName)) return void 0;
+  }
   const rels = objRels(candidate).filter(
     (r) => (r.relationFromFields?.length ?? 0) > 0
   );
@@ -1870,7 +1874,7 @@ function buildRelationsForModel(dmmf, model) {
         }
         const rawChain = chainParts.length ? chainParts.join("->") : "";
         defs.push({
-          name: f.name.replace(/Id$/, ""),
+          name: (f.dbName ?? f.name).replace(/Id$/, ""),
           type: "belongsToMany",
           mode: "explicit",
           modelClass: `${keys.target}::class`,
@@ -1888,7 +1892,7 @@ function buildRelationsForModel(dmmf, model) {
         });
       } else if (keys.kind === "belongsToMany" && keys.mode === "implicit") {
         defs.push({
-          name: f.name.replace(/Id$/, ""),
+          name: (f.dbName ?? f.name).replace(/Id$/, ""),
           type: "belongsToMany",
           mode: "implicit",
           modelClass: `${keys.target}::class`,
@@ -1908,7 +1912,7 @@ function buildRelationsForModel(dmmf, model) {
     const otherOwnsFK = (counterpart?.relationFromFields?.length ?? 0) > 0;
     if (thisOwnsFK) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "belongsTo",
         modelClass: `${f.type}::class`,
         foreignKey: f.relationFromFields ?? [],
@@ -1921,7 +1925,7 @@ function buildRelationsForModel(dmmf, model) {
     counterpart ? isUniqueOn(related, counterpart.relationFromFields ?? []) : false;
     if (otherOwnsFK && counterpartIsSingle) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "hasOne",
         modelClass: `${f.type}::class`,
         foreignKey: counterpart.relationFromFields ?? [],
@@ -1932,7 +1936,7 @@ function buildRelationsForModel(dmmf, model) {
     }
     if (otherOwnsFK) {
       defs.push({
-        name: f.name.replace(/Id$/, ""),
+        name: (f.dbName ?? f.name).replace(/Id$/, ""),
         type: "hasMany",
         modelClass: `${f.type}::class`,
         foreignKey: counterpart.relationFromFields ?? [],
@@ -2006,9 +2010,10 @@ var PrismaToLaravelModelGenerator = class {
   }
   primitiveTypes = [PrismaTypes.BigInt, PrismaTypes.Int, PrismaTypes.String, PrismaTypes.Boolean, PrismaTypes.Bool];
   generateAll() {
+    const { namespace: baseNamespace, modelNamespace, enumNamespace } = getConfig("model") ?? {};
     const enums = this.dmmf.datamodel.enums.map((e) => ({
       name: e.name,
-      namespace: getConfig("model")?.namespace ?? "App",
+      namespace: enumNamespace ?? baseNamespace ?? "App",
       // filled in by printer
       values: e.values.map((v) => v.name)
     }));
@@ -2046,7 +2051,7 @@ var PrismaToLaravelModelGenerator = class {
           phpType = phpType.split("\\").pop();
         }
         return {
-          name: field.name,
+          name: field.dbName ?? field.name,
           phpType,
           fillable,
           hidden,
@@ -2125,13 +2130,13 @@ var PrismaToLaravelModelGenerator = class {
         const type = rel.type === "hasMany" || rel.type === "belongsToMany" ? `\\Illuminate\\Support\\Collection<int, ${rel.modelClass}>` : rel.modelClass;
         docblockProps.push(`@property ${type} $${rel.name}`);
       }
+      const namespace = modelNamespace ?? baseNamespace ?? "App";
       return {
         className: model.name,
         tableName: model.dbName ?? model.name,
         guarded,
         properties,
-        namespace: getConfig("model")?.namespace ?? "App",
-        // filled in by printer
+        namespace,
         relations,
         enums,
         interfaces,
@@ -2283,7 +2288,9 @@ async function generateLaravelModels(options) {
     modelStubPath: pick("modelStubPath"),
     noEmit: pick("noEmit", false),
     allowedPivotExtraFields: pick("allowedPivotExtraFields", []),
-    namespace: pick("namespace", "App")
+    namespace: pick("namespace", "App"),
+    modelNamespace: pick("modelNamespace"),
+    enumNamespace: pick("enumNamespace")
   };
   addToConfig("model", cfg);
   const modelsDir = cfg.outputDir ? path9.resolve(process.cwd(), cfg.outputDir) : path9.resolve(process.cwd(), getOutDir2(generator));
@@ -3265,7 +3272,7 @@ async function generateTypesFromPrisma(options) {
       await writeWithMerge(
         enumsPath,
         enumsCode,
-        "ts",
+        "typescript",
         cfg.overwriteExisting
       );
     }
@@ -3288,7 +3295,7 @@ async function generateTypesFromPrisma(options) {
     await writeWithMerge(
       mainPath,
       mainFile,
-      "ts",
+      "typescript",
       cfg.overwriteExisting
     );
   }
@@ -3303,7 +3310,7 @@ async function generateTypesFromPrisma(options) {
     await writeWithMerge(
       filePath,
       code,
-      "ts",
+      "typescript",
       cfg.overwriteExisting
     );
   });

package/package.json

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