fix(core): handle semver ranges containing 1.x.x

Author: JamieMason

src/version.spec.ts

@@ -3,13 +3,24 @@ import { getNewest, getVersionRange, sortBySemver } from './version';
 
 describe('getNewest', () => {
   it('returns the newest version from an array of versions', () => {
-    expect(getNewest(['<=1.0.0', '<1.0.0'])).toEqual('<=1.0.0');
-    expect(getNewest(['1.0.0', '<=1.0.0', '<1.0.0'])).toEqual('1.0.0');
-    expect(getNewest(['~1.0.0', '1.0.0', '<=1.0.0', '<1.0.0'])).toEqual('~1.0.0');
-    expect(getNewest(['^1.0.0', '~1.0.0', '1.0.0', '<=1.0.0', '<1.0.0'])).toEqual('^1.0.0');
-    expect(getNewest(['>=1.0.0', '^1.0.0', '~1.0.0', '1.0.0', '<=1.0.0', '<1.0.0'])).toEqual('>=1.0.0');
-    expect(getNewest(['>1.0.0', '>=1.0.0', '^1.0.0', '~1.0.0', '1.0.0', '<=1.0.0', '<1.0.0'])).toEqual('>1.0.0');
-    expect(getNewest(['>1.0.0', '>=1.0.0', '^1.0.0', '*', '~1.0.0', '1.0.0', '<=1.0.0', '<1.0.0'])).toEqual('*');
+    const a = ['<1.0.0'];
+    const b = _.shuffle(a.concat('<=1.0.0'));
+    const c = _.shuffle(b.concat('1.0.0'));
+    const d = _.shuffle(c.concat('~1.0.0'));
+    const e = _.shuffle(d.concat('1.x.x'));
+    const f = _.shuffle(e.concat('^1.0.0'));
+    const g = _.shuffle(f.concat('>=1.0.0'));
+    const h = _.shuffle(g.concat('>1.0.0'));
+    const i = _.shuffle(h.concat('*'));
+    expect(getNewest(a)).toEqual('<1.0.0');
+    expect(getNewest(b)).toEqual('<=1.0.0');
+    expect(getNewest(c)).toEqual('1.0.0');
+    expect(getNewest(d)).toEqual('~1.0.0');
+    expect(getNewest(e)).toEqual('1.x.x');
+    expect(getNewest(f)).toEqual('^1.0.0');
+    expect(getNewest(g)).toEqual('>=1.0.0');
+    expect(getNewest(h)).toEqual('>1.0.0');
+    expect(getNewest(i)).toEqual('*');
   });
 });
 

src/version.ts

@@ -12,31 +12,46 @@ export const getVersionRange: GetVersionRange = (version) => version.split(/[0-9
 
 export const isValid = (version: string) => semver.valid(version) !== null;
 
-export const sortBySemver: SortBySemver = (versions: string[]) =>
-  versions.concat().sort((a: string, b: string) => {
-    const ar = getVersionRange(a);
-    const br = getVersionRange(b);
-    const ac = getVersionNumber(a);
-    const bc = getVersionNumber(b);
-    if (a === '*') {
-      return GREATER;
-    }
-    if (b === '*') {
-      return LESSER;
-    }
-    if (semver.gtr(ac, bc)) {
-      return GREATER;
-    }
-    if (semver.ltr(ac, bc)) {
-      return LESSER;
-    }
-    if (SEMVER_ORDER.indexOf(ar) > SEMVER_ORDER.indexOf(br)) {
-      return GREATER;
-    }
-    if (SEMVER_ORDER.indexOf(ar) < SEMVER_ORDER.indexOf(br)) {
-      return LESSER;
-    }
-    return SAME;
-  });
+export const sortBySemver: SortBySemver = (versions: string[]) => {
+  return versions
+    .concat()
+    .sort()
+    .sort((a: string, b: string) => {
+      if (a === '*') {
+        return GREATER;
+      }
+      if (b === '*') {
+        return LESSER;
+      }
+      if (a === b) {
+        return SAME;
+      }
+      let aRange = getVersionRange(a);
+      let bRange = getVersionRange(b);
+      let aNumber = getVersionNumber(a);
+      let bNumber = getVersionNumber(b);
+      if (aNumber.indexOf('.x') !== -1) {
+        aNumber = aNumber.split('.x').join('.0');
+        aRange = '^';
+      }
+      if (bNumber.indexOf('.x') !== -1) {
+        bNumber = bNumber.split('.x').join('.0');
+        bRange = '^';
+      }
+      if (semver.gt(aNumber, bNumber)) {
+        return GREATER;
+      }
+      if (semver.lt(aNumber, bNumber)) {
+        return LESSER;
+      }
+      if (SEMVER_ORDER.indexOf(aRange) > SEMVER_ORDER.indexOf(bRange)) {
+        return GREATER;
+      }
+      if (SEMVER_ORDER.indexOf(aRange) < SEMVER_ORDER.indexOf(bRange)) {
+        return LESSER;
+      }
+      return SAME;
+    });
+};
 
 export const getNewest: GetNewest = (versions: string[]) => _(sortBySemver(versions)).last();