package-versioner 0.5.0 → 0.5.2

package/README.md

@@ -87,7 +87,7 @@ Customize behavior by creating a `version.config.json` file in your project root
   "versionPrefix": "v",
   "tagTemplate": "${prefix}${version}",
   "packageTagTemplate": "${packageName}@${prefix}${version}",
-  "commitMessage": "chore(release): {{currentTag}} [skip ci]",
+  "commitMessage": "chore(release): ${version}",
   "monorepo": {
     "synced": true,
     "skip": [
@@ -99,7 +99,10 @@ Customize behavior by creating a `version.config.json` file in your project root
 }
 ```
 
-**Note:** Options like `synced`, `packages`, and `updateInternalDependencies` enable monorepo-specific behaviours. The `tagTemplate` and `packageTagTemplate` allow you to customize how Git tags are formatted for releases.
+**Notes:** 
+- Options like `synced`, `packages`, and `updateInternalDependencies` enable monorepo-specific behaviours.
+- The `tagTemplate` and `packageTagTemplate` allow you to customize how Git tags are formatted for releases.
+- The `commitMessage` template can include CI skip tokens like `[skip ci]` if you want to prevent CI runs after version commits (e.g., `"commitMessage": "chore(release): ${version} [skip ci]"`). See [CI/CD Integration](./docs/CI_CD_INTEGRATION.md) for more details.
 
 ## How Versioning Works
 

package/dist/index.cjs

@@ -141,9 +141,6 @@ function printJsonOutput() {
 
 // src/utils/logging.ts
 function log(message, status = "info") {
-  if (isJsonOutputMode() && status !== "error") {
-    return;
-  }
   let chalkFn;
   switch (status) {
     case "success":
@@ -161,7 +158,18 @@ function log(message, status = "info") {
     default:
       chalkFn = import_chalk.default.blue;
   }
-  console.log(chalkFn(message));
+  if (isJsonOutputMode()) {
+    if (status === "error") {
+      chalkFn(message);
+      console.error(message);
+    }
+    return;
+  }
+  if (status === "error") {
+    console.error(chalkFn(message));
+  } else {
+    console.log(chalkFn(message));
+  }
 }
 
 // src/core/versionStrategies.ts
@@ -389,11 +397,12 @@ async function lastMergeBranchName(branches, baseBranch) {
 }
 async function getLatestTagForPackage(packageName, tagPrefix) {
   try {
-    const tags = await (0, import_git_semver_tags.getSemverTags)({
-      package: packageName,
+    const allTags = await (0, import_git_semver_tags.getSemverTags)({
       tagPrefix
     });
-    return tags[0] || "";
+    const packageTagPattern = tagPrefix ? new RegExp(`^${escapeRegExp(tagPrefix)}${escapeRegExp(packageName)}@`) : new RegExp(`^${escapeRegExp(packageName)}@`);
+    const packageTags = allTags.filter((tag) => packageTagPattern.test(tag));
+    return packageTags[0] || "";
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     log(`Failed to get latest tag for package ${packageName}: ${errorMessage}`, "error");
@@ -673,10 +682,27 @@ var PackageProcessor = class {
       const name = pkg.packageJson.name;
       const pkgPath = pkg.dir;
       const formattedPrefix = formatTagPrefix(this.versionPrefix);
-      let latestTagResult = await getLatestTagForPackage(name, this.versionPrefix);
+      let latestTagResult = "";
+      try {
+        latestTagResult = await getLatestTagForPackage(name, this.versionPrefix);
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        log(
+          `Error getting package-specific tag for ${name}, falling back to global tag: ${errorMessage}`,
+          "warning"
+        );
+      }
       if (!latestTagResult) {
-        const globalTagResult = await this.getLatestTag();
-        latestTagResult = globalTagResult || "";
+        try {
+          const globalTagResult = await this.getLatestTag();
+          latestTagResult = globalTagResult || "";
+          if (globalTagResult) {
+            log(`Using global tag ${globalTagResult} as fallback for package ${name}`, "info");
+          }
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          log(`Error getting global tag, using empty tag value: ${errorMessage}`, "warning");
+        }
       }
       const latestTag = latestTagResult;
       const nextVersion = await calculateVersion(this.fullConfig, {
@@ -732,7 +758,6 @@ var PackageProcessor = class {
     } else {
       commitMessage = `chore(release): ${packageNames} ${representativeVersion}`;
     }
-    commitMessage += " [skip-ci]";
     setCommitMessage(commitMessage);
     if (!this.dryRun) {
       try {

package/dist/index.js

@@ -118,9 +118,6 @@ function printJsonOutput() {
 
 // src/utils/logging.ts
 function log(message, status = "info") {
-  if (isJsonOutputMode() && status !== "error") {
-    return;
-  }
   let chalkFn;
   switch (status) {
     case "success":
@@ -138,7 +135,18 @@ function log(message, status = "info") {
     default:
       chalkFn = chalk.blue;
   }
-  console.log(chalkFn(message));
+  if (isJsonOutputMode()) {
+    if (status === "error") {
+      chalkFn(message);
+      console.error(message);
+    }
+    return;
+  }
+  if (status === "error") {
+    console.error(chalkFn(message));
+  } else {
+    console.log(chalkFn(message));
+  }
 }
 
 // src/core/versionStrategies.ts
@@ -366,11 +374,12 @@ async function lastMergeBranchName(branches, baseBranch) {
 }
 async function getLatestTagForPackage(packageName, tagPrefix) {
   try {
-    const tags = await getSemverTags({
-      package: packageName,
+    const allTags = await getSemverTags({
       tagPrefix
     });
-    return tags[0] || "";
+    const packageTagPattern = tagPrefix ? new RegExp(`^${escapeRegExp(tagPrefix)}${escapeRegExp(packageName)}@`) : new RegExp(`^${escapeRegExp(packageName)}@`);
+    const packageTags = allTags.filter((tag) => packageTagPattern.test(tag));
+    return packageTags[0] || "";
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     log(`Failed to get latest tag for package ${packageName}: ${errorMessage}`, "error");
@@ -649,10 +658,27 @@ var PackageProcessor = class {
       const name = pkg.packageJson.name;
       const pkgPath = pkg.dir;
       const formattedPrefix = formatTagPrefix(this.versionPrefix);
-      let latestTagResult = await getLatestTagForPackage(name, this.versionPrefix);
+      let latestTagResult = "";
+      try {
+        latestTagResult = await getLatestTagForPackage(name, this.versionPrefix);
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        log(
+          `Error getting package-specific tag for ${name}, falling back to global tag: ${errorMessage}`,
+          "warning"
+        );
+      }
       if (!latestTagResult) {
-        const globalTagResult = await this.getLatestTag();
-        latestTagResult = globalTagResult || "";
+        try {
+          const globalTagResult = await this.getLatestTag();
+          latestTagResult = globalTagResult || "";
+          if (globalTagResult) {
+            log(`Using global tag ${globalTagResult} as fallback for package ${name}`, "info");
+          }
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          log(`Error getting global tag, using empty tag value: ${errorMessage}`, "warning");
+        }
       }
       const latestTag = latestTagResult;
       const nextVersion = await calculateVersion(this.fullConfig, {
@@ -708,7 +734,6 @@ var PackageProcessor = class {
     } else {
       commitMessage = `chore(release): ${packageNames} ${representativeVersion}`;
     }
-    commitMessage += " [skip-ci]";
     setCommitMessage(commitMessage);
     if (!this.dryRun) {
       try {

package/docs/CI_CD_INTEGRATION.md

@@ -156,6 +156,24 @@ git push origin "v$NEW_VERSION"
 - `NO_COLOR=1`: Disables colored output in logs (automatically detected in CI environments)
 - `CI=true`: Most CI environments set this automatically, which helps the tool adjust its output behavior
 
+## Skipping CI for Version Commits
+
+If you want to prevent additional CI runs when version commits are made, you can include CI skip flags in your commit message template in `version.config.json`:
+
+```json
+{
+  "commitMessage": "chore(release): ${version} [skip ci]",
+  // other configuration options...
+}
+```
+
+Common CI skip patterns include:
+- `[skip ci]` or `[ci skip]` - Works in GitHub Actions, GitLab CI, CircleCI
+- `[skip-ci]` - Alternative format supported by some CI systems
+- `[no ci]` - Another variant 
+
+Each CI system might have slightly different syntax, so check your CI provider's documentation for the exact skip token to use.
+
 ## Tips for Reliable CI/CD Integration
 
 1. **Always use `--json`** in CI/CD pipelines for consistent output parsing

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.5.0",
+  "version": "0.5.2",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",