@memberjunction/cli 2.117.0 → 2.119.0

package/dist/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFlywayConfig = exports.createFlywayUrl = exports.updatedConfig = exports.config = void 0;
+exports.getFlywayConfig = exports.createFlywayUrl = exports.updatedConfig = exports.getOptionalConfig = exports.getValidatedConfig = exports.config = void 0;
 const cosmiconfig_1 = require("cosmiconfig");
 const node_fs_1 = require("node:fs");
 const node_os_1 = require("node:os");
@@ -9,6 +9,7 @@ const zod_1 = require("zod");
 const MJ_REPO_URL = 'https://github.com/MemberJunction/MJ.git';
 const explorer = (0, cosmiconfig_1.cosmiconfigSync)('mj', { searchStrategy: 'global' });
 const result = explorer.search(process.cwd());
+// Schema for database-dependent config (required fields)
 const mjConfigSchema = zod_1.z.object({
     dbHost: zod_1.z.string().default('localhost'),
     dbDatabase: zod_1.z.string(),
@@ -21,16 +22,51 @@ const mjConfigSchema = zod_1.z.object({
     cleanDisabled: zod_1.z.boolean().optional().default(true),
     mjRepoUrl: zod_1.z.string().url().catch(MJ_REPO_URL),
 });
-const parsedConfig = mjConfigSchema.safeParse(result?.config);
-if (!parsedConfig.success) {
-    console.error('Error parsing config file', JSON.stringify(parsedConfig.error.issues, null, 2));
-}
-exports.config = parsedConfig.success ? parsedConfig.data : undefined;
+// Schema for non-database commands (all fields optional)
+const mjConfigSchemaOptional = zod_1.z.object({
+    dbHost: zod_1.z.string().optional(),
+    dbDatabase: zod_1.z.string().optional(),
+    dbPort: zod_1.z.number({ coerce: true }).optional(),
+    codeGenLogin: zod_1.z.string().optional(),
+    codeGenPassword: zod_1.z.string().optional(),
+    migrationsLocation: zod_1.z.string().optional().default('filesystem:./migrations'),
+    dbTrustServerCertificate: zod_1.z.coerce.boolean().default(false),
+    coreSchema: zod_1.z.string().optional().default('__mj'),
+    cleanDisabled: zod_1.z.boolean().optional().default(true),
+    mjRepoUrl: zod_1.z.string().url().catch(MJ_REPO_URL),
+});
+// Don't validate at module load - let commands decide when they need validated config
+exports.config = result?.config;
+/**
+ * Get validated config for commands that require database connection.
+ * Throws error if config is invalid.
+ */
+const getValidatedConfig = () => {
+    const parsedConfig = mjConfigSchema.safeParse(result?.config);
+    if (!parsedConfig.success) {
+        throw new Error(`Invalid or missing mj.config.cjs file. Database commands require valid configuration.\n` +
+            `Missing fields: ${parsedConfig.error.issues.map(i => i.path.join('.')).join(', ')}`);
+    }
+    return parsedConfig.data;
+};
+exports.getValidatedConfig = getValidatedConfig;
+/**
+ * Get optional config for commands that don't require database connection.
+ * Returns undefined if no config exists, or partial config if it exists.
+ */
+const getOptionalConfig = () => {
+    const parsedConfig = mjConfigSchemaOptional.safeParse(result?.config);
+    return parsedConfig.success ? parsedConfig.data : undefined;
+};
+exports.getOptionalConfig = getOptionalConfig;
+/**
+ * Legacy function for backward compatibility with codegen.
+ * Validates and returns updated config.
+ * Returns undefined silently if config is invalid (command will handle the error).
+ */
 const updatedConfig = () => {
     const maybeConfig = mjConfigSchema.safeParse(explorer.search(process.cwd())?.config);
-    if (!maybeConfig.success) {
-        console.error('Error parsing config file', JSON.stringify(maybeConfig.error.issues, null, 2));
-    }
+    // Don't log errors here - let the calling command handle validation
     return maybeConfig.success ? maybeConfig.data : undefined;
 };
 exports.updatedConfig = updatedConfig;