@famgia/omnify-cli 0.0.5 → 0.0.6

package/dist/index.cjs

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -32,22 +31,177 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   defineConfig: () => defineConfig,
-  loadConfig: () => loadConfig
+  loadConfig: () => loadConfig,
+  logger: () => logger,
+  registerDiffCommand: () => registerDiffCommand,
+  registerGenerateCommand: () => registerGenerateCommand,
+  registerInitCommand: () => registerInitCommand,
+  registerValidateCommand: () => registerValidateCommand,
+  runInit: () => runInit
 });
 module.exports = __toCommonJS(index_exports);
-var import_node_fs4 = require("fs");
-var import_node_path6 = require("path");
-var import_commander = require("commander");
-var import_omnify_core6 = require("@famgia/omnify-core");
 
-// src/commands/init.ts
+// src/config/loader.ts
 var import_node_fs = require("fs");
 var import_node_path = require("path");
+var import_jiti = require("jiti");
+var import_omnify_core = require("@famgia/omnify-core");
+var CONFIG_FILES = [
+  "omnify.config.ts",
+  "omnify.config.js",
+  "omnify.config.mjs",
+  "omnify.config.cjs"
+];
+function findConfigFile(startDir) {
+  const cwd = (0, import_node_path.resolve)(startDir);
+  for (const filename of CONFIG_FILES) {
+    const configPath = (0, import_node_path.resolve)(cwd, filename);
+    if ((0, import_node_fs.existsSync)(configPath)) {
+      return configPath;
+    }
+  }
+  return null;
+}
+async function loadConfigFile(configPath) {
+  const jiti = (0, import_jiti.createJiti)(configPath, {
+    interopDefault: true,
+    moduleCache: false
+  });
+  try {
+    const module2 = await jiti.import(configPath);
+    const config = module2;
+    if ("default" in config) {
+      return config.default;
+    }
+    return config;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw (0, import_omnify_core.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 ? (0, import_node_path.dirname)(configPath) : process.cwd();
+  for (const plugin of plugins) {
+    if (typeof plugin === "string") {
+      const jiti = (0, import_jiti.createJiti)(configDir, {
+        interopDefault: true,
+        moduleCache: false
+      });
+      try {
+        const module2 = await jiti.import(plugin);
+        const loadedPlugin = module2.default ?? module2;
+        resolved.push(loadedPlugin);
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw (0, import_omnify_core.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 = (0, import_node_path.resolve)(rootDir, config.schemasDir);
+  if (!(0, import_node_fs.existsSync)(schemaPath)) {
+    throw (0, import_omnify_core.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 (0, import_omnify_core.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 = (0, import_node_path.resolve)(startDir);
+  const configPath = findConfigFile(cwd);
+  if (configPath) {
+    const userConfig = await loadConfigFile(configPath);
+    const config = await resolveConfig(userConfig, configPath);
+    return {
+      config,
+      configPath
+    };
+  }
+  throw (0, import_omnify_core.configNotFoundError)((0, import_node_path.resolve)(cwd, "omnify.config.ts"));
+}
+function defineConfig(config) {
+  return config;
+}
+
+// src/commands/init.ts
+var import_node_fs2 = require("fs");
+var import_node_path2 = require("path");
 var import_prompts = require("@inquirer/prompts");
 
 // src/output/logger.ts
 var import_picocolors = __toESM(require("picocolors"), 1);
-var import_omnify_core = require("@famgia/omnify-core");
+var import_omnify_core2 = require("@famgia/omnify-core");
 var Logger = class {
   _verbose;
   _quiet;
@@ -156,14 +310,14 @@ var Logger = class {
    * Format and log an OmnifyError.
    */
   formatError(error) {
-    const formatted = (0, import_omnify_core.formatError)(error, { color: true });
+    const formatted = (0, import_omnify_core2.formatError)(error, { color: true });
     console.error(formatted);
   }
   /**
    * Get exit code for an error.
    */
   getExitCode(error) {
-    return (0, import_omnify_core.getExitCode)(error);
+    return (0, import_omnify_core2.getExitCode)(error);
   }
 };
 var logger = new Logger();
@@ -256,8 +410,8 @@ async function runInit(options) {
   const cwd = process.cwd();
   logger.header("Omnify Project Setup");
   logger.newline();
-  const configPath2 = (0, import_node_path.resolve)(cwd, "omnify.config.ts");
-  if ((0, import_node_fs.existsSync)(configPath2) && !options.force) {
+  const configPath = (0, import_node_path2.resolve)(cwd, "omnify.config.ts");
+  if ((0, import_node_fs2.existsSync)(configPath) && !options.force) {
     logger.warn("omnify.config.ts already exists. Use --force to overwrite.");
     return;
   }
@@ -333,18 +487,18 @@ async function runInit(options) {
   }
   logger.newline();
   logger.step("Creating project files...");
-  const schemasDir = (0, import_node_path.resolve)(cwd, config.schemasDir);
-  if (!(0, import_node_fs.existsSync)(schemasDir)) {
-    (0, import_node_fs.mkdirSync)(schemasDir, { recursive: true });
+  const schemasDir = (0, import_node_path2.resolve)(cwd, config.schemasDir);
+  if (!(0, import_node_fs2.existsSync)(schemasDir)) {
+    (0, import_node_fs2.mkdirSync)(schemasDir, { recursive: true });
     logger.debug(`Created ${config.schemasDir}/ directory`);
   }
-  const examplePath = (0, import_node_path.resolve)(schemasDir, "User.yaml");
-  if (!(0, import_node_fs.existsSync)(examplePath) || options.force) {
-    (0, import_node_fs.writeFileSync)(examplePath, EXAMPLE_SCHEMA);
+  const examplePath = (0, import_node_path2.resolve)(schemasDir, "User.yaml");
+  if (!(0, import_node_fs2.existsSync)(examplePath) || options.force) {
+    (0, import_node_fs2.writeFileSync)(examplePath, EXAMPLE_SCHEMA);
     logger.debug("Created example schema: User.yaml");
   }
   const configContent = generateConfig(config);
-  (0, import_node_fs.writeFileSync)(configPath2, configContent);
+  (0, import_node_fs2.writeFileSync)(configPath, configContent);
   logger.debug("Created omnify.config.ts");
   logger.newline();
   logger.success("Project initialized!");
@@ -371,8 +525,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) {
@@ -392,169 +546,14 @@ function registerInitCommand(program2) {
 // src/commands/validate.ts
 var import_node_path3 = require("path");
 var import_omnify_core3 = require("@famgia/omnify-core");
-
-// src/config/loader.ts
-var import_node_fs2 = require("fs");
-var import_node_path2 = require("path");
-var import_jiti = require("jiti");
-var import_omnify_core2 = require("@famgia/omnify-core");
-var CONFIG_FILES = [
-  "omnify.config.ts",
-  "omnify.config.js",
-  "omnify.config.mjs",
-  "omnify.config.cjs"
-];
-function findConfigFile(startDir) {
-  const cwd = (0, import_node_path2.resolve)(startDir);
-  for (const filename of CONFIG_FILES) {
-    const configPath2 = (0, import_node_path2.resolve)(cwd, filename);
-    if ((0, import_node_fs2.existsSync)(configPath2)) {
-      return configPath2;
-    }
-  }
-  return null;
-}
-async function loadConfigFile(configPath2) {
-  const jiti = (0, import_jiti.createJiti)(configPath2, {
-    interopDefault: true,
-    moduleCache: false
-  });
-  try {
-    const module2 = await jiti.import(configPath2);
-    const config = module2;
-    if ("default" in config) {
-      return config.default;
-    }
-    return config;
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    throw (0, import_omnify_core2.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 ? (0, import_node_path2.dirname)(configPath2) : process.cwd();
-  for (const plugin of plugins) {
-    if (typeof plugin === "string") {
-      const jiti = (0, import_jiti.createJiti)(configDir, {
-        interopDefault: true,
-        moduleCache: false
-      });
-      try {
-        const module2 = await jiti.import(plugin);
-        const loadedPlugin = module2.default ?? module2;
-        resolved.push(loadedPlugin);
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        throw (0, import_omnify_core2.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 = (0, import_node_path2.resolve)(rootDir, config.schemasDir);
-  if (!(0, import_node_fs2.existsSync)(schemaPath)) {
-    throw (0, import_omnify_core2.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 (0, import_omnify_core2.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 = (0, import_node_path2.resolve)(startDir);
-  const configPath2 = findConfigFile(cwd);
-  if (configPath2) {
-    const userConfig = await loadConfigFile(configPath2);
-    const config = await resolveConfig(userConfig, configPath2);
-    return {
-      config,
-      configPath: configPath2
-    };
-  }
-  throw (0, import_omnify_core2.configNotFoundError)((0, import_node_path2.resolve)(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 ? (0, import_node_path3.dirname)(configPath2) : process.cwd();
+  const rootDir = configPath ? (0, import_node_path3.dirname)(configPath) : process.cwd();
   validateConfig(config, rootDir);
   const schemaPath = (0, import_node_path3.resolve)(rootDir, config.schemasDir);
   logger.step(`Loading schemas from ${schemaPath}`);
@@ -584,8 +583,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) {
@@ -633,8 +632,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 ? (0, import_node_path4.dirname)(configPath2) : process.cwd();
+  const { config, configPath } = await loadConfig();
+  const rootDir = configPath ? (0, import_node_path4.dirname)(configPath) : process.cwd();
   validateConfig(config, rootDir);
   requireDevUrl(config);
   const schemaPath = (0, import_node_path4.resolve)(rootDir, config.schemasDir);
@@ -685,8 +684,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) {
@@ -754,7 +753,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 = (0, import_node_path5.resolve)(rootDir, config.output.laravel.migrationsPath);
     if (!(0, import_node_fs3.existsSync)(migrationsDir)) {
@@ -770,7 +769,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 = (0, import_node_path5.resolve)(rootDir, config.output.typescript.path);
     if (!(0, import_node_fs3.existsSync)(typesDir)) {
@@ -794,8 +793,8 @@ 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 ? (0, import_node_path5.dirname)(configPath2) : process.cwd();
+  const { config, configPath } = await loadConfig();
+  const rootDir = configPath ? (0, import_node_path5.dirname)(configPath) : process.cwd();
   validateConfig(config, rootDir);
   requireDevUrl(config);
   const schemaPath = (0, import_node_path5.resolve)(rootDir, config.schemasDir);
@@ -858,19 +857,22 @@ async function runGenerate(options) {
     typesGenerated = counts.types;
   }
   logger.step("Updating lock file...");
-  await (0, import_omnify_atlas2.updateLockFile)(lockPath, schemas);
+  const existingLock = await (0, import_omnify_atlas2.readLockFile)(lockPath);
+  const schemaHashes = await (0, import_omnify_atlas2.buildSchemaHashes)(schemas);
+  const newLockFile = (0, import_omnify_atlas2.updateLockFile)(existingLock, schemaHashes, config.database.driver);
+  await (0, import_omnify_atlas2.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) {
@@ -885,58 +887,15 @@ function registerGenerateCommand(program2) {
     }
   });
 }
-
-// src/index.ts
-var VERSION = "0.0.1";
-var program = new import_commander.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 import_omnify_core6.OmnifyError) {
-    logger.formatError(error);
-    process.exit(logger.getExitCode(error));
-  } else {
-    logger.error(error.message);
-    process.exit(1);
-  }
-});
-process.on("unhandledRejection", (reason) => {
-  if (reason instanceof import_omnify_core6.OmnifyError) {
-    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 = (0, import_node_path6.resolve)(process.cwd(), "omnify.config.ts");
-var hasConfig = (0, import_node_fs4.existsSync)(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();
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   defineConfig,
-  loadConfig
+  loadConfig,
+  logger,
+  registerDiffCommand,
+  registerGenerateCommand,
+  registerInitCommand,
+  registerValidateCommand,
+  runInit
 });
 //# sourceMappingURL=index.cjs.map