@famgia/omnify-cli 0.0.5 → 0.0.7

package/dist/index.js

@@ -1,14 +1,159 @@
-#!/usr/bin/env node
-
-// src/index.ts
-import { existsSync as existsSync4 } from "fs";
-import { resolve as resolve6 } from "path";
-import { Command } from "commander";
-import { OmnifyError as OmnifyError5 } from "@famgia/omnify-core";
+// src/config/loader.ts
+import { existsSync } from "fs";
+import { resolve, dirname } from "path";
+import { createJiti } from "jiti";
+import { configError, configNotFoundError } from "@famgia/omnify-core";
+var CONFIG_FILES = [
+  "omnify.config.ts",
+  "omnify.config.js",
+  "omnify.config.mjs",
+  "omnify.config.cjs"
+];
+function findConfigFile(startDir) {
+  const cwd = resolve(startDir);
+  for (const filename of CONFIG_FILES) {
+    const configPath = resolve(cwd, filename);
+    if (existsSync(configPath)) {
+      return configPath;
+    }
+  }
+  return null;
+}
+async function loadConfigFile(configPath) {
+  const jiti = createJiti(configPath, {
+    interopDefault: true,
+    moduleCache: false
+  });
+  try {
+    const module = await jiti.import(configPath);
+    const config = module;
+    if ("default" in config) {
+      return config.default;
+    }
+    return config;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw configError(
+      `Failed to load config file: ${message}. Check your omnify.config.ts for syntax errors.`,
+      "E002"
+    );
+  }
+}
+async function resolvePlugins(plugins, configPath) {
+  if (!plugins || plugins.length === 0) {
+    return [];
+  }
+  const resolved = [];
+  const configDir = configPath ? dirname(configPath) : process.cwd();
+  for (const plugin of plugins) {
+    if (typeof plugin === "string") {
+      const jiti = createJiti(configDir, {
+        interopDefault: true,
+        moduleCache: false
+      });
+      try {
+        const module = await jiti.import(plugin);
+        const loadedPlugin = module.default ?? module;
+        resolved.push(loadedPlugin);
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw configError(
+          `Failed to load plugin '${plugin}': ${message}. Ensure the plugin is installed: npm install ${plugin}`,
+          "E301"
+        );
+      }
+    } else {
+      resolved.push(plugin);
+    }
+  }
+  return resolved;
+}
+async function resolveConfig(userConfig, configPath) {
+  const plugins = await resolvePlugins(userConfig.plugins, configPath);
+  const databaseConfig = {
+    driver: userConfig.database.driver,
+    enableFieldComments: userConfig.database.enableFieldComments ?? false
+  };
+  const database = userConfig.database.devUrl !== void 0 ? { ...databaseConfig, devUrl: userConfig.database.devUrl } : databaseConfig;
+  const laravelConfig = {
+    migrationsPath: userConfig.output?.laravel?.migrationsPath ?? "database/migrations"
+  };
+  const laravel = buildLaravelConfig(laravelConfig, userConfig.output?.laravel);
+  const typescript = {
+    path: userConfig.output?.typescript?.path ?? "types",
+    singleFile: userConfig.output?.typescript?.singleFile ?? true,
+    generateEnums: userConfig.output?.typescript?.generateEnums ?? true,
+    generateRelationships: userConfig.output?.typescript?.generateRelationships ?? true
+  };
+  const result = {
+    schemasDir: userConfig.schemasDir ?? "./schemas",
+    database,
+    output: {
+      laravel,
+      typescript
+    },
+    plugins,
+    verbose: userConfig.verbose ?? false,
+    lockFilePath: userConfig.lockFilePath ?? ".omnify.lock"
+  };
+  return result;
+}
+function buildLaravelConfig(base, userLaravel) {
+  const config = { ...base };
+  if (userLaravel?.modelsPath !== void 0) {
+    config.modelsPath = userLaravel.modelsPath;
+  }
+  if (userLaravel?.modelsNamespace !== void 0) {
+    config.modelsNamespace = userLaravel.modelsNamespace;
+  }
+  if (userLaravel?.factoriesPath !== void 0) {
+    config.factoriesPath = userLaravel.factoriesPath;
+  }
+  if (userLaravel?.enumsPath !== void 0) {
+    config.enumsPath = userLaravel.enumsPath;
+  }
+  if (userLaravel?.enumsNamespace !== void 0) {
+    config.enumsNamespace = userLaravel.enumsNamespace;
+  }
+  return config;
+}
+function validateConfig(config, rootDir) {
+  const schemaPath = resolve(rootDir, config.schemasDir);
+  if (!existsSync(schemaPath)) {
+    throw configError(
+      `Schema directory not found: ${schemaPath}. Create the '${config.schemasDir}' directory or update schemasDir in config.`,
+      "E002"
+    );
+  }
+}
+function requireDevUrl(config) {
+  if (!config.database.devUrl) {
+    throw configError(
+      `database.devUrl is required for diff and generate operations. Add devUrl to your database config, e.g., "mysql://root@localhost:3306/omnify_dev"`,
+      "E003"
+    );
+  }
+}
+async function loadConfig(startDir = process.cwd()) {
+  const cwd = resolve(startDir);
+  const configPath = findConfigFile(cwd);
+  if (configPath) {
+    const userConfig = await loadConfigFile(configPath);
+    const config = await resolveConfig(userConfig, configPath);
+    return {
+      config,
+      configPath
+    };
+  }
+  throw configNotFoundError(resolve(cwd, "omnify.config.ts"));
+}
+function defineConfig(config) {
+  return config;
+}
 
 // src/commands/init.ts
-import { existsSync, mkdirSync, writeFileSync } from "fs";
-import { resolve } from "path";
+import { existsSync as existsSync2, mkdirSync, writeFileSync } from "fs";
+import { resolve as resolve2 } from "path";
 import { select, confirm, input } from "@inquirer/prompts";
 
 // src/output/logger.ts
@@ -222,8 +367,8 @@ async function runInit(options) {
   const cwd = process.cwd();
   logger.header("Omnify Project Setup");
   logger.newline();
-  const configPath2 = resolve(cwd, "omnify.config.ts");
-  if (existsSync(configPath2) && !options.force) {
+  const configPath = resolve2(cwd, "omnify.config.ts");
+  if (existsSync2(configPath) && !options.force) {
     logger.warn("omnify.config.ts already exists. Use --force to overwrite.");
     return;
   }
@@ -299,18 +444,18 @@ async function runInit(options) {
   }
   logger.newline();
   logger.step("Creating project files...");
-  const schemasDir = resolve(cwd, config.schemasDir);
-  if (!existsSync(schemasDir)) {
+  const schemasDir = resolve2(cwd, config.schemasDir);
+  if (!existsSync2(schemasDir)) {
     mkdirSync(schemasDir, { recursive: true });
     logger.debug(`Created ${config.schemasDir}/ directory`);
   }
-  const examplePath = resolve(schemasDir, "User.yaml");
-  if (!existsSync(examplePath) || options.force) {
+  const examplePath = resolve2(schemasDir, "User.yaml");
+  if (!existsSync2(examplePath) || options.force) {
     writeFileSync(examplePath, EXAMPLE_SCHEMA);
     logger.debug("Created example schema: User.yaml");
   }
   const configContent = generateConfig(config);
-  writeFileSync(configPath2, configContent);
+  writeFileSync(configPath, configContent);
   logger.debug("Created omnify.config.ts");
   logger.newline();
   logger.success("Project initialized!");
@@ -337,8 +482,8 @@ async function runInit(options) {
   logger.info("   npx omnify generate");
   logger.newline();
 }
-function registerInitCommand(program2) {
-  program2.command("init").description("Initialize a new omnify project").option("-f, --force", "Overwrite existing files").option("-y, --yes", "Use default configuration (skip prompts)").action(async (options) => {
+function registerInitCommand(program) {
+  program.command("init").description("Initialize a new omnify project").option("-f, --force", "Overwrite existing files").option("-y, --yes", "Use default configuration (skip prompts)").action(async (options) => {
     try {
       await runInit(options);
     } catch (error) {
@@ -358,169 +503,14 @@ function registerInitCommand(program2) {
 // src/commands/validate.ts
 import { resolve as resolve3, dirname as dirname2 } from "path";
 import { loadSchemas, validateSchemas, OmnifyError as OmnifyError2 } from "@famgia/omnify-core";
-
-// src/config/loader.ts
-import { existsSync as existsSync2 } from "fs";
-import { resolve as resolve2, dirname } from "path";
-import { createJiti } from "jiti";
-import { configError, configNotFoundError } from "@famgia/omnify-core";
-var CONFIG_FILES = [
-  "omnify.config.ts",
-  "omnify.config.js",
-  "omnify.config.mjs",
-  "omnify.config.cjs"
-];
-function findConfigFile(startDir) {
-  const cwd = resolve2(startDir);
-  for (const filename of CONFIG_FILES) {
-    const configPath2 = resolve2(cwd, filename);
-    if (existsSync2(configPath2)) {
-      return configPath2;
-    }
-  }
-  return null;
-}
-async function loadConfigFile(configPath2) {
-  const jiti = createJiti(configPath2, {
-    interopDefault: true,
-    moduleCache: false
-  });
-  try {
-    const module = await jiti.import(configPath2);
-    const config = module;
-    if ("default" in config) {
-      return config.default;
-    }
-    return config;
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    throw configError(
-      `Failed to load config file: ${message}. Check your omnify.config.ts for syntax errors.`,
-      "E002"
-    );
-  }
-}
-async function resolvePlugins(plugins, configPath2) {
-  if (!plugins || plugins.length === 0) {
-    return [];
-  }
-  const resolved = [];
-  const configDir = configPath2 ? dirname(configPath2) : process.cwd();
-  for (const plugin of plugins) {
-    if (typeof plugin === "string") {
-      const jiti = createJiti(configDir, {
-        interopDefault: true,
-        moduleCache: false
-      });
-      try {
-        const module = await jiti.import(plugin);
-        const loadedPlugin = module.default ?? module;
-        resolved.push(loadedPlugin);
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        throw configError(
-          `Failed to load plugin '${plugin}': ${message}. Ensure the plugin is installed: npm install ${plugin}`,
-          "E301"
-        );
-      }
-    } else {
-      resolved.push(plugin);
-    }
-  }
-  return resolved;
-}
-async function resolveConfig(userConfig, configPath2) {
-  const plugins = await resolvePlugins(userConfig.plugins, configPath2);
-  const databaseConfig = {
-    driver: userConfig.database.driver,
-    enableFieldComments: userConfig.database.enableFieldComments ?? false
-  };
-  const database = userConfig.database.devUrl !== void 0 ? { ...databaseConfig, devUrl: userConfig.database.devUrl } : databaseConfig;
-  const laravelConfig = {
-    migrationsPath: userConfig.output?.laravel?.migrationsPath ?? "database/migrations"
-  };
-  const laravel = buildLaravelConfig(laravelConfig, userConfig.output?.laravel);
-  const typescript = {
-    path: userConfig.output?.typescript?.path ?? "types",
-    singleFile: userConfig.output?.typescript?.singleFile ?? true,
-    generateEnums: userConfig.output?.typescript?.generateEnums ?? true,
-    generateRelationships: userConfig.output?.typescript?.generateRelationships ?? true
-  };
-  const result = {
-    schemasDir: userConfig.schemasDir ?? "./schemas",
-    database,
-    output: {
-      laravel,
-      typescript
-    },
-    plugins,
-    verbose: userConfig.verbose ?? false,
-    lockFilePath: userConfig.lockFilePath ?? ".omnify.lock"
-  };
-  return result;
-}
-function buildLaravelConfig(base, userLaravel) {
-  const config = { ...base };
-  if (userLaravel?.modelsPath !== void 0) {
-    config.modelsPath = userLaravel.modelsPath;
-  }
-  if (userLaravel?.modelsNamespace !== void 0) {
-    config.modelsNamespace = userLaravel.modelsNamespace;
-  }
-  if (userLaravel?.factoriesPath !== void 0) {
-    config.factoriesPath = userLaravel.factoriesPath;
-  }
-  if (userLaravel?.enumsPath !== void 0) {
-    config.enumsPath = userLaravel.enumsPath;
-  }
-  if (userLaravel?.enumsNamespace !== void 0) {
-    config.enumsNamespace = userLaravel.enumsNamespace;
-  }
-  return config;
-}
-function validateConfig(config, rootDir) {
-  const schemaPath = resolve2(rootDir, config.schemasDir);
-  if (!existsSync2(schemaPath)) {
-    throw configError(
-      `Schema directory not found: ${schemaPath}. Create the '${config.schemasDir}' directory or update schemasDir in config.`,
-      "E002"
-    );
-  }
-}
-function requireDevUrl(config) {
-  if (!config.database.devUrl) {
-    throw configError(
-      `database.devUrl is required for diff and generate operations. Add devUrl to your database config, e.g., "mysql://root@localhost:3306/omnify_dev"`,
-      "E003"
-    );
-  }
-}
-async function loadConfig(startDir = process.cwd()) {
-  const cwd = resolve2(startDir);
-  const configPath2 = findConfigFile(cwd);
-  if (configPath2) {
-    const userConfig = await loadConfigFile(configPath2);
-    const config = await resolveConfig(userConfig, configPath2);
-    return {
-      config,
-      configPath: configPath2
-    };
-  }
-  throw configNotFoundError(resolve2(cwd, "omnify.config.ts"));
-}
-function defineConfig(config) {
-  return config;
-}
-
-// src/commands/validate.ts
 async function runValidate(options) {
   logger.setVerbose(options.verbose ?? false);
   logger.header("Validating Schemas");
   logger.debug("Loading configuration...");
   logger.timing("Config load start");
-  const { config, configPath: configPath2 } = await loadConfig();
+  const { config, configPath } = await loadConfig();
   logger.timing("Config loaded");
-  const rootDir = configPath2 ? dirname2(configPath2) : process.cwd();
+  const rootDir = configPath ? dirname2(configPath) : process.cwd();
   validateConfig(config, rootDir);
   const schemaPath = resolve3(rootDir, config.schemasDir);
   logger.step(`Loading schemas from ${schemaPath}`);
@@ -550,8 +540,8 @@ async function runValidate(options) {
     process.exit(2);
   }
 }
-function registerValidateCommand(program2) {
-  program2.command("validate").description("Validate schema files").option("-v, --verbose", "Show detailed output").action(async (options) => {
+function registerValidateCommand(program) {
+  program.command("validate").description("Validate schema files").option("-v, --verbose", "Show detailed output").action(async (options) => {
     try {
       await runValidate(options);
     } catch (error) {
@@ -602,8 +592,8 @@ async function runDiff(options) {
   logger.setVerbose(options.verbose ?? false);
   logger.header("Checking for Schema Changes");
   logger.debug("Loading configuration...");
-  const { config, configPath: configPath2 } = await loadConfig();
-  const rootDir = configPath2 ? dirname3(configPath2) : process.cwd();
+  const { config, configPath } = await loadConfig();
+  const rootDir = configPath ? dirname3(configPath) : process.cwd();
   validateConfig(config, rootDir);
   requireDevUrl(config);
   const schemaPath = resolve4(rootDir, config.schemasDir);
@@ -654,8 +644,8 @@ async function runDiff(options) {
   logger.newline();
   logger.info('Run "omnify generate" to create migrations');
 }
-function registerDiffCommand(program2) {
-  program2.command("diff").description("Show pending schema changes").option("-v, --verbose", "Show detailed output").option("--check", "Exit with code 1 if changes exist (for CI)").action(async (options) => {
+function registerDiffCommand(program) {
+  program.command("diff").description("Show pending schema changes").option("-v, --verbose", "Show detailed output").option("--check", "Exit with code 1 if changes exist (for CI)").action(async (options) => {
     try {
       await runDiff(options);
     } catch (error) {
@@ -680,7 +670,13 @@ import {
   OmnifyError as OmnifyError4,
   PluginManager
 } from "@famgia/omnify-core";
-import { updateLockFile } from "@famgia/omnify-atlas";
+import {
+  writeLockFile,
+  readLockFile,
+  updateLockFile,
+  buildSchemaHashes,
+  compareSchemas
+} from "@famgia/omnify-atlas";
 import { generateMigrations, generateTypeScript } from "@famgia/omnify-laravel";
 function hasPluginGenerators(plugins) {
   return plugins.some((p) => p.generators && p.generators.length > 0);
@@ -728,7 +724,7 @@ async function runPluginGeneration(plugins, schemas, rootDir, verbose) {
 function runDirectGeneration(schemas, config, rootDir, options) {
   let migrationsGenerated = 0;
   let typesGenerated = 0;
-  if (!options.typesOnly) {
+  if (!options.typesOnly && config.output.laravel) {
     logger.step("Generating Laravel migrations...");
     const migrationsDir = resolve5(rootDir, config.output.laravel.migrationsPath);
     if (!existsSync3(migrationsDir)) {
@@ -744,7 +740,7 @@ function runDirectGeneration(schemas, config, rootDir, options) {
     }
     logger.success(`Generated ${migrationsGenerated} migration(s)`);
   }
-  if (!options.migrationsOnly) {
+  if (!options.migrationsOnly && config.output.typescript) {
     logger.step("Generating TypeScript types...");
     const typesDir = resolve5(rootDir, config.output.typescript.path);
     if (!existsSync3(typesDir)) {
@@ -768,10 +764,9 @@ async function runGenerate(options) {
   logger.setVerbose(options.verbose ?? false);
   logger.header("Generating Outputs");
   logger.debug("Loading configuration...");
-  const { config, configPath: configPath2 } = await loadConfig();
-  const rootDir = configPath2 ? dirname4(configPath2) : process.cwd();
+  const { config, configPath } = await loadConfig();
+  const rootDir = configPath ? dirname4(configPath) : process.cwd();
   validateConfig(config, rootDir);
-  requireDevUrl(config);
   const schemaPath = resolve5(rootDir, config.schemasDir);
   logger.step(`Loading schemas from ${schemaPath}`);
   const schemas = await loadSchemas3(schemaPath);
@@ -793,17 +788,19 @@ async function runGenerate(options) {
   }
   logger.step("Checking for changes...");
   const lockPath = resolve5(rootDir, config.lockFilePath);
-  const diffResult = await runDiffOperation({
-    schemas,
-    devUrl: config.database.devUrl,
-    lockFilePath: lockPath,
-    driver: config.database.driver,
-    workDir: rootDir
-  });
-  if (!diffResult.hasChanges && !options.force) {
+  const existingLock = await readLockFile(lockPath);
+  const currentHashes = await buildSchemaHashes(schemas);
+  const comparison = compareSchemas(currentHashes, existingLock);
+  if (!comparison.hasChanges && !options.force) {
     logger.success("No changes to generate");
     return;
   }
+  if (comparison.hasChanges) {
+    logger.debug(`Detected ${comparison.changes.length} change(s)`);
+    for (const change of comparison.changes) {
+      logger.debug(`  ${change.changeType}: ${change.schemaName}`);
+    }
+  }
   let migrationsGenerated = 0;
   let typesGenerated = 0;
   const usePlugins = hasPluginGenerators(config.plugins);
@@ -832,19 +829,20 @@ async function runGenerate(options) {
     typesGenerated = counts.types;
   }
   logger.step("Updating lock file...");
-  await updateLockFile(lockPath, schemas);
+  const newLockFile = updateLockFile(existingLock, currentHashes, config.database.driver);
+  await writeLockFile(lockPath, newLockFile);
   logger.debug(`Updated: ${config.lockFilePath}`);
   logger.newline();
   logger.success("Generation complete!");
-  if (migrationsGenerated > 0) {
+  if (migrationsGenerated > 0 && config.output.laravel) {
     logger.info(`  Migrations: ${config.output.laravel.migrationsPath}/`);
   }
-  if (typesGenerated > 0) {
+  if (typesGenerated > 0 && config.output.typescript) {
     logger.info(`  Types: ${config.output.typescript.path}/`);
   }
 }
-function registerGenerateCommand(program2) {
-  program2.command("generate").description("Generate Laravel migrations and TypeScript types").option("-v, --verbose", "Show detailed output").option("--migrations-only", "Only generate migrations").option("--types-only", "Only generate TypeScript types").option("-f, --force", "Generate even if no changes detected").action(async (options) => {
+function registerGenerateCommand(program) {
+  program.command("generate").description("Generate Laravel migrations and TypeScript types").option("-v, --verbose", "Show detailed output").option("--migrations-only", "Only generate migrations").option("--types-only", "Only generate TypeScript types").option("-f, --force", "Generate even if no changes detected").action(async (options) => {
     try {
       await runGenerate(options);
     } catch (error) {
@@ -859,57 +857,14 @@ function registerGenerateCommand(program2) {
     }
   });
 }
-
-// src/index.ts
-var VERSION = "0.0.1";
-var program = new Command();
-program.name("omnify").description("Schema-first database migrations for Laravel and TypeScript").version(VERSION);
-registerInitCommand(program);
-registerValidateCommand(program);
-registerDiffCommand(program);
-registerGenerateCommand(program);
-process.on("uncaughtException", (error) => {
-  if (error instanceof OmnifyError5) {
-    logger.formatError(error);
-    process.exit(logger.getExitCode(error));
-  } else {
-    logger.error(error.message);
-    process.exit(1);
-  }
-});
-process.on("unhandledRejection", (reason) => {
-  if (reason instanceof OmnifyError5) {
-    logger.formatError(reason);
-    process.exit(logger.getExitCode(reason));
-  } else if (reason instanceof Error) {
-    logger.error(reason.message);
-  } else {
-    logger.error(String(reason));
-  }
-  process.exit(1);
-});
-var args = process.argv.slice(2);
-var firstArg = args[0];
-var hasCommand = firstArg !== void 0 && !firstArg.startsWith("-");
-var configPath = resolve6(process.cwd(), "omnify.config.ts");
-var hasConfig = existsSync4(configPath);
-if (!hasCommand && !hasConfig) {
-  runInit({}).catch((error) => {
-    if (error instanceof Error) {
-      if (error.message.includes("User force closed")) {
-        logger.newline();
-        logger.info("Setup cancelled.");
-        process.exit(0);
-      }
-      logger.error(error.message);
-    }
-    process.exit(1);
-  });
-} else {
-  program.parse();
-}
 export {
   defineConfig,
-  loadConfig
+  loadConfig,
+  logger,
+  registerDiffCommand,
+  registerGenerateCommand,
+  registerInitCommand,
+  registerValidateCommand,
+  runInit
 };
 //# sourceMappingURL=index.js.map