Exclude pre-release tags from version consideration

PaulHatch · Dec 18, 2022 · 02763ed · 02763ed
1 parent ba6e71e
commit 02763ed
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/lib/formatting/DefaultTagFormatter.js b/lib/formatting/DefaultTagFormatter.js
@@ -42,5 +42,11 @@ class DefaultTagFormatter {
         return [major, minor, patch];
     }
     ;
+    IsValid(tag) {
+        if (!!this.namespace) {
+            return new RegExp(`^${this.tagPrefix}[0-9]+.[0-9]+.[0-9]+${this.namespaceSeperator}${this.namespace}$`).test(tag);
+        }
+        return new RegExp(`^${this.tagPrefix}[0-9]+.[0-9]+.[0-9]+$`).test(tag);
+    }
 }
 exports.DefaultTagFormatter = DefaultTagFormatter;
diff --git a/lib/providers/DefaultLastReleaseResolver.js b/lib/providers/DefaultLastReleaseResolver.js
@@ -54,11 +54,17 @@ class DefaultLastReleaseResolver {
                     // so that we will have an accurate increment (assuming the new tag is the expected one)
                     const command = `git for-each-ref --count=2 --sort=-v:*refname --format=%(refname:short) --merged=${current} ${refPrefixPattern}${releasePattern}`;
                     tag = yield (0, CommandRunner_1.cmd)(command);
-                    tag = tag.split('\n').reverse().find(t => t !== '' && t !== currentTag) || '';
+                    tag = tag
+                        .split('\n')
+                        .reverse()
+                        .find(t => tagFormatter.IsValid(t) && t !== currentTag) || '';
                 }
                 else {
-                    const command = `git for-each-ref --count=1 --sort=-v:*refname --format=%(refname:short) --merged=${current} ${refPrefixPattern}${releasePattern}`;
-                    tag = yield (0, CommandRunner_1.cmd)(command);
+                    const command = `git for-each-ref --sort=-v:*refname --format=%(refname:short) --merged=${current} ${refPrefixPattern}${releasePattern}`;
+                    let tags = yield (0, CommandRunner_1.cmd)(command);
+                    tag = tags
+                        .split('\n')
+                        .find(t => tagFormatter.IsValid(t)) || '';
                 }
                 tag = tag.trim();
             }

diff --git a/src/formatting/DefaultTagFormatter.ts b/src/formatting/DefaultTagFormatter.ts
@@ -61,4 +61,12 @@ export class DefaultTagFormatter implements TagFormatter {
     return [major, minor, patch];
   };
 
+  public IsValid(tag: string): boolean {        
+    if (!!this.namespace) {
+      return new RegExp(`^${this.tagPrefix}[0-9]+.[0-9]+.[0-9]+${this.namespaceSeperator}${this.namespace}$`).test(tag);
+    }
+
+    return new RegExp(`^${this.tagPrefix}[0-9]+.[0-9]+.[0-9]+$`).test(tag);
+  }
+
 }
diff --git a/src/formatting/TagFormatter.ts b/src/formatting/TagFormatter.ts
@@ -4,4 +4,5 @@ export interface TagFormatter {
   Format(versionInfo: VersionInformation): string;
   GetPattern(): string;
   Parse(tag: string): [major: number, minor: number, patch: number];
+  IsValid(tag: string): boolean;
 }
diff --git a/src/main.test.ts b/src/main.test.ts
@@ -666,4 +666,29 @@ test('Correct previous version is returned when directly tagged', async () => {
 
     expect(result.previousVersion).toBe('2.0.1');
     expect(result.formattedVersion).toBe('2.0.2+1');
+}, 15000);
+
+test('Prerelease suffixes are ignored', async () => {
+    const repo = createTestRepo();
+
+    repo.makeCommit('Initial Commit (MAJOR)');
+    repo.makeCommit(`Second Commit`);
+    repo.exec('git tag v1.0.0-alpha.1')
+    repo.makeCommit(`Third Commit`);
+    const result = await repo.runAction();
+
+    expect(result.formattedVersion).toBe('1.0.0+2');
+}, 15000);
+
+test('Prerelease suffixes are ignored when namespaces are set', async () => {
+    const repo = createTestRepo({ namespace: 'test' });
+
+    repo.makeCommit('Initial Commit (MAJOR)');
+    repo.exec('git tag v1.0.0-test')
+    repo.makeCommit(`Second Commit`);
+    repo.exec('git tag v1.0.1-test-alpha.1')
+    repo.makeCommit(`Third Commit`);
+    const result = await repo.runAction();
+
+    expect(result.formattedVersion).toBe('1.0.1+1');
 }, 15000);
diff --git a/src/providers/DefaultLastReleaseResolver.ts b/src/providers/DefaultLastReleaseResolver.ts
@@ -31,11 +31,17 @@ export class DefaultLastReleaseResolver implements LastReleaseResolver {
                 // so that we will have an accurate increment (assuming the new tag is the expected one)
                 const command = `git for-each-ref --count=2 --sort=-v:*refname --format=%(refname:short) --merged=${current} ${refPrefixPattern}${releasePattern}`;
                 tag = await cmd(command);
-                tag = tag.split('\n').reverse().find(t => t !== '' && t !== currentTag) || '';
+                tag = tag
+                    .split('\n')
+                    .reverse()
+                    .find(t => tagFormatter.IsValid(t) && t !== currentTag) || '';
 
             } else {
-                const command = `git for-each-ref --count=1 --sort=-v:*refname --format=%(refname:short) --merged=${current} ${refPrefixPattern}${releasePattern}`;
-                tag = await cmd(command);
+                const command = `git for-each-ref --sort=-v:*refname --format=%(refname:short) --merged=${current} ${refPrefixPattern}${releasePattern}`;
+                let tags = await cmd(command);
+                tag = tags
+                    .split('\n')
+                    .find(t => tagFormatter.IsValid(t)) || '';
             }
 
             tag = tag.trim();