fix yielding sync flows before async ones

conclude.js

@@ -92,7 +92,6 @@ export function conclude(it, callback) {
   }
 
   const subscribers = new Set();
-  let cancel;
 
   const onConclude = (error, result) => {
     finalize(it, { error, result });
@@ -117,7 +116,7 @@ export function conclude(it, callback) {
 
   const unsubscribe = subscribe(callback);
 
-  cancel = runners.get(flowType)(it, onConclude);
+  const cancel = runners.get(flowType)(it, onConclude);
 
   return unsubscribe;
 }
@@ -159,20 +158,24 @@ function runEffect({ [TYPE]: type, context, fn, args }, callback) {
 }
 
 function runIterator(it, callback) {
-  let cancel;
+  let cancel, step = 0;
+
+  const setCancel = (j, fn) => {
+    if (j >= step) cancel = fn;
+  }
 
   function iterate(error, result) {
     try {
       let cancelled = false;
-      cancel = () => cancelled = true;
+      setCancel(++step, () => cancelled = true);
 
       const { value, done } = error
         ? it.throw(error)
         : it.next(result);
 
       if (cancelled) return;
 
-      cancel = conclude(value, done ? callback : iterate);
+      setCancel(step, conclude(value, done ? callback : iterate));
     }
     catch (err) {
       callback(err);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "conclure",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Generator runner",
   "main": "conclude.js",
   "module": "conclude.js",

tests/combinators.spec.js

@@ -93,7 +93,12 @@ test.cb('all, cancelling before completion', t => {
     Promise.reject('boom')
   ];
 
-  const cancel = conclude(Conclude.all(promises), t.fail);
+  function* g() {
+    yield 5;
+    yield Conclude.all(promises);
+  }
+
+  const cancel = conclude(g(), t.fail);
 
   let count = 2;