git-coco 0.4.0 → 0.5.0

package/dist/index.esm.mjs

@@ -19,8 +19,8 @@ import { minimatch } from 'minimatch';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as ini from 'ini';
-import { simpleGit } from 'simple-git';
 import { editor, select } from '@inquirer/prompts';
+import { simpleGit } from 'simple-git';
 
 /**
  * Extract the path from a file path string.
@@ -606,6 +606,7 @@ function loadEnvConfig(config) {
         ignoredExtensions: process.env.COCO_IGNORED_EXTENSIONS
             ? process.env.COCO_IGNORED_EXTENSIONS.split(',')
             : undefined,
+        defaultBranch: process.env.COCO_DEFAULT_BRANCH || undefined,
     };
     config = { ...config, ...removeUndefined(envConfig) };
     return config;
@@ -634,6 +635,7 @@ function loadGitConfig(config) {
             summarizePrompt: gitConfigParsed.coco?.summarizePrompt || config.summarizePrompt,
             ignoredFiles: gitConfigParsed.coco?.ignoredFiles || config.ignoredFiles,
             ignoredExtensions: gitConfigParsed.coco?.ignoredExtensions || config.ignoredExtensions,
+            defaultBranch: gitConfigParsed.coco?.defaultBranch || config.defaultBranch,
         };
     }
     return config;
@@ -679,6 +681,8 @@ function loadIgnore(config) {
  * @returns {Config} Updated config
  **/
 function loadProjectConfig(config) {
+    // TODO: Add validation based of JSON schema?
+    // @see https://github.com/acornejo/jjv
     if (fs.existsSync('.coco.config.json')) {
         const projectConfig = JSON.parse(fs.readFileSync('.coco.config.json', 'utf-8'));
         config = { ...config, ...projectConfig };
@@ -716,6 +720,7 @@ const DEFAULT_CONFIG = {
     mode: 'stdout',
     ignoredFiles: ['package-lock.json'],
     ignoredExtensions: ['.map', '.lock'],
+    defaultBranch: 'main',
 };
 /**
  * Load application config
@@ -1016,9 +1021,21 @@ const handleResult = async (result, { mode, git }) => {
     process.exit(0);
 };
 
-const tokenizer = getTokenizer();
-const git$1 = simpleGit();
+const getRepo = () => {
+    let git;
+    try {
+        git = simpleGit();
+    }
+    catch (e) {
+        console.log('Error initializing git repo', e);
+        process.exit(1);
+    }
+    return git;
+};
+
 async function handler$1(argv) {
+    const tokenizer = getTokenizer();
+    const git = getRepo();
     const options = loadConfig(argv);
     const logger = new Logger(options);
     const key = getApiKeyForModel(options.model, options);
@@ -1032,14 +1049,14 @@ async function handler$1(argv) {
     });
     const INTERACTIVE = isInteractive(options);
     async function factory() {
-        const changes = await getChanges({ git: git$1 });
+        const changes = await getChanges({ git });
         return changes.staged;
     }
     async function parser(changes) {
         return await fileChangeParser({
             changes,
             commit: '--staged',
-            options: { tokenizer, git: git$1, model, logger },
+            options: { tokenizer, git, model, logger },
         });
     }
     const commitMsg = await generateAndReviewLoop({
@@ -1058,7 +1075,7 @@ async function handler$1(argv) {
             });
         },
         noResult: async () => {
-            await noResult({ git: git$1, logger });
+            await noResult({ git, logger });
             process.exit(0);
         },
         options: {
@@ -1071,7 +1088,7 @@ async function handler$1(argv) {
     const MODE = (INTERACTIVE && 'interactive') || (options.commit && 'interactive') || options?.mode || 'stdout';
     handleResult(commitMsg, {
         mode: MODE,
-        git: git$1,
+        git,
     });
 }
 
@@ -1152,15 +1169,9 @@ const CHANGELOG_PROMPT = new PromptTemplate({
 
 async function getCommitLogRange(from, to, { noMerges, git }) {
     try {
-        const output = await git.raw([
-            'log',
-            `${from}..${to}`,
-            '--pretty=format:%s',
-            // Include '--no-merges' here if you want to exclude merge commits.
-            noMerges ? '--no-merges' : null,
-        ].filter(Boolean)); // filter(Boolean) removes any null values from the array
-        const messages = output.split('\n').filter(Boolean);
-        return messages;
+        const logOptions = { from: `${from}^1`, to, '--no-merges': noMerges };
+        const commitLog = await git.log(logOptions);
+        return commitLog.all.map(({ message, date, body, author_name }) => `[${date}] ${message}\n${body}\n - ${author_name}`);
     }
     catch (error) {
         // If there's an error, handle it appropriately
@@ -1169,10 +1180,56 @@ async function getCommitLogRange(from, to, { noMerges, git }) {
     }
 }
 
-const git = simpleGit();
+async function getCurrentBranchName({ git }) {
+    return await git.revparse(['--abbrev-ref', 'HEAD']);
+}
+
+async function getCommitLogCurrentBranch({ git, logger, comparisonBranch = 'main', comparisonRemote = 'origin', }) {
+    try {
+        // Get the current branch name
+        const branch = await getCurrentBranchName({ git });
+        // Check if the current branch has any commits
+        const hasCommits = (await git.raw(['rev-list', '--count', branch])) !== '0';
+        if (!hasCommits) {
+            logger?.log('No commits on the current branch.');
+            return [];
+        }
+        // Get the list of commits that are unique to the current branch
+        let uniqueCommits;
+        if (comparisonBranch === branch) {
+            // If the comparison branch is the same as the current branch, we compare against the remote.
+            uniqueCommits = (await git.raw(['rev-list', `${comparisonRemote}/${comparisonBranch}..${branch}`]))
+                .split('\n')
+                .filter(Boolean)
+                .reverse();
+        }
+        else {
+            // Your existing code for different branches
+            uniqueCommits = (await git.raw(['rev-list', `${comparisonBranch}..${branch}`]))
+                .split('\n')
+                .filter(Boolean)
+                .reverse();
+        }
+        logger?.verbose(`Found ${uniqueCommits.length} unique commits on "${branch}"`, { color: 'blue' });
+        const firstCommit = uniqueCommits[0];
+        const lastCommit = uniqueCommits[uniqueCommits.length - 1];
+        if (!firstCommit || !lastCommit) {
+            logger?.log('Unable to determine first and last commit on the current branch', { color: 'yellow' });
+            return [];
+        }
+        // Retrieve commit log with messages
+        return await getCommitLogRange(firstCommit, lastCommit, { git, noMerges: true });
+    }
+    catch (error) {
+        logger?.log('Encountered an error getting commit log from current branch', { color: 'red' });
+    }
+    return [];
+}
+
 async function handler(argv) {
     const options = loadConfig(argv);
     const logger = new Logger(options);
+    const git = getRepo();
     const key = getApiKeyForModel(options.model, options);
     if (!key) {
         logger.log(`No API Key found. 🗝️🚪`, { color: 'red' });
@@ -1183,14 +1240,17 @@ async function handler(argv) {
         maxConcurrency: 10,
     });
     const INTERACTIVE = isInteractive(options);
-    const [from, to] = options.range?.split(':');
-    if (!from || !to) {
-        logger.log(`Invalid range provided. Expected format is <from>:<to>`, { color: 'red' });
-        process.exit(1);
-    }
     async function factory() {
-        const messages = await getCommitLogRange(from, to, { git, noMerges: true });
-        return messages;
+        if (options.range) {
+            const [from, to] = options.range?.split(':');
+            if (!from || !to) {
+                logger.log(`Invalid range provided. Expected format is <from>:<to>`, { color: 'red' });
+                process.exit(1);
+            }
+            return await getCommitLogRange(from, to, { git, noMerges: true });
+        }
+        logger.verbose(`No range provided. Defaulting to current branch`, { color: 'yellow' });
+        return await getCommitLogCurrentBranch({ git, logger });
     }
     async function parser(messages) {
         const result = messages.join('\n');
@@ -1213,7 +1273,11 @@ async function handler(argv) {
             });
         },
         noResult: async () => {
-            await noResult({ git, logger });
+            if (options.range) {
+                logger.log(`No commits found in the provided range.`, { color: 'red' });
+                process.exit(0);
+            }
+            logger.log(`No commits found in the current branch.`, { color: 'red' });
             process.exit(0);
         },
         options: {
@@ -1238,7 +1302,6 @@ const options = {
         type: 'string',
         alias: 'r',
         description: 'Commit range e.g `HEAD~2:HEAD`',
-        demandOption: true,
     },
     model: { type: 'string', description: 'LLM/Model-Name' },
     openAIApiKey: {