methods accepts callbacks with one arguments (removing index & iterab…

…le parameters) & remove context parameter #8

src/gen/dropWhile.js

@@ -1,11 +1,9 @@
-const entriesGen = require('../core/entriesGen')
-
-module.exports = function* dropWhile (iterable, cb, context) {
+module.exports = function* dropWhile (iterable, cb) {
     let next = false
-    for (const [index, val] of entriesGen(iterable)) {
+    for (const val of iterable) {
         if (next) {
             yield val
-        } else if (!cb.call(context, val, index, iterable)) {
+        } else if (!cb(val)) {
             next = true
             yield val
         }

src/gen/filter.js

@@ -1,8 +1,6 @@
-const entriesGen = require('../core/entriesGen')
-
 module.exports = function* filter (iterable, cb) {
-    for (const [index, val] of entriesGen(iterable)) {
-        if (cb(val, index, iterable)) {
+    for (const val of iterable) {
+        if (cb(val)) {
             yield val
         }
     }

src/gen/map.js

@@ -1,7 +1,5 @@
-const entriesGen = require('../core/entriesGen')
-
 module.exports = function* map (iterable, cb) {
-    for (const [index, val] of entriesGen(iterable)) {
-        yield cb(val, index, iterable)
+    for (const val of iterable) {
+        yield cb(val)
     }
 }

src/gen/takeWhile.js

@@ -1,8 +1,6 @@
-const entriesGen = require('../core/entriesGen')
-
-module.exports = function* takeWhile (iterable, cb, context) {
-    for (const [index, val] of entriesGen(iterable)) {
-        if (cb.call(context, val, index, iterable)) {
+module.exports = function* takeWhile (iterable, cb) {
+    for (const val of iterable) {
+        if (cb(val)) {
             yield val
         } else {
             return

test/fn/dropWhile_test.js

@@ -1,5 +1,6 @@
 const {expect} = require('chai')
 const Iterum = require('../../src/index.js')
+const {range} = Iterum
 
 describe('dropWhile', function () {
     it('drop iterable values while value is greater than 5', function () {
@@ -8,13 +9,11 @@ describe('dropWhile', function () {
         expect([...iterum]).to.be.deep.equal([4, 7, 2])
     })
 
-    it('drop iterable values while sum of first elements is not greater than 10', function () {
-        const iterum = Iterum([2, 0, 3, 6, 1, 2])
-            .dropWhile(function (e, index, it) {
-                return it.slice(0, index + 1)
-                    .reduce((a, b) => a + b) <= 10
-            })
-        expect([...iterum]).to.be.deep.equal([6, 1, 2])
+    it('drop values while are less than 10', function () {
+        const iterum = range(0, 15)
+            .dropWhile(e => e < 10)
+            .slice(0, 5)
+        expect([...iterum]).to.be.deep.equal([10, 11, 12, 13, 14])
     })
 
     it('dropping to end of iterable because condition always match', function () {
@@ -23,20 +22,6 @@ describe('dropWhile', function () {
         expect([...iterum]).to.be.deep.equal([])
     })
 
-    it('using context parameter', function () {
-        const context = []
-        const iterum = Iterum([2, 5, 3, 7])
-            .dropWhile(function (e) {
-                const result = e !== 3
-                if (result) {
-                    this.push(e)
-                }
-                return result
-            }, context)
-        for (const value of iterum) {} // eslint-disable-line no-unused-vars
-        expect(context).to.be.deep.equal([2, 5])
-    })
-
     describe('converting iterum instance to array', function () {
         it('returns the same as converting [Symbol.iterator]() iterator to array', function () {
             const iterum = Iterum([7, 100, 4, 7, 2])

test/fn/filter_test.js

@@ -35,18 +35,6 @@ describe('filter', function () {
         })
     })
 
-    describe('using the whole parameters of callback', function () {
-        it('filter method does not mutate iterum instance behaviour', function () {
-            const a = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-            const fn = (e, i, it) => {
-                return e <= 8 && i % 2 === 0
-                    && [...it.slice(i)].length <= 8
-            }
-            const iterable = Iterum(a).filter(fn)
-            expect([...iterable]).to.be.deep.equal([...a].filter(fn))
-        })
-    })
-
     describe('bad arguments', function () {
         it('throws an exception when the first argument is not a function', function () {
             const a = [1, 4, 2, 7, 3]

test/fn/map_test.js

@@ -30,34 +30,6 @@ describe('.map', function () {
         })
     })
 
-    describe('using index parameter of callback', function () {
-        it('map method does not mutate object', function () {
-            const a = [1, 0, 2, 4]
-            const fn = (e, i) => e * i
-            const iterable = Iterum(a)
-                .map(fn)
-            expect([...iterable]).to.be.deep.equal([...a].map(fn))
-        })
-    })
-
-    describe('using some parameters of callback', function () {
-        it('map method does not mutate iterum instance behaviour', function () {
-            const a = [1, 2, 3]
-            const fn = (e, i, it) => [...it.concat([e])]
-            const iterable = Iterum(a).map(fn)
-            expect([...iterable]).to.be.deep.equal([...a].map(fn))
-        })
-    })
-
-    describe('using all parameters of callback', function () {
-        it('map method does not mutate iterum instance behaviour', function () {
-            const a = [1, 2, 3, 4, 5, 6]
-            const fn = (e, index, iterum) => [...iterum.slice(index + e)]
-            const iterable = Iterum(a).map(fn)
-            expect([...iterable]).to.be.deep.equal([...a].map(fn))
-        })
-    })
-
     describe('bad arguments', function () {
         it('throws an exception when the first argument is not a function', function () {
             const a = new Map([['a', 'A'], ['b', 'B']])

test/fn/takeWhile_test.js

@@ -8,12 +8,9 @@ describe('takeWhile', function () {
         expect([...iterum]).to.be.deep.equal([7, 100])
     })
 
-    it('take while sum of first elements is not greater than 10', function () {
+    it('take while values while are is not greater than 10', function () {
         const iterum = Iterum([2, 0, 3, 6, 1, 2])
-            .takeWhile((e, index, itm) => {
-                return itm.slice(0, index + 1)
-                    .reduce((a, b) => a + b) <= 10
-            })
+            .takeWhile(e => e % 5 !== 1)
         expect([...iterum]).to.be.deep.equal([2, 0, 3])
     })
 
@@ -23,20 +20,6 @@ describe('takeWhile', function () {
         expect([...iterum]).to.be.deep.equal([])
     })
 
-    it('using context parameter', function () {
-        const context = []
-        const a = [7, 100, 4, 7, 2]
-        const iterum = Iterum(a).takeWhile(function (e) {
-            const result = e > 5
-            if (result) {
-                this.push(e)
-            }
-            return result
-        }, context)
-        for (const value of iterum) {} // eslint-disable-line no-unused-vars
-        expect(context).to.be.deep.equal([7, 100])
-    })
-
     describe('converting iterum instance to array', function () {
         it('returns the same as converting [Symbol.iterator]() iterator to array', function () {
             const iterum = Iterum([7, 100, 4, 7, 2])