semver-ratchet 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semver-ratchet",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Forward-only versioning for Trunk-Based Development",
   "main": "index.js",
   "type": "module",

package/src/cli.js

@@ -13,8 +13,9 @@ import {
   pushGitTag,
   isMainBranch,
   parseSemver,
-  getGitAdapter,
+  getGitAdapterInstance,
 } from './version.js';
+import { getTrunkName } from './config.js';
 
 /**
  * Display the current version.
@@ -110,7 +111,7 @@ function cmdCheckMonotonic(_args) {
     // For main branch, compare with latest tag
     if (isMainBranch(_args.trunkName)) {
       try {
-        const adapter = getGitAdapter();
+        const adapter = getGitAdapterInstance();
         const latestTag = adapter.getLatestTag();
 
         if (latestTag) {
@@ -160,7 +161,7 @@ function cmdInfo(_args) {
   console.log(`Branch: ${branch}`);
   console.log(`Type: ${branchType}`);
   console.log(`Version: ${version}`);
-  console.log(`Trunk name: ${_args.trunkName || 'main'}`);
+  console.log(`Trunk name: ${getTrunkName(_args.trunkName) || 'main'}`);
   console.log(`Default bump: ${_args.defaultBump || 'patch'}`);
 
   if (!isMainBranch(_args.trunkName)) {

package/src/config.js

@@ -40,14 +40,14 @@ export function getGitPath(cliOverride) {
 /**
  * Get the name of the trunk/main branch.
  * @param {string} [cliOverride] - CLI override value
- * @returns {string} Name of the trunk branch (default: 'main')
+ * @returns {string|undefined} Name of the trunk branch, or undefined to let adapter use its default
  */
 export function getTrunkName(cliOverride) {
   if (cliOverride) return cliOverride;
   if (process.env.RATCHET_TRUNK_NAME) return process.env.RATCHET_TRUNK_NAME;
   const config = getConfig();
   if (config && config.trunkName) return config.trunkName;
-  return 'main';
+  return undefined;
 }
 
 /**

package/src/version.js

@@ -151,7 +151,7 @@ export function getCompatibleVersions(version) {
  * @returns {boolean} True if on trunk branch
  */
 export function isMainBranch(trunkNameOverride) {
-  const trunkName = trunkNameOverride !== undefined ? getTrunkName(trunkNameOverride) : undefined;
+  const trunkName = getTrunkName(trunkNameOverride);
   return getGitAdapter().isMainBranch(trunkName);
 }
 
@@ -212,7 +212,7 @@ export function determineVersionBump(messages, defaultBump = 'patch') {
  */
 export function calculateMainVersion(defaultBump = 'patch', verifyHistory = true, trunkNameOverride) {
   const adapter = getGitAdapter();
-  const trunkName = trunkNameOverride !== undefined ? getTrunkName(trunkNameOverride) : undefined;
+  const trunkName = getTrunkName(trunkNameOverride);
 
   // Verify we're on main branch
   if (!adapter.isMainBranch(trunkName)) {
@@ -268,7 +268,7 @@ export function calculateMainVersion(defaultBump = 'patch', verifyHistory = true
  */
 export function calculateFeatureVersion(_defaultBump = 'patch', _verifyHistory = true, trunkNameOverride) {
   const adapter = getGitAdapter();
-  const trunkName = trunkNameOverride !== undefined ? getTrunkName(trunkNameOverride) : undefined;
+  const trunkName = getTrunkName(trunkNameOverride);
 
   // Verify we're NOT on main branch
   if (adapter.isMainBranch(trunkName)) {
@@ -302,7 +302,7 @@ export function getVersion(defaultBump, _verifyHistory = true, trunkNameOverride
   }
 
   const adapter = getGitAdapter();
-  const trunkName = trunkNameOverride !== undefined ? getTrunkName(trunkNameOverride) : undefined;
+  const trunkName = getTrunkName(trunkNameOverride);
 
   if (adapter.isMainBranch(trunkName)) {
     return calculateMainVersion(defaultBump, _verifyHistory, trunkNameOverride);