@axe-core/watcher 2.0.0-next.3e4ae779 → 2.0.0-next.530262c0

package/dist/puppeteerWrapping.js

@@ -8,138 +8,40 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrapJSHandle = exports.wrapFrame = exports.wrapDialog = exports.wrapTouchscreen = exports.wrapMouse = exports.wrapKeyboard = exports.wrapElementHandle = exports.wrapTarget = exports.wrapPage = exports.wrapBrowser = exports.wrapBrowserContext = void 0;
-var util_1 = require("./util");
-var wrappedCallWithSideEffects = function (target, prop, controller) {
-    return function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        return __awaiter(void 0, void 0, void 0, function () {
-            var result;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, target[prop].apply(target, args)];
-                    case 1:
-                        result = _a.sent();
-                        return [4 /*yield*/, controller.analyze()];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/, result];
-                }
-            });
-        });
-    };
-};
-var wrapBrowserContext = function (browserContext, controller) {
+const util_1 = require("./util");
+const wrapBrowserContext = (browserContext, controller) => {
     if ((0, util_1.isWrapped)(browserContext)) {
         return browserContext;
     }
-    var proxy = new Proxy(browserContext, {
-        get: function (host, prop, receiver) {
-            var _this = this;
+    const proxy = new Proxy(browserContext, {
+        get(host, prop, receiver) {
             switch (prop) {
                 case 'newPage':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var page;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host.newPage.apply(host, args)];
-                                    case 1:
-                                        page = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapPage)(page, controller)];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const page = yield host.newPage(...args);
+                        return (0, exports.wrapPage)(page, controller);
+                    });
                 case 'pages':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var pages;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host.pages.apply(host, args)];
-                                    case 1:
-                                        pages = _a.sent();
-                                        return [2 /*return*/, pages.map(function (p) { return (0, exports.wrapPage)(p, controller); })];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const pages = yield host.pages(...args);
+                        return pages.map(p => (0, exports.wrapPage)(p, controller));
+                    });
                 case 'targets':
-                    return function () { return host.targets().map(function (t) { return (0, exports.wrapTarget)(t, controller); }); };
+                    return () => host.targets().map(t => (0, exports.wrapTarget)(t, controller));
                 case 'browser':
-                    return function () { return (0, exports.wrapBrowser)(host.browser(), controller); };
+                    return () => (0, exports.wrapBrowser)(host.browser(), controller);
                 case 'waitForTarget':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var target;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host.waitForTarget.apply(host, args)];
-                                    case 1:
-                                        target = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapTarget)(target, controller)];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const target = yield host.waitForTarget(...args);
+                        return (0, exports.wrapTarget)(target, controller);
+                    });
                 case 'close':
-                    return function () { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, controller.flush()];
-                                case 1:
-                                    _a.sent();
-                                    return [4 /*yield*/, host.close()];
-                                case 2:
-                                    _a.sent();
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); };
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        yield controller.flush();
+                        yield host.close();
+                    });
                 default:
                     return Reflect.get(host, prop, receiver);
             }
@@ -149,106 +51,46 @@ var wrapBrowserContext = function (browserContext, controller) {
     return proxy;
 };
 exports.wrapBrowserContext = wrapBrowserContext;
-var wrapBrowser = function (browser, controller) {
+const wrapBrowser = (browser, controller) => {
     if ((0, util_1.isWrapped)(browser)) {
         return browser;
     }
-    var proxy = new Proxy(browser, {
-        get: function (host, prop, receiver) {
-            var _this = this;
+    const proxy = new Proxy(browser, {
+        get(host, prop, receiver) {
             switch (prop) {
                 case 'newPage':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var page;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host.newPage.apply(host, args)];
-                                    case 1:
-                                        page = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapPage)(page, controller)];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const page = yield host.newPage(...args);
+                        return (0, exports.wrapPage)(page, controller);
+                    });
                 case 'createIncognitoBrowserContext':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var context;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host.createIncognitoBrowserContext.apply(host, args)];
-                                    case 1:
-                                        context = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapBrowserContext)(context, controller)];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const context = yield host.createIncognitoBrowserContext(...args);
+                        return (0, exports.wrapBrowserContext)(context, controller);
+                    });
                 case 'defaultBrowserContext':
-                    return function () {
-                        return (0, exports.wrapBrowserContext)(host.defaultBrowserContext(), controller);
-                    };
+                    return () => (0, exports.wrapBrowserContext)(host.defaultBrowserContext(), controller);
                 case 'pages':
-                    return function () { return __awaiter(_this, void 0, void 0, function () {
-                        var pages;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, host.pages()];
-                                case 1:
-                                    pages = _a.sent();
-                                    return [2 /*return*/, pages.map(function (p) { return (0, exports.wrapPage)(p, controller); })];
-                            }
-                        });
-                    }); };
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        const pages = yield host.pages();
+                        return pages.map(p => (0, exports.wrapPage)(p, controller));
+                    });
                 case 'target':
-                    return function () { return (0, exports.wrapTarget)(host.target(), controller); };
+                    return () => (0, exports.wrapTarget)(host.target(), controller);
                 case 'targets':
-                    return function () { return host.targets().map(function (t) { return (0, exports.wrapTarget)(t, controller); }); };
+                    return () => host.targets().map(t => (0, exports.wrapTarget)(t, controller));
                 case 'waitForTarget':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var target;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host.waitForTarget.apply(host, args)];
-                                    case 1:
-                                        target = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapTarget)(target, controller)];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const target = yield host.waitForTarget(...args);
+                        return (0, exports.wrapTarget)(target, controller);
+                    });
                 case 'browserContexts':
-                    return function () {
-                        return host.browserContexts().map(function (c) { return (0, exports.wrapBrowserContext)(c, controller); });
-                    };
+                    return () => host.browserContexts().map(c => (0, exports.wrapBrowserContext)(c, controller));
                 case 'close':
-                    return function () { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, controller.flush()];
-                                case 1:
-                                    _a.sent();
-                                    return [4 /*yield*/, host.close()];
-                                case 2:
-                                    _a.sent();
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); };
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        yield controller.flush();
+                        yield host.close();
+                    });
                 default:
                     return Reflect.get(host, prop, receiver);
             }
@@ -258,57 +100,32 @@ var wrapBrowser = function (browser, controller) {
     return proxy;
 };
 exports.wrapBrowser = wrapBrowser;
-var wrapPage = function (page, controller) {
+const wrapPage = (page, controller) => {
     if ((0, util_1.isWrapped)(page)) {
         return page;
     }
-    var proxy = new Proxy(page, {
-        get: function (host, prop, receiver) {
-            var _this = this;
+    const proxy = new Proxy(page, {
+        get(host, prop, receiver) {
             switch (prop) {
                 case 'browserContext':
-                    return function () { return (0, exports.wrapBrowserContext)(host.browserContext(), controller); };
+                    return () => (0, exports.wrapBrowserContext)(host.browserContext(), controller);
                 case '$':
                 case 'addScriptTag':
                 case 'addStyleTag':
                 case 'waitForSelector':
                 case 'waitForXPath':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var el;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host[prop].apply(host, args)];
-                                    case 1:
-                                        el = _a.sent();
-                                        return [2 /*return*/, el ? (0, exports.wrapElementHandle)(el, controller) : null];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        // @ts-expect-error TypeScript is angry.
+                        const el = yield host[prop](...args);
+                        return el ? (0, exports.wrapElementHandle)(el, controller) : null;
+                    });
                 case '$$':
                 case '$x':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var els;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host[prop].apply(host, args)];
-                                    case 1:
-                                        els = _a.sent();
-                                        return [2 /*return*/, els.map(function (el) { return (0, exports.wrapElementHandle)(el, controller); })];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        // @ts-expect-error TypeScript is angry.
+                        const els = yield host[prop](...args);
+                        return els.map(el => (0, exports.wrapElementHandle)(el, controller));
+                    });
                 case 'authenticate':
                 case 'bringToFront':
                 case 'click':
@@ -326,13 +143,13 @@ var wrapPage = function (page, controller) {
                 case 'setViewport':
                 case 'tap':
                 case 'type':
-                    return wrappedCallWithSideEffects(host, prop, controller);
+                    return (0, util_1.wrappedCallWithSideEffects)(host, prop, controller);
                 case 'browser':
-                    return function () { return (0, exports.wrapBrowser)(host.browser(), controller); };
+                    return () => (0, exports.wrapBrowser)(host.browser(), controller);
                 case 'target':
-                    return function () { return (0, exports.wrapTarget)(host.target(), controller); };
+                    return () => (0, exports.wrapTarget)(host.target(), controller);
                 case 'frames':
-                    return function () { return host.frames().map(function (f) { return (0, exports.wrapFrame)(f, controller); }); };
+                    return () => host.frames().map(f => (0, exports.wrapFrame)(f, controller));
                 case 'keyboard':
                     return (0, exports.wrapKeyboard)(host.keyboard, controller);
                 case 'mouse':
@@ -340,24 +157,12 @@ var wrapPage = function (page, controller) {
                 case 'touchscreen':
                     return (0, exports.wrapTouchscreen)(host.touchscreen, controller);
                 case 'mainFrame':
-                    return function () { return (0, exports.wrapFrame)(host.mainFrame(), controller); };
+                    return () => (0, exports.wrapFrame)(host.mainFrame(), controller);
                 case 'close':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, controller.flush()];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/, host.close.apply(host, args)];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        yield controller.flush();
+                        return host.close(...args);
+                    });
                 default:
                     return Reflect.get(host, prop, receiver);
             }
@@ -367,35 +172,27 @@ var wrapPage = function (page, controller) {
     return proxy;
 };
 exports.wrapPage = wrapPage;
-var wrapTarget = function (target, controller) {
+const wrapTarget = (target, controller) => {
     if ((0, util_1.isWrapped)(target)) {
         return target;
     }
-    var proxy = new Proxy(target, {
-        get: function (host, prop, receiver) {
-            var _this = this;
+    const proxy = new Proxy(target, {
+        get(host, prop, receiver) {
             switch (prop) {
                 case 'browserContext':
-                    return function () { return (0, exports.wrapBrowserContext)(host.browserContext(), controller); };
+                    return () => (0, exports.wrapBrowserContext)(host.browserContext(), controller);
                 case 'browser':
-                    return function () { return (0, exports.wrapBrowser)(host.browser(), controller); };
+                    return () => (0, exports.wrapBrowser)(host.browser(), controller);
                 case 'opener':
-                    return function () {
-                        var opener = host.opener();
+                    return () => {
+                        const opener = host.opener();
                         return opener ? (0, exports.wrapTarget)(opener, controller) : null;
                     };
                 case 'page':
-                    return function () { return __awaiter(_this, void 0, void 0, function () {
-                        var page;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, host.page()];
-                                case 1:
-                                    page = _a.sent();
-                                    return [2 /*return*/, page ? (0, exports.wrapPage)(page, controller) : null];
-                            }
-                        });
-                    }); };
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        const page = yield host.page();
+                        return page ? (0, exports.wrapPage)(page, controller) : null;
+                    });
                 default:
                     return Reflect.get(host, prop, receiver);
             }
@@ -405,86 +202,40 @@ var wrapTarget = function (target, controller) {
     return proxy;
 };
 exports.wrapTarget = wrapTarget;
-var wrapElementHandle = function (
+const wrapElementHandle = (
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-elementHandle, controller) {
+elementHandle, controller) => {
     if ((0, util_1.isWrapped)(elementHandle)) {
         return elementHandle;
     }
-    var proxy = new Proxy(elementHandle, {
-        get: function (host, prop, receiver) {
-            var _this = this;
+    const proxy = new Proxy(elementHandle, {
+        get(host, prop, receiver) {
             switch (prop) {
                 case '$':
                 case 'waitForSelector':
                 case 'waitForXPath':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var el;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host.$.apply(host, args)];
-                                    case 1:
-                                        el = _a.sent();
-                                        return [2 /*return*/, el ? (0, exports.wrapElementHandle)(el, controller) : null];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const el = yield host.$(...args);
+                        return el ? (0, exports.wrapElementHandle)(el, controller) : null;
+                    });
                 case '$$':
                 case '$x':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var els;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host[prop].apply(host, args)];
-                                    case 1:
-                                        els = _a.sent();
-                                        return [2 /*return*/, els.map(function (el) { return (0, exports.wrapElementHandle)(el, controller); })];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        // @ts-expect-error TypeScript is angry.
+                        const els = yield host[prop](...args);
+                        return els.map(el => (0, exports.wrapElementHandle)(el, controller));
+                    });
                 case 'asElement':
-                    return function () { return (0, exports.wrapElementHandle)(host.asElement(), controller); };
+                    return () => (0, exports.wrapElementHandle)(host.asElement(), controller);
                 case 'contentFrame':
-                    return function () { return __awaiter(_this, void 0, void 0, function () {
-                        var frame;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, host.contentFrame()];
-                                case 1:
-                                    frame = _a.sent();
-                                    return [2 /*return*/, frame ? (0, exports.wrapFrame)(frame, controller) : null];
-                            }
-                        });
-                    }); };
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        const frame = yield host.contentFrame();
+                        return frame ? (0, exports.wrapFrame)(frame, controller) : null;
+                    });
                 case 'frame':
                     return (0, exports.wrapFrame)(host.frame, controller);
                 case 'toElement':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () { var _a; return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    _a = exports.wrapElementHandle;
-                                    return [4 /*yield*/, host.toElement.apply(host, args)];
-                                case 1: return [2 /*return*/, _a.apply(void 0, [_b.sent(), controller])];
-                            }
-                        }); });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () { return (0, exports.wrapElementHandle)(yield host.toElement(...args), controller); });
                 case 'click':
                 case 'drag':
                 case 'dragAndDrop':
@@ -501,7 +252,7 @@ elementHandle, controller) {
                 case 'touchMove':
                 case 'touchStart':
                 case 'type':
-                    return wrappedCallWithSideEffects(host, prop, controller);
+                    return (0, util_1.wrappedCallWithSideEffects)(host, prop, controller);
                 default:
                     return Reflect.get(host, prop, receiver);
             }
@@ -511,19 +262,19 @@ elementHandle, controller) {
     return proxy;
 };
 exports.wrapElementHandle = wrapElementHandle;
-var wrapKeyboard = function (keyboard, controller) {
+const wrapKeyboard = (keyboard, controller) => {
     if ((0, util_1.isWrapped)(keyboard)) {
         return keyboard;
     }
-    var proxy = new Proxy(keyboard, {
-        get: function (host, prop, receiver) {
+    const proxy = new Proxy(keyboard, {
+        get(host, prop, receiver) {
             switch (prop) {
                 case 'down':
                 case 'press':
                 case 'up':
                 case 'sendCharacter':
                 case 'type':
-                    return wrappedCallWithSideEffects(host, prop, controller);
+                    return (0, util_1.wrappedCallWithSideEffects)(host, prop, controller);
                 default:
                     return Reflect.get(host, prop, receiver);
             }
@@ -533,12 +284,12 @@ var wrapKeyboard = function (keyboard, controller) {
     return proxy;
 };
 exports.wrapKeyboard = wrapKeyboard;
-var wrapMouse = function (mouse, controller) {
+const wrapMouse = (mouse, controller) => {
     if ((0, util_1.isWrapped)(mouse)) {
         return mouse;
     }
-    var proxy = new Proxy(mouse, {
-        get: function (host, prop, receiver) {
+    const proxy = new Proxy(mouse, {
+        get(host, prop, receiver) {
             switch (prop) {
                 case 'click':
                 case 'down':
@@ -550,7 +301,7 @@ var wrapMouse = function (mouse, controller) {
                 case 'move':
                 case 'up':
                 case 'wheel':
-                    return wrappedCallWithSideEffects(host, prop, controller);
+                    return (0, util_1.wrappedCallWithSideEffects)(host, prop, controller);
                 default:
                     return Reflect.get(host, prop, receiver);
             }
@@ -560,18 +311,18 @@ var wrapMouse = function (mouse, controller) {
     return proxy;
 };
 exports.wrapMouse = wrapMouse;
-var wrapTouchscreen = function (touchscreen, controller) {
+const wrapTouchscreen = (touchscreen, controller) => {
     if ((0, util_1.isWrapped)(touchscreen)) {
         return touchscreen;
     }
-    var proxy = new Proxy(touchscreen, {
-        get: function (host, prop, receiver) {
+    const proxy = new Proxy(touchscreen, {
+        get(host, prop, receiver) {
             switch (prop) {
                 case 'tap':
                 case 'touchEnd':
                 case 'touchMove':
                 case 'touchStart':
-                    return wrappedCallWithSideEffects(host, prop, controller);
+                    return (0, util_1.wrappedCallWithSideEffects)(host, prop, controller);
                 default:
                     return Reflect.get(host, prop, receiver);
             }
@@ -581,16 +332,16 @@ var wrapTouchscreen = function (touchscreen, controller) {
     return proxy;
 };
 exports.wrapTouchscreen = wrapTouchscreen;
-var wrapDialog = function (dialog, controller) {
+const wrapDialog = (dialog, controller) => {
     if ((0, util_1.isWrapped)(dialog)) {
         return dialog;
     }
-    var proxy = new Proxy(dialog, {
-        get: function (host, prop, receiver) {
+    const proxy = new Proxy(dialog, {
+        get(host, prop, receiver) {
             switch (prop) {
                 case 'accept':
                 case 'dismiss':
-                    return wrappedCallWithSideEffects(host, prop, controller);
+                    return (0, util_1.wrappedCallWithSideEffects)(host, prop, controller);
                 default:
                     return Reflect.get(host, prop, receiver);
             }
@@ -600,62 +351,37 @@ var wrapDialog = function (dialog, controller) {
     return proxy;
 };
 exports.wrapDialog = wrapDialog;
-var wrapFrame = function (frame, controller) {
+const wrapFrame = (frame, controller) => {
     if ((0, util_1.isWrapped)(frame)) {
         return frame;
     }
-    var proxy = new Proxy(frame, {
-        get: function (host, prop, receiver) {
-            var _this = this;
+    const proxy = new Proxy(frame, {
+        get(host, prop, receiver) {
             switch (prop) {
                 case '$':
                 case 'addScriptTag':
                 case 'addStyleTag':
                 case 'waitForSelector':
                 case 'waitForXPath':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var el;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host[prop].apply(host, args)];
-                                    case 1:
-                                        el = _a.sent();
-                                        return [2 /*return*/, el ? (0, exports.wrapElementHandle)(el, controller) : null];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        // @ts-expect-error TypeScript is angry.
+                        const el = yield host[prop](...args);
+                        return el ? (0, exports.wrapElementHandle)(el, controller) : null;
+                    });
                 case '$$':
                 case '$x':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var els;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, host[prop].apply(host, args)];
-                                    case 1:
-                                        els = _a.sent();
-                                        return [2 /*return*/, els.map(function (el) { return (0, exports.wrapElementHandle)(el, controller); })];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        // @ts-expect-error TypeScript is angry.
+                        const els = yield host[prop](...args);
+                        return els.map(el => (0, exports.wrapElementHandle)(el, controller));
+                    });
                 case 'childFrames':
-                    return function () { return host.childFrames().map(function (f) { return (0, exports.wrapFrame)(f, controller); }); };
+                    return () => host.childFrames().map(f => (0, exports.wrapFrame)(f, controller));
                 case 'page':
-                    return function () { return (0, exports.wrapPage)(host.page(), controller); };
+                    return () => (0, exports.wrapPage)(host.page(), controller);
                 case 'parentFrame':
-                    return function () {
-                        var f = host.parentFrame();
+                    return () => {
+                        const f = host.parentFrame();
                         return f ? (0, exports.wrapFrame)(f, controller) : null;
                     };
                 case 'click':
@@ -666,7 +392,7 @@ var wrapFrame = function (frame, controller) {
                 case 'setContent':
                 case 'tap':
                 case 'type':
-                    return wrappedCallWithSideEffects(host, prop, controller);
+                    return (0, util_1.wrappedCallWithSideEffects)(host, prop, controller);
                 default:
                     return Reflect.get(host, prop, receiver);
             }
@@ -676,16 +402,16 @@ var wrapFrame = function (frame, controller) {
     return proxy;
 };
 exports.wrapFrame = wrapFrame;
-var wrapJSHandle = function (frame, controller) {
+const wrapJSHandle = (frame, controller) => {
     if ((0, util_1.isWrapped)(frame)) {
         return frame;
     }
-    var proxy = new Proxy(frame, {
-        get: function (host, prop, receiver) {
+    const proxy = new Proxy(frame, {
+        get(host, prop, receiver) {
             switch (prop) {
                 case 'asElement':
-                    return function () {
-                        var el = host.asElement();
+                    return () => {
+                        const el = host.asElement();
                         return el ? (0, exports.wrapElementHandle)(el, controller) : null;
                     };
                 default: