git-coco 0.12.1 → 0.13.1

package/dist/index.esm.mjs

@@ -55,7 +55,7 @@ const getCommandUsageHeader = (command) => {
     return chalk.green(`${USAGE_BANNER}\n${chalk.white('Command:')}\n\xa0\xa0\xa0\xa0\xa0 $0 ${chalk.greenBright(command)} [options]`);
 };
 const CONFIG_ALREADY_EXISTS = (path) => {
-    return `coco config found in '${path}', do you want to override it?`;
+    return `existing config found in '${path}', do you want to override it?`;
 };
 
 /**
@@ -376,11 +376,11 @@ function loadGitConfig(config) {
     if (fs.existsSync(gitConfigPath)) {
         const gitConfigRaw = fs.readFileSync(gitConfigPath, 'utf-8');
         const gitConfigParsed = ini.parse(gitConfigRaw);
-        const gitServiceAlias = gitConfigParsed.coco?.service;
+        const gitConfigServiceObject = gitConfigParsed.coco?.service;
         let service = config.service;
-        if (gitServiceAlias) {
-            const gitServiceConfig = getDefaultServiceConfigFromAlias(gitServiceAlias);
-            service = parseServiceConfig$1(gitServiceConfig || config.service);
+        if (gitConfigServiceObject) {
+            const gitServiceConfig = JSON.parse(gitConfigServiceObject);
+            service = gitServiceConfig || config?.service;
         }
         config = {
             ...config,
@@ -391,32 +391,11 @@ function loadGitConfig(config) {
             ignoredFiles: gitConfigParsed.coco?.ignoredFiles || config.ignoredFiles,
             ignoredExtensions: gitConfigParsed.coco?.ignoredExtensions || config.ignoredExtensions,
             defaultBranch: gitConfigParsed.coco?.defaultBranch || config.defaultBranch,
+            verbose: gitConfigParsed.coco?.verbose || config.verbose,
         };
     }
     return removeUndefined(config);
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function parseServiceConfig$1(service) {
-    if (!service)
-        return undefined;
-    switch (service.provider) {
-        case 'openai':
-            return {
-                provider: 'openai',
-                model: service.model,
-                fields: { apiKey: service.apiKey },
-            };
-        case 'ollama':
-            return {
-                provider: 'ollama',
-                model: service.model,
-                endpoint: service.endpoint,
-                fields: service.fields,
-            };
-        default:
-            return undefined;
-    }
-}
 /**
  * Appends the provided configuration to a git config file.
  *
@@ -431,15 +410,18 @@ const appendToGitConfig = async (filePath, config) => {
     const getNewContent = async () => {
         const contentLines = [header];
         for (const key in config) {
-            // check if string has new lines, if so, wrap in quotes
-            if (typeof config[key] === 'string') {
-                const value = config[key];
-                if (value.includes('\n')) {
-                    contentLines.push(`\t${key} = ${JSON.stringify(value)}`);
-                    continue;
-                }
+            const value = config[key];
+            if (typeof value === 'object') {
+                // Serialize object to JSON string
+                contentLines.push(`\t${key} = ${JSON.stringify(value)}`);
+            }
+            else if (typeof value === 'string' && value.includes('\n')) {
+                // Wrap strings with new lines in quotes
+                contentLines.push(`\t${key} = ${JSON.stringify(value)}`);
+            }
+            else {
+                contentLines.push(`\t${key} = ${value}`);
             }
-            contentLines.push(`\t${key} = ${config[key]}`);
         }
         return contentLines.join('\n');
     };
@@ -6329,7 +6311,10 @@ const handler$2 = async (argv, logger) => {
                 parser,
             });
             const appendedText = argv.append ? `\n\n${argv.append}` : '';
-            return `${commitMsg.title}\n\n${commitMsg.body}${appendedText}`;
+            const branchName = await getCurrentBranchName({ git });
+            const ticketId = extractTicketIdFromBranchName(branchName);
+            const ticketFooter = argv.appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
+            return `${commitMsg.title}\n\n${commitMsg.body}${appendedText}${ticketFooter}`;
         },
         noResult: async () => {
             await noResult$1({ git, logger });
@@ -6368,6 +6353,10 @@ const options$2 = {
         description: 'Add content to the end of the generated commit message',
         type: 'string',
     },
+    appendTicket: {
+        description: 'Append ticket ID from branch name to the commit message',
+        type: 'boolean',
+    },
     additional: {
         description: 'Add extra contextual information to the prompt',
         type: 'string',
@@ -6473,9 +6462,16 @@ async function checkAndHandlePackageInstallation({ global = false, logger, }) {
     try {
         // Global installation
         if (global) {
-            logger.startSpinner(`Installing '${packageName}' globally...`, { color: 'blue' });
-            await installNpmPackage({ name: packageName, flags: ['-g'] });
-            logger.stopSpinner(`Installed '${packageName}' globally`);
+            const shouldInstall = await confirm({
+                message: `Would you like to install/update '${packageName}' globally at this time?`,
+                default: true,
+            });
+            if (!shouldInstall) {
+                return;
+            }
+            logger.startSpinner(`Updating '${packageName}'...`, { color: 'blue' });
+            // await installNpmPackage({ name: packageName, flags: ['-g'] })
+            logger.stopSpinner(`Updated '${packageName}'`);
             return;
         }
         // Project level installation

package/dist/index.js

@@ -76,7 +76,7 @@ const getCommandUsageHeader = (command) => {
     return chalk.green(`${USAGE_BANNER}\n${chalk.white('Command:')}\n\xa0\xa0\xa0\xa0\xa0 $0 ${chalk.greenBright(command)} [options]`);
 };
 const CONFIG_ALREADY_EXISTS = (path) => {
-    return `coco config found in '${path}', do you want to override it?`;
+    return `existing config found in '${path}', do you want to override it?`;
 };
 
 /**
@@ -397,11 +397,11 @@ function loadGitConfig(config) {
     if (fs__namespace.existsSync(gitConfigPath)) {
         const gitConfigRaw = fs__namespace.readFileSync(gitConfigPath, 'utf-8');
         const gitConfigParsed = ini__namespace.parse(gitConfigRaw);
-        const gitServiceAlias = gitConfigParsed.coco?.service;
+        const gitConfigServiceObject = gitConfigParsed.coco?.service;
         let service = config.service;
-        if (gitServiceAlias) {
-            const gitServiceConfig = getDefaultServiceConfigFromAlias(gitServiceAlias);
-            service = parseServiceConfig$1(gitServiceConfig || config.service);
+        if (gitConfigServiceObject) {
+            const gitServiceConfig = JSON.parse(gitConfigServiceObject);
+            service = gitServiceConfig || config?.service;
         }
         config = {
             ...config,
@@ -412,32 +412,11 @@ function loadGitConfig(config) {
             ignoredFiles: gitConfigParsed.coco?.ignoredFiles || config.ignoredFiles,
             ignoredExtensions: gitConfigParsed.coco?.ignoredExtensions || config.ignoredExtensions,
             defaultBranch: gitConfigParsed.coco?.defaultBranch || config.defaultBranch,
+            verbose: gitConfigParsed.coco?.verbose || config.verbose,
         };
     }
     return removeUndefined(config);
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function parseServiceConfig$1(service) {
-    if (!service)
-        return undefined;
-    switch (service.provider) {
-        case 'openai':
-            return {
-                provider: 'openai',
-                model: service.model,
-                fields: { apiKey: service.apiKey },
-            };
-        case 'ollama':
-            return {
-                provider: 'ollama',
-                model: service.model,
-                endpoint: service.endpoint,
-                fields: service.fields,
-            };
-        default:
-            return undefined;
-    }
-}
 /**
  * Appends the provided configuration to a git config file.
  *
@@ -452,15 +431,18 @@ const appendToGitConfig = async (filePath, config) => {
     const getNewContent = async () => {
         const contentLines = [header];
         for (const key in config) {
-            // check if string has new lines, if so, wrap in quotes
-            if (typeof config[key] === 'string') {
-                const value = config[key];
-                if (value.includes('\n')) {
-                    contentLines.push(`\t${key} = ${JSON.stringify(value)}`);
-                    continue;
-                }
+            const value = config[key];
+            if (typeof value === 'object') {
+                // Serialize object to JSON string
+                contentLines.push(`\t${key} = ${JSON.stringify(value)}`);
+            }
+            else if (typeof value === 'string' && value.includes('\n')) {
+                // Wrap strings with new lines in quotes
+                contentLines.push(`\t${key} = ${JSON.stringify(value)}`);
+            }
+            else {
+                contentLines.push(`\t${key} = ${value}`);
             }
-            contentLines.push(`\t${key} = ${config[key]}`);
         }
         return contentLines.join('\n');
     };
@@ -6350,7 +6332,10 @@ const handler$2 = async (argv, logger) => {
                 parser,
             });
             const appendedText = argv.append ? `\n\n${argv.append}` : '';
-            return `${commitMsg.title}\n\n${commitMsg.body}${appendedText}`;
+            const branchName = await getCurrentBranchName({ git });
+            const ticketId = extractTicketIdFromBranchName(branchName);
+            const ticketFooter = argv.appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
+            return `${commitMsg.title}\n\n${commitMsg.body}${appendedText}${ticketFooter}`;
         },
         noResult: async () => {
             await noResult$1({ git, logger });
@@ -6389,6 +6374,10 @@ const options$2 = {
         description: 'Add content to the end of the generated commit message',
         type: 'string',
     },
+    appendTicket: {
+        description: 'Append ticket ID from branch name to the commit message',
+        type: 'boolean',
+    },
     additional: {
         description: 'Add extra contextual information to the prompt',
         type: 'string',
@@ -6494,9 +6483,16 @@ async function checkAndHandlePackageInstallation({ global = false, logger, }) {
     try {
         // Global installation
         if (global) {
-            logger.startSpinner(`Installing '${packageName}' globally...`, { color: 'blue' });
-            await installNpmPackage({ name: packageName, flags: ['-g'] });
-            logger.stopSpinner(`Installed '${packageName}' globally`);
+            const shouldInstall = await prompts.confirm({
+                message: `Would you like to install/update '${packageName}' globally at this time?`,
+                default: true,
+            });
+            if (!shouldInstall) {
+                return;
+            }
+            logger.startSpinner(`Updating '${packageName}'...`, { color: 'blue' });
+            // await installNpmPackage({ name: packageName, flags: ['-g'] })
+            logger.stopSpinner(`Updated '${packageName}'`);
             return;
         }
         // Project level installation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-coco",
-  "version": "0.12.1",
+  "version": "0.13.1",
   "description": "zero-effort git commits with coco.",
   "author": "gfargo <ghfargo@gmail.com>",
   "license": "MIT",