Skip to content

Commit

Permalink
Fixed issues with semver, added dedicated semver unit tests. Version …
Browse files Browse the repository at this point in the history
…bump.
  • Loading branch information
coreybutler committed Sep 19, 2020
1 parent f8255e9 commit 2a230ec
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngnjs/plugin",
"version": "1.0.0-alpha.7",
"version": "1.0.0-alpha.8",
"description": "A plugin module for NGN.",
"main": "src/index.js",
"module": "index.js",
Expand Down
25 changes: 21 additions & 4 deletions src/semver.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,24 +111,41 @@ export default class SV {
if (typeof a.subversion === typeof b.subversion && typeof a.subversion === 'string') {
return a.subversion.length > b.subversions.length
}
if (!a.prerelease && b.prerelease) { return true }
if (a.prerelease && !b.prerelease) { return false }
if (a.prerelease && b.prerelease) {
try {
const { aPrefix } = /^(<aPrefix>[^\d]+)/i.exec(a.prerelease).groups
const { bPrefix } = /^(<bPrefix>[^\d]+)/i.exec(b.prerelease).groups
if (aPrefix !== bPrefix) {
return aPrefix > bPrefix
}
const { aNum } = /(<aNum>^\d+)/i.exec(a.prerelease).groups
const { bNum } = /(<bNum>^\d+)/i.exec(b.prerelease).groups
return aNum === undefined ? false : (bNum === undefined ? true : (aNum === bNum ? false : aNum > bNum))
} catch (e) {
return a.prerelease > b.prerelease
}
}

return true
}

static gte () {
return (SV.gt(...arguments) || SV.eq(...arguments))
return (SV.eq(...arguments) || SV.gt(...arguments))
}

static lt () {
return !SV.gte(...arguments)
}

static lte () {
return (SV.lt(...arguments) || SV.eq(...arguments))
return (SV.eq(...arguments) || SV.lt(...arguments))
}

static eq () {
const { a, b } = normalize(arguments)
try { return a.toString() === b.toString() } catch (e) { return false }
const { a, b } = normalize(...arguments)
return a.toString() === b.toString()
}

// Only necessary when inc/dec are enabled.
Expand Down
17 changes: 17 additions & 0 deletions tests/01-semver.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import test from 'tappedout'
import { Semver as sv } from '@ngnjs/plugin'

const a = '2.0.0-alpha.3'
const b = '2.0.0-alpha.5'

test('Semver Checks', t => {
t.expect(true, sv.eq(a, a), 'equal')
t.expect(true, sv.lt(a, b), 'less than')
t.expect(true, sv.gt(b, a), 'greater than')
t.expect(true, sv.lte(a, b), 'less than or equal to (unequal)')
t.expect(true, sv.gte(b, a), 'greater than or equal to (unequal)')
t.expect(true, sv.lte(a, a), 'less than or equal to (equal)')
t.expect(true, sv.gte(a, a), 'greater than or equal to (equal)')
t.expect(b, sv.select('^2.0.0-alpha', b, a), 'Select latest version of the same minor version.')
t.end()
})
File renamed without changes.

0 comments on commit 2a230ec

Please sign in to comment.