prisma-laravel-migrate 3.1.7 → 3.1.8

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/prisma-to-laravel-migration.iml" filepath="$PROJECT_DIR$/.idea/prisma-to-laravel-migration.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/prisma-to-laravel-migration.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/dist/cli/cli.js

@@ -1301,7 +1301,7 @@ function formatLaravelTimestamp(date, seq, width) {
   return base + suffix;
 }
 
-// src/generator/modeler/relationship/template-builder.ts
+// src/generator/lib/relationship/template-builder.ts
 var asArrayPhp = (xs) => `[${xs.map((x) => `'${x}'`).join(", ")}]`;
 var firstOrUndef = (xs) => xs && xs.length ? `'${xs[0]}'` : void 0;
 function relationTemplate(def, opts = {}) {
@@ -1442,7 +1442,7 @@ var StubModelPrinter = class {
   }
 };
 
-// src/generator/modeler/relationship/types.ts
+// src/generator/lib/relationship/types.ts
 var getModel = (dmmf, name) => dmmf.datamodel.models.find((m) => m.name === name);
 var dbNameOf = (m) => m.dbName ?? m.name;
 var conventionalPivotName = (a, b) => [a, b].map((s) => s.toLowerCase()).sort().join("_");
@@ -1479,7 +1479,7 @@ var isUniqueOn = (m, fields) => {
   return uniques.some((set) => setsEqual(set.slice().sort(), sorted));
 };
 
-// src/generator/modeler/relationship/morph.ts
+// src/generator/lib/relationship/morph.ts
 var MORPH_DEFAULTS = {
   idSuffix: "_id",
   typeSuffix: "_type"
@@ -1689,7 +1689,7 @@ function deriveMethodName(modelName, kind) {
   return kind === "morphOne" ? base : base.endsWith("s") ? base : base + "s";
 }
 
-// src/generator/modeler/relationship/index.ts
+// src/generator/lib/relationship/index.ts
 var pivotOtherEndpointFor = (thisModelName, candidate) => {
   const rels = objRels(candidate).filter(
     (r) => (r.relationFromFields?.length ?? 0) > 0
@@ -1879,7 +1879,6 @@ function buildRelationsForModel(dmmf, model) {
         localKey: counterpart.relationToFields ?? [],
         targetModelName: f.type
       });
-      continue;
     }
   }
   const detectedMorphTo = detectMorphToRelations(model);
@@ -2407,7 +2406,60 @@ var PrismaToTypesGenerator = class {
     const hiddenFromModel = new Set(
       listFrom(model.documentation ?? "", "hidden").map((n) => n.trim()).filter(Boolean)
     );
-    const fields = model.fields.map((field) => {
+    const relationships = buildRelationsForModel(this.dmmf, model).map((rel) => {
+      const isMany = rel.type === "hasMany" || rel.type === "belongsToMany" || rel.type === "morphMany" || rel.type === "morphToMany" || rel.type === "morphedByMany";
+      const readonlyArrays = !!this.cfg.readonlyArrays;
+      const wrapList = (base) => isMany ? readonlyArrays ? `ReadonlyArray<${base}>` : `${base}[]` : base;
+      let tsType;
+      if (rel.type === "morphTo") {
+        tsType = "any";
+      } else {
+        const target = rel.targetModelName ?? "any";
+        if (rel.pivotColumns) {
+          const pivotCols = rel.pivotColumns;
+          const pivotTable = rel.pivotTable;
+          const pivotModel = pivotTable ? this.dmmf.datamodel.models.find(
+            (m) => (m.dbName ?? m.name) === pivotTable
+          ) : void 0;
+          const pivotProps = [];
+          for (const col of pivotCols) {
+            let colTs = "any";
+            const f = pivotModel?.fields.find((pf) => pf.name === col);
+            if (f && f.kind !== "object" && f.kind !== "enum") {
+              colTs = this.mapPrismaTypeToTs(f);
+            } else if (f && f.kind === "enum") {
+              colTs = this.mapPrismaTypeToTs(f);
+              enumNames.add(f.type);
+            }
+            const propName = /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(col) ? col : JSON.stringify(col);
+            pivotProps.push(`${propName}: ${colTs}`);
+          }
+          const pivotShape = pivotProps.length ? `{ ${pivotProps.join("; ")} }` : "{}";
+          const elementType = `${target} & ${pivotShape}`;
+          tsType = wrapList(elementType);
+        } else {
+          tsType = wrapList(target);
+        }
+      }
+      let optional = true;
+      if (containsWith(rel.name)) {
+        optional = false;
+      } else {
+        const objField = model.fields.find(
+          (f) => f.kind === "object" && (f.name === rel.name || f.name.replace(/Id$/, "") === rel.name)
+        );
+        if (objField && this.hasWithDirective(objField)) {
+          optional = false;
+        }
+      }
+      return {
+        name: rel.name,
+        type: tsType,
+        optional,
+        isList: isMany
+      };
+    });
+    const fields = model.fields.filter((item) => item.kind !== "object").map((field) => {
       const doc = field.documentation ?? "";
       let tsType = this.mapPrismaTypeToTs(field);
       const typeDirective = getFieldTypeDirective(field);
@@ -2423,8 +2475,6 @@ var PrismaToTypesGenerator = class {
           enumNames.add(field.type);
         }
       }
-      const isRelation = field.kind === "object";
-      const hasWith = isRelation && (this.hasWithDirective(field) || containsWith(field.name));
       const hiddenInline = /(^|\s)@hidden(\b|[{(])/m.test(doc) || listFrom(doc, "hidden").includes(field.name);
       const hiddenByModel = hiddenFromModel.has(field.name);
       const isHidden = hiddenInline || hiddenByModel;
@@ -2434,7 +2484,7 @@ var PrismaToTypesGenerator = class {
         // Relations: optional by default (navigation props),
         // unless @with says "this is always loaded".
         // Non-relations: keep Prisma's required flag semantics.
-        optional: isRelation ? !hasWith : !field.isRequired,
+        optional: !field.isRequired,
         isList: field.isList,
         isId: field.isId,
         isGenerated: !!field.isGenerated,
@@ -2487,7 +2537,7 @@ var PrismaToTypesGenerator = class {
     );
     return {
       name: model.name,
-      fields,
+      fields: [...fields, ...relationships],
       appends,
       imports,
       // strip directives from doc so TS header comment stays clean
@@ -2533,10 +2583,6 @@ var PrismaToTypesGenerator = class {
     if (field.kind === "enum") {
       return wrapList(field.type);
     }
-    if (field.kind === "object") {
-      const base = field.type;
-      return wrapList(base);
-    }
     return wrapList("any");
   }
 };

package/dist/cli/models.index.js

@@ -141,7 +141,7 @@ function getStubPath(pathString, folder) {
   return path7.join(baseDir, "stubs", normalised);
 }
 
-// src/generator/modeler/relationship/template-builder.ts
+// src/generator/lib/relationship/template-builder.ts
 var asArrayPhp = (xs) => `[${xs.map((x) => `'${x}'`).join(", ")}]`;
 var firstOrUndef = (xs) => xs && xs.length ? `'${xs[0]}'` : void 0;
 function relationTemplate(def, opts = {}) {
@@ -282,7 +282,7 @@ var StubModelPrinter = class {
   }
 };
 
-// src/generator/modeler/relationship/types.ts
+// src/generator/lib/relationship/types.ts
 var getModel = (dmmf, name) => dmmf.datamodel.models.find((m) => m.name === name);
 var dbNameOf = (m) => m.dbName ?? m.name;
 var conventionalPivotName = (a, b) => [a, b].map((s) => s.toLowerCase()).sort().join("_");
@@ -319,7 +319,7 @@ var isUniqueOn = (m, fields) => {
   return uniques.some((set) => setsEqual(set.slice().sort(), sorted));
 };
 
-// src/generator/modeler/relationship/morph.ts
+// src/generator/lib/relationship/morph.ts
 var MORPH_DEFAULTS = {
   idSuffix: "_id",
   typeSuffix: "_type"
@@ -529,7 +529,7 @@ function deriveMethodName(modelName, kind) {
   return kind === "morphOne" ? base : base.endsWith("s") ? base : base + "s";
 }
 
-// src/generator/modeler/relationship/index.ts
+// src/generator/lib/relationship/index.ts
 var pivotOtherEndpointFor = (thisModelName, candidate) => {
   const rels = objRels(candidate).filter(
     (r) => (r.relationFromFields?.length ?? 0) > 0
@@ -719,7 +719,6 @@ function buildRelationsForModel(dmmf, model) {
         localKey: counterpart.relationToFields ?? [],
         targetModelName: f.type
       });
-      continue;
     }
   }
   const detectedMorphTo = detectMorphToRelations(model);