@famgia/omnify-laravel 2.0.21 → 2.0.22

package/dist/index.d.cts

@@ -192,6 +192,17 @@ interface SchemaToBlueprintOptions {
     pluginEnums?: ReadonlyMap<string, PluginEnumDefinition>;
     /** Locale resolution options for displayName */
     locale?: LocaleResolutionOptions;
+    /**
+     * Set of FK constraints to exclude from this blueprint.
+     * Format: "schemaName.propertyName" (e.g., "Employee.department")
+     * Used for deferring circular FK dependencies to a separate migration.
+     */
+    excludeFKs?: Set<string>;
+    /**
+     * Current schema name (for FK exclusion matching).
+     * Set automatically when excludeFKs is provided.
+     */
+    schemaName?: string;
 }
 /**
  * Generates table blueprint from schema.
@@ -435,6 +446,8 @@ declare function generateProviderRegistration(existingContent: string | null, la
 interface FactoryGeneratorOptions {
     /** Model namespace */
     modelNamespace?: string;
+    /** Factory namespace (defaults to Database\Factories) */
+    factoryNamespace?: string;
     /** Factory output path */
     factoryPath?: string;
     /** Faker locale */

package/dist/index.d.ts

@@ -192,6 +192,17 @@ interface SchemaToBlueprintOptions {
     pluginEnums?: ReadonlyMap<string, PluginEnumDefinition>;
     /** Locale resolution options for displayName */
     locale?: LocaleResolutionOptions;
+    /**
+     * Set of FK constraints to exclude from this blueprint.
+     * Format: "schemaName.propertyName" (e.g., "Employee.department")
+     * Used for deferring circular FK dependencies to a separate migration.
+     */
+    excludeFKs?: Set<string>;
+    /**
+     * Current schema name (for FK exclusion matching).
+     * Set automatically when excludeFKs is provided.
+     */
+    schemaName?: string;
 }
 /**
  * Generates table blueprint from schema.
@@ -435,6 +446,8 @@ declare function generateProviderRegistration(existingContent: string | null, la
 interface FactoryGeneratorOptions {
     /** Model namespace */
     modelNamespace?: string;
+    /** Factory namespace (defaults to Database\Factories) */
+    factoryNamespace?: string;
     /** Factory output path */
     factoryPath?: string;
     /** Faker locale */

package/dist/index.js

@@ -29,7 +29,7 @@ import {
   schemaToBlueprint,
   toColumnName,
   toTableName
-} from "./chunk-U3NDJ6S6.js";
+} from "./chunk-RSC5ATSV.js";
 
 // src/ai-guides/generator.ts
 import { existsSync, readdirSync, readFileSync, writeFileSync } from "fs";

package/dist/plugin.cjs

@@ -455,7 +455,8 @@ function expandCompoundType(propName, property, customTypes, options = {}) {
   return expanded;
 }
 function schemaToBlueprint(schema, allSchemas, options = {}) {
-  const { customTypes = /* @__PURE__ */ new Map(), pluginEnums = /* @__PURE__ */ new Map(), locale } = options;
+  const { customTypes = /* @__PURE__ */ new Map(), pluginEnums = /* @__PURE__ */ new Map(), locale, excludeFKs } = options;
+  const schemaName = options.schemaName ?? schema.name;
   const compoundOptions = { locale, pluginEnums };
   const tableName = schema.options?.tableName ?? toTableName(schema.name);
   const columns = [];
@@ -525,7 +526,10 @@ function schemaToBlueprint(schema, allSchemas, options = {}) {
         if (!explicitColumnNames.has(fkResult.column.name)) {
           columns.push(fkResult.column);
         }
-        foreignKeys.push(fkResult.foreignKey);
+        const fkKey = `${schemaName}.${propName}`;
+        if (!excludeFKs?.has(fkKey)) {
+          foreignKeys.push(fkResult.foreignKey);
+        }
         indexes.push(fkResult.index);
       }
       const polyResult = generatePolymorphicColumns(propName, property, allSchemas);
@@ -1021,6 +1025,143 @@ function extractDependencies(schema) {
   }
   return deps;
 }
+function detectCircularDependencies(schemas) {
+  const circularFKs = /* @__PURE__ */ new Set();
+  const graph = /* @__PURE__ */ new Map();
+  for (const schema of Object.values(schemas)) {
+    if (schema.kind === "enum" || !schema.properties) continue;
+    const refs = /* @__PURE__ */ new Map();
+    for (const [propName, property] of Object.entries(schema.properties)) {
+      if (property.type !== "Association") continue;
+      const assocProp = property;
+      if ((assocProp.relation === "ManyToOne" || assocProp.relation === "OneToOne") && !assocProp.mappedBy && assocProp.target && assocProp.target !== schema.name) {
+        refs.set(assocProp.target, propName);
+      }
+    }
+    if (refs.size > 0) {
+      graph.set(schema.name, refs);
+    }
+  }
+  for (const [schemaA, refsA] of graph) {
+    for (const [targetB, propNameA] of refsA) {
+      if (targetB === schemaA) continue;
+      const refsB = graph.get(targetB);
+      if (refsB && refsB.has(schemaA)) {
+        if (schemaA > targetB) {
+          circularFKs.add(`${schemaA}.${propNameA}`);
+        } else {
+          const propNameB = refsB.get(schemaA);
+          circularFKs.add(`${targetB}.${propNameB}`);
+        }
+      }
+    }
+  }
+  return circularFKs;
+}
+function extractDeferredFKs(schemas, circularFKs) {
+  const deferred = [];
+  for (const schema of Object.values(schemas)) {
+    if (schema.kind === "enum" || !schema.properties) continue;
+    const tableName = schema.options?.tableName ?? toTableName(schema.name);
+    for (const [propName, property] of Object.entries(schema.properties)) {
+      const key = `${schema.name}.${propName}`;
+      if (!circularFKs.has(key)) continue;
+      const assocProp = property;
+      if (!assocProp.target) continue;
+      const targetSchema = schemas[assocProp.target];
+      const targetTable = targetSchema?.options?.tableName ?? toTableName(assocProp.target);
+      const columnName = toColumnName(propName) + "_id";
+      deferred.push({
+        tableName,
+        columnName,
+        targetTable,
+        onDelete: assocProp.onDelete,
+        onUpdate: assocProp.onUpdate
+      });
+    }
+  }
+  return deferred;
+}
+function generateDeferredFKMigration(deferredFKs, options = {}) {
+  if (deferredFKs.length === 0) return null;
+  const timestamp = options.timestamp ?? generateTimestamp();
+  const fileName = `${timestamp}_add_circular_foreign_keys.php`;
+  const connection = options.connection ? `
+    protected $connection = '${options.connection}';
+` : "";
+  const byTable = /* @__PURE__ */ new Map();
+  for (const fk of deferredFKs) {
+    const existing = byTable.get(fk.tableName) ?? [];
+    existing.push(fk);
+    byTable.set(fk.tableName, existing);
+  }
+  const upStatements = [];
+  const downStatements = [];
+  for (const [tableName, fks] of byTable) {
+    const fkLines = fks.map((fk) => {
+      let line = `            $table->foreign('${fk.columnName}')->references('id')->on('${fk.targetTable}')`;
+      if (fk.onDelete) line += `->onDelete('${fk.onDelete}')`;
+      if (fk.onUpdate) line += `->onUpdate('${fk.onUpdate}')`;
+      return line + ";";
+    });
+    upStatements.push(`        Schema::table('${tableName}', function (Blueprint $table) {
+${fkLines.join("\n")}
+        });`);
+    const dropLines = fks.map(
+      (fk) => `            $table->dropForeign(['${fk.columnName}']);`
+    );
+    downStatements.push(`        Schema::table('${tableName}', function (Blueprint $table) {
+${dropLines.join("\n")}
+        });`);
+  }
+  const content = `<?php
+
+/**
+ * \u26A0\uFE0F DO NOT EDIT THIS FILE! \u26A0\uFE0F
+ * \u3053\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96C6\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\uFF01
+ * KH\xD4NG \u0110\u01AF\u1EE2C S\u1EECA FILE N\xC0Y!
+ *
+ * This file is AUTO-GENERATED by Omnify.
+ * Any manual changes will be OVERWRITTEN on next generation.
+ *
+ * This migration adds foreign key constraints for circular dependencies.
+ * These constraints are deferred to run after all tables are created.
+ *
+ * @generated by @famgia/omnify-laravel
+ */
+
+use Illuminate\\Database\\Migrations\\Migration;
+use Illuminate\\Database\\Schema\\Blueprint;
+use Illuminate\\Support\\Facades\\Schema;
+
+return new class extends Migration
+{${connection}
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+${upStatements.join("\n\n")}
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+${downStatements.join("\n\n")}
+    }
+};
+`;
+  const tables = [...byTable.keys()];
+  return {
+    fileName,
+    className: "AddCircularForeignKeys",
+    content,
+    tables,
+    type: "alter"
+  };
+}
 function topologicalSort(schemas) {
   const schemaList = Object.values(schemas).filter((s) => s.kind !== "enum");
   const sorted = [];
@@ -1054,6 +1195,7 @@ function generateMigrations(schemas, options = {}) {
   const migrations = [];
   const pivotTablesGenerated = /* @__PURE__ */ new Set();
   let timestampOffset = 0;
+  const circularFKs = detectCircularDependencies(schemas);
   const sortedSchemas = topologicalSort(schemas);
   const baseTimestamp = options.timestamp ?? generateTimestamp();
   for (const schema of sortedSchemas) {
@@ -1062,7 +1204,9 @@ function generateMigrations(schemas, options = {}) {
     const blueprint = schemaToBlueprint(schema, schemas, {
       customTypes: options.customTypes,
       pluginEnums: options.pluginEnums,
-      locale: options.locale
+      locale: options.locale,
+      excludeFKs: circularFKs,
+      schemaName: schema.name
     });
     const migration = generateCreateMigration(blueprint, {
       ...options,
@@ -1102,6 +1246,19 @@ function generateMigrations(schemas, options = {}) {
       });
     }
   }
+  if (circularFKs.size > 0) {
+    const deferredFKs = extractDeferredFKs(schemas, circularFKs);
+    if (deferredFKs.length > 0) {
+      const offsetTimestamp = incrementTimestamp(baseTimestamp, timestampOffset);
+      const deferredMigration = generateDeferredFKMigration(deferredFKs, {
+        ...options,
+        timestamp: offsetTimestamp
+      });
+      if (deferredMigration) {
+        migrations.push(deferredMigration);
+      }
+    }
+  }
   return migrations;
 }
 function incrementTimestamp(timestamp, seconds) {
@@ -1181,8 +1338,16 @@ function generateTimestamp2() {
   const seconds = String(now.getSeconds()).padStart(2, "0");
   return `${year}_${month}_${day}_${hours}${minutes}${seconds}`;
 }
+function shouldSkipAssociationColumn(prop) {
+  if (prop.type !== "Association") return false;
+  if (isAssociationWithFkColumn(prop)) return false;
+  return true;
+}
 function formatAddColumn(columnName, prop) {
   const lines = [];
+  if (shouldSkipAssociationColumn(prop)) {
+    return lines;
+  }
   if (isAssociationWithFkColumn(prop)) {
     const fkColumn = getAssociationFkColumnName(columnName);
     let code2 = `$table->unsignedBigInteger('${fkColumn}')`;
@@ -1222,6 +1387,9 @@ function formatAddColumn(columnName, prop) {
 }
 function formatDropColumn(columnName, prop) {
   const lines = [];
+  if (prop && shouldSkipAssociationColumn(prop)) {
+    return lines;
+  }
   if (prop && isAssociationWithFkColumn(prop)) {
     const fkColumn = getAssociationFkColumnName(columnName);
     lines.push(`$table->dropForeign(['${fkColumn}']);`);
@@ -2871,9 +3039,26 @@ ${providerLine}
 }
 
 // src/factory/generator.ts
+function deriveFactoryNamespace(modelNamespace) {
+  if (modelNamespace === "App\\Models") {
+    return "Database\\Factories";
+  }
+  if (modelNamespace.endsWith("\\Models")) {
+    const base = modelNamespace.slice(0, -7);
+    return `${base}\\Database\\Factories`;
+  }
+  const parts = modelNamespace.split("\\");
+  if (parts.length > 1 && parts[parts.length - 1] === "Models") {
+    parts.pop();
+    return [...parts, "Database", "Factories"].join("\\");
+  }
+  return "Database\\Factories";
+}
 function resolveOptions2(options) {
+  const modelNamespace = options?.modelNamespace ?? "App\\Models";
   return {
-    modelNamespace: options?.modelNamespace ?? "App\\Models",
+    modelNamespace,
+    factoryNamespace: options?.factoryNamespace ?? deriveFactoryNamespace(modelNamespace),
     factoryPath: options?.factoryPath ?? "database/factories",
     fakerLocale: options?.fakerLocale ?? "en_US",
     customTypes: options?.customTypes ?? /* @__PURE__ */ new Map(),
@@ -2886,16 +3071,18 @@ function resolveSchemaOptions2(schema, globalOptions) {
     return globalOptions;
   }
   const base = pkgOutput.base;
+  const modelNamespace = pkgOutput.modelsNamespace;
   return {
     ...globalOptions,
-    modelNamespace: pkgOutput.modelsNamespace,
+    modelNamespace,
+    factoryNamespace: pkgOutput.factoriesNamespace ?? deriveFactoryNamespace(modelNamespace),
     factoryPath: `${base}/${pkgOutput.factoriesPath ?? "database/factories"}`
   };
 }
 function getStubContent2() {
   return `<?php
 
-namespace Database\\Factories;
+namespace {{FACTORY_NAMESPACE}};
 
 use {{MODEL_NAMESPACE}}\\{{MODEL_NAME}};
 use Illuminate\\Database\\Eloquent\\Factories\\Factory;
@@ -3192,6 +3379,7 @@ function generateFactory(schema, schemas, options, stubContent) {
     }
   }
   let content = stubContent;
+  content = content.replace(/\{\{FACTORY_NAMESPACE\}\}/g, options.factoryNamespace);
   content = content.replace(/\{\{MODEL_NAMESPACE\}\}/g, options.modelNamespace);
   content = content.replace(/\{\{MODEL_NAME\}\}/g, modelName);
   const uniqueImports = [...new Set(imports)];
@@ -4813,9 +5001,10 @@ function laravelPlugin(options) {
     name: "laravel-migrations",
     description: "Generate Laravel migration files",
     generate: async (ctx) => {
+      const baseTimestamp = resolved.timestamp ?? generateTimestamp();
       const migrationOptions = {
         connection: resolved.connection,
-        timestamp: resolved.timestamp,
+        timestamp: baseTimestamp,
         customTypes: ctx.customTypes,
         pluginEnums: ctx.pluginEnums
       };
@@ -4837,6 +5026,7 @@ function laravelPlugin(options) {
         if (ctx.changes.length === 0) {
           return outputs;
         }
+        let timestampOffset = 0;
         const addedSchemaNames = new Set(
           ctx.changes.filter((c) => c.changeType === "added").map((c) => c.schemaName)
         );
@@ -4861,15 +5051,17 @@ function laravelPlugin(options) {
                 schemaName: migration.schemaName
               }
             });
+            timestampOffset++;
           }
         }
         const alterChanges = ctx.changes.filter(
           (c) => c.changeType === "modified" || c.changeType === "removed"
         );
         if (alterChanges.length > 0) {
+          const alterTimestamp = timestampOffset > 0 ? incrementTimestamp(baseTimestamp, timestampOffset) : baseTimestamp;
           const alterMigrations = generateMigrationsFromChanges(
             alterChanges,
-            migrationOptions
+            { ...migrationOptions, timestamp: alterTimestamp }
           );
           for (const migration of alterMigrations) {
             outputs.push({