git-coco 0.22.5 → 0.22.7

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 import * as yargs from 'yargs';
 import { Arguments } from 'yargs';
 import { OllamaInput } from '@langchain/community/llms/ollama';

package/dist/index.esm.mjs

@@ -5,7 +5,7 @@ import yargs from 'yargs';
 import chalk from 'chalk';
 import * as fs from 'fs';
 import fs__default, { promises, existsSync, readFileSync } from 'fs';
-import { confirm, editor, select, password, input } from '@inquirer/prompts';
+import { confirm, editor, select, input, password } from '@inquirer/prompts';
 import * as ini from 'ini';
 import * as os from 'os';
 import os__default from 'os';
@@ -47,7 +47,7 @@ import { pathToFileURL } from 'url';
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.22.5";
+const BUILD_VERSION = "0.22.7";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -231,7 +231,7 @@ function validateRequired(value, paramName, functionName) {
 function validateNonEmptyString(value, paramName, functionName) {
     validateRequired(value, paramName, functionName);
     if (typeof value !== 'string' || value.trim() === '') {
-        throw new LangChainValidationError(`${functionName ? `${functionName}: ` : ''}Parameter '${paramName}' must be a non-empty string`, { paramName, functionName, value, type: typeof value });
+        throw new LangChainValidationError(`${`${functionName}: ` }Parameter '${paramName}' must be a non-empty string`, { paramName, functionName, value, type: typeof value });
     }
 }
 /**
@@ -240,7 +240,7 @@ function validateNonEmptyString(value, paramName, functionName) {
 function validateNonEmptyArray(value, paramName, functionName) {
     validateRequired(value, paramName, functionName);
     if (!Array.isArray(value) || value.length === 0) {
-        throw new LangChainValidationError(`${functionName ? `${functionName}: ` : ''}Parameter '${paramName}' must be a non-empty array`, { paramName, functionName, value, isArray: Array.isArray(value), length: Array.isArray(value) ? value.length : undefined });
+        throw new LangChainValidationError(`${`${functionName}: ` }Parameter '${paramName}' must be a non-empty array`, { paramName, functionName, value, isArray: Array.isArray(value), length: Array.isArray(value) ? value.length : undefined });
     }
 }
 /**
@@ -2627,9 +2627,8 @@ const errorMap = (issue, _ctx) => {
     }
     return { message };
 };
-var defaultErrorMap = errorMap;
 
-let overrideErrorMap = defaultErrorMap;
+let overrideErrorMap = errorMap;
 function getErrorMap() {
     return overrideErrorMap;
 }
@@ -2672,7 +2671,7 @@ function addIssueToContext(ctx, issueData) {
             ctx.common.contextualErrorMap, // contextual error map is first priority
             ctx.schemaErrorMap, // then schema-bound map if available
             overrideMap, // then global override map
-            overrideMap === defaultErrorMap ? undefined : defaultErrorMap, // then global default map
+            overrideMap === errorMap ? undefined : errorMap, // then global default map
         ].filter((x) => !!x),
     });
     ctx.common.issues.push(issue);
@@ -5988,9 +5987,6 @@ ZodReadonly.create = (type, params) => {
         ...processCreateParams(params),
     });
 };
-({
-    object: ZodObject.lazycreate,
-});
 var ZodFirstPartyTypeKind;
 (function (ZodFirstPartyTypeKind) {
     ZodFirstPartyTypeKind["ZodString"] = "ZodString";
@@ -6034,7 +6030,6 @@ const stringType = ZodString.create;
 ZodNever.create;
 const arrayType = ZodArray.create;
 const objectType = ZodObject.create;
-ZodObject.strictCreate;
 const unionType = ZodUnion.create;
 ZodIntersection.create;
 ZodTuple.create;
@@ -7721,7 +7716,7 @@ const handler$4 = async (argv, logger) => {
             logger.verbose(`Generating commit log since the last tag`, { color: 'yellow' });
             // This function returns string[], needs to be adapted or replaced
             // For now, this path will have limited details.
-            const commitMessages = await getChangesSinceLastTag({ git, logger });
+            const commitMessages = await getChangesSinceLastTag({ git});
             commits = commitMessages.map(msg => ({ message: msg }));
         }
         else if (config.range && config.range.includes(':')) {
@@ -7966,31 +7961,64 @@ async function executeChainWithSchema(schema, llm, prompt, variables, options =
  */
 function formatCommitMessage(result, options = {}) {
     const { append, ticketId, appendTicket } = options;
-    // If it's a string, check if it contains a JSON object
+    // Helper function to construct the final message with appends
+    const constructMessage = (title, body) => {
+        const appendedText = append ? `\n\n${append}` : '';
+        const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
+        return `${title}\n\n${body}${appendedText}${ticketFooter}`;
+    };
+    // If it's a string, check if it contains a JSON object (including markdown code blocks)
     if (typeof result === 'string') {
-        try {
-            // Try to parse as JSON to see if it's a stringified object
-            const parsed = JSON.parse(result);
-            if (parsed && typeof parsed === 'object' && parsed.title && parsed.body) {
-                // It's a stringified JSON object, format it properly
-                const appendedText = append ? `\n\n${append}` : '';
-                const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-                return `${parsed.title}\n\n${parsed.body}${appendedText}${ticketFooter}`;
+        // Early return if string clearly doesn't contain JSON-like content
+        if (!result.includes('{') && !result.includes('"title"')) {
+            return result;
+        }
+        // Handle multiple markdown code block formats
+        const codeBlockPatterns = [
+            /```(?:json)?\s*(\{[\s\S]*?\})\s*```/, // Standard markdown blocks
+            /`(\{[\s\S]*?\})`/, // Inline code blocks
+            /^\s*(\{[\s\S]*\})\s*$/ // Raw JSON without blocks
+        ];
+        let jsonString = result;
+        // Try each pattern to extract JSON
+        for (const pattern of codeBlockPatterns) {
+            const match = result.match(pattern);
+            if (match && match[1]) {
+                jsonString = match[1].trim();
+                break;
             }
         }
-        catch {
-            // Not valid JSON, treat as regular string
+        // Only attempt JSON parsing if we found potential JSON content
+        if (jsonString !== result || jsonString.startsWith('{')) {
+            try {
+                // Try to parse as JSON to see if it's a stringified object
+                const parsed = JSON.parse(jsonString);
+                if (parsed &&
+                    typeof parsed === 'object' &&
+                    typeof parsed.title === 'string' &&
+                    typeof parsed.body === 'string' &&
+                    parsed.title.length > 0 &&
+                    parsed.body.length > 0) {
+                    // It's a valid stringified JSON object, format it properly
+                    return constructMessage(parsed.title, parsed.body);
+                }
+            }
+            catch {
+                // Not valid JSON, continue to fallback
+            }
         }
+        // If no JSON found and it's already formatted, return as-is
         return result;
     }
     // If it's already an object with title and body, format it
-    if (typeof result === 'object' && result !== null && 'title' in result && 'body' in result) {
+    if (typeof result === 'object' && result !== null &&
+        'title' in result && 'body' in result) {
         const commitMsgObj = result;
-        const appendedText = append ? `\n\n${append}` : '';
-        const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-        return `${commitMsgObj.title}\n\n${commitMsgObj.body}${appendedText}${ticketFooter}`;
+        if (typeof commitMsgObj.title === 'string' && typeof commitMsgObj.body === 'string') {
+            return constructMessage(commitMsgObj.title, commitMsgObj.body);
+        }
     }
-    // Fallback - convert to string
+    // Fallback - convert to string and return as-is
     return String(result);
 }
 
@@ -11579,11 +11607,13 @@ ${schema.description}
                         });
                     },
                 });
-                // Construct the full commit message
-                const appendedText = argv.append ? `\n\n${argv.append}` : '';
+                // Construct the full commit message using the utility function
                 const ticketId = extractTicketIdFromBranchName(branchName);
-                const ticketFooter = argv.appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-                const fullMessage = `${commitMsg.title}\n\n${commitMsg.body}${appendedText}${ticketFooter}`;
+                const fullMessage = formatCommitMessage(commitMsg, {
+                    append: argv.append,
+                    ticketId: ticketId || undefined,
+                    appendTicket: argv.appendTicket,
+                });
                 // If commitlint validation is needed and not skipped, validate the message
                 if ((USE_CONVENTIONAL_COMMITS || hasCommitLintConfig) && !shouldSkipCommitlintValidation) {
                     const { validateCommitMessage, CommitlintValidationError } = await Promise.resolve().then(function () { return commitlintValidator; });
@@ -11666,13 +11696,8 @@ ${schema.description}
                     logger.verbose(`Retrying commit message generation (attempt ${attempt}): ${error.message}`, { color: 'yellow' });
                 },
             });
-            // Ensure we always return a properly formatted commit message string
-            const ticketId = extractTicketIdFromBranchName(branchName);
-            return formatCommitMessage(result, {
-                append: argv.append,
-                ticketId: ticketId || undefined,
-                appendTicket: argv.appendTicket,
-            });
+            // Return the result which is already a properly formatted commit message string
+            return result;
         },
         noResult: async () => {
             await noResult$2({ git, logger });
@@ -12855,9 +12880,7 @@ var review = {
     command,
     desc: 'Perform a code review on your changes',
     builder,
-    handler: commandExecutor(handler),
-    options,
-};
+    handler: commandExecutor(handler)};
 
 var types = /*#__PURE__*/Object.freeze({
   __proto__: null

package/dist/index.js

@@ -69,7 +69,7 @@ var readline__namespace = /*#__PURE__*/_interopNamespaceDefault(readline);
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.22.5";
+const BUILD_VERSION = "0.22.7";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -253,7 +253,7 @@ function validateRequired(value, paramName, functionName) {
 function validateNonEmptyString(value, paramName, functionName) {
     validateRequired(value, paramName, functionName);
     if (typeof value !== 'string' || value.trim() === '') {
-        throw new LangChainValidationError(`${functionName ? `${functionName}: ` : ''}Parameter '${paramName}' must be a non-empty string`, { paramName, functionName, value, type: typeof value });
+        throw new LangChainValidationError(`${`${functionName}: ` }Parameter '${paramName}' must be a non-empty string`, { paramName, functionName, value, type: typeof value });
     }
 }
 /**
@@ -262,7 +262,7 @@ function validateNonEmptyString(value, paramName, functionName) {
 function validateNonEmptyArray(value, paramName, functionName) {
     validateRequired(value, paramName, functionName);
     if (!Array.isArray(value) || value.length === 0) {
-        throw new LangChainValidationError(`${functionName ? `${functionName}: ` : ''}Parameter '${paramName}' must be a non-empty array`, { paramName, functionName, value, isArray: Array.isArray(value), length: Array.isArray(value) ? value.length : undefined });
+        throw new LangChainValidationError(`${`${functionName}: ` }Parameter '${paramName}' must be a non-empty array`, { paramName, functionName, value, isArray: Array.isArray(value), length: Array.isArray(value) ? value.length : undefined });
     }
 }
 /**
@@ -2649,9 +2649,8 @@ const errorMap = (issue, _ctx) => {
     }
     return { message };
 };
-var defaultErrorMap = errorMap;
 
-let overrideErrorMap = defaultErrorMap;
+let overrideErrorMap = errorMap;
 function getErrorMap() {
     return overrideErrorMap;
 }
@@ -2694,7 +2693,7 @@ function addIssueToContext(ctx, issueData) {
             ctx.common.contextualErrorMap, // contextual error map is first priority
             ctx.schemaErrorMap, // then schema-bound map if available
             overrideMap, // then global override map
-            overrideMap === defaultErrorMap ? undefined : defaultErrorMap, // then global default map
+            overrideMap === errorMap ? undefined : errorMap, // then global default map
         ].filter((x) => !!x),
     });
     ctx.common.issues.push(issue);
@@ -6010,9 +6009,6 @@ ZodReadonly.create = (type, params) => {
         ...processCreateParams(params),
     });
 };
-({
-    object: ZodObject.lazycreate,
-});
 var ZodFirstPartyTypeKind;
 (function (ZodFirstPartyTypeKind) {
     ZodFirstPartyTypeKind["ZodString"] = "ZodString";
@@ -6056,7 +6052,6 @@ const stringType = ZodString.create;
 ZodNever.create;
 const arrayType = ZodArray.create;
 const objectType = ZodObject.create;
-ZodObject.strictCreate;
 const unionType = ZodUnion.create;
 ZodIntersection.create;
 ZodTuple.create;
@@ -7743,7 +7738,7 @@ const handler$4 = async (argv, logger) => {
             logger.verbose(`Generating commit log since the last tag`, { color: 'yellow' });
             // This function returns string[], needs to be adapted or replaced
             // For now, this path will have limited details.
-            const commitMessages = await getChangesSinceLastTag({ git, logger });
+            const commitMessages = await getChangesSinceLastTag({ git});
             commits = commitMessages.map(msg => ({ message: msg }));
         }
         else if (config.range && config.range.includes(':')) {
@@ -7988,31 +7983,64 @@ async function executeChainWithSchema(schema, llm, prompt, variables, options =
  */
 function formatCommitMessage(result, options = {}) {
     const { append, ticketId, appendTicket } = options;
-    // If it's a string, check if it contains a JSON object
+    // Helper function to construct the final message with appends
+    const constructMessage = (title, body) => {
+        const appendedText = append ? `\n\n${append}` : '';
+        const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
+        return `${title}\n\n${body}${appendedText}${ticketFooter}`;
+    };
+    // If it's a string, check if it contains a JSON object (including markdown code blocks)
     if (typeof result === 'string') {
-        try {
-            // Try to parse as JSON to see if it's a stringified object
-            const parsed = JSON.parse(result);
-            if (parsed && typeof parsed === 'object' && parsed.title && parsed.body) {
-                // It's a stringified JSON object, format it properly
-                const appendedText = append ? `\n\n${append}` : '';
-                const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-                return `${parsed.title}\n\n${parsed.body}${appendedText}${ticketFooter}`;
+        // Early return if string clearly doesn't contain JSON-like content
+        if (!result.includes('{') && !result.includes('"title"')) {
+            return result;
+        }
+        // Handle multiple markdown code block formats
+        const codeBlockPatterns = [
+            /```(?:json)?\s*(\{[\s\S]*?\})\s*```/, // Standard markdown blocks
+            /`(\{[\s\S]*?\})`/, // Inline code blocks
+            /^\s*(\{[\s\S]*\})\s*$/ // Raw JSON without blocks
+        ];
+        let jsonString = result;
+        // Try each pattern to extract JSON
+        for (const pattern of codeBlockPatterns) {
+            const match = result.match(pattern);
+            if (match && match[1]) {
+                jsonString = match[1].trim();
+                break;
             }
         }
-        catch {
-            // Not valid JSON, treat as regular string
+        // Only attempt JSON parsing if we found potential JSON content
+        if (jsonString !== result || jsonString.startsWith('{')) {
+            try {
+                // Try to parse as JSON to see if it's a stringified object
+                const parsed = JSON.parse(jsonString);
+                if (parsed &&
+                    typeof parsed === 'object' &&
+                    typeof parsed.title === 'string' &&
+                    typeof parsed.body === 'string' &&
+                    parsed.title.length > 0 &&
+                    parsed.body.length > 0) {
+                    // It's a valid stringified JSON object, format it properly
+                    return constructMessage(parsed.title, parsed.body);
+                }
+            }
+            catch {
+                // Not valid JSON, continue to fallback
+            }
         }
+        // If no JSON found and it's already formatted, return as-is
         return result;
     }
     // If it's already an object with title and body, format it
-    if (typeof result === 'object' && result !== null && 'title' in result && 'body' in result) {
+    if (typeof result === 'object' && result !== null &&
+        'title' in result && 'body' in result) {
         const commitMsgObj = result;
-        const appendedText = append ? `\n\n${append}` : '';
-        const ticketFooter = appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-        return `${commitMsgObj.title}\n\n${commitMsgObj.body}${appendedText}${ticketFooter}`;
+        if (typeof commitMsgObj.title === 'string' && typeof commitMsgObj.body === 'string') {
+            return constructMessage(commitMsgObj.title, commitMsgObj.body);
+        }
     }
-    // Fallback - convert to string
+    // Fallback - convert to string and return as-is
     return String(result);
 }
 
@@ -11601,11 +11629,13 @@ ${schema.description}
                         });
                     },
                 });
-                // Construct the full commit message
-                const appendedText = argv.append ? `\n\n${argv.append}` : '';
+                // Construct the full commit message using the utility function
                 const ticketId = extractTicketIdFromBranchName(branchName);
-                const ticketFooter = argv.appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
-                const fullMessage = `${commitMsg.title}\n\n${commitMsg.body}${appendedText}${ticketFooter}`;
+                const fullMessage = formatCommitMessage(commitMsg, {
+                    append: argv.append,
+                    ticketId: ticketId || undefined,
+                    appendTicket: argv.appendTicket,
+                });
                 // If commitlint validation is needed and not skipped, validate the message
                 if ((USE_CONVENTIONAL_COMMITS || hasCommitLintConfig) && !shouldSkipCommitlintValidation) {
                     const { validateCommitMessage, CommitlintValidationError } = await Promise.resolve().then(function () { return commitlintValidator; });
@@ -11688,13 +11718,8 @@ ${schema.description}
                     logger.verbose(`Retrying commit message generation (attempt ${attempt}): ${error.message}`, { color: 'yellow' });
                 },
             });
-            // Ensure we always return a properly formatted commit message string
-            const ticketId = extractTicketIdFromBranchName(branchName);
-            return formatCommitMessage(result, {
-                append: argv.append,
-                ticketId: ticketId || undefined,
-                appendTicket: argv.appendTicket,
-            });
+            // Return the result which is already a properly formatted commit message string
+            return result;
         },
         noResult: async () => {
             await noResult$2({ git, logger });
@@ -12877,9 +12902,7 @@ var review = {
     command,
     desc: 'Perform a code review on your changes',
     builder,
-    handler: commandExecutor(handler),
-    options,
-};
+    handler: commandExecutor(handler)};
 
 var types = /*#__PURE__*/Object.freeze({
   __proto__: null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-coco",
-  "version": "0.22.5",
+  "version": "0.22.7",
   "description": "zero-effort git commits with coco.",
   "author": "gfargo <ghfargo@gmail.com>",
   "license": "MIT",
@@ -60,7 +60,7 @@
     "eslint": "^8.54.0",
     "jest": "^30.0.5",
     "release-it": "^19.0.4",
-    "rollup": "^3.26.1",
+    "rollup": "^4.50.0",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-executable": "^1.6.3",
     "rollup-plugin-peer-deps-external": "^2.2.4",