fix: versioning after pre-release exit

Author: tscpp

e2e/pre-release.test.ts

@@ -63,7 +63,7 @@ it("exists pre-release", async () => {
     await sandbox.$`${CONVER} pre exit my-package`;
 
     // check package
-    const pkg = (await sandbox.readJsoncFile("package.json")) as {
+    let pkg = (await sandbox.readJsoncFile("package.json")) as {
       version?: string;
       publishConfig?: {
         tag?: string;
@@ -75,6 +75,67 @@ it("exists pre-release", async () => {
     // versioning
     await sandbox.$`${CONVER} version`;
 
+    // check package
+    pkg = (await sandbox.readJsoncFile("package.json")) as {
+      version?: string;
+      publishConfig?: {
+        tag?: string;
+      };
+    };
+    expect(pkg.version).toBe("1.3.0");
+    expect(pkg.publishConfig?.tag).toBe(undefined);
+
+    // check config
+    const options = (await sandbox.readJsoncFile("conver.json")) as Options;
+    expect(Object.keys(options.original ?? {})).not.toContain("my-package");
+  });
+});
+
+it("preserves version after pre-release exit", async () => {
+  await sandbox(async (sandbox) => {
+    // package.json
+    await sandbox.writeFiles({
+      "package.json": json({
+        name: "my-package",
+        version: "1.3.0-rc.5",
+        publishConfig: {
+          tag: "next",
+        },
+      }),
+      "conver.json": json({
+        original: {
+          "my-package": "1.2.3",
+        },
+      }),
+    });
+
+    // init sandbox
+    await sandbox.$`git init`;
+    await sandbox.$`git commit -m ${"chore: first commit"} --allow-empty`;
+
+    // add commit
+    await sandbox.writeFiles({
+      "foo.txt": "foo",
+    });
+    await sandbox.$`git add foo.txt`;
+    await sandbox.$`git commit -m ${"fix: add foo"}`;
+
+    // exit pre-release
+    await sandbox.$`${CONVER} pre exit my-package`;
+
+    // versioning
+    await sandbox.$`${CONVER} version`;
+
+    // check package
+    const pkg = (await sandbox.readJsoncFile("package.json")) as {
+      version?: string;
+      publishConfig?: {
+        tag?: string;
+      };
+    };
+    expect(pkg.version).toBe("1.3.0");
+    expect(pkg.publishConfig?.tag).toBe(undefined);
+
     // check config
     const options = (await sandbox.readJsoncFile("conver.json")) as Options;
     expect(Object.keys(options.original ?? {})).not.toContain("my-package");

src/lib/versioning.ts

@@ -233,16 +233,22 @@ export function createVersioningPlan(
     let bump = bumps.get(pkg);
     if (!bump) continue;
 
+    /** The package's original version before pre-release. */
+    const originalVersion = option(options, "original")[pkg.name];
+
+    /** Current version is pre-release. */
+    const isPre = isPreRelease(pkg.version);
+    /** Was pre-release in previous versioning. */
+    const wasPre = !!originalVersion;
+
     /** The package's current version. */
     const currentVersion = new SemVer(pkg.version);
 
     /**
      * The version to base increments from. Normally this is the same as
      * {@link currentVersion}, except in pre-releases.
      */
-    const baseVersion = new SemVer(
-      option(options, "original")[pkg.name] ?? pkg.version,
-    );
+    const baseVersion = new SemVer(originalVersion ?? pkg.version);
 
     // Limit bump for '0.x' packages to 'minor', to prevent releasing the first
     // stable version, which may not be wanted.
@@ -258,7 +264,7 @@ export function createVersioningPlan(
     let newVersion = baseVersion.inc(bump);
     newVersion.prerelease = currentVersion.prerelease;
 
-    if (isPreRelease(currentVersion)) {
+    if (isPre) {
       // When the main version (stable version before pre-release suffix) has
       // not changed, revert to the current version.
       const noMainBump = currentVersion.compareMain(newVersion) >= 0;
@@ -278,6 +284,10 @@ export function createVersioningPlan(
       }
     }
 
+    if (wasPre && currentVersion.compare(newVersion) > 0) {
+      newVersion = currentVersion;
+    }
+
     versioning.push({
       name: pkg.name,
       oldVersion: currentVersion.format(),