|
|
|
|
@@ -91,118 +91,47 @@ function calculateNewVersion(currentVersion: string, versionType: VersionType):
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Bumps the version in deno.json, commits the change, and creates a tag
|
|
|
|
|
* @param versionType Type of version bump
|
|
|
|
|
* @returns The new version string
|
|
|
|
|
* Reads the current version from package.json or deno.json
|
|
|
|
|
* @param projectType The project type to determine which file to read
|
|
|
|
|
* @returns The current version string
|
|
|
|
|
*/
|
|
|
|
|
export async function bumpDenoVersion(versionType: VersionType): Promise<string> {
|
|
|
|
|
const denoJsonPath = plugins.path.join(paths.cwd, 'deno.json');
|
|
|
|
|
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
|
|
|
executor: 'bash',
|
|
|
|
|
sourceFilePaths: [],
|
|
|
|
|
});
|
|
|
|
|
function readCurrentVersion(projectType: ProjectType): string {
|
|
|
|
|
if (projectType === 'npm' || projectType === 'both') {
|
|
|
|
|
const packageJsonPath = plugins.path.join(paths.cwd, 'package.json');
|
|
|
|
|
const packageJson = plugins.smartfile.fs.toObjectSync(packageJsonPath) as { version?: string };
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
// Read deno.json
|
|
|
|
|
const denoConfig = plugins.smartfile.fs.toObjectSync(
|
|
|
|
|
denoJsonPath
|
|
|
|
|
) as { version?: string };
|
|
|
|
|
if (!packageJson.version) {
|
|
|
|
|
throw new Error('package.json does not contain a version field');
|
|
|
|
|
}
|
|
|
|
|
return packageJson.version;
|
|
|
|
|
} else {
|
|
|
|
|
const denoJsonPath = plugins.path.join(paths.cwd, 'deno.json');
|
|
|
|
|
const denoConfig = plugins.smartfile.fs.toObjectSync(denoJsonPath) as { version?: string };
|
|
|
|
|
|
|
|
|
|
if (!denoConfig.version) {
|
|
|
|
|
throw new Error('deno.json does not contain a version field');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const currentVersion = denoConfig.version;
|
|
|
|
|
const newVersion = calculateNewVersion(currentVersion, versionType);
|
|
|
|
|
|
|
|
|
|
logger.log('info', `Bumping deno.json version: ${currentVersion} → ${newVersion}`);
|
|
|
|
|
|
|
|
|
|
// Update version
|
|
|
|
|
denoConfig.version = newVersion;
|
|
|
|
|
|
|
|
|
|
// Write back to disk
|
|
|
|
|
await plugins.smartfile.memory.toFs(
|
|
|
|
|
JSON.stringify(denoConfig, null, 2) + '\n',
|
|
|
|
|
denoJsonPath
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Stage the deno.json file
|
|
|
|
|
await smartshellInstance.exec('git add deno.json');
|
|
|
|
|
|
|
|
|
|
// Commit the version bump
|
|
|
|
|
await smartshellInstance.exec(`git commit -m "v${newVersion}"`);
|
|
|
|
|
|
|
|
|
|
// Create the version tag
|
|
|
|
|
await smartshellInstance.exec(`git tag v${newVersion} -m "v${newVersion}"`);
|
|
|
|
|
|
|
|
|
|
logger.log('info', `Created commit and tag v${newVersion}`);
|
|
|
|
|
|
|
|
|
|
return newVersion;
|
|
|
|
|
} catch (error) {
|
|
|
|
|
throw new Error(`Failed to bump deno.json version: ${error.message}`);
|
|
|
|
|
return denoConfig.version;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Bumps the version in package.json using npm version command
|
|
|
|
|
* @param versionType Type of version bump
|
|
|
|
|
* @returns The new version string
|
|
|
|
|
* Updates the version field in a JSON file (package.json or deno.json)
|
|
|
|
|
* @param filePath Path to the JSON file
|
|
|
|
|
* @param newVersion The new version to write
|
|
|
|
|
*/
|
|
|
|
|
async function bumpNpmVersion(versionType: VersionType): Promise<string> {
|
|
|
|
|
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
|
|
|
executor: 'bash',
|
|
|
|
|
sourceFilePaths: [],
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
logger.log('info', `Bumping package.json version using npm version ${versionType}`);
|
|
|
|
|
const result = await smartshellInstance.exec(`npm version ${versionType}`);
|
|
|
|
|
|
|
|
|
|
// npm version returns the new version with a 'v' prefix, e.g., "v1.2.3"
|
|
|
|
|
const newVersion = result.stdout.trim().replace(/^v/, '');
|
|
|
|
|
return newVersion;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Syncs the version from package.json to deno.json and amends the npm commit
|
|
|
|
|
* @param version The version to sync
|
|
|
|
|
*/
|
|
|
|
|
async function syncVersionToDenoJson(version: string): Promise<void> {
|
|
|
|
|
const denoJsonPath = plugins.path.join(paths.cwd, 'deno.json');
|
|
|
|
|
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
|
|
|
executor: 'bash',
|
|
|
|
|
sourceFilePaths: [],
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
const denoConfig = plugins.smartfile.fs.toObjectSync(
|
|
|
|
|
denoJsonPath
|
|
|
|
|
) as { version?: string };
|
|
|
|
|
|
|
|
|
|
logger.log('info', `Syncing version to deno.json: ${version}`);
|
|
|
|
|
denoConfig.version = version;
|
|
|
|
|
|
|
|
|
|
async function updateVersionFile(filePath: string, newVersion: string): Promise<void> {
|
|
|
|
|
const config = plugins.smartfile.fs.toObjectSync(filePath) as { version?: string };
|
|
|
|
|
config.version = newVersion;
|
|
|
|
|
await plugins.smartfile.memory.toFs(
|
|
|
|
|
JSON.stringify(denoConfig, null, 2) + '\n',
|
|
|
|
|
denoJsonPath
|
|
|
|
|
JSON.stringify(config, null, 2) + '\n',
|
|
|
|
|
filePath
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Stage the deno.json file
|
|
|
|
|
await smartshellInstance.exec('git add deno.json');
|
|
|
|
|
|
|
|
|
|
// Amend the npm version commit to include deno.json
|
|
|
|
|
await smartshellInstance.exec('git commit --amend --no-edit');
|
|
|
|
|
|
|
|
|
|
// Re-create the tag with force to update it
|
|
|
|
|
await smartshellInstance.exec(`git tag -fa v${version} -m "v${version}"`);
|
|
|
|
|
|
|
|
|
|
logger.log('info', `Amended commit to include deno.json and updated tag v${version}`);
|
|
|
|
|
} catch (error) {
|
|
|
|
|
throw new Error(`Failed to sync version to deno.json: ${error.message}`);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Bumps the project version based on project type
|
|
|
|
|
* Handles npm-only, deno-only, and dual projects with unified logic
|
|
|
|
|
* @param projectType The detected project type
|
|
|
|
|
* @param versionType The type of version bump
|
|
|
|
|
* @param currentStep The current step number for progress display
|
|
|
|
|
@@ -215,6 +144,10 @@ export async function bumpProjectVersion(
|
|
|
|
|
currentStep?: number,
|
|
|
|
|
totalSteps?: number
|
|
|
|
|
): Promise<string> {
|
|
|
|
|
if (projectType === 'none') {
|
|
|
|
|
throw new Error('Cannot bump version: no package.json or deno.json found');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const projectEmoji = projectType === 'npm' ? '📦' : projectType === 'deno' ? '🦕' : '🔀';
|
|
|
|
|
const description = `🏷️ Bumping version (${projectEmoji} ${projectType})`;
|
|
|
|
|
|
|
|
|
|
@@ -222,35 +155,52 @@ export async function bumpProjectVersion(
|
|
|
|
|
ui.printStep(currentStep, totalSteps, description, 'in-progress');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let newVersion: string;
|
|
|
|
|
const smartshellInstance = new plugins.smartshell.Smartshell({
|
|
|
|
|
executor: 'bash',
|
|
|
|
|
sourceFilePaths: [],
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
switch (projectType) {
|
|
|
|
|
case 'npm':
|
|
|
|
|
newVersion = await bumpNpmVersion(versionType);
|
|
|
|
|
break;
|
|
|
|
|
try {
|
|
|
|
|
// 1. Read current version
|
|
|
|
|
const currentVersion = readCurrentVersion(projectType);
|
|
|
|
|
|
|
|
|
|
case 'deno':
|
|
|
|
|
newVersion = await bumpDenoVersion(versionType);
|
|
|
|
|
break;
|
|
|
|
|
// 2. Calculate new version (reuse existing function!)
|
|
|
|
|
const newVersion = calculateNewVersion(currentVersion, versionType);
|
|
|
|
|
|
|
|
|
|
case 'both': {
|
|
|
|
|
// Bump npm version first (it handles git tags)
|
|
|
|
|
newVersion = await bumpNpmVersion(versionType);
|
|
|
|
|
// Then sync to deno.json
|
|
|
|
|
await syncVersionToDenoJson(newVersion);
|
|
|
|
|
break;
|
|
|
|
|
logger.log('info', `Bumping version: ${currentVersion} → ${newVersion}`);
|
|
|
|
|
|
|
|
|
|
// 3. Determine which files to update
|
|
|
|
|
const filesToUpdate: string[] = [];
|
|
|
|
|
const packageJsonPath = plugins.path.join(paths.cwd, 'package.json');
|
|
|
|
|
const denoJsonPath = plugins.path.join(paths.cwd, 'deno.json');
|
|
|
|
|
|
|
|
|
|
if (projectType === 'npm' || projectType === 'both') {
|
|
|
|
|
await updateVersionFile(packageJsonPath, newVersion);
|
|
|
|
|
filesToUpdate.push('package.json');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case 'none':
|
|
|
|
|
throw new Error('Cannot bump version: no package.json or deno.json found');
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
throw new Error(`Unknown project type: ${projectType}`);
|
|
|
|
|
if (projectType === 'deno' || projectType === 'both') {
|
|
|
|
|
await updateVersionFile(denoJsonPath, newVersion);
|
|
|
|
|
filesToUpdate.push('deno.json');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 4. Stage all updated files
|
|
|
|
|
await smartshellInstance.exec(`git add ${filesToUpdate.join(' ')}`);
|
|
|
|
|
|
|
|
|
|
// 5. Create version commit
|
|
|
|
|
await smartshellInstance.exec(`git commit -m "v${newVersion}"`);
|
|
|
|
|
|
|
|
|
|
// 6. Create version tag
|
|
|
|
|
await smartshellInstance.exec(`git tag v${newVersion} -m "v${newVersion}"`);
|
|
|
|
|
|
|
|
|
|
logger.log('info', `Created commit and tag v${newVersion}`);
|
|
|
|
|
|
|
|
|
|
if (currentStep && totalSteps) {
|
|
|
|
|
ui.printStep(currentStep, totalSteps, description, 'done');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return newVersion;
|
|
|
|
|
} catch (error) {
|
|
|
|
|
throw new Error(`Failed to bump project version: ${error.message}`);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|