integrate iterarray dependency #8

package.json

@@ -40,6 +40,7 @@
   "dependencies": {
     "arguments-verify": "^0.3.0",
     "is-empty-iterable": "^1.0.0",
+    "iterarray": "^0.1.0",
     "type-verify": "^0.4.0"
   },
   "engines": {

src/fn/drop.js

@@ -0,0 +1,5 @@
+const IterArray = require('iterarray')
+
+module.exports = function drop (iterable, n = 1) {
+    return this(IterArray(iterable).slice(n, Infinity))
+}

src/fn/includes.js

@@ -1,8 +1,8 @@
 const findEntry = require('./findEntry')
-const slice = require('../gen/slice')
+const IterArray = require('iterarray')
 const sameValueZero = require('../core/same-value-zero')
 
 module.exports = function includes (iterable, e, fromIndex = 0) {
-    const sliceIterable = slice(iterable, fromIndex)
-    return !!findEntry(sliceIterable, value => sameValueZero(value, e))
+    const slicedIterable = IterArray(iterable).slice(fromIndex, Infinity)
+    return !!findEntry(slicedIterable, value => sameValueZero(value, e))
 }

src/fn/indexOf.js

@@ -1,8 +1,8 @@
 const findIndex = require('./findIndex')
-const slice = require('../gen/slice')
+const IterArray = require('iterarray')
 
 module.exports = function indexOf (iterable, e, fromIndex = 0) {
-    const sliceIterable = slice(iterable, fromIndex)
-    const index = findIndex(sliceIterable, value => value === e)
+    const slicedIterable = IterArray(iterable).slice(fromIndex, Infinity)
+    const index = findIndex(slicedIterable, value => value === e)
     return index === -1 ? -1 : fromIndex + index
 }

src/fn/slice.js

@@ -0,0 +1,5 @@
+const IterArray = require('iterarray')
+
+module.exports = function slice (iterable, start = 0, end = Infinity) {
+    return IterArray(iterable).slice(start, end)
+}

src/fn/take.js

@@ -0,0 +1,5 @@
+const IterArray = require('iterarray')
+
+module.exports = function take (iterable, n = 1) {
+    return this(IterArray(iterable).slice(0, n))
+}

src/gen/slice.js

@@ -1,15 +1,5 @@
-module.exports = function* slice (iterable, start = 0, end = Infinity) {
-    if (start >= end) {
-        return
-    }
-    let index
-    const iterator = iterable[Symbol.iterator]()
-    for (index = 0; index < end; ++index) {
-        const state = iterator.next()
-        if (state.done) {
-            return
-        } else if (index >= start) {
-            yield state.value
-        }
-    }
+const IterArray = require('iterarray')
+
+module.exports = function slice (iterable, start = 0, end = Infinity) {
+    return this(IterArray(iterable).slice(start, end))
 }

src/index.js

@@ -2,7 +2,6 @@ const factory = require('./factory')
 const Iterable = require('./core/iterable')
 
 const concat = require('./gen/concat')
-const drop = require('./gen/drop')
 const dropWhile = require('./gen/dropWhile')
 const entries = require('./gen/entries')
 const filter = require('./gen/filter')
@@ -14,14 +13,13 @@ const permutations = require('./gen/permutations')
 const product = require('./gen/product')
 const range = require('./gen/range')
 const repeat = require('./gen/repeat')
-const slice = require('./gen/slice')
-const take = require('./gen/take')
 const takeWhile = require('./gen/takeWhile')
 const uniq = require('./gen/uniq')
 const uniqBy = require('./gen/uniqBy')
 const uniqWith = require('./gen/uniqWith')
 const zip = require('./gen/zip')
 
+const drop = require('./fn/drop')
 const every = require('./fn/every')
 const find = require('./fn/find')
 const findEntry = require('./fn/findEntry')
@@ -35,7 +33,9 @@ const isEqualBy = require('./fn/isEqualBy')
 const isEqualWith = require('./fn/isEqualWith')
 const reduce = require('./fn/reduce')
 const reduceRight = require('./fn/reduceRight')
+const slice = require('./fn/slice')
 const some = require('./fn/some')
+const take = require('./fn/take')
 
 const optionalNumber = ['Number', 'Undefined']
 const infiniteIterablesValidation = [[], [Iterable], Infinity]
@@ -55,7 +55,7 @@ const Iterum = factory({
             validation: infiniteIterablesValidation
         },
         drop: {
-            gen: drop,
+            fn: drop,
             validation: optionalNumberValidation
         },
         dropWhile: {
@@ -143,15 +143,15 @@ const Iterum = factory({
             validation: optionalNumberValidation
         },
         slice: {
-            gen: slice,
+            fn: slice,
             validation: [[], optionalNumber, optionalNumber]
         },
         some: {
             fn: some,
             validation: functionValidation
         },
         take: {
-            gen: take,
+            fn: take,
             validation: optionalNumberValidation
         },
         takeWhile: {