gitpt 1.4.0 → 1.7.2

package/dist/services/gh/createPullRequest.js

@@ -1,63 +1,43 @@
 import chalk from "chalk";
 import { execSync } from "child_process";
-export const createPullRequest = (title, body, baseBranch, draft) => {
-    const draftFlag = draft ? "--draft" : "";
-    try {
-        console.log(chalk.blue(`Creating pull request to ${baseBranch}...`));
-        // Create a temporary file for the PR body to avoid issues with escaping
-        const tempFilePath = `/tmp/gitpt-pr-body-${Date.now()}.md`;
-        try {
-            // Write the body to a temporary file
-            execSync(`cat > "${tempFilePath}" << 'GITPT_EOF'
+//#region src/services/gh/createPullRequest.ts
+var createPullRequest = (title, body, baseBranch, draft) => {
+	const draftFlag = draft ? "--draft" : "";
+	try {
+		console.log(chalk.blue(`Creating pull request to ${baseBranch}...`));
+		const tempFilePath = `/tmp/gitpt-pr-body-${Date.now()}.md`;
+		try {
+			execSync(`cat > "${tempFilePath}" << 'GITPT_EOF'
   ${body}
   GITPT_EOF`);
-            // Try to get the remote repo URL if available
-            let repoUrlArg = "";
-            try {
-                const repoUrl = execSync("git config --get remote.origin.url")
-                    .toString()
-                    .trim();
-                if (repoUrl) {
-                    repoUrlArg = `--repo "${repoUrl}"`;
-                }
-            }
-            catch (e) {
-                // Proceed without repo URL
-            }
-            // Use the file for the body
-            const command = `gh pr create --title "${title.replace(/"/g, '\\"')}" --body-file "${tempFilePath}" --base "${baseBranch}" ${draftFlag} ${repoUrlArg}`;
-            // Set a timeout to avoid hanging indefinitely
-            console.log(chalk.gray("Running GitHub PR creation command..."));
-            console.log(chalk.gray(`Using base branch: ${baseBranch}`));
-            // Add debugging output
-            console.log(chalk.gray("Executing command with 60s timeout:"));
-            // Execute the command with a timeout
-            const result = execSync(command, {
-                stdio: "pipe",
-                timeout: 60000, // 60-second timeout
-            }).toString();
-            console.log(result);
-            console.log(chalk.green("✓ Pull request created successfully"));
-        }
-        finally {
-            // Clean up temporary file
-            try {
-                execSync(`rm -f "${tempFilePath}"`);
-            }
-            catch (e) {
-                // Ignore cleanup errors
-            }
-        }
-    }
-    catch (error) {
-        if (error instanceof Error && error.message.includes("timeout")) {
-            console.error(chalk.red("Error: GitHub CLI command timed out after 60 seconds."));
-            console.log(chalk.yellow("You may need to create the PR manually using:"));
-            console.log(chalk.yellow(`gh pr create --title "${title}" --base "${baseBranch}" ${draftFlag}`));
-        }
-        else {
-            console.error(chalk.red("Error creating pull request:"), error);
-        }
-        throw new Error("Failed to create pull request");
-    }
+			let repoUrlArg = "";
+			try {
+				const repoUrl = execSync("git config --get remote.origin.url").toString().trim();
+				if (repoUrl) repoUrlArg = `--repo "${repoUrl}"`;
+			} catch (e) {}
+			const command = `gh pr create --title "${title.replace(/"/g, "\\\"")}" --body-file "${tempFilePath}" --base "${baseBranch}" ${draftFlag} ${repoUrlArg}`;
+			console.log(chalk.gray("Running GitHub PR creation command..."));
+			console.log(chalk.gray(`Using base branch: ${baseBranch}`));
+			console.log(chalk.gray("Executing command with 60s timeout:"));
+			const result = execSync(command, {
+				stdio: "pipe",
+				timeout: 6e4
+			}).toString();
+			console.log(result);
+			console.log(chalk.green("✓ Pull request created successfully"));
+		} finally {
+			try {
+				execSync(`rm -f "${tempFilePath}"`);
+			} catch (e) {}
+		}
+	} catch (error) {
+		if (error instanceof Error && error.message.includes("timeout")) {
+			console.error(chalk.red("Error: GitHub CLI command timed out after 60 seconds."));
+			console.log(chalk.yellow("You may need to create the PR manually using:"));
+			console.log(chalk.yellow(`gh pr create --title "${title}" --base "${baseBranch}" ${draftFlag}`));
+		} else console.error(chalk.red("Error creating pull request:"), error);
+		throw new Error("Failed to create pull request");
+	}
 };
+//#endregion
+export { createPullRequest };

package/dist/services/gh/index.js

@@ -1,6 +1,9 @@
 import { createPullRequest } from "./createPullRequest.js";
 import { isAvailable } from "./isAvailable.js";
-export const gh = {
-    createPullRequest,
-    isAvailable,
+//#region src/services/gh/index.ts
+var gh = {
+	createPullRequest,
+	isAvailable
 };
+//#endregion
+export { gh };

package/dist/services/gh/isAvailable.js

@@ -1,10 +1,12 @@
 import { execSync } from "child_process";
-export const isAvailable = () => {
-    try {
-        execSync("gh --version", { stdio: "ignore" });
-        return true;
-    }
-    catch (error) {
-        return false;
-    }
+//#region src/services/gh/isAvailable.ts
+var isAvailable = () => {
+	try {
+		execSync("gh --version", { stdio: "ignore" });
+		return true;
+	} catch (error) {
+		return false;
+	}
 };
+//#endregion
+export { isAvailable };

package/dist/services/git/executeGitAdd.js

@@ -1,15 +1,14 @@
 import chalk from "chalk";
 import { execSync } from "child_process";
-export const executeGitAdd = (files) => {
-    try {
-        if (files.length === 0) {
-            throw new Error("No files specified");
-        }
-        const fileArgs = files.join(" ");
-        execSync(`git add ${fileArgs}`, { stdio: "inherit" });
-    }
-    catch (error) {
-        console.error(chalk.red("Error adding files:"), error);
-        throw new Error("Failed to add files to git");
-    }
+//#region src/services/git/executeGitAdd.ts
+var executeGitAdd = (files) => {
+	try {
+		if (files.length === 0) throw new Error("No files specified");
+		execSync(`git add ${files.join(" ")}`, { stdio: "inherit" });
+	} catch (error) {
+		console.error(chalk.red("Error adding files:"), error);
+		throw new Error("Failed to add files to git");
+	}
 };
+//#endregion
+export { executeGitAdd };

package/dist/services/git/executeGitCommit.js

@@ -1,12 +1,11 @@
-import chalk from "chalk";
-import { execSync } from "child_process";
-export const executeGitCommit = (message, additionalArgs = []) => {
-    try {
-        const args = additionalArgs.join(" ");
-        execSync(`git commit -m "${message}" ${args}`, { stdio: "inherit" });
-    }
-    catch (error) {
-        console.error(chalk.red("Error committing changes:"), error);
-        throw new Error("Failed to commit changes");
-    }
+import { spawnSync } from "child_process";
+//#region src/services/git/executeGitCommit.ts
+var executeGitCommit = (message, additionalArgs = []) => {
+	if (spawnSync("git", [
+		"commit",
+		...message === null ? [] : ["-m", message],
+		...additionalArgs
+	], { stdio: "inherit" }).status !== 0) throw new Error("Failed to commit changes");
 };
+//#endregion
+export { executeGitCommit };

package/dist/services/git/getAmendChanges.js

@@ -0,0 +1,23 @@
+import chalk from "chalk";
+import { execSync } from "child_process";
+//#region src/services/git/getAmendChanges.ts
+/**
+* The content of the commit being amended: the staged tree compared to the
+* commit before HEAD — so a plain reword still has a diff (even with nothing
+* staged), and any new staged changes are folded in. Falls back to the staged
+* diff when there is no previous commit (amending the very first commit).
+*/
+var getAmendChanges = () => {
+	try {
+		return execSync("git diff --staged --function-context HEAD~1").toString();
+	} catch {
+		try {
+			return execSync("git diff --staged --function-context").toString();
+		} catch (error) {
+			console.error(chalk.red("Error getting amend changes:"), error);
+			throw new Error("Failed to get amend changes");
+		}
+	}
+};
+//#endregion
+export { getAmendChanges };

package/dist/services/git/getChangedFiles.js

@@ -1,64 +1,31 @@
 import chalk from "chalk";
 import { execSync } from "child_process";
-export const getChangedFiles = (baseBranch) => {
-    // Try several methods to get changed files
-    // Method 1: Compare with origin/baseBranch using three dots
-    try {
-        const changedFiles = execSync(`git diff --name-only origin/${baseBranch}...HEAD`)
-            .toString()
-            .trim();
-        if (changedFiles) {
-            return changedFiles.split("\n").filter(Boolean);
-        }
-    }
-    catch (error) {
-        // Continue to next method
-    }
-    // Method 2: Compare with local baseBranch using three dots
-    try {
-        const changedFiles = execSync(`git diff --name-only ${baseBranch}...HEAD`)
-            .toString()
-            .trim();
-        if (changedFiles) {
-            return changedFiles.split("\n").filter(Boolean);
-        }
-    }
-    catch (error) {
-        // Continue to next method
-    }
-    // Method 3: Direct comparison with two dots
-    try {
-        const changedFiles = execSync(`git diff --name-only ${baseBranch}..HEAD`)
-            .toString()
-            .trim();
-        if (changedFiles) {
-            return changedFiles.split("\n").filter(Boolean);
-        }
-    }
-    catch (error) {
-        // Continue to next method
-    }
-    // Method 4: Get recently modified files
-    try {
-        console.log(chalk.yellow(`Could not determine changed files relative to ${baseBranch}, using recently modified files...`));
-        const changedFiles = execSync("git ls-files --modified --others --exclude-standard")
-            .toString()
-            .trim();
-        if (changedFiles) {
-            return changedFiles.split("\n").filter(Boolean);
-        }
-    }
-    catch (error) {
-        // Last resort
-    }
-    // Method 5: List all files in the repo as a last resort
-    try {
-        console.log(chalk.yellow("Using all tracked files as fallback..."));
-        const allFiles = execSync("git ls-files").toString().trim();
-        return allFiles.split("\n").filter(Boolean).slice(0, 50); // Limit to first 50 files
-    }
-    catch (error) {
-        console.error(chalk.red("Could not determine changed files."));
-        return [];
-    }
+//#region src/services/git/getChangedFiles.ts
+var getChangedFiles = (baseBranch) => {
+	try {
+		const changedFiles = execSync(`git diff --name-only origin/${baseBranch}...HEAD`).toString().trim();
+		if (changedFiles) return changedFiles.split("\n").filter(Boolean);
+	} catch (error) {}
+	try {
+		const changedFiles = execSync(`git diff --name-only ${baseBranch}...HEAD`).toString().trim();
+		if (changedFiles) return changedFiles.split("\n").filter(Boolean);
+	} catch (error) {}
+	try {
+		const changedFiles = execSync(`git diff --name-only ${baseBranch}..HEAD`).toString().trim();
+		if (changedFiles) return changedFiles.split("\n").filter(Boolean);
+	} catch (error) {}
+	try {
+		console.log(chalk.yellow(`Could not determine changed files relative to ${baseBranch}, using recently modified files...`));
+		const changedFiles = execSync("git ls-files --modified --others --exclude-standard").toString().trim();
+		if (changedFiles) return changedFiles.split("\n").filter(Boolean);
+	} catch (error) {}
+	try {
+		console.log(chalk.yellow("Using all tracked files as fallback..."));
+		return execSync("git ls-files").toString().trim().split("\n").filter(Boolean).slice(0, 50);
+	} catch (error) {
+		console.error(chalk.red("Could not determine changed files."));
+		return [];
+	}
 };
+//#endregion
+export { getChangedFiles };

package/dist/services/git/getCommitsSinceBaseBranch.js

@@ -1,59 +1,31 @@
 import chalk from "chalk";
 import { execSync } from "child_process";
-export const getCommitsSinceBaseBranch = (baseBranch) => {
-    try {
-        // Try first with origin/baseBranch
-        try {
-            const mergeBase = execSync(`git merge-base HEAD origin/${baseBranch}`)
-                .toString()
-                .trim();
-            const commitMessages = execSync(`git log --pretty=format:"%s" ${mergeBase}..HEAD`)
-                .toString()
-                .trim();
-            if (commitMessages) {
-                return commitMessages.split("\n").filter(Boolean);
-            }
-        }
-        catch (error) {
-            // If origin/baseBranch doesn't exist, try with just baseBranch
-            console.log(chalk.yellow(`No origin/${baseBranch} found, trying with local ${baseBranch} branch...`));
-        }
-        // Try with local branch
-        try {
-            const mergeBase = execSync(`git merge-base HEAD ${baseBranch}`)
-                .toString()
-                .trim();
-            const commitMessages = execSync(`git log --pretty=format:"%s" ${mergeBase}..HEAD`)
-                .toString()
-                .trim();
-            if (commitMessages) {
-                return commitMessages.split("\n").filter(Boolean);
-            }
-        }
-        catch (error) {
-            // If that fails too, fallback to simple branch comparison
-            console.log(chalk.yellow(`Merge base with ${baseBranch} not found, comparing branches directly...`));
-        }
-        // Direct branch comparison
-        try {
-            const commitMessages = execSync(`git log --pretty=format:"%s" ${baseBranch}..HEAD`)
-                .toString()
-                .trim();
-            if (commitMessages) {
-                return commitMessages.split("\n").filter(Boolean);
-            }
-        }
-        catch (error) {
-            console.log(chalk.yellow(`Could not compare with ${baseBranch}, using recent commits...`));
-        }
-        // Last resort: get most recent commits
-        const commitMessages = execSync('git log --pretty=format:"%s" -n 10')
-            .toString()
-            .trim();
-        return commitMessages.split("\n").filter(Boolean);
-    }
-    catch (error) {
-        console.error(chalk.yellow("Could not get commits. Using empty list."));
-        return [];
-    }
+//#region src/services/git/getCommitsSinceBaseBranch.ts
+var getCommitsSinceBaseBranch = (baseBranch) => {
+	try {
+		try {
+			const commitMessages = execSync(`git log --pretty=format:"%s" ${execSync(`git merge-base HEAD origin/${baseBranch}`).toString().trim()}..HEAD`).toString().trim();
+			if (commitMessages) return commitMessages.split("\n").filter(Boolean);
+		} catch (error) {
+			console.log(chalk.yellow(`No origin/${baseBranch} found, trying with local ${baseBranch} branch...`));
+		}
+		try {
+			const commitMessages = execSync(`git log --pretty=format:"%s" ${execSync(`git merge-base HEAD ${baseBranch}`).toString().trim()}..HEAD`).toString().trim();
+			if (commitMessages) return commitMessages.split("\n").filter(Boolean);
+		} catch (error) {
+			console.log(chalk.yellow(`Merge base with ${baseBranch} not found, comparing branches directly...`));
+		}
+		try {
+			const commitMessages = execSync(`git log --pretty=format:"%s" ${baseBranch}..HEAD`).toString().trim();
+			if (commitMessages) return commitMessages.split("\n").filter(Boolean);
+		} catch (error) {
+			console.log(chalk.yellow(`Could not compare with ${baseBranch}, using recent commits...`));
+		}
+		return execSync("git log --pretty=format:\"%s\" -n 10").toString().trim().split("\n").filter(Boolean);
+	} catch (error) {
+		console.error(chalk.yellow("Could not get commits. Using empty list."));
+		return [];
+	}
 };
+//#endregion
+export { getCommitsSinceBaseBranch };

package/dist/services/git/getCurrentBranch.js

@@ -1,11 +1,13 @@
 import chalk from "chalk";
 import { execSync } from "child_process";
-export const getCurrentBranch = () => {
-    try {
-        return execSync("git rev-parse --abbrev-ref HEAD").toString().trim();
-    }
-    catch (error) {
-        console.error(chalk.red("Error getting current branch:"), error);
-        throw new Error("Failed to get current branch");
-    }
+//#region src/services/git/getCurrentBranch.ts
+var getCurrentBranch = () => {
+	try {
+		return execSync("git rev-parse --abbrev-ref HEAD").toString().trim();
+	} catch (error) {
+		console.error(chalk.red("Error getting current branch:"), error);
+		throw new Error("Failed to get current branch");
+	}
 };
+//#endregion
+export { getCurrentBranch };

package/dist/services/git/getDefaultBranch.js

@@ -1,63 +1,38 @@
 import chalk from "chalk";
 import { execSync } from "child_process";
-export const getDefaultBranch = () => {
-    try {
-        // First check for a default branch set in git config
-        try {
-            const defaultBranch = execSync("git config init.defaultBranch")
-                .toString()
-                .trim();
-            if (defaultBranch) {
-                return defaultBranch;
-            }
-        }
-        catch (error) {
-            // Continue if git config doesn't have default branch
-        }
-        // Next, check if GitHub CLI can tell us the default branch
-        try {
-            const repoInfo = execSync("gh repo view --json defaultBranchRef --jq .defaultBranchRef.name")
-                .toString()
-                .trim();
-            if (repoInfo) {
-                return repoInfo;
-            }
-        }
-        catch (error) {
-            // Continue if gh command fails
-        }
-        // Try to find default branch in remote branches list
-        const branches = execSync("git branch -r").toString().trim().split("\n");
-        // Common default branch names, in order of likelihood
-        const mainPatterns = [
-            /origin\/main$/,
-            /origin\/master$/,
-            /origin\/develop$/,
-            /origin\/dev$/,
-            /origin\/trunk$/,
-        ];
-        // Try each pattern in order
-        for (const pattern of mainPatterns) {
-            const defaultBranch = branches.find((b) => pattern.test(b.trim()));
-            if (defaultBranch) {
-                return defaultBranch.trim().replace(/^origin\//, "");
-            }
-        }
-        // Check for a branch that has 'HEAD -> origin/' in it, indicating the default branch
-        const headBranch = branches.find((b) => b.includes("HEAD -> origin/"));
-        if (headBranch) {
-            const match = headBranch.match(/HEAD -> origin\/([^,\s]+)/);
-            if (match && match[1]) {
-                return match[1];
-            }
-        }
-        // Fallback to 'main' as most GitHub repos use this now
-        console.log(chalk.yellow('Could not determine default branch, using "main"'));
-        return "main";
-    }
-    catch (error) {
-        // If we can't determine, default to main
-        console.log(chalk.yellow('Error detecting default branch, using "main"'));
-        return "main";
-    }
+//#region src/services/git/getDefaultBranch.ts
+var getDefaultBranch = () => {
+	try {
+		try {
+			const defaultBranch = execSync("git config init.defaultBranch").toString().trim();
+			if (defaultBranch) return defaultBranch;
+		} catch (error) {}
+		try {
+			const repoInfo = execSync("gh repo view --json defaultBranchRef --jq .defaultBranchRef.name").toString().trim();
+			if (repoInfo) return repoInfo;
+		} catch (error) {}
+		const branches = execSync("git branch -r").toString().trim().split("\n");
+		for (const pattern of [
+			/origin\/main$/,
+			/origin\/master$/,
+			/origin\/develop$/,
+			/origin\/dev$/,
+			/origin\/trunk$/
+		]) {
+			const defaultBranch = branches.find((b) => pattern.test(b.trim()));
+			if (defaultBranch) return defaultBranch.trim().replace(/^origin\//, "");
+		}
+		const headBranch = branches.find((b) => b.includes("HEAD -> origin/"));
+		if (headBranch) {
+			const match = headBranch.match(/HEAD -> origin\/([^,\s]+)/);
+			if (match && match[1]) return match[1];
+		}
+		console.log(chalk.yellow("Could not determine default branch, using \"main\""));
+		return "main";
+	} catch (error) {
+		console.log(chalk.yellow("Error detecting default branch, using \"main\""));
+		return "main";
+	}
 };
+//#endregion
+export { getDefaultBranch };

package/dist/services/git/getStagedChanges.js

@@ -1,11 +1,13 @@
 import chalk from "chalk";
 import { execSync } from "child_process";
-export const getStagedChanges = () => {
-    try {
-        return execSync("git diff --staged").toString();
-    }
-    catch (error) {
-        console.error(chalk.red("Error getting staged changes:"), error);
-        throw new Error("Failed to get staged changes");
-    }
+//#region src/services/git/getStagedChanges.ts
+var getStagedChanges = () => {
+	try {
+		return execSync("git diff --staged --function-context").toString();
+	} catch (error) {
+		console.error(chalk.red("Error getting staged changes:"), error);
+		throw new Error("Failed to get staged changes");
+	}
 };
+//#endregion
+export { getStagedChanges };

package/dist/services/git/getStagedFiles.js

@@ -1,12 +1,13 @@
 import chalk from "chalk";
 import { execSync } from "child_process";
-export const getStagedFiles = () => {
-    try {
-        const result = execSync("git diff --staged --name-only").toString();
-        return result.split("\n").filter(Boolean);
-    }
-    catch (error) {
-        console.error(chalk.red("Error getting staged files:"), error);
-        throw new Error("Failed to get staged files");
-    }
+//#region src/services/git/getStagedFiles.ts
+var getStagedFiles = () => {
+	try {
+		return execSync("git diff --staged --name-only").toString().split("\n").filter(Boolean);
+	} catch (error) {
+		console.error(chalk.red("Error getting staged files:"), error);
+		throw new Error("Failed to get staged files");
+	}
 };
+//#endregion
+export { getStagedFiles };

package/dist/services/git/hasStagedChanges.js

@@ -1,10 +1,11 @@
 import { execSync } from "child_process";
-export const hasStagedChanges = () => {
-    try {
-        const output = execSync('git diff --staged --quiet || echo "has-changes"').toString();
-        return output.includes("has-changes");
-    }
-    catch (error) {
-        return true; // Assume there are changes if we can't check
-    }
+//#region src/services/git/hasStagedChanges.ts
+var hasStagedChanges = () => {
+	try {
+		return execSync("git diff --staged --quiet || echo \"has-changes\"").toString().includes("has-changes");
+	} catch (error) {
+		return true;
+	}
 };
+//#endregion
+export { hasStagedChanges };

package/dist/services/git/index.js

@@ -1,6 +1,7 @@
 import { executeGitAdd } from "./executeGitAdd.js";
 import { executeGitCommit } from "./executeGitCommit.js";
 import { getChangedFiles } from "./getChangedFiles.js";
+import { getAmendChanges } from "./getAmendChanges.js";
 import { getCommitsSinceBaseBranch } from "./getCommitsSinceBaseBranch.js";
 import { getCurrentBranch } from "./getCurrentBranch.js";
 import { getDefaultBranch } from "./getDefaultBranch.js";
@@ -9,16 +10,20 @@ import { getStagedFiles } from "./getStagedFiles.js";
 import { hasStagedChanges } from "./hasStagedChanges.js";
 import { isAvailable } from "./isAvailable.js";
 import { isGitRepository } from "./isGitRepository.js";
-export const git = {
-    add: executeGitAdd,
-    commit: executeGitCommit,
-    getChangedFiles,
-    getCommitsSinceBaseBranch,
-    getCurrentBranch,
-    getDefaultBranch,
-    hasStagedChanges,
-    getStagedChanges,
-    getStagedFiles,
-    isAvailable,
-    isGitRepository,
+//#region src/services/git/index.ts
+var git = {
+	add: executeGitAdd,
+	commit: executeGitCommit,
+	getAmendChanges,
+	getChangedFiles,
+	getCommitsSinceBaseBranch,
+	getCurrentBranch,
+	getDefaultBranch,
+	hasStagedChanges,
+	getStagedChanges,
+	getStagedFiles,
+	isAvailable,
+	isGitRepository
 };
+//#endregion
+export { git };