[update-changelog] Fix bug introduced in #158

- `updateChangelog` returns results even if `isReleaseCandidate` is false
MetaMask · Dec 8, 2023 · a02b488 · a02b488
1 parent f65c16b
commit a02b488
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/src/update-changelog.ts b/src/update-changelog.ts
@@ -196,7 +196,12 @@ export async function updateChangelog({
   projectRootDirectory,
   tagPrefixes = ['v'],
   formatter = undefined,
-}: UpdateChangelogOptions): Promise<string | undefined> {
+}: UpdateChangelogOptions): Promise<string | undefined | never> {
+  if (isReleaseCandidate && !currentVersion) {
+    throw new Error(
+      `A version must be specified if 'isReleaseCandidate' is set.`,
+    );
+  }
   const changelog = parseChangelog({
     changelogContent,
     repoUrl,
@@ -233,14 +238,8 @@ export async function updateChangelog({
     return undefined;
   }
 
-  if (isReleaseCandidate) {
-    if (!currentVersion) {
-      throw new Error(
-        `A version must be specified if 'isReleaseCandidate' is set.`,
-      );
-    }
-
-    if (mostRecentTag === `${tagPrefixes[0]}${currentVersion ?? ''}`) {
+  if (isReleaseCandidate && currentVersion) {
+    if (mostRecentTag === `${tagPrefixes[0]}${currentVersion}`) {
       throw new Error(
         `Current version already has a tag ('${mostRecentTag}'), which is unexpected for a release candidate.`,
       );
@@ -258,22 +257,22 @@ export async function updateChangelog({
     if (hasUnreleasedChanges) {
       changelog.migrateUnreleasedChangesToRelease(currentVersion);
     }
+  }
 
-    const newChangeEntries = newCommits.map(({ prNumber, description }) => {
-      if (prNumber) {
-        const suffix = `([#${prNumber}](${repoUrl}/pull/${prNumber}))`;
-        return `${description} ${suffix}`;
-      }
-      return description;
-    });
-
-    for (const description of newChangeEntries.reverse()) {
-      changelog.addChange({
-        version: isReleaseCandidate ? currentVersion : undefined,
-        category: ChangeCategory.Uncategorized,
-        description,
-      });
+  const newChangeEntries = newCommits.map(({ prNumber, description }) => {
+    if (prNumber) {
+      const suffix = `([#${prNumber}](${repoUrl}/pull/${prNumber}))`;
+      return `${description} ${suffix}`;
     }
+    return description;
+  });
+
+  for (const description of newChangeEntries.reverse()) {
+    changelog.addChange({
+      version: isReleaseCandidate ? currentVersion : undefined,
+      category: ChangeCategory.Uncategorized,
+      description,
+    });
   }
 
   return changelog.toString();