@famgia/omnify-laravel 0.0.16 → 0.0.17

package/dist/index.js

@@ -19,7 +19,7 @@ import {
   schemaToBlueprint,
   toColumnName,
   toTableName
-} from "./chunk-CAWNYSF3.js";
+} from "./chunk-52JAFQBQ.js";
 export {
   formatColumnMethod,
   formatForeignKey,

package/dist/plugin.cjs

@@ -239,7 +239,7 @@ function generateForeignKey(propertyName, property, allSchemas) {
     method = "string";
   }
   const modifiers = [];
-  if (assocProp.nullable || assocProp.relation === "ManyToOne") {
+  if (assocProp.nullable === true) {
     modifiers.push({ method: "nullable" });
   }
   if (assocProp.default !== void 0 && assocProp.default !== null) {
@@ -300,36 +300,67 @@ function schemaToBlueprint(schema, allSchemas) {
     columns.push(generateSoftDeleteColumn());
   }
   if (schema.options?.indexes) {
+    const propToColName = (propName) => {
+      const colName = toColumnName(propName);
+      const prop = schema.properties?.[propName];
+      if (prop?.type === "Association") {
+        const assoc = prop;
+        if ((assoc.relation === "ManyToOne" || assoc.relation === "OneToOne") && !assoc.mappedBy) {
+          return colName + "_id";
+        }
+      }
+      return colName;
+    };
     for (const index of schema.options.indexes) {
       if (typeof index === "string") {
         indexes.push({
-          columns: [toColumnName(index)],
+          columns: [propToColName(index)],
           unique: false
         });
       } else {
         indexes.push({
           name: index.name,
-          columns: index.columns.map(toColumnName),
+          columns: index.columns.map(propToColName),
           unique: index.unique ?? false
         });
       }
     }
   }
   if (schema.options?.unique) {
+    const propToColName = (propName) => {
+      const colName = toColumnName(propName);
+      const prop = schema.properties?.[propName];
+      if (prop?.type === "Association") {
+        const assoc = prop;
+        if ((assoc.relation === "ManyToOne" || assoc.relation === "OneToOne") && !assoc.mappedBy) {
+          return colName + "_id";
+        }
+      }
+      return colName;
+    };
     const uniqueConstraints = Array.isArray(schema.options.unique[0]) ? schema.options.unique : [schema.options.unique];
     for (const constraint of uniqueConstraints) {
       indexes.push({
-        columns: constraint.map(toColumnName),
+        columns: constraint.map(propToColName),
         unique: true
       });
     }
   }
+  const seenIndexes = /* @__PURE__ */ new Set();
+  const uniqueIndexes = indexes.filter((idx) => {
+    const key = idx.columns.join(",") + (idx.unique ? ":unique" : "");
+    if (seenIndexes.has(key)) {
+      return false;
+    }
+    seenIndexes.add(key);
+    return true;
+  });
   return {
     tableName,
     columns,
     primaryKey: ["id"],
     foreignKeys,
-    indexes
+    indexes: uniqueIndexes
   };
 }
 function formatColumnMethod(column) {