git-coco 0.14.0 → 0.14.1

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 import * as yargs from 'yargs';
 import { Arguments } from 'yargs';
+import { AnthropicInput, ChatAnthropic } from '@langchain/anthropic';
 import { OllamaInput } from '@langchain/community/llms/ollama';
 import { BaseLLMParams } from '@langchain/core/language_models/llms';
 import * as _langchain_openai from '@langchain/openai';
 import { TiktokenModel, OpenAIInput, ChatOpenAI } from '@langchain/openai';
 import { SimpleGit } from 'simple-git';
-import { ChatAnthropic } from '@langchain/anthropic';
 import { ChatOllama } from '@langchain/ollama';
 import { Color } from 'chalk';
 import { TiktokenModel as TiktokenModel$1 } from 'tiktoken';
@@ -61,6 +61,7 @@ type Authentication = {
 };
 type OpenAIFields = Partial<OpenAIInput> & BaseLLMParams;
 type OllamaFields = Partial<OllamaInput> & BaseLLMParams;
+type AnthropicFields = Partial<AnthropicInput> & BaseLLMParams;
 type OpenAILLMService = BaseLLMService & {
     provider: 'openai';
     model: TiktokenModel;
@@ -72,7 +73,12 @@ type OllamaLLMService = BaseLLMService & {
     endpoint: string;
     fields?: OllamaFields;
 };
-type LLMService = OpenAILLMService | OllamaLLMService;
+type AnthropicLLMService = BaseLLMService & {
+    provider: 'anthropic';
+    model: string;
+    fields?: AnthropicFields;
+};
+type LLMService = OpenAILLMService | OllamaLLMService | AnthropicLLMService;
 
 type BaseConfig = {
     /**

package/dist/index.esm.mjs

@@ -268,7 +268,7 @@ function getDefaultServiceConfigFromAlias(provider, model) {
     }
 }
 
-const DEFAULT_IGNORED_FILES = ['package-lock.json'];
+const DEFAULT_IGNORED_FILES = ['package-lock.json', 'yarn.lock', 'node_modules'];
 const DEFAULT_IGNORED_EXTENSIONS = ['.map', '.lock'];
 const COCO_CONFIG_START_COMMENT = '# -- start coco config --';
 const COCO_CONFIG_END_COMMENT = '# -- end coco config --';
@@ -7108,6 +7108,46 @@ var recap = {
     options: options$1,
 };
 
+/**
+ * Retrieves the diff between the current branch and a specified target branch.
+ *
+ * @param {Object} options - The options for retrieving the diff.
+ * @param {SimpleGit} options.git - The SimpleGit instance.
+ * @param {Logger} options.logger - The logger for logging messages.
+ * @param {string} options.targetBranch - The target branch to compare against.
+ * @param {string[]} options.ignoredFiles - Array of specific files to ignore.
+ * @param {string[]} options.ignoredExtensions - Array of file extensions to ignore.
+ * @returns {Promise<string>} The diff between the current branch and the target branch.
+ */
+async function getDiffForBranch({ git, logger, targetBranch, ignoredFiles = [], ignoredExtensions = [], }) {
+    try {
+        // Get the current branch name
+        const currentBranch = await getCurrentBranchName({ git });
+        // Prepare ignore patterns
+        const ignorePatterns = [
+            ...ignoredFiles.map((file) => `:!${file}`),
+            ...ignoredExtensions.map((ext) => `:!*${ext}`),
+        ];
+        // Construct the diff command
+        const diffArgs = [`${targetBranch}..${currentBranch}`];
+        if (ignorePatterns.length > 0) {
+            diffArgs.push('--');
+            diffArgs.push(...ignorePatterns);
+        }
+        // Get the diff
+        const diff = await git.diff(diffArgs);
+        logger?.verbose(`Generated diff between "${currentBranch}" and "${targetBranch}"`, {
+            color: 'blue',
+        });
+        return diff;
+    }
+    catch (error) {
+        console.error('Error in getDiffForBranch:', error);
+        logger?.log('Encountered an error getting diff between branches', { color: 'red' });
+        return '';
+    }
+}
+
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
@@ -28273,33 +28313,52 @@ const handler = async (argv, logger) => {
         logger.log(LOGO);
     }
     async function factory() {
-        const { staged, unstaged, untracked } = await getChanges({ git });
-        if (staged.length === 0 && unstaged?.length === 0 && untracked?.length === 0) {
-            logger.log('No changes detected. Exiting...');
-            process.exit(0);
+        if (argv.branch) {
+            logger.verbose(`Generating diff for branch: ${argv.branch}`, { color: 'yellow' });
+            const diff = await getDiffForBranch({
+                git,
+                logger,
+                targetBranch: argv.branch,
+                ignoredFiles: config.ignoredFiles || [],
+                ignoredExtensions: config.ignoredExtensions || [],
+            });
+            return [diff];
         }
-        if (INTERACTIVE) {
-            logger.verbose(`Staged: ${staged.length}, Unstaged: ${unstaged?.length || 0}, Untracked: ${untracked?.length || 0}`);
+        else {
+            const { staged, unstaged, untracked } = await getChanges({
+                git,
+                options: {
+                    ignoredFiles: config.ignoredFiles || undefined,
+                    ignoredExtensions: config.ignoredExtensions || undefined,
+                },
+            });
+            if (staged.length === 0 && unstaged?.length === 0 && untracked?.length === 0) {
+                logger.log('No changes detected. Exiting...');
+                process.exit(0);
+            }
+            if (INTERACTIVE) {
+                logger.verbose(`Staged: ${staged.length}, Unstaged: ${unstaged?.length || 0}, Untracked: ${untracked?.length || 0}`);
+            }
+            const unstagedChanges = await fileChangeParser({
+                changes: unstaged || [],
+                commit: '--unstaged',
+                options: { tokenizer, git, llm, logger },
+            });
+            const unstagedResponse = `Unstaged changes:\n${unstagedChanges}`;
+            const untrackedChanges = await fileChangeParser({
+                changes: untracked || [],
+                commit: '--untracked',
+                options: { tokenizer, git, llm, logger },
+            });
+            const untrackedResponse = `Untracked changes:\n${untrackedChanges}`;
+            const stagedChanges = await fileChangeParser({
+                changes: staged,
+                commit: '--staged',
+                options: { tokenizer, git, llm, logger },
+            });
+            const stagedResponse = `Staged changes:\n${stagedChanges}`;
+            return [unstagedResponse, untrackedResponse, stagedResponse];
         }
-        const unstagedChanges = await fileChangeParser({
-            changes: unstaged || [],
-            commit: '--unstaged',
-            options: { tokenizer, git, llm, logger },
-        });
-        const unstagedResponse = `Unstaged changes:\n${unstagedChanges}`;
-        const untrackedChanges = await fileChangeParser({
-            changes: untracked || [],
-            commit: '--untracked',
-            options: { tokenizer, git, llm, logger },
-        });
-        const untrackedResponse = `Untracked changes:\n${untrackedChanges}`;
-        const stagedChanges = await fileChangeParser({
-            changes: staged,
-            commit: '--staged',
-            options: { tokenizer, git, llm, logger },
-        });
-        const stagedResponse = `Staged changes:\n${stagedChanges}`;
-        return [unstagedResponse, untrackedResponse, stagedResponse];
     }
     async function parser(changes) {
         return changes.join('\n');
@@ -28372,6 +28431,11 @@ const options = {
         alias: 'interactive',
         description: 'Toggle interactive mode',
     },
+    'b': {
+        type: 'string',
+        alias: 'branch',
+        description: 'Branch to review',
+    },
 };
 const builder = (yargs) => {
     return yargs.options(options).usage(getCommandUsageHeader(review.command));

package/dist/index.js

@@ -290,7 +290,7 @@ function getDefaultServiceConfigFromAlias(provider, model) {
     }
 }
 
-const DEFAULT_IGNORED_FILES = ['package-lock.json'];
+const DEFAULT_IGNORED_FILES = ['package-lock.json', 'yarn.lock', 'node_modules'];
 const DEFAULT_IGNORED_EXTENSIONS = ['.map', '.lock'];
 const COCO_CONFIG_START_COMMENT = '# -- start coco config --';
 const COCO_CONFIG_END_COMMENT = '# -- end coco config --';
@@ -7130,6 +7130,46 @@ var recap = {
     options: options$1,
 };
 
+/**
+ * Retrieves the diff between the current branch and a specified target branch.
+ *
+ * @param {Object} options - The options for retrieving the diff.
+ * @param {SimpleGit} options.git - The SimpleGit instance.
+ * @param {Logger} options.logger - The logger for logging messages.
+ * @param {string} options.targetBranch - The target branch to compare against.
+ * @param {string[]} options.ignoredFiles - Array of specific files to ignore.
+ * @param {string[]} options.ignoredExtensions - Array of file extensions to ignore.
+ * @returns {Promise<string>} The diff between the current branch and the target branch.
+ */
+async function getDiffForBranch({ git, logger, targetBranch, ignoredFiles = [], ignoredExtensions = [], }) {
+    try {
+        // Get the current branch name
+        const currentBranch = await getCurrentBranchName({ git });
+        // Prepare ignore patterns
+        const ignorePatterns = [
+            ...ignoredFiles.map((file) => `:!${file}`),
+            ...ignoredExtensions.map((ext) => `:!*${ext}`),
+        ];
+        // Construct the diff command
+        const diffArgs = [`${targetBranch}..${currentBranch}`];
+        if (ignorePatterns.length > 0) {
+            diffArgs.push('--');
+            diffArgs.push(...ignorePatterns);
+        }
+        // Get the diff
+        const diff = await git.diff(diffArgs);
+        logger?.verbose(`Generated diff between "${currentBranch}" and "${targetBranch}"`, {
+            color: 'blue',
+        });
+        return diff;
+    }
+    catch (error) {
+        console.error('Error in getDiffForBranch:', error);
+        logger?.log('Encountered an error getting diff between branches', { color: 'red' });
+        return '';
+    }
+}
+
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
@@ -28295,33 +28335,52 @@ const handler = async (argv, logger) => {
         logger.log(LOGO);
     }
     async function factory() {
-        const { staged, unstaged, untracked } = await getChanges({ git });
-        if (staged.length === 0 && unstaged?.length === 0 && untracked?.length === 0) {
-            logger.log('No changes detected. Exiting...');
-            process.exit(0);
+        if (argv.branch) {
+            logger.verbose(`Generating diff for branch: ${argv.branch}`, { color: 'yellow' });
+            const diff = await getDiffForBranch({
+                git,
+                logger,
+                targetBranch: argv.branch,
+                ignoredFiles: config.ignoredFiles || [],
+                ignoredExtensions: config.ignoredExtensions || [],
+            });
+            return [diff];
         }
-        if (INTERACTIVE) {
-            logger.verbose(`Staged: ${staged.length}, Unstaged: ${unstaged?.length || 0}, Untracked: ${untracked?.length || 0}`);
+        else {
+            const { staged, unstaged, untracked } = await getChanges({
+                git,
+                options: {
+                    ignoredFiles: config.ignoredFiles || undefined,
+                    ignoredExtensions: config.ignoredExtensions || undefined,
+                },
+            });
+            if (staged.length === 0 && unstaged?.length === 0 && untracked?.length === 0) {
+                logger.log('No changes detected. Exiting...');
+                process.exit(0);
+            }
+            if (INTERACTIVE) {
+                logger.verbose(`Staged: ${staged.length}, Unstaged: ${unstaged?.length || 0}, Untracked: ${untracked?.length || 0}`);
+            }
+            const unstagedChanges = await fileChangeParser({
+                changes: unstaged || [],
+                commit: '--unstaged',
+                options: { tokenizer, git, llm, logger },
+            });
+            const unstagedResponse = `Unstaged changes:\n${unstagedChanges}`;
+            const untrackedChanges = await fileChangeParser({
+                changes: untracked || [],
+                commit: '--untracked',
+                options: { tokenizer, git, llm, logger },
+            });
+            const untrackedResponse = `Untracked changes:\n${untrackedChanges}`;
+            const stagedChanges = await fileChangeParser({
+                changes: staged,
+                commit: '--staged',
+                options: { tokenizer, git, llm, logger },
+            });
+            const stagedResponse = `Staged changes:\n${stagedChanges}`;
+            return [unstagedResponse, untrackedResponse, stagedResponse];
         }
-        const unstagedChanges = await fileChangeParser({
-            changes: unstaged || [],
-            commit: '--unstaged',
-            options: { tokenizer, git, llm, logger },
-        });
-        const unstagedResponse = `Unstaged changes:\n${unstagedChanges}`;
-        const untrackedChanges = await fileChangeParser({
-            changes: untracked || [],
-            commit: '--untracked',
-            options: { tokenizer, git, llm, logger },
-        });
-        const untrackedResponse = `Untracked changes:\n${untrackedChanges}`;
-        const stagedChanges = await fileChangeParser({
-            changes: staged,
-            commit: '--staged',
-            options: { tokenizer, git, llm, logger },
-        });
-        const stagedResponse = `Staged changes:\n${stagedChanges}`;
-        return [unstagedResponse, untrackedResponse, stagedResponse];
     }
     async function parser(changes) {
         return changes.join('\n');
@@ -28394,6 +28453,11 @@ const options = {
         alias: 'interactive',
         description: 'Toggle interactive mode',
     },
+    'b': {
+        type: 'string',
+        alias: 'branch',
+        description: 'Branch to review',
+    },
 };
 const builder = (yargs) => {
     return yargs.options(options).usage(getCommandUsageHeader(review.command));

package/package.json

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