✨ Add support for versions with no zeroes

orlowdev · Jul 3, 2020 · 847e00c · 847e00c
1 parent 1aed845
commit 847e00c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -108,6 +108,7 @@ ExtendPipe.empty<IAppCtx, Partial<IAppCtx>>()
 		transport: 'github',
 		customUrl: '',
 		prefixReset: false,
+		noTrailingZeroes: false,
 		conventions: [
 			{
 				match: ['^:ambulance:', '^:bug:', '^:lock:'],

diff --git a/src/pure/getters/get-latest-version.ts b/src/pure/getters/get-latest-version.ts
@@ -6,12 +6,22 @@ interface IDeps {
 	logWarning: LogFunction
 }
 
-type Ctx = Pick<IAppCtx, 'latestVersion' | 'allTags'>
+type Ctx = Pick<IAppCtx, 'latestVersion' | 'allTags' | 'noTrailingZeroes'>
 
-export const getLatestVersion = ({ logWarning }: IDeps) => ({ latestVersion, allTags }: Ctx) => ({
+export const getLatestVersion = ({ logWarning }: IDeps) => ({
+	latestVersion,
+	allTags,
+	noTrailingZeroes,
+}: Ctx) => ({
 	latestVersion:
 		latestVersion ||
-		Either.fromNullable(allTags.find((tag) => /^(\w+)?\.?\d+\.\d+\.\d+$/.test(tag)))
+		Either.fromNullable(
+			allTags.find((tag) =>
+				noTrailingZeroes
+					? /^(\w+)?\d+\.?(\d+)?\.?(\d+)?$/.test(tag)
+					: /^(\w+)?\d+\.\d+\.\d+$/.test(tag),
+			),
+		)
 			.leftMap(
 				() => logWarning`Could not find previous semantic versions. Using ${({ y }) => y('0.0.0')}.`,
 			)

diff --git a/src/pure/make-new-version.ts b/src/pure/make-new-version.ts
@@ -15,8 +15,9 @@ export const makeNewVersion = ({
 	bumpMajor,
 }: Ctx) => ({
 	newVersion: Either.fromNullable(extractVersionTuple(latestVersion))
-		.map((tuple) => tuple.slice(2, 5))
+		.map((tuple) => tuple.slice(1, 4))
 		.map((tuple) => tuple.map(Number))
+		.map((tuple) => tuple.map((x) => (Number.isNaN(x) ? 0 : x)))
 		.map(([major, minor, patch]) => [major, minor, bumpPatch ? patch + 1 : patch])
 		.map(([major, minor, patch]) => (bumpMinor ? [major, minor + 1, 0] : [major, minor, patch]))
 		.map(([major, minor, patch]) =>

diff --git a/src/types/app-config.ts b/src/types/app-config.ts
@@ -212,4 +212,12 @@ export interface IAppConfig {
 	 * @default false
 	 */
 	prefixReset: boolean
+
+	/**
+	 * Remove trailing zeroes when creating new versions. E.g. `1.1.0` -> `1.1` or `14.0.0` -> `14`.
+	 * This is not compliant with Semantic Versioning!
+	 *
+	 * @default false
+	 */
+	noTrailingZeroes: boolean
 }
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
@@ -22,4 +22,4 @@ export const tap = <TArg>(f: Unary<TArg, any>) => (x: TArg): TArg => {
 }
 
 export const extractVersionTuple = (versionString: string) =>
-	/^(\w+)?\.?(\d+)\.(\d+)\.(\d+)/.exec(versionString)
+	/\.?(\d+)\.?(\d+)?\.?(\d+)?/.exec(versionString)