Version 1.4.1

This commit is contained in:
2026-02-02 07:14:25 +01:00
parent 25d4668661
commit 85a67867c9
4 changed files with 115 additions and 69 deletions

View File

@@ -4,12 +4,43 @@ import { execSync } from 'node:child_process';
import fs from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import semver from 'semver';
function tagMatchesVersion(tag, version) {
if (!tag) {
return false;
}
if (tag === version) {
return true;
}
if (tag.startsWith('v')) {
return tag.slice(1) === version;
}
return false;
}
function hasMatchingTag(tagsOutput, version) {
return tagsOutput
.split('\n')
.map(tag => tag.trim())
.filter(Boolean)
.some(tag => tagMatchesVersion(tag, version));
}
function findMatchingTag(tagsOutput, version) {
return tagsOutput
.split('\n')
.map(tag => tag.trim())
.filter(Boolean)
.find(tag => tagMatchesVersion(tag, version)) || null;
}
function showUsage() {
console.log('Usage: node scripts/new-version.mjs <version> [--force] [-m|--message "commit message"]');
console.log(' node scripts/new-version.mjs --check <version>');
console.log('');
console.log('Creates a new version by tagging the current commit.');
console.log('Version must be valid semver (e.g., 1.2.3).');
console.log('');
console.log('Options:');
console.log(' --force Force version creation even with dirty repo or package.json mismatch');
@@ -24,7 +55,7 @@ function showUsage() {
}
function performCheck(targetVersion) {
console.log('🔍 Repository Analysis Report');
console.log('Repository Analysis Report');
console.log('============================');
try {
@@ -33,7 +64,7 @@ function performCheck(targetVersion) {
const pkg = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
const currentVersion = pkg.version;
console.log(`📦 Package.json version: ${currentVersion}`);
console.log(`Package.json version: ${currentVersion}`);
// Check repository status
let isRepoDirty = false;
@@ -43,71 +74,71 @@ function performCheck(targetVersion) {
isRepoDirty = status.trim() !== '';
dirtyFiles = status.trim();
} catch (error) {
console.log('⚠️ Cannot determine git status');
console.log('Warning: Cannot determine git status');
}
if (isRepoDirty) {
console.log('🔄 Repository status: DIRTY');
console.log('Repository status: DIRTY');
console.log(' Uncommitted changes:');
dirtyFiles.split('\n').forEach(line => {
if (line.trim()) console.log(` ${line}`);
});
} else {
console.log('Repository status: CLEAN');
console.log('Repository status: CLEAN');
}
// Check current commit info
try {
const currentCommit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();
const currentBranch = execSync('git rev-parse --abbrev-ref HEAD', { encoding: 'utf8' }).trim();
console.log(`🌟 Current commit: ${currentCommit.substring(0, 7)} (${currentBranch})`);
console.log(`Current commit: ${currentCommit.substring(0, 7)} (${currentBranch})`);
// Check if current commit is tagged
const tagsOnHead = execSync('git tag --points-at HEAD', { encoding: 'utf8' }).trim();
if (tagsOnHead) {
console.log(`🏷️ Current commit tags: ${tagsOnHead.split('\n').join(', ')}`);
console.log(`Current commit tags: ${tagsOnHead.split('\n').join(', ')}`);
} else {
console.log('🏷️ Current commit: No tags');
console.log('Current commit: No tags');
}
} catch (error) {
console.log('⚠️ Cannot determine commit info');
console.log('Warning: Cannot determine commit info');
}
// List recent tags
try {
const recentTags = execSync('git tag --sort=-version:refname | head -5', { encoding: 'utf8' }).trim();
if (recentTags) {
console.log('📋 Recent tags:');
console.log('Recent tags:');
recentTags.split('\n').forEach(tag => {
if (tag.trim()) console.log(` ${tag}`);
});
} else {
console.log('📋 No tags found in repository');
console.log('No tags found in repository');
}
} catch (error) {
console.log('⚠️ Cannot list tags');
console.log('Warning: Cannot list tags');
}
console.log('');
// Analysis for target version (if provided)
if (targetVersion) {
const tagName = `v${targetVersion}`;
console.log(`🎯 Analysis for version ${targetVersion}:`);
const tagName = targetVersion;
console.log(`Analysis for version ${targetVersion}:`);
console.log('=====================================');
// Check if target tag exists
try {
const existingTags = execSync('git tag -l', { encoding: 'utf8' });
const tagExists = existingTags.split('\n').includes(tagName);
const matchingTag = findMatchingTag(existingTags, targetVersion);
if (tagExists) {
console.log(` Tag '${tagName}' already exists - CANNOT CREATE`);
if (matchingTag) {
console.log(`Error: Tag '${matchingTag}' already exists - CANNOT CREATE`);
return;
}
console.log(`Tag '${tagName}' available`);
console.log(`Tag '${tagName}' available`);
} catch (error) {
console.log('⚠️ Cannot check tag availability');
console.log('Warning: Cannot check tag availability');
return;
}
@@ -116,20 +147,20 @@ function performCheck(targetVersion) {
const needsPackageUpdate = !packageJsonMatches;
const needsCommit = isRepoDirty || needsPackageUpdate;
console.log(`📝 Package.json: ${packageJsonMatches ? 'MATCHES' : `NEEDS UPDATE (${currentVersion} ${targetVersion})`}`);
console.log(`Package.json: ${packageJsonMatches ? 'MATCHES' : `NEEDS UPDATE (${currentVersion} -> ${targetVersion})`}`);
if (needsCommit) {
console.log('Actions needed:');
console.log('Actions needed:');
if (needsPackageUpdate) {
console.log(' Update package.json');
console.log(' - Update package.json');
}
if (isRepoDirty) {
console.log(' Stage uncommitted changes');
console.log(' - Stage uncommitted changes');
}
console.log(' Create commit');
console.log(` Create tag ${tagName}`);
console.log(' - Create commit');
console.log(` - Create tag ${tagName}`);
console.log('');
console.log('📋 Commands that would work:');
console.log('Commands that would work:');
if (isRepoDirty || needsPackageUpdate) {
console.log(` node scripts/new-version.mjs ${targetVersion} --force`);
} else {
@@ -137,25 +168,25 @@ function performCheck(targetVersion) {
console.log(` node scripts/new-version.mjs ${targetVersion} --force`);
}
} else {
console.log('Actions needed:');
console.log(` Create tag ${tagName} (no commit needed)`);
console.log('Actions needed:');
console.log(` - Create tag ${tagName} (no commit needed)`);
console.log('');
console.log('📋 Commands that would work:');
console.log('Commands that would work:');
console.log(` node scripts/new-version.mjs ${targetVersion}`);
console.log(` node scripts/new-version.mjs ${targetVersion} --force`);
}
console.log('');
console.log('🚦 Default mode requirements:');
console.log('Default mode requirements:');
if (isRepoDirty) {
console.log(' Repository must be clean (currently dirty)');
console.log(' Repository must be clean (currently dirty)');
} else {
console.log(' Repository is clean');
console.log(' Repository is clean');
}
if (!packageJsonMatches) {
console.log(` Package.json must match version (currently ${currentVersion})`);
console.log(` Package.json must match version (currently ${currentVersion})`);
} else {
console.log(' Package.json version matches');
console.log(' Package.json version matches');
}
} else {
@@ -165,7 +196,7 @@ function performCheck(targetVersion) {
}
} catch (error) {
console.error('Error during analysis:', error.message);
console.error('Error during analysis:', error.message);
process.exit(1);
}
}
@@ -202,28 +233,43 @@ function main() {
// For normal operation, version is required
newVersion = args.find(arg => !arg.startsWith('--') && arg !== '-m' && arg !== customMessage);
if (!newVersion) {
console.error('Error: Version argument required');
showUsage();
process.exit(1);
}
}
if (newVersion && newVersion.startsWith('v')) {
console.error('Error: Version must not start with "v". Use plain semver like 1.2.3.');
process.exit(1);
}
const normalizedVersion = newVersion;
if (!semver.valid(normalizedVersion)) {
console.error('Error: Version must be valid semver (e.g., 1.2.3)');
process.exit(1);
}
if (isCheck) {
performCheck(newVersion);
performCheck(normalizedVersion);
return;
}
const tagName = `v${newVersion}`;
const tagName = normalizedVersion;
console.log(`🏷️ Creating new version: ${newVersion}${isForce ? ' (forced)' : ''}`);
console.log(`Creating new version: ${normalizedVersion}${isForce ? ' (forced)' : ''}`);
try {
// 1. Check if tag already exists - Always ERROR
try {
const existingTags = execSync('git tag -l', { encoding: 'utf8' });
if (existingTags.split('\n').includes(tagName)) {
console.error(`❌ Error: Tag '${tagName}' already exists`);
const matchingTag = findMatchingTag(existingTags, normalizedVersion);
if (matchingTag) {
console.error(`Error: Tag '${matchingTag}' already exists`);
process.exit(1);
}
} catch (error) {
console.error('Error: Failed to check existing tags');
console.error('Error: Failed to check existing tags');
process.exit(1);
}
@@ -233,7 +279,7 @@ function main() {
const status = execSync('git status --porcelain', { encoding: 'utf8' });
isRepoDirty = status.trim() !== '';
} catch (error) {
console.error('Error: Failed to check git status');
console.error('Error: Failed to check git status');
process.exit(1);
}
@@ -241,7 +287,7 @@ function main() {
const packagePath = './package.json';
const pkg = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
const currentVersion = pkg.version;
const packageJsonMatches = currentVersion === newVersion;
const packageJsonMatches = currentVersion === normalizedVersion;
// 4. Determine what action is needed
const needsPackageUpdate = !packageJsonMatches;
@@ -250,12 +296,12 @@ function main() {
// 5. Check if force is required
if (!isForce) {
if (isRepoDirty) {
console.error('Error: Working directory has uncommitted changes');
console.error('Error: Working directory has uncommitted changes');
console.error('Please commit your changes first or use --force');
process.exit(1);
}
if (needsPackageUpdate) {
console.error(`Error: Package.json version is ${currentVersion}, requested ${newVersion}`);
console.error(`Error: Package.json version is ${currentVersion}, requested ${normalizedVersion}`);
console.error('Use --force to update package.json');
process.exit(1);
}
@@ -263,38 +309,38 @@ function main() {
// 6. Execute the versioning
if (needsCommit) {
console.log(`📦 Needs commit: ${needsPackageUpdate ? 'package.json update' : ''}${needsPackageUpdate && isRepoDirty ? ' + ' : ''}${isRepoDirty ? 'uncommitted changes' : ''}`);
console.log(`Needs commit: ${needsPackageUpdate ? 'package.json update' : ''}${needsPackageUpdate && isRepoDirty ? ' + ' : ''}${isRepoDirty ? 'uncommitted changes' : ''}`);
// Update package.json if needed
if (needsPackageUpdate) {
pkg.version = newVersion;
pkg.version = normalizedVersion;
fs.writeFileSync(packagePath, JSON.stringify(pkg, null, 2) + '\n');
console.log(`📝 Updated package.json: ${currentVersion} ${newVersion}`);
console.log(`Updated package.json: ${currentVersion} -> ${normalizedVersion}`);
}
// Stage all changes
execSync('git add .', { stdio: 'inherit' });
// Commit
const commitMessage = customMessage || (needsPackageUpdate ? `Version ${newVersion}` : `Prepare for version ${newVersion}`);
const commitMessage = customMessage || (needsPackageUpdate ? `Version ${normalizedVersion}` : `Prepare for version ${normalizedVersion}`);
execSync(`git commit -m "${commitMessage}"`, { stdio: 'inherit' });
console.log(`Committed changes`);
console.log('Committed changes');
} else {
console.log(`Repository clean, package.json matches - tagging current commit`);
console.log('Repository clean, package.json matches - tagging current commit');
}
// 7. Tag the commit
execSync(`git tag ${tagName}`, { stdio: 'inherit' });
console.log(`🏷️ Created tag: ${tagName}`);
console.log(`Created tag: ${tagName}`);
console.log('');
console.log('🎉 Version created successfully!');
console.log('Version created successfully!');
console.log('');
console.log('Next steps:');
console.log(` git push origin main --tags # Push the commit and tag`);
} catch (error) {
console.error('Error during version creation:', error.message);
console.error('Error during version creation:', error.message);
process.exit(1);
}
}