+

Author: wenfangdu

package.json

@@ -6,6 +6,7 @@
   "description": "Promisify setTimeout & setInterval",
   "devDependencies": {
     "@types/jest": "^26.0.20",
+    "agadoo": "^2.0.0",
     "jest": "^26.6.3",
     "ts-jest": "^26.5.3",
     "typescript": "^4.2.3"

src/main.d.ts

@@ -1,2 +1,2 @@
-export declare const pause: (ms?: number, cb?: (...args: any[]) => any, ...args: any[]) => Promise<any>;
-export declare const poll: (interval?: number, times?: number, cb?: (...args: [...args: any[], resolve: (value: any) => any, reject: (reason: any) => any]) => any, ...args: any[]) => Promise<any>;
+export declare const pause: (ms: number, cb?: (...args: any[]) => any, ...args: any[]) => Promise<any>;
+export declare const poll: (interval: number, times: number, cb?: (...args: [...args: any[], resolve: (value: any) => any, reject: (reason: any) => any]) => any, ...args: any[]) => Promise<any>;

src/main.js

@@ -1,56 +1,30 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
+export const pause = (ms, cb, ...args) => {
+    let timeout;
+    const promise = new Promise((resolve, reject) => {
+        timeout = setTimeout(async () => {
+            try {
+                resolve(await cb?.(...args));
+            }
+            catch (error) {
+                reject(error);
+            }
+        }, ms);
     });
+    promise.abort = () => clearTimeout(timeout);
+    return promise;
+};
+export const poll = async (interval, times, cb, ...args) => {
+    let result;
+    const resolve = value => (times = 0) || (result = value);
+    const reject = reason => (times = 0) || (result = Promise.reject(reason));
+    await (async function basePoll() {
+        if (times > 0) {
+            const _result = await cb?.(...args, resolve, reject);
+            if (times) {
+                result = _result;
+                --times && (await pause(interval, basePoll));
+            }
+        }
+    })();
+    return result;
 };
-(function (factory) {
-    if (typeof module === "object" && typeof module.exports === "object") {
-        var v = factory(require, exports);
-        if (v !== undefined) module.exports = v;
-    }
-    else if (typeof define === "function" && define.amd) {
-        define(["require", "exports"], factory);
-    }
-})(function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.poll = exports.pause = void 0;
-    const pause = (ms, cb, ...args) => {
-        let timeout;
-        const promise = new Promise((resolve, reject) => {
-            timeout = setTimeout(() => __awaiter(void 0, void 0, void 0, function* () {
-                try {
-                    resolve(yield (cb === null || cb === void 0 ? void 0 : cb(...args)));
-                }
-                catch (error) {
-                    reject(error);
-                }
-            }), ms);
-        });
-        promise.abort = () => clearTimeout(timeout);
-        return promise;
-    };
-    exports.pause = pause;
-    const poll = (interval, times, cb, ...args) => __awaiter(void 0, void 0, void 0, function* () {
-        let result;
-        const resolve = value => (times = 0) || (result = value);
-        const reject = reason => (times = 0) || (result = Promise.reject(reason));
-        yield (function basePoll() {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (times > 0) {
-                    const _result = yield cb(...args, resolve, reject);
-                    if (times) {
-                        result = _result;
-                        --times && (yield exports.pause(interval, basePoll));
-                    }
-                }
-            });
-        })();
-        return result;
-    });
-    exports.poll = poll;
-});

src/main.ts

@@ -1,5 +1,5 @@
 export const pause = (
-  ms?: number,
+  ms: number,
   cb?: (...args: any[]) => any,
   ...args: any[]
 ): Promise<any> => {
@@ -21,8 +21,8 @@ export const pause = (
 }
 
 export const poll = async (
-  interval?: number,
-  times?: number,
+  interval: number,
+  times: number,
   cb?: (
     ...args: [
       ...args: any[],
@@ -38,7 +38,7 @@ export const poll = async (
 
   await (async function basePoll() {
     if (times > 0) {
-      const _result = await cb(...args, resolve, reject)
+      const _result = await cb?.(...args, resolve, reject)
 
       if (times) {
         result = _result

tsconfig.json

@@ -2,10 +2,8 @@
   "compilerOptions": {
     "declaration": true,
     "esModuleInterop": true,
-    "module": "UMD",
     "moduleResolution": "Node",
-    "target": "ES6"
+    "removeComments": true,
   },
-  "exclude": ["src/main.test.ts"],
-  "include": ["src/**/*"]
+  "include": ["src/main.ts"]
 }

yarn.lock

@@ -533,6 +533,11 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/estree@*":
+  version "0.0.46"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe"
+  integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==
+
 "@types/graceful-fs@^4.1.2":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
@@ -617,7 +622,7 @@ acorn-walk@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn@^7.1.1:
+acorn@^7.1.0, acorn@^7.1.1:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
@@ -627,6 +632,15 @@ acorn@^8.0.5:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe"
   integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==
 
+agadoo@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/agadoo/-/agadoo-2.0.0.tgz#1fbbcf429ce5e71df3d93855a915252b277667ed"
+  integrity sha512-68aFhseH51ZBKYKkQNxwDi1hJwTnywBjHWg068qFnMkpXShhOazNzJUPRvaLQjrqhT3EOUth5G9mt1A0/dGhOw==
+  dependencies:
+    acorn "^7.1.0"
+    rollup "^1"
+    rollup-plugin-virtual "^1.0.1"
+
 ajv@^6.12.3:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -2978,6 +2992,20 @@ rimraf@^3.0.0:
   dependencies:
     glob "^7.1.3"
 
+rollup-plugin-virtual@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-virtual/-/rollup-plugin-virtual-1.0.1.tgz#8227c94c605b981adfe433ea74de3551e42ffeb4"
+  integrity sha512-HCTBpV8MwP5lNzZrHD2moVxHIToHU1EkzkKGVj6Z0DcgUfxrxrZmeQirQeLz2yhnkJqRjwiVywK9CS8jDYakrw==
+
+rollup@^1:
+  version "1.32.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.32.1.tgz#4480e52d9d9e2ae4b46ba0d9ddeaf3163940f9c4"
+  integrity sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==
+  dependencies:
+    "@types/estree" "*"
+    "@types/node" "*"
+    acorn "^7.1.0"
+
 rsvp@^4.8.4:
   version "4.8.5"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"