Fix check of versions to allow pre-release

Author: kategengler

generate-local.js

@@ -19,7 +19,9 @@ function exit() {
 
 function semverVersion(value) {
   if (!/^\d+\.\d+\.\d+(-[0-9A-Za-z-.]+)?$/.test(value)) {
-    throw new InvalidArgumentError('Not a correctly defined semver version i.e. major.minor.patch or with prerelease');
+    throw new InvalidArgumentError(
+      'Not a correctly defined semver version i.e. major.minor.patch or with prerelease',
+    );
   }
   return value;
 }

index.js

@@ -6,7 +6,9 @@ import chalk from 'chalk';
 
 function semverVersion(value) {
   if (!/^\d+\.\d+\.\d+(-[0-9A-Za-z-.]+)?$/.test(value)) {
-    throw new InvalidArgumentError('Not a correctly defined semver version i.e. major.minor.patch or with prerelease');
+    throw new InvalidArgumentError(
+      'Not a correctly defined semver version i.e. major.minor.patch or with prerelease',
+    );
   }
   return value;
 }

lib/get-latest-patch-versions.js

@@ -1,11 +1,10 @@
 import { groupBy } from 'lodash-es';
-import semverCompare from 'semver-compare';
-import semverUtils from 'semver-utils';
+import semver from 'semver';
 
 export function getLatestPatchVersions(versions) {
   let groupedVersions = groupBy(
-    versions.sort(semverCompare).map(semverUtils.parse),
-    v => `${v.major}.${v.minor}`,
+    versions.sort((a, b) => semver.rcompare(a, b)),
+    v => `${semver.major(v)}.${semver.minor(v)}`,
   );
-  return Object.values(groupedVersions).map(verGroup => verGroup.pop().version);
+  return Object.values(groupedVersions).map(verGroup => verGroup[0]);
 }

lib/normalize-ids.js

@@ -13,9 +13,9 @@ function extractRelationship({ id, type }) {
   return { id, type };
 }
 
-function filterForVersion(version) {
+function filterForVersion(project, version) {
   return ({ relationships }) => {
-    const projectVersion = relationships['project-version'].data.id.split('-').pop();
+    const projectVersion = relationships['project-version'].data.id.replace(`${project}-`, '');
     return version.version === projectVersion;
   };
 }
@@ -56,7 +56,7 @@ async function normalizeIDs(pVersions, projectName) {
 
   let projectVersions = pVersions.map(version => {
     let classes = findType(jsonapidoc, 'class')
-      .filter(filterForVersion(version))
+      .filter(filterForVersion(projectName, version))
       .filter(removeLongDocsBecauseEmber1HasWeirdDocs);
 
     let namespaces = classes.filter(({ attributes }) => attributes.static === 1);
@@ -67,7 +67,7 @@ async function normalizeIDs(pVersions, projectName) {
     namespaces.forEach(ns => (ns.type = 'namespace'));
 
     let modules = findType(jsonapidoc, 'module')
-      .filter(filterForVersion(version))
+      .filter(filterForVersion(projectName, version))
       .filter(curry(filter176)(projectName, version.version));
 
     return {

package.json

@@ -54,7 +54,8 @@
 		"semver-compare": "^1.0.0",
 		"semver-extra": "^3.0.0",
 		"semver-utils": "^1.1.4",
-		"yuidoc-to-jsonapi": "^0.4.1"
+		"yuidoc-to-jsonapi": "^0.4.1",
+		"semver": "^7.7.2"
 	},
 	"devDependencies": {
 		"chai": "^4.2.0",