Simplifying arguments passed

andyfleming · Nov 25, 2017 · d74678b · d74678b
1 parent 442ff25
commit d74678b
Showing 1 changed file with 33 additions and 32 deletions.
diff --git a/src/index.js b/src/index.js
@@ -11,41 +11,42 @@ function interval(func, intervalLength, options = {}) {
     const settings = Object.assign(defaults, options)
 
     return new Promise((rootPromiseResolve, rootPromiseReject) => {
-        callFunction(func, intervalLength, settings, 1, rootPromiseResolve, rootPromiseReject)        
-    })
-}
-
-function callFunction(func, intervalLength, settings, currentIteration, rootPromiseResolve, rootPromiseReject) {
-
-    let stopRequested = false
-    const stop = () => {
-        stopRequested = true
-    }
-
-    const callNext = () => {
-        // If we've hit the desired number of iterations, or stop was called, resolve the root promise and return
-        if (currentIteration === settings.iterations || stopRequested) {
-            rootPromiseResolve()
-            return
-        }
 
-        // Otherwise, call the next iteration
-        callFunction(func, intervalLength, settings, currentIteration + 1, rootPromiseResolve, rootPromiseReject)
-    }
-
-    const calculatedIntervalLength = (typeof intervalLength === 'function') ? intervalLength(currentIteration + 1) : intervalLength
-
-    // Call the user function after the desired interval length. After, call the next iteration (and/or handle error)
-    setTimeout(() => {
-        func(currentIteration, stop).then(callNext).catch(err => {
-            if (!settings.stopOnError) {
-                callNext()
-                return
+        const callFunction = currentIteration => {
+
+            let stopRequested = false
+            const stop = () => {
+                stopRequested = true
             }
+
+            const callNext = () => {
+                // If we've hit the desired number of iterations, or stop was called, resolve the root promise and return
+                if (currentIteration === settings.iterations || stopRequested) {
+                    rootPromiseResolve()
+                    return
+                }
+
+                // Otherwise, call the next iteration
+                callFunction(currentIteration + 1)
+            }
+
+            const calculatedIntervalLength = (typeof intervalLength === 'function') ? intervalLength(currentIteration + 1) : intervalLength
+
+            // Call the user function after the desired interval length. After, call the next iteration (and/or handle error)
+            setTimeout(() => {
+                func(currentIteration, stop).then(callNext).catch(err => {
+                    if (!settings.stopOnError) {
+                        callNext()
+                        return
+                    }
+
+                    rootPromiseReject(err)
+                })
+            }, calculatedIntervalLength)
+        }
 
-            rootPromiseReject(err)
-        })
-    }, calculatedIntervalLength)
+        callFunction(1)        
+    })
 }
 
 module.exports = interval