[Pkg-javascript-commits] [node-async] 52/480: fix lint errors
Jonas Smedegaard
js at moszumanska.debian.org
Fri May 2 08:58:11 UTC 2014
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository node-async.
commit 3346146231683ca27cece79c53dcd71d40a04bcb
Author: Caolan McMahon <caolan at caolanmcmahon.com>
Date: Wed Nov 17 18:57:55 2010 +0000
fix lint errors
---
lib/async.js | 462 +++++++++++++++++++++++++++++++++++------------------------
1 file changed, 275 insertions(+), 187 deletions(-)
diff --git a/lib/async.js b/lib/async.js
index 3ae2c97..62f2e43 100644
--- a/lib/async.js
+++ b/lib/async.js
@@ -1,58 +1,77 @@
-(function(){
+/*global setTimeout: false, console: false */
+(function () {
var async = {};
// global on the server, window in the browser
- var root = this;
- var previous_async = root.async;
+ var root = this,
+ previous_async = root.async;
- if(typeof module !== 'undefined' && module.exports) module.exports = async;
- else root.async = async;
+ if (typeof module !== 'undefined' && module.exports) {
+ module.exports = async;
+ }
+ else {
+ root.async = async;
+ }
- async.noConflict = function(){
+ async.noConflict = function () {
root.async = previous_async;
return async;
};
//// cross-browser compatiblity functions ////
- var _forEach = function(arr, iterator){
- if(arr.forEach) return arr.forEach(iterator);
- for(var i=0; i<arr.length; i++){
+ var _forEach = function (arr, iterator) {
+ if (arr.forEach) {
+ return arr.forEach(iterator);
+ }
+ for (var i = 0; i < arr.length; i += 1) {
iterator(arr[i], i, arr);
}
};
- var _map = function(arr, iterator){
- if(arr.map) return arr.map(iterator);
+ var _map = function (arr, iterator) {
+ if (arr.map) {
+ return arr.map(iterator);
+ }
var results = [];
- _forEach(arr, function(x, i, a){
+ _forEach(arr, function (x, i, a) {
results.push(iterator(x, i, a));
- })
+ });
return results;
};
- var _reduce = function(arr, iterator, memo){
- if(arr.reduce) return arr.reduce(iterator, memo);
- _forEach(arr, function(x, i, a){
+ var _reduce = function (arr, iterator, memo) {
+ if (arr.reduce) {
+ return arr.reduce(iterator, memo);
+ }
+ _forEach(arr, function (x, i, a) {
memo = iterator(memo, x, i, a);
});
return memo;
};
- var _keys = function(obj){
- if(Object.keys) return Object.keys(obj);
+ var _keys = function (obj) {
+ if (Object.keys) {
+ return Object.keys(obj);
+ }
var keys = [];
- for(var k in obj){
- if(obj.hasOwnProperty(k)) keys.push(k);
+ for (var k in obj) {
+ if (obj.hasOwnProperty(k)) {
+ keys.push(k);
+ }
}
return keys;
};
- var _indexOf = function(arr, item){
- if(arr.indexOf) return arr.indexOf(item);
- for(var i=0; i<arr.length; i++){
- if(arr[i] === item) return i;
+ var _indexOf = function (arr, item) {
+ if (arr.indexOf) {
+ return arr.indexOf(item);
+ }
+ for (var i = 0; i < arr.length; i += 1) {
+ if (arr[i] === item) {
+ return i;
+ }
}
return -1;
};
@@ -60,43 +79,55 @@
//// exported async module functions ////
//// nextTick implementation with browser-compatible fallback ////
- async.nextTick = function(fn){
- if(typeof process == 'undefined' || !(process.nextTick)){
+ async.nextTick = function (fn) {
+ if (typeof process === 'undefined' || !(process.nextTick)) {
setTimeout(fn, 0);
}
- else process.nextTick(fn);
+ else {
+ process.nextTick(fn);
+ }
};
- async.forEach = function(arr, iterator, callback){
- if(!arr.length) return callback();
+ async.forEach = function (arr, iterator, callback) {
+ if (!arr.length) {
+ return callback();
+ }
var completed = 0;
- _forEach(arr, function(x){
- iterator(x, function(err){
- if(err){
+ _forEach(arr, function (x) {
+ iterator(x, function (err) {
+ if (err) {
callback(err);
- callback = function(){};
+ callback = function () {};
}
else {
- completed++;
- if(completed == arr.length) callback();
+ completed += 1;
+ if (completed === arr.length) {
+ callback();
+ }
}
});
});
};
- async.forEachSeries = function(arr, iterator, callback){
- if(!arr.length) return callback();
+ async.forEachSeries = function (arr, iterator, callback) {
+ if (!arr.length) {
+ return callback();
+ }
var completed = 0;
- var iterate = function(){
- iterator(arr[completed], function(err){
- if(err){
+ var iterate = function () {
+ iterator(arr[completed], function (err) {
+ if (err) {
callback(err);
- callback = function(){};
+ callback = function () {};
}
else {
- completed++;
- if(completed == arr.length) callback();
- else iterate();
+ completed += 1;
+ if (completed === arr.length) {
+ callback();
+ }
+ else {
+ iterate();
+ }
}
});
};
@@ -104,31 +135,31 @@
};
- var doParallel = function(fn){
- return function(){
+ var doParallel = function (fn) {
+ return function () {
var args = Array.prototype.slice.call(arguments);
return fn.apply(null, [async.forEach].concat(args));
};
};
- var doSeries = function(fn){
- return function(){
+ var doSeries = function (fn) {
+ return function () {
var args = Array.prototype.slice.call(arguments);
return fn.apply(null, [async.forEachSeries].concat(args));
};
};
- var _asyncMap = function(eachfn, arr, iterator, callback){
+ var _asyncMap = function (eachfn, arr, iterator, callback) {
var results = [];
- arr = _map(arr, function(x, i){
+ arr = _map(arr, function (x, i) {
return {index: i, value: x};
});
- eachfn(arr, function(x, callback){
- iterator(x.value, function(err, v){
+ eachfn(arr, function (x, callback) {
+ iterator(x.value, function (err, v) {
results[x.index] = v;
callback(err);
});
- }, function(err){
+ }, function (err) {
callback(err, results);
});
};
@@ -138,13 +169,13 @@
// reduce only has a series version, as doing reduce in parallel won't
// work in many situations.
- async.reduce = function(arr, memo, iterator, callback){
- async.forEachSeries(arr, function(x, callback){
- iterator(memo, x, function(err, v){
+ async.reduce = function (arr, memo, iterator, callback) {
+ async.forEachSeries(arr, function (x, callback) {
+ iterator(memo, x, function (err, v) {
memo = v;
callback(err);
});
- }, function(err){
+ }, function (err) {
callback(err, memo);
});
};
@@ -153,27 +184,31 @@
// foldl alias
async.foldl = async.reduce;
- async.reduceRight = function(arr, memo, iterator, callback){
- var reversed = _map(arr, function(x){return x;}).reverse();
+ async.reduceRight = function (arr, memo, iterator, callback) {
+ var reversed = _map(arr, function (x) {
+ return x;
+ }).reverse();
async.reduce(reversed, memo, iterator, callback);
};
// foldr alias
async.foldr = async.reduceRight;
- var _filter = function(eachfn, arr, iterator, callback){
+ var _filter = function (eachfn, arr, iterator, callback) {
var results = [];
- arr = _map(arr, function(x, i){
+ arr = _map(arr, function (x, i) {
return {index: i, value: x};
});
- eachfn(arr, function(x, callback){
- iterator(x.value, function(v){
- if(v) results.push(x);
+ eachfn(arr, function (x, callback) {
+ iterator(x.value, function (v) {
+ if (v) {
+ results.push(x);
+ }
callback();
});
- }, function(err){
- callback(_map(results.sort(function(a,b){
+ }, function (err) {
+ callback(_map(results.sort(function (a, b) {
return a.index - b.index;
- }), function(x){
+ }), function (x) {
return x.value;
}));
});
@@ -184,20 +219,22 @@
async.select = async.filter;
async.selectSeries = async.filterSeries;
- var _reject = function(eachfn, arr, iterator, callback){
+ var _reject = function (eachfn, arr, iterator, callback) {
var results = [];
- arr = _map(arr, function(x, i){
+ arr = _map(arr, function (x, i) {
return {index: i, value: x};
});
- eachfn(arr, function(x, callback){
- iterator(x.value, function(v){
- if(!v) results.push(x);
+ eachfn(arr, function (x, callback) {
+ iterator(x.value, function (v) {
+ if (!v) {
+ results.push(x);
+ }
callback();
});
- }, function(err){
- callback(_map(results.sort(function(a,b){
+ }, function (err) {
+ callback(_map(results.sort(function (a, b) {
return a.index - b.index;
- }), function(x){
+ }), function (x) {
return x.value;
}));
});
@@ -205,120 +242,141 @@
async.reject = doParallel(_reject);
async.rejectSeries = doSeries(_reject);
- var _detect = function(eachfn, arr, iterator, main_callback){
- eachfn(arr, function(x, callback){
- iterator(x, function(result){
- if(result) main_callback(x);
- else callback();
+ var _detect = function (eachfn, arr, iterator, main_callback) {
+ eachfn(arr, function (x, callback) {
+ iterator(x, function (result) {
+ if (result) {
+ main_callback(x);
+ }
+ else {
+ callback();
+ }
});
- }, function(err){
+ }, function (err) {
main_callback();
});
};
async.detect = doParallel(_detect);
async.detectSeries = doSeries(_detect);
- async.some = function(arr, iterator, main_callback){
- async.forEach(arr, function(x, callback){
- iterator(x, function(v){
- if(v){
+ async.some = function (arr, iterator, main_callback) {
+ async.forEach(arr, function (x, callback) {
+ iterator(x, function (v) {
+ if (v) {
main_callback(true);
- main_callback = function(){};
+ main_callback = function () {};
}
callback();
});
- }, function(err){
+ }, function (err) {
main_callback(false);
});
};
// any alias
async.any = async.some;
- async.every = function(arr, iterator, main_callback){
- async.forEach(arr, function(x, callback){
- iterator(x, function(v){
- if(!v){
+ async.every = function (arr, iterator, main_callback) {
+ async.forEach(arr, function (x, callback) {
+ iterator(x, function (v) {
+ if (!v) {
main_callback(false);
- main_callback = function(){};
+ main_callback = function () {};
}
callback();
});
- }, function(err){
+ }, function (err) {
main_callback(true);
});
};
// all alias
async.all = async.every;
- async.sortBy = function(arr, iterator, callback){
- async.map(arr, function(x, callback){
- iterator(x, function(err, criteria){
- if(err) callback(err);
- else callback(null, {value: x, criteria: criteria});
+ async.sortBy = function (arr, iterator, callback) {
+ async.map(arr, function (x, callback) {
+ iterator(x, function (err, criteria) {
+ if (err) {
+ callback(err);
+ }
+ else {
+ callback(null, {value: x, criteria: criteria});
+ }
});
- }, function(err, results){
- if(err) return callback(err);
- else callback(null, _map(results.sort(function(left, right){
- var a = left.criteria, b = right.criteria;
- return a < b ? -1 : a > b ? 1 : 0;
- }), function(x){return x.value;}));
- })
+ }, function (err, results) {
+ if (err) {
+ return callback(err);
+ }
+ else {
+ var fn = function (left, right) {
+ var a = left.criteria, b = right.criteria;
+ return a < b ? -1 : a > b ? 1 : 0;
+ };
+ callback(null, _map(results.sort(fn), function (x) {
+ return x.value;
+ }));
+ }
+ });
};
- async.auto = function(tasks, callback){
- callback = callback || function(){};
+ async.auto = function (tasks, callback) {
+ callback = callback || function () {};
var keys = _keys(tasks);
- if(!keys.length) return callback(null);
+ if (!keys.length) {
+ return callback(null);
+ }
var completed = [];
var listeners = [];
- var addListener = function(fn){
+ var addListener = function (fn) {
listeners.unshift(fn);
};
- var removeListener = function(fn){
- for(var i=0; i<listeners.length; i++){
- if(listeners[i] === fn){
+ var removeListener = function (fn) {
+ for (var i = 0; i < listeners.length; i += 1) {
+ if (listeners[i] === fn) {
listeners.splice(i, 1);
return;
}
}
};
- var taskComplete = function(){
- _forEach(listeners, function(fn){fn();});
+ var taskComplete = function () {
+ _forEach(listeners, function (fn) {
+ fn();
+ });
};
- addListener(function(){
- if(completed.length == keys.length){
+ addListener(function () {
+ if (completed.length === keys.length) {
callback(null);
}
});
- _forEach(keys, function(k){
- var task = (tasks[k] instanceof Function)? [tasks[k]]: tasks[k];
- var taskCallback = function(err){
- if(err){
+ _forEach(keys, function (k) {
+ var task = (tasks[k] instanceof Function) ? [tasks[k]]: tasks[k];
+ var taskCallback = function (err) {
+ if (err) {
callback(err);
// stop subsequent errors hitting callback multiple times
- callback = function(){};
+ callback = function () {};
}
else {
completed.push(k);
taskComplete();
}
};
- var requires = task.slice(0, Math.abs(task.length-1)) || [];
- var ready = function(){
- return _reduce(requires, function(a,x){
- return (a && _indexOf(completed, x) != -1);
+ var requires = task.slice(0, Math.abs(task.length - 1)) || [];
+ var ready = function () {
+ return _reduce(requires, function (a, x) {
+ return (a && _indexOf(completed, x) !== -1);
}, true);
};
- if(ready()) task[task.length-1](taskCallback);
+ if (ready()) {
+ task[task.length - 1](taskCallback);
+ }
else {
- var listener = function(){
- if(ready()){
+ var listener = function () {
+ if (ready()) {
removeListener(listener);
- task[task.length-1](taskCallback);
+ task[task.length - 1](taskCallback);
}
};
addListener(listener);
@@ -326,35 +384,45 @@
});
};
- async.waterfall = function(tasks, callback){
- if(!tasks.length) return callback();
- callback = callback || function(){};
- var wrapIterator = function(iterator){
- return function(err){
- if(err){
+ async.waterfall = function (tasks, callback) {
+ if (!tasks.length) {
+ return callback();
+ }
+ callback = callback || function () {};
+ var wrapIterator = function (iterator) {
+ return function (err) {
+ if (err) {
callback(err);
- callback = function(){};
+ callback = function () {};
}
else {
var args = Array.prototype.slice.call(arguments, 1);
var next = iterator.next();
- if(next) args.push(wrapIterator(next));
- else args.push(callback);
- async.nextTick(function(){iterator.apply(null, args);});
+ if (next) {
+ args.push(wrapIterator(next));
+ }
+ else {
+ args.push(callback);
+ }
+ async.nextTick(function () {
+ iterator.apply(null, args);
+ });
}
};
};
wrapIterator(async.iterator(tasks))();
};
- async.parallel = function(tasks, callback){
- callback = callback || function(){};
+ async.parallel = function (tasks, callback) {
+ callback = callback || function () {};
if (tasks.constructor === Array) {
- async.map(tasks, function(fn, callback){
- if(fn){
- fn(function(err){
- var args = Array.prototype.slice.call(arguments,1);
- if(args.length <= 1) args = args[0];
+ async.map(tasks, function (fn, callback) {
+ if (fn) {
+ fn(function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
callback.call(null, err, args || null);
});
}
@@ -364,8 +432,10 @@
var results = {};
async.forEach(_keys(tasks), function (k, callback) {
tasks[k](function (err) {
- var args = Array.prototype.slice.call(arguments,1);
- if(args.length <= 1) args = args[0];
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
results[k] = args;
callback(err);
});
@@ -375,14 +445,16 @@
}
};
- async.series = function(tasks, callback){
- callback = callback || function(){};
+ async.series = function (tasks, callback) {
+ callback = callback || function () {};
if (tasks.constructor === Array) {
- async.mapSeries(tasks, function(fn, callback){
- if(fn){
- fn(function(err){
- var args = Array.prototype.slice.call(arguments,1);
- if(args.length <= 1) args = args[0];
+ async.mapSeries(tasks, function (fn, callback) {
+ if (fn) {
+ fn(function (err) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
callback.call(null, err, args || null);
});
}
@@ -392,8 +464,10 @@
var results = {};
async.forEachSeries(_keys(tasks), function (k, callback) {
tasks[k](function (err) {
- var args = Array.prototype.slice.call(arguments,1);
- if(args.length <= 1) args = args[0];
+ var args = Array.prototype.slice.call(arguments, 1);
+ if (args.length <= 1) {
+ args = args[0];
+ }
results[k] = args;
callback(err);
});
@@ -403,61 +477,71 @@
}
};
- async.iterator = function(tasks){
- var makeCallback = function(index){
- var fn = function(){
- if(tasks.length) tasks[index].apply(null, arguments);
+ async.iterator = function (tasks) {
+ var makeCallback = function (index) {
+ var fn = function () {
+ if (tasks.length) {
+ tasks[index].apply(null, arguments);
+ }
return fn.next();
};
- fn.next = function(){
- return (index < tasks.length-1)? makeCallback(index+1): null;
+ fn.next = function () {
+ return (index < tasks.length - 1) ? makeCallback(index + 1): null;
};
return fn;
};
return makeCallback(0);
};
- async.apply = function(fn){
+ async.apply = function (fn) {
var args = Array.prototype.slice.call(arguments, 1);
- return function(){
+ return function () {
return fn.apply(
null, args.concat(Array.prototype.slice.call(arguments))
);
};
};
- var _concat = function(eachfn, arr, fn, callback){
+ var _concat = function (eachfn, arr, fn, callback) {
var r = [];
- eachfn(arr, function(x, cb){
- fn(x, function(err, y){
+ eachfn(arr, function (x, cb) {
+ fn(x, function (err, y) {
r = r.concat(y || []);
cb(err);
});
- }, function(err){
+ }, function (err) {
callback(err, r);
});
};
async.concat = doParallel(_concat);
async.concatSeries = doSeries(_concat);
- async.whilst = function(test, iterator, callback){
+ async.whilst = function (test, iterator, callback) {
if (test()) {
iterator(function (err) {
- if (err) return callback(err);
+ if (err) {
+ return callback(err);
+ }
async.whilst(test, iterator, callback);
});
}
- else callback();
+ else {
+ callback();
+ }
};
- async.until = function(test, iterator, callback){
+ async.until = function (test, iterator, callback) {
if (!test()) {
iterator(function (err) {
- if (err) return callback(err);
+ if (err) {
+ return callback(err);
+ }
async.until(test, iterator, callback);
});
}
- else callback();
+ else {
+ callback();
+ }
};
async.queue = function (worker, concurrency) {
@@ -471,10 +555,10 @@
},
process: function () {
if (workers < q.concurrency && tasks.length) {
- var task = tasks.splice(0,1)[0];
- workers++;
+ var task = tasks.splice(0, 1)[0];
+ workers += 1;
worker(task.data, function () {
- workers--;
+ workers -= 1;
task.callback.apply(task, arguments);
q.process();
});
@@ -487,17 +571,21 @@
return q;
};
- var _console_fn = function(name){
- return function(fn){
+ var _console_fn = function (name) {
+ return function (fn) {
var args = Array.prototype.slice.call(arguments, 1);
- fn.apply(null, args.concat([function(err){
+ fn.apply(null, args.concat([function (err) {
var args = Array.prototype.slice.call(arguments, 1);
- if(typeof console != 'undefined'){
- if(err){
- if(console.error) console.error(err);
+ if (typeof console !== 'undefined') {
+ if (err) {
+ if (console.error) {
+ console.error(err);
+ }
}
- else if(console[name]){
- _forEach(args, function(x){console[name](x);});
+ else if (console[name]) {
+ _forEach(args, function (x) {
+ console[name](x);
+ });
}
}
}]));
@@ -509,4 +597,4 @@
async.warn = _console_fn('warn');
async.error = _console_fn('error');*/
-})();
+}());
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-async.git
More information about the Pkg-javascript-commits
mailing list