@famgia/omnify-cli 2.0.15 → 2.0.17

package/dist/cli.js

@@ -1128,6 +1128,9 @@ import {
   isLockFileV2,
   validateMigrations,
   getMigrationsToRegenerate,
+  addEnhancedMigrationRecord,
+  extractTimestampFromFilename,
+  extractTableNameFromFilename,
   VERSION_CHAIN_FILE,
   readVersionChain,
   checkBulkLockViolation
@@ -1591,6 +1594,7 @@ function schemaChangeToVersionChange(change) {
 }
 function writeGeneratorOutputs(outputs, rootDir) {
   const counts = { migrations: 0, types: 0, models: 0, factories: 0, other: 0 };
+  const migrationRecords = [];
   for (const output of outputs) {
     const filePath = resolve9(rootDir, output.path);
     const dir = dirname6(filePath);
@@ -1604,13 +1608,34 @@ function writeGeneratorOutputs(outputs, rootDir) {
     }
     writeFileSync5(filePath, output.content);
     logger.debug(`Created: ${output.path}`);
-    if (output.type === "migration") counts.migrations++;
-    else if (output.type === "type") counts.types++;
+    if (output.type === "migration") {
+      counts.migrations++;
+      const fileName = output.path.split("/").pop() ?? output.path;
+      const timestamp = extractTimestampFromFilename(fileName);
+      const metaTableName = output.metadata?.tableName;
+      const tableName = metaTableName ?? extractTableNameFromFilename(fileName);
+      const migrationType = output.metadata?.migrationType;
+      const schemaName = output.metadata?.schemaName;
+      const pathParts = output.path.split("/");
+      pathParts.pop();
+      const outputPath = pathParts.join("/");
+      if (timestamp && tableName) {
+        migrationRecords.push({
+          fileName,
+          timestamp,
+          tableName,
+          type: migrationType ?? "create",
+          schemas: schemaName ? [schemaName] : [],
+          content: output.content,
+          outputPath
+        });
+      }
+    } else if (output.type === "type") counts.types++;
     else if (output.type === "model") counts.models++;
     else if (output.type === "factory") counts.factories++;
     else counts.other++;
   }
-  return counts;
+  return { ...counts, migrationRecords };
 }
 async function runPluginGeneration(plugins, schemas, rootDir, verbose, changes, localeConfig) {
   const pluginManager = new PluginManager({
@@ -1641,6 +1666,7 @@ function runDirectGeneration(schemas, config, rootDir, options, changes) {
   let typesGenerated = 0;
   let modelsGenerated = 0;
   let factoriesGenerated = 0;
+  const migrationRecords = [];
   const customTypesMap = /* @__PURE__ */ new Map();
   for (const plugin of config.plugins) {
     if (plugin.types) {
@@ -1686,6 +1712,18 @@ function runDirectGeneration(schemas, config, rootDir, options, changes) {
         writeFileSync5(filePath, migration.content);
         logger.debug(`Created: ${migration.fileName}`);
         migrationsGenerated++;
+        const timestamp = extractTimestampFromFilename(migration.fileName);
+        if (timestamp && tableName) {
+          migrationRecords.push({
+            fileName: migration.fileName,
+            timestamp,
+            tableName,
+            type: "create",
+            schemas: migration.schemaName ? [migration.schemaName] : [],
+            content: migration.content,
+            outputPath: config.output.laravel.migrationsPath
+          });
+        }
       }
     }
     if (alterChanges.length > 0) {
@@ -1695,6 +1733,19 @@ function runDirectGeneration(schemas, config, rootDir, options, changes) {
         writeFileSync5(filePath, migration.content);
         logger.debug(`Created: ${migration.fileName}`);
         migrationsGenerated++;
+        const timestamp = extractTimestampFromFilename(migration.fileName);
+        const tableName = migration.tables[0];
+        if (timestamp && tableName) {
+          migrationRecords.push({
+            fileName: migration.fileName,
+            timestamp,
+            tableName,
+            type: migration.type,
+            schemas: [],
+            content: migration.content,
+            outputPath: config.output.laravel.migrationsPath
+          });
+        }
       }
     }
     logger.success(`Generated ${migrationsGenerated} migration(s)`);
@@ -1855,7 +1906,7 @@ function runDirectGeneration(schemas, config, rootDir, options, changes) {
       logger.success("Auto-configured @omnify-base/* path in tsconfig.json");
     }
   }
-  return { migrations: migrationsGenerated, types: typesGenerated, models: modelsGenerated, factories: factoriesGenerated };
+  return { migrations: migrationsGenerated, types: typesGenerated, models: modelsGenerated, factories: factoriesGenerated, migrationRecords };
 }
 async function runGenerate(options) {
   logger.setVerbose(options.verbose ?? false);
@@ -2015,7 +2066,7 @@ async function runGenerate(options) {
   }
   if (existingLock && config.output.laravel?.migrationsPath) {
     const migrationsDir = resolve9(rootDir, config.output.laravel.migrationsPath);
-    const migrationValidation = await validateMigrations(existingLock, migrationsDir);
+    const migrationValidation = await validateMigrations(existingLock, migrationsDir, rootDir);
     if (!migrationValidation.valid) {
       logger.newline();
       logger.warn("Migration file issues detected:");
@@ -2074,7 +2125,7 @@ async function runGenerate(options) {
         const alterMigrations = toRegenerate.filter((m) => m.type === "alter" || m.type === "drop");
         if (createMigrations.length > 0) {
           logger.info(`Regenerating ${createMigrations.length} missing CREATE migration(s) with original timestamps...`);
-          const migrationsDir2 = resolve9(rootDir, config.output.laravel.migrationsPath);
+          const defaultMigrationsDir = resolve9(rootDir, config.output.laravel.migrationsPath);
           const customTypesMap2 = /* @__PURE__ */ new Map();
           for (const plugin of config.plugins) {
             if (plugin.types) {
@@ -2095,11 +2146,20 @@ async function runGenerate(options) {
               timestamp: migData.timestamp,
               customTypes: customTypesMap2
             });
-            for (const mig of regenerated) {
-              const filePath = resolve9(migrationsDir2, migData.fileName);
-              writeFileSync5(filePath, mig.content);
-              logger.success(`  Regenerated: ${migData.fileName}`);
+            const matchingMig = regenerated.find((mig) => {
+              return mig.tables.includes(migData.tableName);
+            });
+            if (!matchingMig) {
+              logger.warn(`  Cannot regenerate ${migData.fileName}: migration for table '${migData.tableName}' not found`);
+              continue;
             }
+            const targetDir = migData.outputPath ? resolve9(rootDir, migData.outputPath) : defaultMigrationsDir;
+            if (!existsSync9(targetDir)) {
+              mkdirSync3(targetDir, { recursive: true });
+            }
+            const filePath = resolve9(targetDir, migData.fileName);
+            writeFileSync5(filePath, matchingMig.content);
+            logger.success(`  Regenerated: ${migData.fileName}`);
           }
         }
         if (alterMigrations.length > 0) {
@@ -2129,6 +2189,7 @@ async function runGenerate(options) {
   let typesGenerated = 0;
   let modelsGenerated = 0;
   let factoriesGenerated = 0;
+  let allMigrationRecords = [];
   const usePlugins = hasPluginGenerators(config.plugins);
   const customTypesMap = /* @__PURE__ */ new Map();
   for (const plugin of config.plugins) {
@@ -2158,6 +2219,7 @@ async function runGenerate(options) {
     );
     migrationsGenerated = counts.migrations;
     typesGenerated = counts.types;
+    allMigrationRecords = counts.migrationRecords;
     if (counts.migrations > 0) {
       logger.success(`Generated ${counts.migrations} migration(s)`);
     }
@@ -2283,9 +2345,24 @@ async function runGenerate(options) {
     typesGenerated = counts.types;
     modelsGenerated = counts.models;
     factoriesGenerated = counts.factories;
+    allMigrationRecords = counts.migrationRecords;
   }
   logger.step("Updating lock file...");
-  const newLockFile = updateLockFile(existingLock, currentSnapshots, config.database.driver);
+  let newLockFile = updateLockFile(existingLock, currentSnapshots, config.database.driver);
+  if (allMigrationRecords.length > 0) {
+    logger.debug(`Adding ${allMigrationRecords.length} migration(s) to lock file...`);
+    for (const record of allMigrationRecords) {
+      newLockFile = addEnhancedMigrationRecord(newLockFile, {
+        fileName: record.fileName,
+        timestamp: record.timestamp,
+        tableName: record.tableName,
+        type: record.type,
+        schemas: record.schemas,
+        content: record.content,
+        outputPath: record.outputPath
+      });
+    }
+  }
   await writeLockFile(lockPath, newLockFile);
   logger.debug(`Updated: ${config.lockFilePath}`);
   if (comparison.hasChanges) {
@@ -3279,12 +3356,31 @@ async function runAIGuides(options) {
   } catch {
     logger.debug("No omnify.config.ts found, using defaults");
   }
-  let categories = getAvailableCategories();
+  const availableCategories = getAvailableCategories();
+  let categories = availableCategories;
   if (options.categories) {
-    categories = options.categories.split(",").map((c) => c.trim());
+    const requestedCategories = options.categories.split(",").map((c) => c.trim());
+    const invalidCategories = requestedCategories.filter(
+      (c) => !availableCategories.includes(c)
+    );
+    if (invalidCategories.length > 0) {
+      logger.error(`Invalid category: ${invalidCategories.join(", ")}`);
+      logger.error(`Available categories: ${availableCategories.join(", ")}`);
+      throw new Error(`Invalid category: ${invalidCategories.join(", ")}`);
+    }
+    categories = requestedCategories;
     logger.debug(`Categories (from CLI): ${categories.join(", ")}`);
   } else if (configAiGuides?.categories) {
-    categories = [...configAiGuides.categories];
+    const invalidCategories = configAiGuides.categories.filter(
+      (c) => !availableCategories.includes(c)
+    );
+    if (invalidCategories.length > 0) {
+      logger.warn(`Invalid category in config: ${invalidCategories.join(", ")}`);
+      logger.warn(`Available categories: ${availableCategories.join(", ")}`);
+    }
+    categories = configAiGuides.categories.filter(
+      (c) => availableCategories.includes(c)
+    );
     logger.debug(`Categories (from config): ${categories.join(", ")}`);
   }
   let adapters;