@axe-core/watcher 2.0.0-next.f699cb79 → 2.0.0-next.fd1cc39e

package/dist/playwrightWrapping.js

@@ -8,219 +8,104 @@ 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.wrapTouchscreen = exports.wrapMouse = exports.wrapKeyboard = exports.wrapJSHandle = exports.wrapLocator = exports.wrapFrameLocator = exports.wrapFrame = exports.wrapElementHandle = exports.wrapPage = exports.wrapBrowser = exports.wrapBrowserContext = exports.markAsWrapped = exports.isWrapped = void 0;
-var kWrapped = Symbol('axe watcher wrapped');
-var isWrapped = function (o) {
-    if (!o) {
-        return false;
-    }
-    return o[kWrapped] === true;
-};
-exports.isWrapped = isWrapped;
-var markAsWrapped = function (o) {
-    Object.defineProperty(o, kWrapped, {
-        configurable: false,
-        enumerable: false,
-        value: true
-    });
-};
-exports.markAsWrapped = markAsWrapped;
-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) {
-    if ((0, exports.isWrapped)(browserContext)) {
+exports.wrapTouchscreen = exports.wrapMouse = exports.wrapKeyboard = exports.wrapJSHandle = exports.wrapLocator = exports.wrapFrameLocator = exports.wrapFrame = exports.wrapElementHandle = exports.wrapPage = exports.wrapBrowser = exports.wrapBrowserContext = void 0;
+const util_1 = require("./util");
+const wrappedCallWithSideEffects = (target, prop, controller) => (...args) => __awaiter(void 0, void 0, void 0, function* () {
+    // @ts-expect-error TypeScript is angry.
+    const result = yield target[prop](...args);
+    yield controller.analyze();
+    return result;
+});
+const wrapBrowserContext = (browserContext, controller) => {
+    if ((0, util_1.isWrapped)(browserContext)) {
         return browserContext;
     }
-    var browserContextProxy = new Proxy(browserContext, {
-        get: function (target, prop, receiver) {
-            var _this = this;
+    const browserContextProxy = new Proxy(browserContext, {
+        get(target, 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*/, target.newPage.apply(target, args)];
-                                    case 1:
-                                        page = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapPage)(page, controller)];
-                                }
-                            });
-                        });
-                    };
-                case 'browser': {
-                    return function () {
-                        var browser = target.browser();
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const page = yield target.newPage(...args);
+                        return (0, exports.wrapPage)(page, controller);
+                    });
+                case 'browser':
+                    return () => {
+                        const browser = target.browser();
                         if (!browser) {
                             return null;
                         }
                         return (0, exports.wrapBrowser)(browser, controller);
                     };
-                }
-                case 'pages': {
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        var pages = target.pages.apply(target, args);
-                        return pages.map(function (p) { return (0, exports.wrapPage)(p, controller); });
+                case 'pages':
+                    return (...args) => {
+                        const pages = target.pages(...args);
+                        return pages.map(p => (0, exports.wrapPage)(p, controller));
                     };
-                }
+                case 'close':
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        yield controller.flush();
+                        return target.close();
+                    });
                 default:
                     return Reflect.get(target, prop, receiver);
             }
         }
     });
-    (0, exports.markAsWrapped)(browserContextProxy);
+    (0, util_1.markAsWrapped)(browserContextProxy);
     return browserContextProxy;
 };
 exports.wrapBrowserContext = wrapBrowserContext;
-var wrapBrowser = function (browser, controller) {
-    if ((0, exports.isWrapped)(browser)) {
+const wrapBrowser = (browser, controller) => {
+    if ((0, util_1.isWrapped)(browser)) {
         return browser;
     }
-    var browserProxy = new Proxy(browser, {
-        get: function (target, prop, receiver) {
-            var _this = this;
+    const browserProxy = new Proxy(browser, {
+        get(target, prop, receiver) {
             switch (prop) {
-                case 'newContext': {
-                    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*/, target.newContext.apply(target, args)];
-                                    case 1:
-                                        context = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapBrowserContext)(context, controller)];
-                                }
-                            });
-                        });
-                    };
-                }
-                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*/, target.newPage.apply(target, args)];
-                                    case 1:
-                                        page = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapPage)(page, controller)];
-                                }
-                            });
-                        });
-                    };
-                }
-                case 'contexts': {
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        var contexts = target.contexts.apply(target, args);
-                        return contexts.map(function (c) { return (0, exports.wrapBrowserContext)(c, controller); });
+                case 'newContext':
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const context = yield target.newContext(...args);
+                        return (0, exports.wrapBrowserContext)(context, controller);
+                    });
+                case 'newPage':
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const page = yield target.newPage(...args);
+                        return (0, exports.wrapPage)(page, controller);
+                    });
+                case 'contexts':
+                    return (...args) => {
+                        const contexts = target.contexts(...args);
+                        return contexts.map(c => (0, exports.wrapBrowserContext)(c, controller));
                     };
-                }
+                case 'close':
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        yield controller.flush();
+                        return target.close();
+                    });
                 default:
                     return Reflect.get(target, prop, receiver);
             }
         }
     });
-    (0, exports.markAsWrapped)(browserProxy);
+    (0, util_1.markAsWrapped)(browserProxy);
     return browserProxy;
 };
 exports.wrapBrowser = wrapBrowser;
-var wrapPage = function (page, controller) {
-    if ((0, exports.isWrapped)(page)) {
+const wrapPage = (page, controller) => {
+    if ((0, util_1.isWrapped)(page)) {
         return page;
     }
-    var pageProxy = new Proxy(page, {
-        get: function (target, prop, receiver) {
-            var _this = this;
+    const pageProxy = new Proxy(page, {
+        get(target, prop, receiver) {
             switch (prop) {
                 case 'addScriptTag':
                 case 'addStyleTag':
-                    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 style;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, target[prop].apply(target, args)];
-                                    case 1:
-                                        style = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapElementHandle)(style, controller)];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        // @ts-expect-error TypeScript is angry.
+                        const style = yield target[prop](...args);
+                        return (0, exports.wrapElementHandle)(style, controller);
+                    });
                 case 'bringToFront':
                 case 'check':
                 case 'click':
@@ -243,59 +128,35 @@ var wrapPage = function (page, controller) {
                 case 'uncheck':
                     return wrappedCallWithSideEffects(target, prop, controller);
                 case 'context':
-                    return function () {
-                        var context = target.context();
+                    return () => {
+                        const context = target.context();
                         return (0, exports.wrapBrowserContext)(context, controller);
                     };
                 case 'evaluateHandle':
                 case 'waitForFunction':
-                    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 handle;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, target[prop].apply(target, args)];
-                                    case 1:
-                                        handle = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapJSHandle)(handle, controller)];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        // @ts-expect-error TypeScript is angry.
+                        const handle = yield target[prop](...args);
+                        return (0, exports.wrapJSHandle)(handle, controller);
+                    });
                 case 'frame':
                 case 'mainFrame':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
+                    return (...args) => {
                         // @ts-expect-error TypeScript is angry.
-                        var mainFrame = target[prop].apply(target, args);
+                        const mainFrame = target[prop](...args);
                         if (!mainFrame) {
                             return null;
                         }
                         return (0, exports.wrapFrame)(mainFrame, controller);
                     };
                 case 'frames':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        var frames = target.frames.apply(target, args);
-                        return frames.map(function (f) { return (0, exports.wrapFrame)(f, controller); });
+                    return (...args) => {
+                        const frames = target.frames(...args);
+                        return frames.map(f => (0, exports.wrapFrame)(f, controller));
                     };
                 case 'frameLocator':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        var frameLocator = target.frameLocator.apply(target, args);
+                    return (...args) => {
+                        const frameLocator = target.frameLocator(...args);
                         return (0, exports.wrapFrameLocator)(frameLocator, controller);
                     };
                 case 'getByAltText':
@@ -306,13 +167,9 @@ var wrapPage = function (page, controller) {
                 case 'getByText':
                 case 'getByTitle':
                 case 'locator':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
+                    return (...args) => {
                         // @ts-expect-error TypeScript is angry.
-                        var el = target[prop].apply(target, args);
+                        const el = target[prop](...args);
                         return (0, exports.wrapLocator)(el, controller);
                     };
                 case 'keyboard':
@@ -321,62 +178,40 @@ var wrapPage = function (page, controller) {
                     return (0, exports.wrapMouse)(target.mouse, controller);
                 case 'touchscreen':
                     return (0, exports.wrapTouchscreen)(target.touchscreen, controller);
+                case 'close':
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        yield controller.flush();
+                        return target.close();
+                    });
                 default:
                     return Reflect.get(target, prop, receiver);
             }
         }
     });
-    (0, exports.markAsWrapped)(pageProxy);
+    (0, util_1.markAsWrapped)(pageProxy);
     return pageProxy;
 };
 exports.wrapPage = wrapPage;
-var wrapElementHandle = function (elementHandle, controller) {
-    if ((0, exports.isWrapped)(elementHandle)) {
+const wrapElementHandle = (elementHandle, controller) => {
+    if ((0, util_1.isWrapped)(elementHandle)) {
         return elementHandle;
     }
-    var elementHandleProxy = new Proxy(elementHandle, {
-        get: function (target, prop, receiver) {
-            var _this = this;
+    const elementHandleProxy = new Proxy(elementHandle, {
+        get(target, prop, receiver) {
             switch (prop) {
                 case '$':
                 case 'asElement':
                 case 'waitForSelector':
-                    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*/, target[prop].apply(target, args)];
-                                    case 1:
-                                        el = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapElementHandle)(el, controller)];
-                                }
-                            });
-                        });
-                    };
-                case '$$': {
-                    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*/, target.$$.apply(target, args)];
-                                    case 1:
-                                        els = _a.sent();
-                                        return [2 /*return*/, els.map(function (e) { return (0, exports.wrapElementHandle)(e, controller); })];
-                                }
-                            });
-                        });
-                    };
-                }
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        // @ts-expect-error TypeScript is angry.
+                        const el = yield target[prop](...args);
+                        return (0, exports.wrapElementHandle)(el, controller);
+                    });
+                case '$$':
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const els = yield target.$$(...args);
+                        return els.map(e => (0, exports.wrapElementHandle)(e, controller));
+                    });
                 case 'check':
                 case 'click':
                 case 'dblclick':
@@ -396,94 +231,52 @@ var wrapElementHandle = function (elementHandle, controller) {
                     return wrappedCallWithSideEffects(target, prop, controller);
                 case 'contentFrame':
                 case 'ownerFrame':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        // @ts-expect-error TypeScript is angry.
+                        const frame = yield target[prop](...args);
+                        if (!frame) {
+                            return null;
                         }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var frame;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, target[prop].apply(target, args)];
-                                    case 1:
-                                        frame = _a.sent();
-                                        if (!frame) {
-                                            return [2 /*return*/, null];
-                                        }
-                                        return [2 /*return*/, (0, exports.wrapFrame)(frame, controller)];
-                                }
-                            });
-                        });
-                    };
+                        return (0, exports.wrapFrame)(frame, controller);
+                    });
                 default:
                     return Reflect.get(target, prop, receiver);
             }
         }
     });
-    (0, exports.markAsWrapped)(elementHandleProxy);
+    (0, util_1.markAsWrapped)(elementHandleProxy);
     return elementHandleProxy;
 };
 exports.wrapElementHandle = wrapElementHandle;
-var wrapFrame = function (frame, controller) {
-    if ((0, exports.isWrapped)(frame)) {
+const wrapFrame = (frame, controller) => {
+    if ((0, util_1.isWrapped)(frame)) {
         return frame;
     }
-    var frameProxy = new Proxy(frame, {
-        get: function (target, prop, receiver) {
-            var _this = this;
+    const frameProxy = new Proxy(frame, {
+        get(target, prop, receiver) {
             switch (prop) {
                 case '$':
                 case 'addScriptTag':
                 case 'addStyleTag':
                 case 'frameElement':
                 case 'waitForSelector':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        // @ts-expect-error TypeScript is angry.
+                        const el = yield target[prop](...args);
+                        if (!el) {
+                            return null;
                         }
-                        return __awaiter(_this, void 0, void 0, function () {
-                            var el;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, target[prop].apply(target, args)];
-                                    case 1:
-                                        el = _a.sent();
-                                        if (!el) {
-                                            return [2 /*return*/, null];
-                                        }
-                                        return [2 /*return*/, (0, exports.wrapElementHandle)(el, controller)];
-                                }
-                            });
-                        });
-                    };
+                        return (0, exports.wrapElementHandle)(el, controller);
+                    });
                 case 'evaluateHandle':
-                    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*/, target.evaluateHandle.apply(target, args)];
-                                    case 1:
-                                        el = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapJSHandle)(el, controller)];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const el = yield target.evaluateHandle(...args);
+                        return (0, exports.wrapJSHandle)(el, controller);
+                    });
                 case 'childFrames':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        var frames = target.childFrames.apply(target, args);
-                        return frames.map(function (f) { return (0, exports.wrapFrame)(f, controller); });
+                    return (...args) => {
+                        const frames = target.childFrames(...args);
+                        return frames.map(f => (0, exports.wrapFrame)(f, controller));
                     };
                 case 'check':
                 case 'click':
@@ -502,12 +295,8 @@ var wrapFrame = function (frame, controller) {
                 case 'uncheck':
                     return wrappedCallWithSideEffects(target, prop, controller);
                 case 'frameLocator':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        var frameLocator = target.frameLocator.apply(target, args);
+                    return (...args) => {
+                        const frameLocator = target.frameLocator(...args);
                         return (0, exports.wrapFrameLocator)(frameLocator, controller);
                     };
                 case 'getByAltText':
@@ -518,20 +307,16 @@ var wrapFrame = function (frame, controller) {
                 case 'getByText':
                 case 'getByTitle':
                 case 'locator':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
+                    return (...args) => {
                         // @ts-expect-error TypeScript is angry.
-                        var el = target[prop].apply(target, args);
+                        const el = target[prop](...args);
                         return (0, exports.wrapLocator)(el, controller);
                     };
                 case 'page':
-                    return function () { return (0, exports.wrapPage)(target.page(), controller); };
+                    return () => (0, exports.wrapPage)(target.page(), controller);
                 case 'parentFrame':
-                    return function () {
-                        var parentFrame = target.parentFrame();
+                    return () => {
+                        const parentFrame = target.parentFrame();
                         if (!parentFrame) {
                             return null;
                         }
@@ -542,28 +327,24 @@ var wrapFrame = function (frame, controller) {
             }
         }
     });
-    (0, exports.markAsWrapped)(frameProxy);
+    (0, util_1.markAsWrapped)(frameProxy);
     return frameProxy;
 };
 exports.wrapFrame = wrapFrame;
-var wrapFrameLocator = function (frameLocator, controller) {
-    if ((0, exports.isWrapped)(frameLocator)) {
+const wrapFrameLocator = (frameLocator, controller) => {
+    if ((0, util_1.isWrapped)(frameLocator)) {
         return frameLocator;
     }
-    var frameLocatorProxy = new Proxy(frameLocator, {
-        get: function (target, prop, receiver) {
+    const frameLocatorProxy = new Proxy(frameLocator, {
+        get(target, prop, receiver) {
             switch (prop) {
                 case 'first':
                 case 'frameLocator':
                 case 'last':
                 case 'nth':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
+                    return (...args) => {
                         // @ts-expect-error TypeScript is angry.
-                        var frame = target[prop].apply(target, args);
+                        const frame = target[prop](...args);
                         if (!frame) {
                             return null;
                         }
@@ -577,13 +358,9 @@ var wrapFrameLocator = function (frameLocator, controller) {
                 case 'getByTestId':
                 case 'getByText':
                 case 'getByTitle':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
+                    return (...args) => {
                         // @ts-expect-error TypeScript is angry.
-                        var el = target[prop].apply(target, args);
+                        const el = target[prop](...args);
                         return (0, exports.wrapLocator)(el, controller);
                     };
                 default:
@@ -591,36 +368,22 @@ var wrapFrameLocator = function (frameLocator, controller) {
             }
         }
     });
-    (0, exports.markAsWrapped)(frameLocatorProxy);
+    (0, util_1.markAsWrapped)(frameLocatorProxy);
     return frameLocatorProxy;
 };
 exports.wrapFrameLocator = wrapFrameLocator;
-var wrapLocator = function (locator, controller) {
-    if ((0, exports.isWrapped)(locator)) {
+const wrapLocator = (locator, controller) => {
+    if ((0, util_1.isWrapped)(locator)) {
         return locator;
     }
-    var locatorProxy = new Proxy(locator, {
-        get: function (target, prop, receiver) {
-            var _this = this;
+    const locatorProxy = new Proxy(locator, {
+        get(target, prop, receiver) {
             switch (prop) {
                 case 'all':
-                    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*/, target.all.apply(target, args)];
-                                    case 1:
-                                        els = _a.sent();
-                                        return [2 /*return*/, els.map(function (e) { return (0, exports.wrapLocator)(e, controller); })];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const els = yield target.all(...args);
+                        return els.map(e => (0, exports.wrapLocator)(e, controller));
+                    });
                 case 'blur':
                 case 'check':
                 case 'click':
@@ -642,50 +405,23 @@ var wrapLocator = function (locator, controller) {
                 case 'uncheck':
                     return wrappedCallWithSideEffects(target, prop, controller);
                 case 'elementHandle':
-                    return function () { return __awaiter(_this, void 0, void 0, function () {
-                        var el;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, target.elementHandle()];
-                                case 1:
-                                    el = _a.sent();
-                                    if (!el) {
-                                        return [2 /*return*/, null];
-                                    }
-                                    return [2 /*return*/, (0, exports.wrapElementHandle)(el, controller)];
-                            }
-                        });
-                    }); };
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        const el = yield target.elementHandle();
+                        if (!el) {
+                            return null;
+                        }
+                        return (0, exports.wrapElementHandle)(el, controller);
+                    });
                 case 'elementHandles':
-                    return function () { return __awaiter(_this, void 0, void 0, function () {
-                        var els;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, target.elementHandles()];
-                                case 1:
-                                    els = _a.sent();
-                                    return [2 /*return*/, els.map(function (e) { return (0, exports.wrapElementHandle)(e, controller); })];
-                            }
-                        });
-                    }); };
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        const els = yield target.elementHandles();
+                        return els.map(e => (0, exports.wrapElementHandle)(e, controller));
+                    });
                 case 'evaluateHandle':
-                    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 handle;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, target.evaluateHandle.apply(target, args)];
-                                    case 1:
-                                        handle = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapJSHandle)(handle, controller)];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const handle = yield target.evaluateHandle(...args);
+                        return (0, exports.wrapJSHandle)(handle, controller);
+                    });
                 case 'filter':
                 case 'first':
                 case 'last':
@@ -698,28 +434,20 @@ var wrapLocator = function (locator, controller) {
                 case 'getByTestId':
                 case 'getByText':
                 case 'getByTitle':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
+                    return (...args) => {
                         // @ts-expect-error TypeScript doesn't like this.
-                        var el = target[prop].apply(target, args);
+                        const el = target[prop](...args);
                         return (0, exports.wrapLocator)(el, controller);
                     };
                 case 'frameLocator':
-                    return function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
+                    return (...args) => {
                         // @ts-expect-error TypeScript doesn't like this.
-                        var frame = target[prop].apply(target, args);
+                        const frame = target[prop](...args);
                         return (0, exports.wrapFrameLocator)(frame, controller);
                     };
                 case 'page':
-                    return function () {
-                        var page = target[prop]();
+                    return () => {
+                        const page = target[prop]();
                         return (0, exports.wrapPage)(page, controller);
                     };
                 default:
@@ -727,59 +455,45 @@ var wrapLocator = function (locator, controller) {
             }
         }
     });
-    (0, exports.markAsWrapped)(locatorProxy);
+    (0, util_1.markAsWrapped)(locatorProxy);
     return locatorProxy;
 };
 exports.wrapLocator = wrapLocator;
-var wrapJSHandle = function (jsHandle, controller) {
-    if ((0, exports.isWrapped)(jsHandle)) {
+const wrapJSHandle = (jsHandle, controller) => {
+    if ((0, util_1.isWrapped)(jsHandle)) {
         return jsHandle;
     }
-    var jsHandleProxy = new Proxy(jsHandle, {
-        get: function (target, prop, receiver) {
-            var _this = this;
+    const jsHandleProxy = new Proxy(jsHandle, {
+        get(target, prop, receiver) {
             switch (prop) {
                 case 'asElement':
-                    return function () {
-                        var el = target.asElement();
+                    return () => {
+                        const el = target.asElement();
                         if (!el) {
                             return null;
                         }
                         return (0, exports.wrapElementHandle)(el, controller);
                     };
                 case 'evaluateHandle':
-                    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 handle;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, target.evaluateHandle.apply(target, args)];
-                                    case 1:
-                                        handle = _a.sent();
-                                        return [2 /*return*/, (0, exports.wrapJSHandle)(handle, controller)];
-                                }
-                            });
-                        });
-                    };
+                    return (...args) => __awaiter(this, void 0, void 0, function* () {
+                        const handle = yield target.evaluateHandle(...args);
+                        return (0, exports.wrapJSHandle)(handle, controller);
+                    });
                 default:
                     return Reflect.get(target, prop, receiver);
             }
         }
     });
-    (0, exports.markAsWrapped)(jsHandleProxy);
+    (0, util_1.markAsWrapped)(jsHandleProxy);
     return jsHandleProxy;
 };
 exports.wrapJSHandle = wrapJSHandle;
-var wrapKeyboard = function (keyboard, controller) {
-    if ((0, exports.isWrapped)(keyboard)) {
+const wrapKeyboard = (keyboard, controller) => {
+    if ((0, util_1.isWrapped)(keyboard)) {
         return keyboard;
     }
-    var keyboardProxy = new Proxy(keyboard, {
-        get: function (target, prop, receiver) {
+    const keyboardProxy = new Proxy(keyboard, {
+        get(target, prop, receiver) {
             switch (prop) {
                 case 'down':
                 case 'press':
@@ -792,16 +506,16 @@ var wrapKeyboard = function (keyboard, controller) {
             }
         }
     });
-    (0, exports.markAsWrapped)(keyboardProxy);
+    (0, util_1.markAsWrapped)(keyboardProxy);
     return keyboardProxy;
 };
 exports.wrapKeyboard = wrapKeyboard;
-var wrapMouse = function (mouse, controller) {
-    if ((0, exports.isWrapped)(mouse)) {
+const wrapMouse = (mouse, controller) => {
+    if ((0, util_1.isWrapped)(mouse)) {
         return mouse;
     }
-    var mouseProxy = new Proxy(mouse, {
-        get: function (target, prop, receiver) {
+    const mouseProxy = new Proxy(mouse, {
+        get(target, prop, receiver) {
             switch (prop) {
                 case 'click':
                 case 'dblclick':
@@ -815,16 +529,16 @@ var wrapMouse = function (mouse, controller) {
             }
         }
     });
-    (0, exports.markAsWrapped)(mouseProxy);
+    (0, util_1.markAsWrapped)(mouseProxy);
     return mouseProxy;
 };
 exports.wrapMouse = wrapMouse;
-var wrapTouchscreen = function (touchscreen, controller) {
-    if ((0, exports.isWrapped)(touchscreen)) {
+const wrapTouchscreen = (touchscreen, controller) => {
+    if ((0, util_1.isWrapped)(touchscreen)) {
         return touchscreen;
     }
-    var touchscreenProxy = new Proxy(touchscreen, {
-        get: function (target, prop, receiver) {
+    const touchscreenProxy = new Proxy(touchscreen, {
+        get(target, prop, receiver) {
             switch (prop) {
                 case 'tap':
                     return wrappedCallWithSideEffects(target, prop, controller);
@@ -833,7 +547,7 @@ var wrapTouchscreen = function (touchscreen, controller) {
             }
         }
     });
-    (0, exports.markAsWrapped)(touchscreenProxy);
+    (0, util_1.markAsWrapped)(touchscreenProxy);
     return touchscreenProxy;
 };
 exports.wrapTouchscreen = wrapTouchscreen;