package-versioner 0.6.2 → 0.6.4

package/dist/index.cjs

@@ -359,8 +359,12 @@ function formatVersionPrefix(versionPrefix, scope) {
   }
   return cleanPrefix;
 }
-function formatCommitMessage(template, version, scope) {
-  return createTemplateString(template, { version, scope });
+function formatCommitMessage(template, version, packageName, scope) {
+  return createTemplateString(template, {
+    version,
+    scope,
+    packageName: packageName || ""
+  });
 }
 function createTemplateString(template, variables) {
   return Object.entries(variables).reduce((result, [key, value]) => {
@@ -710,14 +714,14 @@ async function calculateVersion(config, options) {
       }
       const cleanedTag = import_semver2.default.clean(latestTag) || latestTag;
       const currentVersion = import_semver2.default.clean(cleanedTag.replace(new RegExp(`^${escapedTagPattern}`), "")) || "0.0.0";
-      if (STANDARD_BUMP_TYPES.includes(specifiedType) && import_semver2.default.prerelease(currentVersion)) {
+      if (STANDARD_BUMP_TYPES.includes(specifiedType) && (import_semver2.default.prerelease(currentVersion) || normalizedPrereleaseId)) {
         log(
-          `Cleaning prerelease identifier from ${currentVersion} for ${specifiedType} bump`,
+          normalizedPrereleaseId ? `Creating prerelease version with identifier '${normalizedPrereleaseId}' using ${specifiedType}` : `Cleaning prerelease identifier from ${currentVersion} for ${specifiedType} bump`,
           "debug"
         );
         return bumpVersion(currentVersion, specifiedType, normalizedPrereleaseId);
       }
-      return import_semver2.default.inc(currentVersion, specifiedType, normalizedPrereleaseId) || "";
+      return bumpVersion(currentVersion, specifiedType, normalizedPrereleaseId);
     }
     if (branchPattern && branchPattern.length > 0) {
       const currentBranch = getCurrentBranch();
@@ -751,7 +755,7 @@ async function calculateVersion(config, options) {
         const cleanedTag = import_semver2.default.clean(latestTag) || latestTag;
         const currentVersion = import_semver2.default.clean(cleanedTag.replace(new RegExp(`^${escapedTagPattern}`), "")) || "0.0.0";
         log(`Applying ${branchVersionType} bump based on branch pattern`, "debug");
-        return import_semver2.default.inc(currentVersion, branchVersionType, void 0) || "";
+        return bumpVersion(currentVersion, branchVersionType, normalizedPrereleaseId);
       }
     }
     try {
@@ -788,7 +792,7 @@ async function calculateVersion(config, options) {
         return "";
       }
       const currentVersion = import_semver2.default.clean(latestTag.replace(new RegExp(`^${escapedTagPattern}`), "")) || "0.0.0";
-      return import_semver2.default.inc(currentVersion, releaseTypeFromCommits, normalizedPrereleaseId) || "";
+      return bumpVersion(currentVersion, releaseTypeFromCommits, normalizedPrereleaseId);
     } catch (error) {
       log(`Failed to calculate version for ${name || "project"}`, "error");
       console.error(error);
@@ -832,11 +836,15 @@ function calculateNextVersion(version, manifestType, name, releaseType, prerelea
     `No tags found for ${name || "package"}, using ${manifestType} version: ${version} as base`,
     "info"
   );
-  if (STANDARD_BUMP_TYPES.includes(releaseType) && import_semver2.default.prerelease(version)) {
-    log(`Cleaning prerelease identifier from ${version} for ${releaseType} bump`, "debug");
+  if (STANDARD_BUMP_TYPES.includes(releaseType) && (import_semver2.default.prerelease(version) || prereleaseIdentifier)) {
+    log(
+      prereleaseIdentifier ? `Creating prerelease version with identifier '${prereleaseIdentifier}' using ${releaseType}` : `Cleaning prerelease identifier from ${version} for ${releaseType} bump`,
+      "debug"
+    );
     return bumpVersion(version, releaseType, prereleaseIdentifier);
   }
-  return import_semver2.default.inc(version, releaseType, prereleaseIdentifier) || initialVersion;
+  const result = bumpVersion(version, releaseType, prereleaseIdentifier);
+  return result || initialVersion;
 }
 
 // src/package/packageProcessor.ts
@@ -1003,8 +1011,10 @@ var PackageProcessor = class {
     const packageNames = updatedPackagesInfo.map((p) => p.name).join(", ");
     const representativeVersion = ((_a = updatedPackagesInfo[0]) == null ? void 0 : _a.version) || "multiple";
     let commitMessage = this.commitMessageTemplate || "chore(release): publish packages";
-    if (updatedPackagesInfo.length === 1 && commitMessage.includes("${version}")) {
-      commitMessage = formatCommitMessage(commitMessage, representativeVersion);
+    const placeholderRegex = /\$\{[^}]+\}/;
+    if (updatedPackagesInfo.length === 1 && placeholderRegex.test(commitMessage)) {
+      const packageName = updatedPackagesInfo[0].name;
+      commitMessage = formatCommitMessage(commitMessage, representativeVersion, packageName);
     } else {
       commitMessage = `chore(release): ${packageNames} ${representativeVersion}`;
     }
@@ -1172,7 +1182,7 @@ function createSingleStrategy(config) {
         tagTemplate,
         packageTagTemplate
       );
-      const formattedCommitMessage = formatCommitMessage(commitMessage, nextVersion);
+      const formattedCommitMessage = formatCommitMessage(commitMessage, nextVersion, packageName);
       await createGitCommitAndTag(
         [packageJsonPath],
         nextTag,

package/dist/index.js

@@ -326,8 +326,12 @@ function formatVersionPrefix(versionPrefix, scope) {
   }
   return cleanPrefix;
 }
-function formatCommitMessage(template, version, scope) {
-  return createTemplateString(template, { version, scope });
+function formatCommitMessage(template, version, packageName, scope) {
+  return createTemplateString(template, {
+    version,
+    scope,
+    packageName: packageName || ""
+  });
 }
 function createTemplateString(template, variables) {
   return Object.entries(variables).reduce((result, [key, value]) => {
@@ -675,14 +679,14 @@ async function calculateVersion(config, options) {
       }
       const cleanedTag = semver2.clean(latestTag) || latestTag;
       const currentVersion = semver2.clean(cleanedTag.replace(new RegExp(`^${escapedTagPattern}`), "")) || "0.0.0";
-      if (STANDARD_BUMP_TYPES.includes(specifiedType) && semver2.prerelease(currentVersion)) {
+      if (STANDARD_BUMP_TYPES.includes(specifiedType) && (semver2.prerelease(currentVersion) || normalizedPrereleaseId)) {
         log(
-          `Cleaning prerelease identifier from ${currentVersion} for ${specifiedType} bump`,
+          normalizedPrereleaseId ? `Creating prerelease version with identifier '${normalizedPrereleaseId}' using ${specifiedType}` : `Cleaning prerelease identifier from ${currentVersion} for ${specifiedType} bump`,
           "debug"
         );
         return bumpVersion(currentVersion, specifiedType, normalizedPrereleaseId);
       }
-      return semver2.inc(currentVersion, specifiedType, normalizedPrereleaseId) || "";
+      return bumpVersion(currentVersion, specifiedType, normalizedPrereleaseId);
     }
     if (branchPattern && branchPattern.length > 0) {
       const currentBranch = getCurrentBranch();
@@ -716,7 +720,7 @@ async function calculateVersion(config, options) {
         const cleanedTag = semver2.clean(latestTag) || latestTag;
         const currentVersion = semver2.clean(cleanedTag.replace(new RegExp(`^${escapedTagPattern}`), "")) || "0.0.0";
         log(`Applying ${branchVersionType} bump based on branch pattern`, "debug");
-        return semver2.inc(currentVersion, branchVersionType, void 0) || "";
+        return bumpVersion(currentVersion, branchVersionType, normalizedPrereleaseId);
       }
     }
     try {
@@ -753,7 +757,7 @@ async function calculateVersion(config, options) {
         return "";
       }
       const currentVersion = semver2.clean(latestTag.replace(new RegExp(`^${escapedTagPattern}`), "")) || "0.0.0";
-      return semver2.inc(currentVersion, releaseTypeFromCommits, normalizedPrereleaseId) || "";
+      return bumpVersion(currentVersion, releaseTypeFromCommits, normalizedPrereleaseId);
     } catch (error) {
       log(`Failed to calculate version for ${name || "project"}`, "error");
       console.error(error);
@@ -797,11 +801,15 @@ function calculateNextVersion(version, manifestType, name, releaseType, prerelea
     `No tags found for ${name || "package"}, using ${manifestType} version: ${version} as base`,
     "info"
   );
-  if (STANDARD_BUMP_TYPES.includes(releaseType) && semver2.prerelease(version)) {
-    log(`Cleaning prerelease identifier from ${version} for ${releaseType} bump`, "debug");
+  if (STANDARD_BUMP_TYPES.includes(releaseType) && (semver2.prerelease(version) || prereleaseIdentifier)) {
+    log(
+      prereleaseIdentifier ? `Creating prerelease version with identifier '${prereleaseIdentifier}' using ${releaseType}` : `Cleaning prerelease identifier from ${version} for ${releaseType} bump`,
+      "debug"
+    );
     return bumpVersion(version, releaseType, prereleaseIdentifier);
   }
-  return semver2.inc(version, releaseType, prereleaseIdentifier) || initialVersion;
+  const result = bumpVersion(version, releaseType, prereleaseIdentifier);
+  return result || initialVersion;
 }
 
 // src/package/packageProcessor.ts
@@ -968,8 +976,10 @@ var PackageProcessor = class {
     const packageNames = updatedPackagesInfo.map((p) => p.name).join(", ");
     const representativeVersion = ((_a = updatedPackagesInfo[0]) == null ? void 0 : _a.version) || "multiple";
     let commitMessage = this.commitMessageTemplate || "chore(release): publish packages";
-    if (updatedPackagesInfo.length === 1 && commitMessage.includes("${version}")) {
-      commitMessage = formatCommitMessage(commitMessage, representativeVersion);
+    const placeholderRegex = /\$\{[^}]+\}/;
+    if (updatedPackagesInfo.length === 1 && placeholderRegex.test(commitMessage)) {
+      const packageName = updatedPackagesInfo[0].name;
+      commitMessage = formatCommitMessage(commitMessage, representativeVersion, packageName);
     } else {
       commitMessage = `chore(release): ${packageNames} ${representativeVersion}`;
     }
@@ -1137,7 +1147,7 @@ function createSingleStrategy(config) {
         tagTemplate,
         packageTagTemplate
       );
-      const formattedCommitMessage = formatCommitMessage(commitMessage, nextVersion);
+      const formattedCommitMessage = formatCommitMessage(commitMessage, nextVersion, packageName);
       await createGitCommitAndTag(
         [packageJsonPath],
         nextTag,

package/package-versioner.schema.json

@@ -84,7 +84,7 @@
       "type": "string",
       "minLength": 1,
       "default": "chore(release): v${version}",
-      "description": "Template for commit messages"
+      "description": "Template for commit messages. Available variables: ${version}, ${packageName}, ${scope}"
     },
     "prereleaseIdentifier": {
       "type": "string",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "package-versioner",
   "description": "A lightweight yet powerful CLI tool for automated semantic versioning based on Git history and conventional commits.",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",