refactor(done): don't use done() method

blond · Aug 11, 2016 · d200239 · d200239
1 parent 68abd9d
commit d200239
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 26 deletions.
diff --git a/lib/done.js b/lib/done.js
diff --git a/lib/evenly.js b/lib/evenly.js
@@ -3,7 +3,6 @@
 const unspread = require('spread-args').unspread;
 
 const createIterator = require('./create-iterator');
-const done = require('./done');
 
 /**
  * Returns an Iterator, that traverses iterators evenly.
@@ -78,7 +77,7 @@ function evenly(iterables) {
     function next() {
         // Exit if all iterators are traversed.
         if (empties.size === count) {
-            return done();
+            return { done: true };
         }
 
         // Go to the next iterator.

diff --git a/lib/object-entries-iterator.js b/lib/object-entries-iterator.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const done = require('./done');
-
 /**
  * Creates an iterator whose elements are arrays corresponding to the enumerable property [key, value] pairs
  * found directly upon object.
@@ -42,7 +40,7 @@ module.exports = class ObjectEntriesIterator {
     }
     next() {
         if (this._index === this._length) {
-            return done();
+            return { done: true };
         }
 
         const key = this._keys[this._index++];

diff --git a/lib/series.js b/lib/series.js
@@ -3,7 +3,6 @@
 const unspread = require('spread-args').unspread;
 
 const createIterator = require('./create-iterator');
-const done = require('./done');
 
 /**
  * Returns an Iterator, that traverses iterators in series.
@@ -50,7 +49,7 @@ function series(iterables) {
             while (next.done) {
                 // If iterators are ended, then exit.
                 if (iterables.length === 0) {
-                    return done();
+                    return { done: true };
                 }
 
                 iter = createIterator(iterables.shift(), { strict: false });

diff --git a/lib/value-iterator.js b/lib/value-iterator.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const done = require('./done');
-
 /**
  * Iterator with specified value.
  *
@@ -24,7 +22,7 @@ module.exports = class ValueIterator {
     }
     next() {
         if (this._done) {
-            return done();
+            return { done: true };
         }
 
         this._done = true;

diff --git a/test/evenly/iterator.test.js b/test/evenly/iterator.test.js
@@ -4,20 +4,19 @@ const test = require('ava');
 
 const evenly = require('../../lib/evenly');
 const createIterator = require('../../lib/create-iterator');
-const done = require('../../lib/done');
 
 test('should return empty iterator', t => {
     const iter = evenly();
 
-    t.deepEqual(iter.next(), done());
+    t.deepEqual(iter.next(), { done: true });
 });
 
 test('should support empty iterator', t => {
     const emptyIter = createIterator();
 
     const iter = evenly(emptyIter);
 
-    t.deepEqual(iter.next(), done());
+    t.deepEqual(iter.next(), { done: true });
 });
 
 test('should return equal iterator', t => {

diff --git a/test/is-iterator/iterable.test.js b/test/is-iterator/iterable.test.js
@@ -3,13 +3,12 @@
 const test = require('ava');
 
 const isIterator = require('../../lib/is-iterator');
-const done = require('../../lib/done');
 
 test('iterable object should not be iterator', t => {
     const iterable = {
         [Symbol.iterator]() {
             return {
-                next: () => (done)
+                next: () => ({ done: true })
             };
         }
     };

diff --git a/test/series/iterator.test.js b/test/series/iterator.test.js
@@ -4,20 +4,19 @@ const test = require('ava');
 
 const series = require('../../lib/series');
 const createIterator = require('../../lib/create-iterator');
-const done = require('../../lib/done');
 
 test('should return empty iterator', t => {
     const iter = series();
 
-    t.deepEqual(iter.next(), done());
+    t.deepEqual(iter.next(), { done: true });
 });
 
 test('should support empty iterator', t => {
     const emptyIter = createIterator();
 
     const iter = series(emptyIter);
 
-    t.deepEqual(iter.next(), done());
+    t.deepEqual(iter.next(), { done: true });
 });
 
 test('should return equal iterator', t => {