@git.zone/cli
Version:
A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.
297 lines • 29 kB
JavaScript
// this file contains code to create commits in a consistent way
import * as plugins from './mod.plugins.js';
import * as paths from '../paths.js';
import { logger } from '../gitzone.logging.js';
import * as helpers from './mod.helpers.js';
import * as ui from './mod.ui.js';
import { ReleaseConfig } from '../mod_config/classes.releaseconfig.js';
export const run = async (argvArg) => {
// Read commit config from npmextra.json
const npmextraConfig = new plugins.npmextra.Npmextra();
const gitzoneConfig = npmextraConfig.dataFor('@git.zone/cli', {});
const commitConfig = gitzoneConfig.commit || {};
// Check flags and merge with config options
const wantsRelease = !!(argvArg.r || argvArg.release);
const wantsTest = !!(argvArg.t || argvArg.test || commitConfig.alwaysTest);
const wantsBuild = !!(argvArg.b || argvArg.build || commitConfig.alwaysBuild);
let releaseConfig = null;
if (wantsRelease) {
releaseConfig = await ReleaseConfig.fromCwd();
if (!releaseConfig.hasRegistries()) {
logger.log('error', 'No release registries configured.');
console.log('');
console.log(' Run `gitzone config add <registry-url>` to add registries.');
console.log('');
process.exit(1);
}
}
// Print execution plan at the start
ui.printExecutionPlan({
autoAccept: !!(argvArg.y || argvArg.yes),
push: !!(argvArg.p || argvArg.push),
test: wantsTest,
build: wantsBuild,
release: wantsRelease,
format: !!argvArg.format,
registries: releaseConfig?.getRegistries(),
});
if (argvArg.format) {
const formatMod = await import('../mod_format/index.js');
await formatMod.run();
}
// Run tests early to fail fast before analysis
if (wantsTest) {
ui.printHeader('🧪 Running tests...');
const smartshellForTest = new plugins.smartshell.Smartshell({
executor: 'bash',
sourceFilePaths: [],
});
const testResult = await smartshellForTest.exec('pnpm test');
if (testResult.exitCode !== 0) {
logger.log('error', 'Tests failed. Aborting commit.');
process.exit(1);
}
logger.log('success', 'All tests passed.');
}
ui.printHeader('🔍 Analyzing repository changes...');
const aidoc = new plugins.tsdoc.AiDoc();
await aidoc.start();
const nextCommitObject = await aidoc.buildNextCommitObject(paths.cwd);
await aidoc.stop();
ui.printRecommendation({
recommendedNextVersion: nextCommitObject.recommendedNextVersion,
recommendedNextVersionLevel: nextCommitObject.recommendedNextVersionLevel,
recommendedNextVersionScope: nextCommitObject.recommendedNextVersionScope,
recommendedNextVersionMessage: nextCommitObject.recommendedNextVersionMessage,
});
let answerBucket;
// Check if -y/--yes flag is set AND version is not a breaking change
// Breaking changes (major version bumps) always require manual confirmation
const isBreakingChange = nextCommitObject.recommendedNextVersionLevel === 'BREAKING CHANGE';
const canAutoAccept = (argvArg.y || argvArg.yes) && !isBreakingChange;
if (canAutoAccept) {
// Auto-mode: create AnswerBucket programmatically
logger.log('info', '✓ Auto-accepting AI recommendations (--yes flag)');
answerBucket = new plugins.smartinteract.AnswerBucket();
answerBucket.addAnswer({
name: 'commitType',
value: nextCommitObject.recommendedNextVersionLevel,
});
answerBucket.addAnswer({
name: 'commitScope',
value: nextCommitObject.recommendedNextVersionScope,
});
answerBucket.addAnswer({
name: 'commitDescription',
value: nextCommitObject.recommendedNextVersionMessage,
});
answerBucket.addAnswer({
name: 'pushToOrigin',
value: !!(argvArg.p || argvArg.push), // Only push if -p flag also provided
});
answerBucket.addAnswer({
name: 'createRelease',
value: wantsRelease,
});
}
else {
// Warn if --yes was provided but we're requiring confirmation due to breaking change
if (isBreakingChange && (argvArg.y || argvArg.yes)) {
logger.log('warn', '⚠️ BREAKING CHANGE detected - manual confirmation required');
}
// Interactive mode: prompt user for input
const commitInteract = new plugins.smartinteract.SmartInteract();
commitInteract.addQuestions([
{
type: 'list',
name: `commitType`,
message: `Choose TYPE of the commit:`,
choices: [`fix`, `feat`, `BREAKING CHANGE`],
default: nextCommitObject.recommendedNextVersionLevel,
},
{
type: 'input',
name: `commitScope`,
message: `What is the SCOPE of the commit:`,
default: nextCommitObject.recommendedNextVersionScope,
},
{
type: `input`,
name: `commitDescription`,
message: `What is the DESCRIPTION of the commit?`,
default: nextCommitObject.recommendedNextVersionMessage,
},
{
type: 'confirm',
name: `pushToOrigin`,
message: `Do you want to push this version now?`,
default: true,
},
{
type: 'confirm',
name: `createRelease`,
message: `Do you want to publish to npm registries?`,
default: wantsRelease,
},
]);
answerBucket = await commitInteract.runQueue();
}
const commitString = createCommitStringFromAnswerBucket(answerBucket);
const commitVersionType = (() => {
switch (answerBucket.getAnswerFor('commitType')) {
case 'fix':
return 'patch';
case 'feat':
return 'minor';
case 'BREAKING CHANGE':
return 'major';
}
})();
ui.printHeader('✨ Creating Semantic Commit');
ui.printCommitMessage(commitString);
const smartshellInstance = new plugins.smartshell.Smartshell({
executor: 'bash',
sourceFilePaths: [],
});
// Load release config if user wants to release (interactively selected)
if (answerBucket.getAnswerFor('createRelease') && !releaseConfig) {
releaseConfig = await ReleaseConfig.fromCwd();
if (!releaseConfig.hasRegistries()) {
logger.log('error', 'No release registries configured.');
console.log('');
console.log(' Run `gitzone config add <registry-url>` to add registries.');
console.log('');
process.exit(1);
}
}
// Determine total steps based on options
// Note: test runs early (like format) so not counted in numbered steps
const willPush = answerBucket.getAnswerFor('pushToOrigin') && !(process.env.CI === 'true');
const willRelease = answerBucket.getAnswerFor('createRelease') && releaseConfig?.hasRegistries();
let totalSteps = 5; // Base steps: commitinfo, changelog, staging, commit, version
if (wantsBuild)
totalSteps += 2; // build step + verification step
if (willPush)
totalSteps++;
if (willRelease)
totalSteps++;
let currentStep = 0;
// Step 1: Baking commitinfo
currentStep++;
ui.printStep(currentStep, totalSteps, '🔧 Baking commit info into code', 'in-progress');
const commitInfo = new plugins.commitinfo.CommitInfo(paths.cwd, commitVersionType);
await commitInfo.writeIntoPotentialDirs();
ui.printStep(currentStep, totalSteps, '🔧 Baking commit info into code', 'done');
// Step 2: Writing changelog
currentStep++;
ui.printStep(currentStep, totalSteps, '📄 Generating changelog.md', 'in-progress');
let changelog = nextCommitObject.changelog;
changelog = changelog.replaceAll('{{nextVersion}}', (await commitInfo.getNextPlannedVersion()).versionString);
changelog = changelog.replaceAll('{{nextVersionScope}}', `${await answerBucket.getAnswerFor('commitType')}(${await answerBucket.getAnswerFor('commitScope')})`);
changelog = changelog.replaceAll('{{nextVersionMessage}}', nextCommitObject.recommendedNextVersionMessage);
if (nextCommitObject.recommendedNextVersionDetails?.length > 0) {
changelog = changelog.replaceAll('{{nextVersionDetails}}', '- ' + nextCommitObject.recommendedNextVersionDetails.join('\n- '));
}
else {
changelog = changelog.replaceAll('\n{{nextVersionDetails}}', '');
}
await plugins.smartfs
.file(plugins.path.join(paths.cwd, `changelog.md`))
.encoding('utf8')
.write(changelog);
ui.printStep(currentStep, totalSteps, '📄 Generating changelog.md', 'done');
// Step 3: Staging files
currentStep++;
ui.printStep(currentStep, totalSteps, '📦 Staging files', 'in-progress');
await smartshellInstance.exec(`git add -A`);
ui.printStep(currentStep, totalSteps, '📦 Staging files', 'done');
// Step 4: Creating commit
currentStep++;
ui.printStep(currentStep, totalSteps, '💾 Creating git commit', 'in-progress');
await smartshellInstance.exec(`git commit -m "${commitString}"`);
ui.printStep(currentStep, totalSteps, '💾 Creating git commit', 'done');
// Step 5: Bumping version
currentStep++;
const projectType = await helpers.detectProjectType();
const newVersion = await helpers.bumpProjectVersion(projectType, commitVersionType, currentStep, totalSteps);
// Step 6: Run build (optional)
if (wantsBuild) {
currentStep++;
ui.printStep(currentStep, totalSteps, '🔨 Running build', 'in-progress');
const buildResult = await smartshellInstance.exec('pnpm build');
if (buildResult.exitCode !== 0) {
ui.printStep(currentStep, totalSteps, '🔨 Running build', 'error');
logger.log('error', 'Build failed. Aborting release.');
process.exit(1);
}
ui.printStep(currentStep, totalSteps, '🔨 Running build', 'done');
// Step 7: Verify no uncommitted changes
currentStep++;
ui.printStep(currentStep, totalSteps, '🔍 Verifying clean working tree', 'in-progress');
const statusResult = await smartshellInstance.exec('git status --porcelain');
if (statusResult.stdout.trim() !== '') {
ui.printStep(currentStep, totalSteps, '🔍 Verifying clean working tree', 'error');
logger.log('error', 'Build produced uncommitted changes. This usually means build output is not gitignored.');
logger.log('error', 'Uncommitted files:');
console.log(statusResult.stdout);
logger.log('error', 'Aborting release. Please ensure build artifacts are in .gitignore');
process.exit(1);
}
ui.printStep(currentStep, totalSteps, '🔍 Verifying clean working tree', 'done');
}
// Step: Push to remote (optional)
const currentBranch = await helpers.detectCurrentBranch();
if (willPush) {
currentStep++;
ui.printStep(currentStep, totalSteps, `🚀 Pushing to origin/${currentBranch}`, 'in-progress');
await smartshellInstance.exec(`git push origin ${currentBranch} --follow-tags`);
ui.printStep(currentStep, totalSteps, `🚀 Pushing to origin/${currentBranch}`, 'done');
}
// Step 7: Publish to npm registries (optional)
let releasedRegistries = [];
if (willRelease && releaseConfig) {
currentStep++;
const registries = releaseConfig.getRegistries();
ui.printStep(currentStep, totalSteps, `📦 Publishing to ${registries.length} registr${registries.length === 1 ? 'y' : 'ies'}`, 'in-progress');
const accessLevel = releaseConfig.getAccessLevel();
for (const registry of registries) {
try {
await smartshellInstance.exec(`npm publish --registry=${registry} --access=${accessLevel}`);
releasedRegistries.push(registry);
}
catch (error) {
logger.log('error', `Failed to publish to ${registry}: ${error}`);
}
}
if (releasedRegistries.length === registries.length) {
ui.printStep(currentStep, totalSteps, `📦 Publishing to ${registries.length} registr${registries.length === 1 ? 'y' : 'ies'}`, 'done');
}
else {
ui.printStep(currentStep, totalSteps, `📦 Publishing to ${registries.length} registr${registries.length === 1 ? 'y' : 'ies'}`, 'error');
}
}
console.log(''); // Add spacing before summary
// Get commit SHA for summary
const commitShaResult = await smartshellInstance.exec('git rev-parse --short HEAD');
const commitSha = commitShaResult.stdout.trim();
// Print final summary
ui.printSummary({
projectType,
branch: currentBranch,
commitType: answerBucket.getAnswerFor('commitType'),
commitScope: answerBucket.getAnswerFor('commitScope'),
commitMessage: answerBucket.getAnswerFor('commitDescription'),
newVersion: newVersion,
commitSha: commitSha,
pushed: willPush,
released: releasedRegistries.length > 0,
releasedRegistries: releasedRegistries.length > 0 ? releasedRegistries : undefined,
});
};
const createCommitStringFromAnswerBucket = (answerBucket) => {
const commitType = answerBucket.getAnswerFor('commitType');
const commitScope = answerBucket.getAnswerFor('commitScope');
const commitDescription = answerBucket.getAnswerFor('commitDescription');
return `${commitType}(${commitScope}): ${commitDescription}`;
};
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_commit/index.ts"],"names":[],"mappings":"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"}