autorel 2.3.1 → 2.3.2

package/dist/index.js

@@ -57,20 +57,22 @@ async function autorel(args) {
     }
     const commitTypeMap = new Map(args.commitTypes.map((type) => [type.type, type]));
     git.gitFetch();
-    const latestTags = git.getLatestTags();
-    const latestTag = semver.latestTag(latestTags);
-    const lastStableTag = semver.latestStableTag(latestTags);
-    const lastChannelTag = prereleaseChannel
-        ? semver.latestChannelTag(latestTags, prereleaseChannel)
+    const recentTags = git.getRecentTags();
+    const highestTag = semver.highestTag(recentTags);
+    const highestStableTag = semver.highestStableTag(recentTags);
+    const highestChannelTag = prereleaseChannel
+        ? semver.highestChannelTag(recentTags, prereleaseChannel)
         : undefined;
     // Determine the starting Git tag to compare against when generating
     // release notes or changelogs (i.e. the point “since” which to find commits).
-    // If a pre-release channel is specified and a last channel tag exists,
-    // use the last channel tag. Otherwise, use the last stable tag.
-    const tagFromWhichToFindCommits = lastChannelTag ?? lastStableTag;
-    !!lastChannelTag && logger_1.default.info(`The last pre-release channel version (${prereleaseChannel}) is: ${(0, colorette_1.bold)(lastChannelTag)}`);
-    logger_1.default.info(`The last stable/production version is: ${lastStableTag ? (0, colorette_1.bold)(lastStableTag) : (0, colorette_1.gray)('none')}`);
-    logger_1.default.info(`The current/highest version is: ${latestTag ? (0, colorette_1.bold)(latestTag) : (0, colorette_1.gray)('none')}`);
+    // If a pre-release channel is specified, and that channel has a tag, and
+    // it is higher than the stable tag, use that tag. Otherwise, use the stable tag.
+    const tagFromWhichToFindCommits = highestChannelTag
+        ? semver.highestTag([highestChannelTag, highestStableTag ?? 'v0.0.0'])
+        : highestStableTag;
+    !!highestChannelTag && logger_1.default.info(`The last pre-release channel version (${prereleaseChannel}) is: ${(0, colorette_1.bold)(highestChannelTag)}`);
+    logger_1.default.info(`The last stable/production version is: ${highestStableTag ? (0, colorette_1.bold)(highestStableTag) : (0, colorette_1.gray)('none')}`);
+    logger_1.default.info(`The current/highest version is: ${highestTag ? (0, colorette_1.bold)(highestTag) : (0, colorette_1.gray)('none')}`);
     logger_1.default.info(`Fetching commits since ${tagFromWhichToFindCommits ?? 'the beginning of the repository'}...`);
     const commits = git.getCommitsFromTag(tagFromWhichToFindCommits);
     logger_1.default.info(`Found ${(0, colorette_1.bold)(commits.length.toString())} commit(s).`);
@@ -102,11 +104,11 @@ async function autorel(args) {
     const nextTag = args.useVersion
         ? `v${args.useVersion}`
         : semver.toTag(semver.incrVer({
-            latestVer: semver.fromTag(latestTag || 'v0.0.0'),
-            latestStableVer: semver.fromTag(lastStableTag || 'v0.0.0'),
+            latestVer: semver.fromTag(highestTag || 'v0.0.0'),
+            latestStableVer: semver.fromTag(highestStableTag || 'v0.0.0'),
             releaseType,
             prereleaseChannel,
-            latestChannelVer: lastChannelTag ? semver.fromTag(lastChannelTag) ?? undefined : undefined,
+            latestChannelVer: highestChannelTag ? semver.fromTag(highestChannelTag) ?? undefined : undefined,
         }));
     const changelog = (0, changelog_1.generateChangelog)(parsedCommits, commitTypeMap, args.breakingChangeTitle);
     logger_1.default.info(`The next version is: ${(0, colorette_1.bold)(nextTag)}`);

package/dist/semver/compare.d.ts

@@ -11,9 +11,18 @@ export declare function compareVersions(version1: SemVer, version2: SemVer): num
  * Returns the highest version of two SemVer objects (nomalized).
  */
 export declare function highestVersion(version1: SemVer, version2: SemVer): SemVer;
-export declare function latestTag(tags: string[]): string | undefined;
-export declare function latestChannelTag(tags: string[], channel: string): string | undefined;
-export declare function latestStableTag(tags: string[]): string | undefined;
+/**
+ * Returns the tag with the highest version.
+ */
+export declare function highestTag(tags: string[]): string | undefined;
+/**
+ * Returns the tag with the highest version for a specific channel.
+ */
+export declare function highestChannelTag(tags: string[], channel: string): string | undefined;
+/**
+ * Returns the tag with the highest version that does not have a channel.
+ */
+export declare function highestStableTag(tags: string[]): string | undefined;
 /**
  * Returns the raw tag string with the highest version.
  */

package/dist/semver/compare.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.highest = exports.latestStableTag = exports.latestChannelTag = exports.latestTag = exports.highestVersion = exports.compareVersions = void 0;
+exports.highest = exports.highestStableTag = exports.highestChannelTag = exports.highestTag = exports.highestVersion = exports.compareVersions = void 0;
 const parse_1 = require("./parse");
 /**
  * Compares two versions and returns:
@@ -52,29 +52,38 @@ function highestVersion(version1, version2) {
     return (0, parse_1.normalizeVer)(comparison > 0 ? version1 : version2);
 }
 exports.highestVersion = highestVersion;
-function latestTag(tags) {
+/**
+ * Returns the tag with the highest version.
+ */
+function highestTag(tags) {
     const parsed = (0, parse_1.parseTags)(tags);
     if (parsed.length === 0)
         return undefined;
     return highest(parsed).raw;
 }
-exports.latestTag = latestTag;
-function latestChannelTag(tags, channel) {
+exports.highestTag = highestTag;
+/**
+ * Returns the tag with the highest version for a specific channel.
+ */
+function highestChannelTag(tags, channel) {
     const parsed = (0, parse_1.parseTags)(tags)
         .filter((entry) => entry.version.channel === channel);
     if (parsed.length === 0)
         return undefined;
     return highest(parsed).raw;
 }
-exports.latestChannelTag = latestChannelTag;
-function latestStableTag(tags) {
+exports.highestChannelTag = highestChannelTag;
+/**
+ * Returns the tag with the highest version that does not have a channel.
+ */
+function highestStableTag(tags) {
     const parsed = (0, parse_1.parseTags)(tags)
         .filter((entry) => !entry.version.channel);
     if (parsed.length === 0)
         return undefined;
     return highest(parsed).raw;
 }
-exports.latestStableTag = latestStableTag;
+exports.highestStableTag = highestStableTag;
 /**
  * Returns the raw tag string with the highest version.
  */

package/dist/services/git.d.ts

@@ -4,7 +4,11 @@ export type Commit = {
 };
 export declare function gitFetch(): void;
 export declare function createAndPushTag(tag: string): void;
-export declare function getLatestTags(): string[];
+/**
+ * Returns the most recent 100 tags in the repository loosely sorted by version
+ * (does not take into account pre-release tags).
+ */
+export declare function getRecentTags(): string[];
 export declare function getRepo(): {
     owner: string;
     repository: string;

package/dist/services/git.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentBranch = exports.getCommitsFromTag = exports.getRepo = exports.getLatestTags = exports.createAndPushTag = exports.gitFetch = void 0;
+exports.getCurrentBranch = exports.getCommitsFromTag = exports.getRepo = exports.getRecentTags = exports.createAndPushTag = exports.gitFetch = void 0;
 const sh_1 = require("./sh");
 function gitFetch() {
     (0, sh_1.$) `git fetch`;
@@ -11,11 +11,15 @@ function createAndPushTag(tag) {
     (0, sh_1.$) `git push origin ${tag}`;
 }
 exports.createAndPushTag = createAndPushTag;
-function getLatestTags() {
+/**
+ * Returns the most recent 100 tags in the repository loosely sorted by version
+ * (does not take into account pre-release tags).
+ */
+function getRecentTags() {
     const tags = (0, sh_1.$) `git tag --sort=-v:refname | head -n 100`;
     return tags.split('\n').filter((tag) => tag.trim() !== '');
 }
-exports.getLatestTags = getLatestTags;
+exports.getRecentTags = getRecentTags;
 function getRepo() {
     if (process.env.GITHUB_REPOSITORY) {
         const [owner, repository] = process.env.GITHUB_REPOSITORY.split('/');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autorel",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "Automate semantic releases based on conventional commits. Similar to semantic-release but much simpler.",
   "license": "MIT",
   "author": "Marc H. Weiner <mhweiner234@gmail.com> (https://mhweiner.com)",