busywait-7 (#8)

* #7 - protect the options argumnet and refrain form using the async reserved keyword * #7 - protect the options argumnet and refrain form using the async reserved keyword
regevbr · Nov 10, 2017 · 33c5935 · 33c5935
1 parent 2330374
commit 33c5935
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -1,26 +1,23 @@
 "use strict";
 
 module.exports = {
-    sync: sync,
-    async: async
+    sync: _sync,
+    async: _async
 };
 
-function sync(syncCheckFn, options) {
+function _sync(syncCheckFn, options) {
     return _busywait(syncCheckFn, options, true);
 }
 
-function async(asyncCheckFn, options) {
+function _async(asyncCheckFn, options) {
     return _busywait(asyncCheckFn, options, false);
 }
 
-function _busywait(checkFn, options, wrapCheckFun) {
+function _busywait(checkFn, _options, wrapCheckFun) {
+    const options = Object.assign({}, _options);
     return _checkArgs(checkFn, options)
         .then(function () {
-            let asyncCheckFn = checkFn;
-            if (wrapCheckFun) {
-                asyncCheckFn = _wrapSyncMethod(checkFn);
-            }
-            return _eventLoop(asyncCheckFn, options);
+            return _eventLoop(wrapCheckFun ? _wrapSyncMethod(checkFn) : checkFn, options);
         });
 }
 
@@ -39,18 +36,14 @@ function _checkArgs(checkFn, options) {
 
 function _wrapSyncMethod(checkFn) {
     return function (iteration) {
-        return new Promise(function (resolve, reject) {
-            if (checkFn(iteration)) {
-                return resolve(true);
-            } else {
-                return reject();
-            }
+        return new Promise((resolve, reject) => {
+            return checkFn(iteration) ? resolve(true) : reject();
         });
     };
 }
 
 function _eventLoop(asyncCheckFn, options) {
-    return new Promise(function busyWait(resolve, reject) {
+    return new Promise((resolve, reject) => {
         let iteration = 0;
         const iterationCheck = function () {
             iteration++;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "busywait",
-  "version": "1.0.10",
+  "version": "1.1.0",
   "description": "Async busy wait",
   "main": "./lib/index.js",
   "scripts": {