The parseVersion util should be forgiving to non-semver input (fixes #…

…754)
release-it · Apr 11, 2021 · 50216ad · 50216ad
1 parent 96602c3
commit 50216ad
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/lib/util.js b/lib/util.js
@@ -72,13 +72,14 @@ const hasAccess = path => {
 };
 
 const parseVersion = raw => {
-  if (!raw) return { version: null, isPreRelease: false, preReleaseId: null };
+  if (raw == null) return { version: raw, isPreRelease: false, preReleaseId: null };
   const version = semver.valid(raw) ? raw : semver.coerce(raw);
+  if (!version) return { version: raw, isPreRelease: false, preReleaseId: null };
   const parsed = semver.parse(version);
   const isPreRelease = parsed.prerelease.length > 0;
   const preReleaseId = isPreRelease && isNaN(parsed.prerelease[0]) ? parsed.prerelease[0] : null;
   return {
-    version,
+    version: version.toString(),
     isPreRelease,
     preReleaseId
   };

diff --git a/test/utils.js b/test/utils.js
@@ -2,7 +2,7 @@ const { EOL } = require('os');
 const test = require('ava');
 const mockStdIo = require('mock-stdio');
 const stripAnsi = require('strip-ansi');
-const { format, truncateLines, parseGitUrl } = require('../lib/util');
+const { format, truncateLines, parseGitUrl, parseVersion } = require('../lib/util');
 
 test('format', t => {
   t.is(format('release v${version}', { version: '1.0.0' }), 'release v1.0.0');
@@ -56,3 +56,15 @@ test('parseGitUrl', t => {
     repository: 'owner/project'
   });
 });
+
+test('parseVersion', t => {
+  t.deepEqual(parseVersion(), { version: undefined, isPreRelease: false, preReleaseId: null });
+  t.deepEqual(parseVersion(0), { version: '0.0.0', isPreRelease: false, preReleaseId: null });
+  t.deepEqual(parseVersion(1), { version: '1.0.0', isPreRelease: false, preReleaseId: null });
+  t.deepEqual(parseVersion('1'), { version: '1.0.0', isPreRelease: false, preReleaseId: null });
+  t.deepEqual(parseVersion('1.0'), { version: '1.0.0', isPreRelease: false, preReleaseId: null });
+  t.deepEqual(parseVersion('1.0.0'), { version: '1.0.0', isPreRelease: false, preReleaseId: null });
+  t.deepEqual(parseVersion('1.0.0-0'), { version: '1.0.0-0', isPreRelease: true, preReleaseId: null });
+  t.deepEqual(parseVersion('1.0.0-next.1'), { version: '1.0.0-next.1', isPreRelease: true, preReleaseId: 'next' });
+  t.deepEqual(parseVersion('21.04.1'), { version: '21.04.1', isPreRelease: false, preReleaseId: null });
+});