Feature/refactor

.jshintrc

@@ -0,0 +1,3 @@
+{
+  "esversion": 6
+}

filter-promise.js

@@ -1,49 +1,23 @@
+const iterate = require('./iterate-promise');
+
 /**
  * Array filter to remove any falsy values from array
  * @param {array} to be operated on
  * @param {function} handle the operations, receiveds current element, index, main array and next callback
  * @param {function} callback function, called when operations are completed
  */
 function arrFilter(arr, func) {
-  return new Promise((resolve, reject) => {
-    if (!Array.isArray(arr)) {
-      return reject(new Error('First argument must be a valid array.'));
-    }
-
-    if (typeof func !== 'function') {
-      return reject(new Error('Second argument must be a valid function.'));
-    }
-
-    // Initialize
-    const len = arr.length;
-    let i = 0;
-    let _arr = [];
-
-    if (len > 0) {
-      func(arr[i], i, arr, next);
-    } else {
-      return resolve(_arr);
-    }
-
-    function next(err, isTrue) {
-      setImmediate(() => {
-        if (err) {
-          return reject(err);
-        }
-
-        if (isTrue) {
-          _arr = _arr.concat([arr[i]]);
-        }
-
-        if (++i < len) {
-          func(arr[i], i, arr, next);
-          return;
-        }
-
-        resolve(_arr);
-      });
-    }
-  });
+  const result = [];
+  return iterate(
+    arr,
+    func,
+    (value, item) => {
+      if (value) {
+        result.push(item);
+      }
+    },
+    () => result
+  );
 }
 
 module.exports = arrFilter;

filter.js

@@ -1,49 +1,24 @@
+const iterate = require('./iterate');
+
 /**
  * Array filter to remove any falsy values from array
  * @param {array} to be operated on
  * @param {function} handle the operations, receiveds current element, index, main array and next callback
  * @param {function} callback function, called when operations are completed
  */
 function arrFilter(arr, func, cb) {
-  const onComplete = (typeof cb === 'function') ? cb : function () { };
-
-  if (!Array.isArray(arr)) {
-    return onComplete(new Error('First argument must be a valid array.'));
-  }
-
-  if (typeof func !== 'function') {
-    return onComplete(new Error('Second argument must be a valid function.'));
-  }
-
-  // Initialize
-  let i = 0;
-  let _arr = [];
-  const len = arr.length;
-
-  if (len > 0) {
-    func(arr[i], i, arr, next);
-  } else {
-    return onComplete(null, _arr);
-  }
-
-  function next(err, isTrue) {
-    setImmediate(() => {
-      if (err) {
-        return onComplete(err);
+  const result = [];
+  return iterate(
+    arr,
+    func,
+    cb,
+    (value, item) => {
+      if (value) {
+        result.push(item);
       }
-
-      if (isTrue) {
-        _arr = _arr.concat([arr[i]]);
-      }
-
-      if (++i < len) {
-        func(arr[i], i, arr, next);
-        return;
-      }
-
-      onComplete(null, _arr);
-    });
-  }
+    },
+    () => result
+  );
 }
 
 module.exports = arrFilter;

foreach-promise.js

@@ -1,41 +1,13 @@
+const iterate = require('./iterate-promise');
+
 /**
  * An array foreach operation
  * @param {array} to iterate over
  * @param {function} to receive each element
  * @returns {promise}
  */
-module.exports = function (arr, func) {
-  return new Promise((resolve, reject) => {
-    if (!Array.isArray(arr)) {
-      return reject(new Error('First argument must be a valid array.'));
-    }
-
-    if (typeof func !== 'function') {
-      return reject(new Error('Second argument must be a valid function.'));
-    }
-
-    // Initialize
-    let i = 0;
-    const len = arr.length;
-
-    if (len > 0) {
-      func(arr[i], i, arr, next);
-    } else {
-      resolve();
-    }
-
-    function next(err) {
-      setImmediate(() => {
-        if (err) {
-          return reject(err);
-        }
-
-        if (++i < len) {
-          return func(arr[i], i, arr, next);
-        }
+function arrForeach(arr, func) {
+  return iterate(arr, func);
+}
 
-        return resolve();
-      });
-    }
-  });
-};
+module.exports = arrForeach;

foreach.js

@@ -1,45 +1,13 @@
+const iterate = require('./iterate');
+
 /**
  * An array foreach operation
  * @param {array} to iterate over
  * @param {function} to receive each element
  * @param {function} callback called when iteration completes
  */
 function arrForeach(arr, func, cb) {
-  const onComplete = (typeof cb === 'function') ? cb : function () { };
-
-  if (!Array.isArray(arr)) {
-    return onComplete(new Error('First argument must be a valid array.'));
-  }
-
-  if (typeof func !== 'function') {
-    return onComplete(new Error('Second argument must be a valid function.'));
-  }
-
-  // Initialize
-  let i = 0;
-  const len = arr.length;
-  const _arr = arr.slice();
-
-  if (len > 0) {
-    func(_arr[i], i, _arr, next);
-  } else {
-    return onComplete();
-  }
-
-  function next(err) {
-    setImmediate(() => {
-      if (err) {
-        return onComplete(err);
-      }
-
-      if (++i < len) {
-        func(_arr[i], i, _arr, next);
-        return;
-      }
-
-      return onComplete();
-    });
-  }
+  return iterate(arr, func, cb);
 }
 
 module.exports = arrForeach;

iterate-promise.js

@@ -0,0 +1,9 @@
+const iterate = require('./iterate');
+
+function iteratePromise(arr, func, valueFn, resultFn) {
+  return new Promise((resolve, reject) => {
+    iterate(arr, func, (err, data) => err ? reject(err) : resolve(data), valueFn, resultFn);
+  });
+}
+
+module.exports = iteratePromise;

iterate.js

@@ -0,0 +1,39 @@
+function iterate(arr, func, cb, valueFn, resultFn) {
+  const onComplete = typeof cb === 'function' ? cb : () => {};
+
+  if (!Array.isArray(arr)) {
+    return onComplete(new Error('First argument must be a valid array.'));
+  }
+
+  if (typeof func !== 'function') {
+    return onComplete(new Error('Second argument must be a valid function.'));
+  }
+
+  let i = 0;
+  const len = arr.length;
+
+  function next() {
+    setImmediate(() => {
+      if (i >= len) {
+        if (resultFn) {
+          return onComplete(undefined, resultFn());
+        }
+        return onComplete();
+      }
+      func(arr[i], i, arr, (err, data) => {
+        if (valueFn) {
+          valueFn(data, arr[i], i, arr);
+        }
+        if (err) {
+          return onComplete(err);
+        }
+        i++;
+        return next();
+      });
+    });
+  }
+
+  next();
+}
+
+module.exports = iterate;

map-promise.js

@@ -1,45 +1,23 @@
+const iterate = require('./iterate-promise');
+
 /**
  * Map operation for array
  * @param {array} to iterated over
  * @param {function} map operation function
  * @returns {promise}
  */
 function arrMap(arr, func) {
-  return new Promise((resolve, reject) => {
-    if (!Array.isArray(arr)) {
-      return reject(new Error('First argument must be a valid array.'));
-    }
-
-    if (typeof func !== 'function') {
-      return reject(new Error('Second argument must be a valid function.'));
-    }
-
-    // Initialize
-    let i = 0;
-    const len = arr.length;
-    const _arr = new Array(len);
-
-    if (len > 0) {
-      func(arr[i], i, arr, next);
-    } else {
-      resolve(_arr);
-    }
-
-    function next(err, newValue) {
-      setImmediate(() => {
-        if (err) {
-          return reject(err);
-        }
-
-        if (i < len) {
-          _arr[i++] = newValue;
-          return func(arr[i], i, arr, next);
-        }
-
-        return resolve(_arr);
-      });
-    }
-  });
+  const result = [];
+  return iterate(
+    arr,
+    func,
+    (value) => {
+      if (value) {
+        result.push(value);
+      }
+    },
+    () => result
+  );
 }
 
 module.exports = arrMap;

map.js

@@ -1,46 +1,24 @@
+const iterate = require('./iterate');
+
 /**
  * Map operation for array
  * @param {array} to iterate over
  * @param {function} to perform map operation
  * @param {function} callback to indicate loop completion
  */
 function arrMap(arr, func, cb) {
-  const onComplete = (typeof cb === 'function') ? cb : function () { };
-
-  if (!Array.isArray(arr)) {
-    return onComplete(new Error('First argument must be a valid array.'));
-  }
-
-  if (typeof func !== 'function') {
-    return onComplete(new Error('Second argument must be a valid function.'));
-  }
-
-  // Initialize
-  let i = 0;
-  const len = arr.length;
-  const _arr = new Array(len);
-
-  if (len > 0) {
-    func(arr[i], i, arr, next);
-  } else {
-    onComplete(null, _arr);
-  }
-
-  function next(err, newValue) {
-    setImmediate(() => {
-      if (err) {
-        return onComplete(err);
-      }
-
-      if (i < len) {
-        _arr[i++] = newValue;
-        func(arr[i], i, arr, next);
-        return;
+  const result = [];
+  return iterate(
+    arr,
+    func,
+    cb,
+    (value) => {
+      if (value) {
+        result.push(value);
       }
-
-      onComplete(null, _arr);
-    });
-  }
+    },
+    () => result
+  );
 }
 
 module.exports = arrMap;