browserslist 0.3.0 → 0.4.0

package/.eslintrc

@@ -0,0 +1,21 @@
+{
+    "rules": {
+        "no-unused-expressions": [0],
+        "no-underscore-dangle":  [0],
+        "no-reserved-keys":      [2],
+        "no-multi-spaces":       [0],
+        "no-extra-parens":       [2],
+        "no-unused-vars":        [2],
+        "no-loop-func":          [0],
+        "key-spacing":           [0],
+        "max-len":               [2],
+        "strict":                [0],
+        "indent":                [2],
+        "quotes":                [2, "single", "avoid-escape"],
+        "curly":                 [0]
+    },
+    "env": {
+        "mocha": true,
+        "node":  true
+    }
+}

package/ChangeLog.md

@@ -1,3 +1,16 @@
+## 0.4
+* Add `config` option and `BROWSERSLIST_CONFIG` environment variable support.
+* Add symlink config support.
+
+## 0.3.3
+* Fix DynJS compatibility (by Nick Howes).
+
+## 0.3.2
+* Fix joined versions on versions query (by Vincent De Oliveira).
+
+## 0.3.1
+* Fix global variable leak (by Peter Müller).
+
 ## 0.3
 * Takes criterias from `BROWSERSLIST` environment variable.
 

package/README.md

@@ -11,8 +11,8 @@ with a usage of over 5% in global usage statistics:
 
 ```js
 browserslist('last 1 version, > 5%');
-//=> ['and_chr 40', 'chrome 40', 'chrome 39', 'firefox 35', 'firefox 34',
-//    'ie 11', 'ie_mob 11', 'ios_saf 8.1', 'opera 27', 'safari 8']
+//=> ['and_chr 41', 'chrome 41', 'chrome 40', 'firefox 37', 'firefox 36',
+//    'ie 11', 'ie_mob 11', 'ios_saf 8.1-8.3', 'opera 27', 'safari 8']
 ```
 
 Browserslist will use browsers criterias from:
@@ -31,7 +31,7 @@ Browserslist will use browsers criterias from:
 
 ## Queries
 
-You can specify the browsers by queries (case insensitive):
+You can specify the versions by queries (case insensitive):
 
 * `last 2 versions`: the last 2 versions for each major browser.
 * `last 2 Chrome versions`: the last 2 versions of Chrome browser.
@@ -47,6 +47,9 @@ You can specify the browsers by queries (case insensitive):
 Blackberry and Android WebView will not be used in `last n versions`.
 You should add them by name.
 
+Browserslist works with separated versions of browsers. To use all versions
+of some browsers you can use `Firefox > 0`, but it is a very bad way.
+
 [two-letter country code]: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements
 
 ## Browsers
@@ -100,3 +103,5 @@ split by a new line. You can write a comment after `#`:
 Last 2 versions
 IE 8 # sorry
 ```
+
+You can specify direct path to config by `config` option.

package/index.js

@@ -5,30 +5,28 @@ var fs      = require('fs');
 var uniq = function (array) {
     var filtered = [];
     for ( var i = 0; i < array.length; i++ ) {
-        if ( filtered.indexOf(array[i]) == -1 ) filtered.push(array[i]);
+        if ( filtered.indexOf(array[i]) === -1 ) filtered.push(array[i]);
     }
     return filtered;
 };
 
-normalizeVersion = function (data, version) {
-    if ( data.versions.indexOf(version) != -1 ) {
-        return version;
-    } else {
-        var alias = browserslist.versionAliases[data.name][version];
-        if ( alias ) return alias;
-    }
-};
-
 // Return array of browsers by selection queries:
 //
 //   browserslist('IE >= 10, IE 8') //=> ['ie 11', 'ie 10', 'ie 8']
 var browserslist = function (selections, opts) {
-    if ( typeof(opts) == 'undefined' ) opts = { };
+    if ( typeof opts === 'undefined' ) opts = { };
 
-    if ( typeof(selections) == 'undefined' || selections === null ) {
+    if ( typeof selections === 'undefined' || selections === null ) {
 
         if ( process.env.BROWSERSLIST ) {
             selections = process.env.BROWSERSLIST;
+        } else if ( opts.config || process.env.BROWSERSLIST_CONFIG ) {
+            var file = opts.config || process.env.BROWSERSLIST_CONFIG;
+            if ( fs.existsSync(file) && fs.statSync(file).isFile() ) {
+                selections = browserslist.parseConfig( fs.readFileSync(file) );
+            } else {
+                throw 'Can\'t read ' + file + ' config';
+            }
         } else {
             var config = browserslist.readConfig(opts.path);
             if ( config !== false ) {
@@ -39,7 +37,7 @@ var browserslist = function (selections, opts) {
         }
     }
 
-    if ( typeof(selections) == 'string' ) {
+    if ( typeof selections === 'string' ) {
         selections = selections.split(/,\s*/);
     }
 
@@ -69,14 +67,44 @@ var browserslist = function (selections, opts) {
     return uniq(result).sort(function (name1, name2) {
         name1 = name1.split(' ');
         name2 = name2.split(' ');
-        if ( name1[0] == name2[0] ) {
-            return parseFloat(name2[1]) - parseFloat(name1[1]);
+        if ( name1[0] === name2[0] ) {
+            var d = parseFloat(name2[1]) - parseFloat(name1[1]);
+            if ( d > 0 ) {
+                return 1;
+            } else if ( d < 0 ) {
+                return -1;
+            } else {
+                return 0;
+            }
         } else {
             return name1[0].localeCompare(name2[0]);
         }
     });
 };
 
+// Helpers
+
+var normalizeVersion = function (data, version) {
+    if ( data.versions.indexOf(version) !== -1 ) {
+        return version;
+    } else {
+        var alias = browserslist.versionAliases[data.name][version];
+        if ( alias ) return alias;
+    }
+};
+
+var normalize = function (versions) {
+    return versions.filter(function (version) {
+        return typeof version === 'string';
+    });
+};
+
+var fillUsage = function (result, name, data) {
+    for ( var i in data ) {
+        result[name + ' ' + i] = data[i];
+    }
+};
+
 // Will be filled by Can I Use data below
 browserslist.data  = { };
 browserslist.usage = {
@@ -116,8 +144,13 @@ browserslist.versionAliases = { };
 browserslist.byName = function (name) {
     name = name.toLowerCase();
     name = browserslist.aliases[name] || name;
+    return browserslist.data[name];
+};
 
-    var data = browserslist.data[name];
+// Get browser data by alias or case insensitive name and throw error
+// on unknown browser
+browserslist.checkName = function (name) {
+    var data = browserslist.byName(name);
     if ( !data ) throw 'Unknown browser ' + name;
     return data;
 };
@@ -126,14 +159,14 @@ browserslist.byName = function (name) {
 browserslist.readConfig = function (from) {
     if ( from === false )   return false;
     if ( !fs.readFileSync ) return false;
-    if ( typeof(from) == 'undefined' ) from = '.';
+    if ( typeof from === 'undefined' ) from = '.';
 
     var dirs = path.resolve(from).split(path.sep);
-    var config, stat;
+    var config;
     while ( dirs.length ) {
         config = dirs.concat(['browserslist']).join(path.sep);
 
-        if ( fs.existsSync(config) && fs.lstatSync(config).isFile() ) {
+        if ( fs.existsSync(config) && fs.statSync(config).isFile() ) {
             return browserslist.parseConfig( fs.readFileSync(config) );
         }
 
@@ -149,10 +182,10 @@ browserslist.parseConfig = function (string) {
                  .replace(/#[^\n]*/g, '')
                  .split(/\n/)
                  .map(function (i) {
-                    return i.trim();
+                     return i.trim();
                  })
                  .filter(function (i) {
-                    return i !== '';
+                     return i !== '';
                  });
 };
 
@@ -164,6 +197,7 @@ browserslist.queries = {
             var selected = [];
             browserslist.major.forEach(function (name) {
                 var data  = browserslist.byName(name);
+                if ( !data ) return;
                 var array = data.released.slice(-versions);
 
                 array = array.map(function (v) {
@@ -178,7 +212,7 @@ browserslist.queries = {
     lastByBrowser: {
         regexp: /^last (\d+) (\w+) versions?$/i,
         select: function (versions, name) {
-            var data = browserslist.byName(name);
+            var data = browserslist.checkName(name);
             return data.released.slice(-versions).map(function (v) {
                 return data.name + ' ' + v;
             });
@@ -231,28 +265,31 @@ browserslist.queries = {
     versions: {
         regexp: /^(\w+) (>=?|<=?)\s*([\d\.]+)/,
         select: function (name, sign, version) {
-            var data = browserslist.byName(name);
-            version  = parseFloat(version);
+            var data = browserslist.checkName(name);
+            var alias = normalizeVersion(data, version);
+            if ( alias ) {
+                version = alias;
+            }
+            version = parseFloat(version);
 
             var filter;
-            if ( sign == '>' ) {
+            if ( sign === '>' ) {
                 filter = function (v) {
                     return parseFloat(v) > version;
                 };
-            } else if ( sign == '>=' ) {
+            } else if ( sign === '>=' ) {
                 filter = function (v) {
                     return parseFloat(v) >= version;
                 };
-            } else if ( sign == '<' ) {
+            } else if ( sign === '<' ) {
                 filter = function (v) {
                     return parseFloat(v) < version;
                 };
-            } else if ( sign == '<=' ) {
+            } else if ( sign === '<=' ) {
                 filter = function (v) {
                     return parseFloat(v) <= version;
                 };
             }
-
             return data.released.filter(filter).map(function (v) {
                 return data.name + ' ' + v;
             });
@@ -261,7 +298,7 @@ browserslist.queries = {
 
     esr: {
         regexp: /^(firefox|ff|fx) esr$/i,
-        select: function (versions) {
+        select: function () {
             return ['firefox 31'];
         }
     },
@@ -269,12 +306,12 @@ browserslist.queries = {
     direct: {
         regexp: /^(\w+) ([\d\.]+)$/,
         select: function (name, version) {
-            var data  = browserslist.byName(name);
+            var data  = browserslist.checkName(name);
             var alias = normalizeVersion(data, version);
             if ( alias ) {
                 version = alias;
             } else {
-                if ( version.indexOf('.') == -1 ) {
+                if ( version.indexOf('.') === -1 ) {
                     alias = version + '.0';
                 } else if ( /\.0$/.test(version) ) {
                     alias = version.replace(/\.0$/, '');
@@ -286,7 +323,6 @@ browserslist.queries = {
                     throw 'Unknown version ' + version + ' of ' + name;
                 }
             }
-
             return [data.name + ' ' + version];
         }
     }
@@ -295,38 +331,28 @@ browserslist.queries = {
 
 // Get and convert Can I Use data
 
-var normalize = function (versions) {
-    return versions.filter(function (version) {
-        return typeof(version) == 'string';
-    });
-};
-
-var fillUsage = function (result, name, data) {
-    for ( var i in data ) {
-        result[name + ' ' + i] = data[i];
-    }
-};
-
-for ( var name in caniuse ) {
-    browserslist.data[name] = {
-        name:     name,
-        versions: normalize(caniuse[name].versions),
-        released: normalize(caniuse[name].versions.slice(0, -3))
-    };
-    fillUsage(browserslist.usage.global, name, caniuse[name].usage_global);
-
-    browserslist.versionAliases[name] = { };
-    for ( var i = 0; i < caniuse[name].versions.length; i++ ) {
-        if ( !caniuse[name].versions[i] ) continue;
-        var full = caniuse[name].versions[i];
-
-        if ( full.indexOf('-') != -1 ) {
-            var interval = full.split('-');
-            for ( var j = 0; j < interval.length; j++ ) {
-                browserslist.versionAliases[name][ interval[j] ] = full;
+(function () {
+    for ( var name in caniuse ) {
+        browserslist.data[name] = {
+            name:     name,
+            versions: normalize(caniuse[name].versions),
+            released: normalize(caniuse[name].versions.slice(0, -3))
+        };
+        fillUsage(browserslist.usage.global, name, caniuse[name].usage_global);
+
+        browserslist.versionAliases[name] = { };
+        for ( var i = 0; i < caniuse[name].versions.length; i++ ) {
+            if ( !caniuse[name].versions[i] ) continue;
+            var full = caniuse[name].versions[i];
+
+            if ( full.indexOf('-') !== -1 ) {
+                var interval = full.split('-');
+                for ( var j = 0; j < interval.length; j++ ) {
+                    browserslist.versionAliases[name][ interval[j] ] = full;
+                }
             }
         }
     }
-}
+})();
 
 module.exports = browserslist;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "browserslist",
-    "version": "0.3.0",
+    "version": "0.4.0",
     "description": "Get browsers versions that matches given criterias like in Autoprefixer",
     "keywords": ["caniuse", "browsers"],
     "author": "Andrey Sitnik <andrey@sitnik.ru>",
@@ -10,15 +10,14 @@
         "url":  "https://github.com/ai/browserslist.git"
     },
     "dependencies": {
-        "caniuse-db": "^1.0.30000078"
+        "caniuse-db": "^1.0.30000153"
     },
     "devDependencies": {
-        "jshint-stylish": "1.0.0",
-        "gulp-jshint":    "1.9.2",
-        "gulp-mocha":     "2.0.0",
-        "mocha":          "2.1.0",
-        "chai":           "2.0.0",
-        "gulp":           "3.8.11"
+        "gulp-eslint": "0.11.1",
+        "gulp-mocha":  "2.0.1",
+        "mocha":       "2.2.4",
+        "chai":        "2.3.0",
+        "gulp":        "3.8.11"
     },
     "scripts": {
         "test": "gulp"