fix migrations (#414)

* refactor(config.ts): improve code readability by formatting array elements and conditions
* fix(migrations): handle undefined values correctly when setting default config values
* fix(migrations): ensure process exits with error code on migration failure
* fix(commit.ts): update error handling to provide clearer feedback when commit message generation fails
* feat(config.ts): add cleanUndefinedValues function to sanitize config values by converting 'undefined' and 'null' strings to actual values
* refactor(config.ts): return cleaned config from getConfig function to ensure consistent data types
* chore(migrations): log entriesToSet in migration to assist with debugging and tracking changes

src/commands/commit.ts

@@ -183,7 +183,11 @@ ${chalk.grey('——————————————————')}`
       }
     }
   } catch (error) {
-    commitGenerationSpinner.stop('📝 Commit message generated');
+    commitGenerationSpinner.stop(
+      `${chalk.red('✖')} Failed to generate the commit message`
+    );
+
+    console.log(error);
 
     const err = error as Error;
     outro(`${chalk.red('✖')} ${err?.message || err}`);

src/commands/config.ts

@@ -79,13 +79,13 @@ export const MODEL_LIST = {
   ],
 
   groq: [
-    'llama3-70b-8192',            // Meta Llama 3 70B (default one, no daily token limit and 14 400 reqs/day)
-    'llama3-8b-8192',             // Meta Llama 3 8B
-    'llama-guard-3-8b',           // Llama Guard 3 8B
-    'llama-3.1-8b-instant',       // Llama 3.1 8B (Preview)
-    'llama-3.1-70b-versatile',    // Llama 3.1 70B (Preview)
-    'gemma-7b-it',                // Gemma 7B
-    'gemma2-9b-it'               // Gemma 2 9B
+    'llama3-70b-8192', // Meta Llama 3 70B (default one, no daily token limit and 14 400 reqs/day)
+    'llama3-8b-8192', // Meta Llama 3 8B
+    'llama-guard-3-8b', // Llama Guard 3 8B
+    'llama-3.1-8b-instant', // Llama 3.1 8B (Preview)
+    'llama-3.1-70b-versatile', // Llama 3.1 70B (Preview)
+    'gemma-7b-it', // Gemma 7B
+    'gemma2-9b-it' // Gemma 2 9B
   ]
 };
 
@@ -253,9 +253,15 @@ export const configValidators = {
 
     validateConfig(
       CONFIG_KEYS.OCO_AI_PROVIDER,
-      ['openai', 'anthropic', 'gemini', 'azure', 'test', 'flowise', 'groq'].includes(
-        value
-      ) || value.startsWith('ollama'),
+      [
+        'openai',
+        'anthropic',
+        'gemini',
+        'azure',
+        'test',
+        'flowise',
+        'groq'
+      ].includes(value) || value.startsWith('ollama'),
       `${value} is not supported yet, use 'ollama', 'anthropic', 'azure', 'gemini', 'flowise' or 'openai' (default)`
     );
 
@@ -301,7 +307,7 @@ export enum OCO_AI_PROVIDER_ENUM {
   AZURE = 'azure',
   TEST = 'test',
   FLOWISE = 'flowise',
-  GROQ = 'groq',
+  GROQ = 'groq'
 }
 
 export type ConfigType = {
@@ -365,7 +371,6 @@ export const DEFAULT_CONFIG = {
   OCO_AI_PROVIDER: OCO_AI_PROVIDER_ENUM.OPENAI,
   OCO_ONE_LINE_COMMIT: false,
   OCO_TEST_MOCK_TYPE: 'commit-message',
-  OCO_FLOWISE_ENDPOINT: ':',
   OCO_WHY: false,
   OCO_GITPUSH: true // todo: deprecate
 };
@@ -401,7 +406,7 @@ const getEnvConfig = (envPath: string) => {
     OCO_EMOJI: parseConfigVarValue(process.env.OCO_EMOJI),
     OCO_LANGUAGE: process.env.OCO_LANGUAGE,
     OCO_MESSAGE_TEMPLATE_PLACEHOLDER:
-    process.env.OCO_MESSAGE_TEMPLATE_PLACEHOLDER,
+      process.env.OCO_MESSAGE_TEMPLATE_PLACEHOLDER,
     OCO_PROMPT_MODULE: process.env.OCO_PROMPT_MODULE as OCO_PROMPT_MODULE_ENUM,
     OCO_ONE_LINE_COMMIT: parseConfigVarValue(process.env.OCO_ONE_LINE_COMMIT),
     OCO_TEST_MOCK_TYPE: process.env.OCO_TEST_MOCK_TYPE,
@@ -457,16 +462,37 @@ interface GetConfigOptions {
   setDefaultValues?: boolean;
 }
 
+const cleanUndefinedValues = (config: ConfigType) => {
+  return Object.fromEntries(
+    Object.entries(config).map(([_, v]) => {
+      try {
+        if (typeof v === 'string') {
+          if (v === 'undefined') return [_, undefined];
+          if (v === 'null') return [_, null];
+
+          const parsedValue = JSON.parse(v);
+          return [_, parsedValue];
+        }
+        return [_, v];
+      } catch (error) {
+        return [_, v];
+      }
+    })
+  );
+};
+
 export const getConfig = ({
-                            envPath = defaultEnvPath,
-                            globalPath = defaultConfigPath
-                          }: GetConfigOptions = {}): ConfigType => {
+  envPath = defaultEnvPath,
+  globalPath = defaultConfigPath
+}: GetConfigOptions = {}): ConfigType => {
   const envConfig = getEnvConfig(envPath);
   const globalConfig = getGlobalConfig(globalPath);
 
   const config = mergeConfigs(envConfig, globalConfig);
 
-  return config;
+  const cleanConfig = cleanUndefinedValues(config);
+
+  return cleanConfig as ConfigType;
 };
 
 export const setConfig = (

src/migrations/02_set_missing_default_values.ts

@@ -10,10 +10,12 @@ export default function () {
     const entriesToSet: [key: string, value: string | boolean | number][] = [];
     for (const entry of Object.entries(DEFAULT_CONFIG)) {
       const [key, _value] = entry;
-      if (config[key] === 'undefined') entriesToSet.push(entry);
+      if (config[key] === 'undefined' || config[key] === undefined)
+        entriesToSet.push(entry);
     }
 
     if (entriesToSet.length > 0) setConfig(entriesToSet);
+    console.log(entriesToSet);
   };
 
   setDefaultConfigValues(getGlobalConfig());

src/migrations/_run.ts

@@ -53,6 +53,7 @@ export const runMigrations = async () => {
             migration.name
           }: ${error}`
         );
+        process.exit(1);
       }
 
       isMigrated = true;