switched to forEachAsync, fixed empty-array and sync bugs

Author: AJ ONeal

README.md

@@ -85,6 +85,4 @@ API
 TODO
 ---
 
-Replace `forAllAsync` with `forEachAsync`
-
-Make work with synchronous callbacks as well
+The code is a little hairy and could use some cleaning.

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "lateral",
   "main": "lateral.js",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "homepage": "https://github.com/FuturesJS/lateral",
   "authors": [
     "AJ ONeal <[email protected]>"
@@ -21,7 +21,7 @@
     "browser"
   ],
   "dependencies": {
-    "forallasync": "~ 1.0"
+    "forEachAsync": "~ 3.0"
   },
   "license": "Apache-v2",
   "ignore": [

lateral.js

@@ -7,10 +7,10 @@
       , curThread = 0
       , nThreads = _nThreads || 4
       , running = 0
-      //, forEachAsync = exports.forEachAsync || require('forEachAsync').forEachAsync
-      , forAllAsync = exports.forAllAsync || require('forallasync').forAllAsync
+      , forEachAsync = exports.forEachAsync || require('forEachAsync').forEachAsync
       , tasks = []
       , callbacks = []
+      , completedAll = true
       ;
 
     function startOne() {
@@ -33,7 +33,8 @@
 
     function onNext() {
       if (!threads.length) {
-        if (0 === running) {
+        if (0 === running && !completedAll) {
+          completedAll = true;
           callbacks.forEach(function (cb) {
             cb();
           });
@@ -43,7 +44,13 @@
 
       if (running < nThreads) {
         curThread = (curThread + 1) % threads.length;
-        threads[curThread].next();
+        if (threads[curThread].next) {
+          threads[curThread].nowNext = threads[curThread].next;
+          threads[curThread].next = null;
+          threads[curThread].nowNext();
+        } else {
+          curThread = Math.max(0, (curThread + (threads.length - 1))) % threads.length;
+        }
       }
     }
 
@@ -98,11 +105,18 @@
 
     return {
       add: function (arr) {
+        if (0 === arr.length) {
+          return {
+            then: function (fn) {
+              fn();
+            }
+          };
+        }
+        completedAll = false;
         var t = newThread(arr.length)
           ;
 
-        //forEachAsync(arr, t.each);
-        forAllAsync(arr, t.each, 1);
+        forEachAsync(arr, t.each);
 
         return {
           then: function (fn) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lateral",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Like forEachAsync and Join had a baby: sequences out n batches of async functions rather than all at once. Part of FuturesJS (Browser, Node.js, Bower, Pakmanager)",
   "homepage": "https://github.com/FuturesJS/lateral",
   "keywords": [
@@ -30,7 +30,7 @@
     "lib": "."
   },
   "dependencies": {
-    "forallasync": "~ 1.0"
+    "forEachAsync": "~ 3.0"
   },
   "engines": {
     "node": "*",

test-sync.js

@@ -0,0 +1,21 @@
+(function () {
+  "use strict";
+
+  var Lateral = require('./lateral').Lateral
+    , lateralSync
+    ;
+
+  lateralSync = Lateral.create(function (complete, item, i) {
+    console.log(item, i);
+    complete();
+  }, 4);
+  lateralSync.add([]).then(function () {
+    console.log('empty sync batch complete');
+  });
+  lateralSync.add('abc'.split('')).then(function () {
+    console.log('sync batch complete');
+  });
+  lateralSync.then(function () {
+    console.log('all sync batches complete');
+  });
+}());

test.js

@@ -13,6 +13,9 @@
     }, timeout);
   }, 4);
 
+  lateral.add([]).then(function () {
+    console.log('empty batch complete');
+  });
   lateral.add('abcdefghijkl'.split('')).then(function () {
     console.log('batch 1 complete');
   });