semver 1.1.0 → 1.1.4

package/README.md

@@ -5,8 +5,8 @@ semver(1) -- The semantic versioner for npm
 
     $ npm install semver
 
-    semver.valid('1.2.3') // true
-    semver.valid('a.b.c') // false
+    semver.valid('1.2.3') // '1.2.3'
+    semver.valid('a.b.c') // null
     semver.clean('  =v1.2.3   ') // '1.2.3'
     semver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true
     semver.gt('1.2.3', '9.8.7') // false
@@ -76,7 +76,7 @@ The following range styles are supported:
 * `<1.2.3` Less than
 * `1.2.3 - 2.3.4` := `>=1.2.3 <=2.3.4`
 * `~1.2.3` := `>=1.2.3 <1.3.0`
-* `~1.2` := `>=1.2.0 <2.0.0`
+* `~1.2` := `>=1.2.0 <1.3.0`
 * `~1` := `>=1.0.0 <2.0.0`
 * `1.2.x` := `>=1.2.0 <1.3.0`
 * `1.x` := `>=1.0.0 <2.0.0`

package/bin/semver

@@ -33,6 +33,7 @@ function main () {
   }
 
   versions = versions.filter(semver.valid)
+  if (!versions.length) return fail()
   for (var i = 0, l = range.length; i < l ; i ++) {
     versions = versions.filter(function (v) {
       return semver.satisfies(v, range[i])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semver",
-  "version": "1.1.0",
+  "version": "1.1.4",
   "description": "The semantic version parser used by npm.",
   "main": "semver.js",
   "scripts": {

package/semver.js

@@ -15,7 +15,8 @@ var semver = "\\s*[v=]*\\s*([0-9]+)"        // major
                 + "(?:\\.([0-9]+|x|X|\\*)"
                 + "([a-zA-Z-][a-zA-Z0-9-\.:]*)?)?)?"
   , xRange = "((?:<|>)=?)?\\s*" + xRangePlain
-  , exprSpermy = "(?:~>?)"+xRange
+  , exprLoneSpermy = "(?:~>?)"
+  , exprSpermy = exprLoneSpermy + xRange
   , expressions = exports.expressions =
     { parse : new RegExp("^\\s*"+semver+"\\s*$")
     , parsePackage : new RegExp("^\\s*([^\/]+)[-@](" +semver+")\\s*$")
@@ -84,7 +85,7 @@ function validPackage (version) {
 // ">1.0.2 <2.0.0" like 1.0.3 - 1.9999.9999
 var starExpression = /(<|>)?=?\s*\*/g
   , starReplace = ""
-  , compTrimExpression = new RegExp("((<|>)?=?)\\s*("
+  , compTrimExpression = new RegExp("((<|>)?=|<|>)\\s*("
                                     +semver+"|"+xRangePlain+")", "g")
   , compTrimReplace = "$1$3"
 
@@ -97,6 +98,7 @@ function toComparators (range) {
     .split("||")
     .map(function (orchunk) {
       return orchunk
+        .replace(new RegExp("(" + exprLoneSpermy + ")\\s+"), "$1")
         .split(" ")
         .map(replaceXRanges)
         .map(replaceSpermies)
@@ -149,7 +151,6 @@ function replaceXRange (version) {
     } else if (!p || p === "*" || p.toLowerCase() === "x") {
       ret = ">="+M+"."+m+".0- <"+M+"."+(+m+1)+".0-"
     }
-    //console.error("parseXRange", [].slice.call(arguments), ret)
     return ret
   })
 }

package/test.js

@@ -17,6 +17,8 @@ var tap = require("tap")
 tap.plan(8)
 
 test("\ncomparison tests", function (t) {
+// [version1, version2]
+// version1 should be greater than version2
 ; [ ["0.0.0", "0.0.0foo"]
   , ["0.0.1", "0.0.0"]
   , ["1.0.0", "0.9.9"]
@@ -61,6 +63,8 @@ test("\ncomparison tests", function (t) {
 })
 
 test("\nequality tests", function (t) {
+// [version1, version2]
+// version1 should be equivalent to version2
 ; [ ["1.2.3", "v1.2.3"]
   , ["1.2.3", "=1.2.3"]
   , ["1.2.3", "v 1.2.3"]
@@ -112,6 +116,8 @@ test("\nequality tests", function (t) {
 
 
 test("\nrange tests", function (t) {
+// [range, version]
+// version should be included by range
 ; [ ["1.0.0 - 2.0.0", "1.2.3"]
   , ["1.0.0", "1.0.0"]
   , [">=*", "0.2.4"]
@@ -165,6 +171,7 @@ test("\nrange tests", function (t) {
   , ["~> 1", "1.2.3"]
   , ["~1.0", "1.0.2"] // >=1.0.0 <1.1.0
   , ["~ 1.0", "1.0.2"]
+  , ["~ 1.0.3", "1.0.12"]
   , [">=1", "1.0.0"]
   , [">= 1", "1.0.0"]
   , ["<1.2", "1.1.1"]
@@ -177,6 +184,16 @@ test("\nrange tests", function (t) {
   , ["=0.7.x", "0.7.0-asdf"]
   , [">=0.7.x", "0.7.0-asdf"]
   , ["<=0.7.x", "0.6.2"]
+  , ["~1.2.1 >=1.2.3", "1.2.3"]
+  , ["~1.2.1 =1.2.3", "1.2.3"]
+  , ["~1.2.1 1.2.3", "1.2.3"]
+  , ['~1.2.1 >=1.2.3 1.2.3', '1.2.3']
+  , ['~1.2.1 1.2.3 >=1.2.3', '1.2.3']
+  , ['~1.2.1 1.2.3', '1.2.3']
+  , ['>=1.2.1 1.2.3', '1.2.3']
+  , ['1.2.3 >=1.2.1', '1.2.3']
+  , ['>=1.2.3 >=1.2.1', '1.2.3']
+  , ['>=1.2.1 >=1.2.3', '1.2.3']
   ].forEach(function (v) {
     t.ok(satisfies(v[1], v[0]), v[0]+" satisfied by "+v[1])
   })
@@ -184,6 +201,8 @@ test("\nrange tests", function (t) {
 })
 
 test("\nnegative range tests", function (t) {
+// [range, version]
+// version should not be included by range
 ; [ ["1.0.0 - 2.0.0", "2.2.3"]
   , ["1.0.0", "1.0.1"]
   , [">=1.0.0", "0.0.0"]
@@ -236,6 +255,8 @@ test("\nnegative range tests", function (t) {
 })
 
 test("\nincrement versions test", function (t) {
+// [version, inc, result]
+// inc(version, inc) -> result
 ; [ [ "1.2.3",   "major", "2.0.0"   ]
   , [ "1.2.3",   "minor", "1.3.0"   ]
   , [ "1.2.3",   "patch", "1.2.4"   ]
@@ -257,6 +278,7 @@ test("\nincrement versions test", function (t) {
 })
 
 test("\nreplace stars test", function (t) {
+// replace stars with ""
 ; [ [ "", "" ]
   , [ "*", "" ]
   , [ "> *", "" ]
@@ -271,6 +293,9 @@ test("\nreplace stars test", function (t) {
 })
 
 test("\nvalid range test", function (t) {
+// [range, result]
+// validRange(range) -> result
+// translate ranges into their canonical form
 ; [ ["1.0.0 - 2.0.0", ">=1.0.0 <=2.0.0"]
   , ["1.0.0", "1.0.0"]
   , [">=*", ""]
@@ -337,6 +362,8 @@ test("\nvalid range test", function (t) {
 })
 
 test("\ncomparators test", function (t) {
+// [range, comparators]
+// turn range into a set of individual comparators
 ; [ ["1.0.0 - 2.0.0", [[">=1.0.0", "<=2.0.0"]] ]
   , ["1.0.0", [["1.0.0"]] ]
   , [">=*", [[">=0.0.0-"]] ]
@@ -391,6 +418,8 @@ test("\ncomparators test", function (t) {
   , ["~> 1", [[">=1.0.0-", "<2.0.0-"]] ]
   , ["~1.0", [[">=1.0.0-", "<1.1.0-"]] ]
   , ["~ 1.0", [[">=1.0.0-", "<1.1.0-"]] ]
+  , ["~ 1.0.3", [[">=1.0.3-", "<1.1.0-"]] ]
+  , ["~> 1.0.3", [[">=1.0.3-", "<1.1.0-"]] ]
   , ["<1", [["<1.0.0-"]] ]
   , ["< 1", [["<1.0.0-"]] ]
   , [">=1", [[">=1.0.0-"]] ]
@@ -398,6 +427,7 @@ test("\ncomparators test", function (t) {
   , ["<1.2", [["<1.2.0-"]] ]
   , ["< 1.2", [["<1.2.0-"]] ]
   , ["1", [[">=1.0.0-", "<2.0.0-"]] ]
+  , ["1 2", [[">=1.0.0-", "<2.0.0-", ">=2.0.0-", "<3.0.0-"]] ]
   ].forEach(function (v) {
     t.equivalent(toComparators(v[0]), v[1], "toComparators("+v[0]+") === "+JSON.stringify(v[1]))
   })