@axe-core/watcher 1.8.2 → 2.0.0-next.0f47d4bc

package/dist/Controller.js

@@ -8,153 +8,93 @@ 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 };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var fs_1 = __importDefault(require("fs"));
-var util_1 = require("./util");
-var updateAutoAnalyze = function (val) {
-    var fileContents = fs_1.default.readFileSync(util_1.PATH_TO_EXTENSION_VARIABLES, 'utf-8');
-    var jsonValue = JSON.parse(fileContents);
+const fs_1 = __importDefault(require("fs"));
+const util_1 = require("./util");
+const updateAutoAnalyze = (val) => {
+    const fileContents = fs_1.default.readFileSync(util_1.PATH_TO_EXTENSION_VARIABLES, 'utf-8');
+    const jsonValue = JSON.parse(fileContents);
     jsonValue.auto_analyze = val;
     fs_1.default.writeFileSync(util_1.PATH_TO_EXTENSION_VARIABLES, JSON.stringify(jsonValue));
 };
-var Controller = /** @class */ (function () {
-    function Controller() {
+class Controller {
+    constructor() {
         this.isStopped = false;
     }
-    Controller.prototype.start = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        updateAutoAnalyze(true);
-                        this.isStopped = false;
-                        return [4 /*yield*/, this.executeScript(function () {
-                                return new Promise(function (resolve) {
-                                    var event = new CustomEvent('axe:start-auto-mode');
-                                    var fn = function () {
-                                        window.removeEventListener('axe:start-auto-mode-done', fn);
-                                        resolve();
-                                    };
-                                    window.addEventListener('axe:start-auto-mode-done', fn);
-                                    window.dispatchEvent(event);
-                                });
-                            })];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
+    start() {
+        return __awaiter(this, void 0, void 0, function* () {
+            updateAutoAnalyze(true);
+            this.isStopped = false;
+            yield this.executeScript(() => {
+                return new Promise(resolve => {
+                    const event = new CustomEvent('axe:start-auto-mode');
+                    const fn = () => {
+                        window.removeEventListener('axe:start-auto-mode-done', fn);
+                        resolve();
+                    };
+                    window.addEventListener('axe:start-auto-mode-done', fn);
+                    window.dispatchEvent(event);
+                });
             });
         });
-    };
-    Controller.prototype.stop = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        updateAutoAnalyze(false);
-                        this.isStopped = true;
-                        return [4 /*yield*/, this.executeScript(function () {
-                                return new Promise(function (resolve) {
-                                    var event = new CustomEvent('axe:stop-auto-mode');
-                                    var fn = function () {
-                                        window.removeEventListener('axe:stop-auto-mode-done', fn);
-                                        resolve();
-                                    };
-                                    window.addEventListener('axe:stop-auto-mode-done', fn);
-                                    window.dispatchEvent(event);
-                                });
-                            })];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
+    }
+    stop() {
+        return __awaiter(this, void 0, void 0, function* () {
+            updateAutoAnalyze(false);
+            this.isStopped = true;
+            yield this.executeScript(() => {
+                return new Promise(resolve => {
+                    const event = new CustomEvent('axe:stop-auto-mode');
+                    const fn = () => {
+                        window.removeEventListener('axe:stop-auto-mode-done', fn);
+                        resolve();
+                    };
+                    window.addEventListener('axe:stop-auto-mode-done', fn);
+                    window.dispatchEvent(event);
+                });
             });
         });
-    };
-    Controller.prototype.analyze = function (_a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.__UserRequestedAnalyze, __UserRequestedAnalyze = _c === void 0 ? true : _c;
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        // If the user didn't request an analyze, and we're in manual mode, don't do anything.
-                        if (this.isStopped && !__UserRequestedAnalyze) {
-                            return [2 /*return*/];
-                        }
-                        return [4 /*yield*/, this.executeScript(function (userRequestedAnalyze) {
-                                return new Promise(function (resolve) {
-                                    var event = new CustomEvent('axe:manual-mode-analyze', {
-                                        detail: { userRequestedAnalyze: userRequestedAnalyze }
-                                    });
-                                    var fn = function () {
-                                        window.removeEventListener('axe:manual-mode-analyze-done', fn);
-                                        resolve();
-                                    };
-                                    window.addEventListener('axe:manual-mode-analyze-done', fn);
-                                    window.dispatchEvent(event);
-                                });
-                            }, __UserRequestedAnalyze)];
-                    case 1:
-                        _d.sent();
-                        return [2 /*return*/];
-                }
-            });
+    }
+    analyze({ __UserRequestedAnalyze = true } = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // If the user didn't request an analyze, and we're in manual mode, don't do anything.
+            if (this.isStopped && !__UserRequestedAnalyze) {
+                return;
+            }
+            yield this.executeScript(userRequestedAnalyze => {
+                return new Promise(resolve => {
+                    const event = new CustomEvent('axe:manual-mode-analyze', {
+                        detail: { userRequestedAnalyze }
+                    });
+                    const fn = () => {
+                        window.removeEventListener('axe:manual-mode-analyze-done', fn);
+                        resolve();
+                    };
+                    window.addEventListener('axe:manual-mode-analyze-done', fn);
+                    window.dispatchEvent(event);
+                });
+            }, __UserRequestedAnalyze);
         });
-    };
+    }
     /** Flush all axe-core results by sending them to the server. */
-    Controller.prototype.flush = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.executeScript(function () {
-                            return new Promise(function (resolve) {
-                                var fn = function () {
-                                    window.removeEventListener('axe:flush-end', fn);
-                                    resolve();
-                                };
-                                window.addEventListener('axe:flush-end', fn);
-                                var event = new CustomEvent('axe:flush-start');
-                                window.dispatchEvent(event);
-                            });
-                        })];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
+    flush() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.executeScript(() => {
+                return new Promise(resolve => {
+                    const fn = () => {
+                        window.removeEventListener('axe:flush-end', fn);
+                        resolve();
+                    };
+                    window.addEventListener('axe:flush-end', fn);
+                    const event = new CustomEvent('axe:flush-start');
+                    window.dispatchEvent(event);
+                });
             });
         });
-    };
-    return Controller;
-}());
+    }
+}
 exports.default = Controller;
 //# sourceMappingURL=Controller.js.map

package/dist/Controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"Controller.js","sourceRoot":"","sources":["../src/Controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Controller.js","sourceRoot":"","sources":["../src/Controller.ts"],"names":[],"mappings":"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"}

package/dist/cypress.d.ts

@@ -1,12 +1,8 @@
 import type Cypress from 'cypress';
-import { Configuration } from './util';
+import { type Configuration } from './util';
 /**
  * Create a Cypress config that uses the axe Watcher extension.
  *
  * @param config Cypress config to extend
  */
 export declare const cypressConfig: (config: Cypress.ConfigOptions & Configuration) => Cypress.ConfigOptions;
-/** Methods we wrap on the provided `cy` instance. */
-export declare const WRAPPED_METHODS: ReadonlyArray<keyof Cypress.cy>;
-/** Wrap the given Cypress `cy` object, ensuring axe-core analysis is run after each command. */
-export declare const wrapCy: (cy: Cypress.cy) => Cypress.cy;

package/dist/cypress.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -21,30 +10,17 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapCy = exports.WRAPPED_METHODS = exports.cypressConfig = void 0;
-var uuid_1 = require("uuid");
-var util_1 = require("./util");
+exports.cypressConfig = void 0;
+const util_1 = require("./util");
 /**
  * Create a Cypress config that uses the axe Watcher extension.
  *
  * @param config Cypress config to extend
  */
-var cypressConfig = function (config) {
-    var axe = config.axe, userConfig = __rest(config, ["axe"]);
-    (0, util_1.writeVariables)(__assign(__assign({}, axe), { 
-        // Ensure the session ID persists between tabs.
-        // We cannot allow the extension to generate an ID, as each tab would get its own.
-        sessionId: axe.sessionId || (0, uuid_1.v4)(), 
+const cypressConfig = (config) => {
+    const { axe } = config, userConfig = __rest(config, ["axe"]);
+    (0, util_1.writeVariables)(Object.assign(Object.assign({}, axe), { 
         // Let the extension know to check for Cypress frames.
         cypress: true }));
     (0, util_1.writeManifest)({
@@ -56,83 +32,21 @@ var cypressConfig = function (config) {
             '*/__cypress/iframes/*'
         ]
     });
-    return __assign(__assign({}, userConfig), { e2e: __assign(__assign({}, userConfig.e2e), { setupNodeEvents: function (on) {
+    return Object.assign(Object.assign({}, userConfig), { e2e: Object.assign(Object.assign({}, userConfig.e2e), { setupNodeEvents(on, ...args) {
                 var _a, _b;
-                var args = [];
-                for (var _i = 1; _i < arguments.length; _i++) {
-                    args[_i - 1] = arguments[_i];
-                }
-                (_b = (_a = userConfig.e2e) === null || _a === void 0 ? void 0 : _a.setupNodeEvents) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a, on], args, false));
-                on('before:browser:launch', function (browser, launchOptions) {
-                    var _a;
+                (_b = (_a = userConfig.e2e) === null || _a === void 0 ? void 0 : _a.setupNodeEvents) === null || _b === void 0 ? void 0 : _b.call(_a, on, ...args);
+                on('before:browser:launch', (browser, launchOptions) => {
                     // We only support Chrome.
                     if (browser.name === 'chrome') {
                         if (browser.isHeadless) {
                             throw new util_1.HeadlessNotSupportedError();
                         }
                         // Load the extension.
-                        (_a = launchOptions.args).push.apply(_a, util_1.extensionArgs);
+                        launchOptions.args.push(...util_1.extensionArgs);
                     }
                     return launchOptions;
                 });
             } }) });
 };
 exports.cypressConfig = cypressConfig;
-/** Methods we wrap on the provided `cy` instance. */
-exports.WRAPPED_METHODS = [
-    'blur',
-    'check',
-    'clear',
-    'click',
-    'dblclick',
-    'focus',
-    'get',
-    'go',
-    'invoke',
-    'reload',
-    'scrollIntoView',
-    'scrollTo',
-    'select',
-    'submit',
-    'trigger',
-    'type',
-    'uncheck',
-    'visit',
-    'wait'
-];
-/** Wrap the given Cypress `cy` object, ensuring axe-core analysis is run after each command. */
-var wrapCy = function (cy) {
-    // We cannot wrap the `cy` instance itself, but instead, wrap its prototype.
-    // We don't have access to the $Chainer prototype, so use the returned value from `cy.wrap('')`.
-    var proto = Object.getPrototypeOf(cy.wrap(''));
-    var _loop_1 = function (method) {
-        var old = proto[method];
-        proto[method] = function () {
-            var _this = this;
-            var params = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                params[_i] = arguments[_i];
-            }
-            return old.apply(this, params).then(function ($element) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                _this.window().then(function (win) {
-                    if (win && !win.__AXE_WATCHER_HAS_VISITED) {
-                        /**
-                         * Set a flag on the Window to indicate that a wrapped method has been called.
-                         * This is used to determine whether we should call `axeFlush` after the test.
-                         */
-                        win.__AXE_WATCHER_HAS_VISITED = true;
-                    }
-                });
-                return _this.axeAnalyze({ __UserRequestedAnalyze: false }).then(function () { return $element; });
-            });
-        };
-    };
-    for (var _i = 0, WRAPPED_METHODS_1 = exports.WRAPPED_METHODS; _i < WRAPPED_METHODS_1.length; _i++) {
-        var method = WRAPPED_METHODS_1[_i];
-        _loop_1(method);
-    }
-    return cy;
-};
-exports.wrapCy = wrapCy;
 //# sourceMappingURL=cypress.js.map

package/dist/cypress.js.map

@@ -1 +1 @@
-{"version":3,"file":"cypress.js","sourceRoot":"","sources":["../src/cypress.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cypress.js","sourceRoot":"","sources":["../src/cypress.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,iCAMe;AAEf;;;;GAIG;AAEI,MAAM,aAAa,GAAG,CAC3B,MAA6C,EACtB,EAAE;IACzB,MAAM,EAAE,GAAG,KAAoB,MAAM,EAArB,UAAU,UAAK,MAAM,EAA/B,OAAsB,CAAS,CAAA;IAErC,IAAA,qBAAc,kCACT,GAAG;QACN,sDAAsD;QACtD,OAAO,EAAE,IAAI,IACb,CAAA;IACF,IAAA,oBAAa,EAAC;QACZ,UAAU,EAAE,IAAI;QAChB,aAAa,EAAE;YACb,0BAA0B;YAC1B,4BAA4B;YAC5B,4BAA4B;YAC5B,uBAAuB;SACxB;KACF,CAAC,CAAA;IAEF,uCACK,UAAU,KACb,GAAG,kCACE,UAAU,CAAC,GAAG,KACjB,eAAe,CAAC,EAAE,EAAE,GAAG,IAAI;;gBACzB,MAAA,MAAA,UAAU,CAAC,GAAG,0CAAE,eAAe,mDAAG,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;gBAE9C,EAAE,CAAC,uBAAuB,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE;oBACrD,0BAA0B;oBAC1B,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;wBAC7B,IAAI,OAAO,CAAC,UAAU,EAAE;4BACtB,MAAM,IAAI,gCAAyB,EAAE,CAAA;yBACtC;wBAED,sBAAsB;wBACtB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,oBAAa,CAAC,CAAA;qBAC1C;oBAED,OAAO,aAAa,CAAA;gBACtB,CAAC,CAAC,CAAA;YACJ,CAAC,OAEJ;AACH,CAAC,CAAA;AA3CY,QAAA,aAAa,iBA2CzB"}

package/dist/cypressCommands.d.ts

@@ -14,6 +14,12 @@ declare global {
             axeStart(): Chainable<void>;
             /** Stop automatic analysis mode. */
             axeStop(): Chainable<void>;
+            /** Access Cypress internal state */
+            state(state: any): any;
+            subject?: () => any;
         }
     }
 }
+declare type CypressMethod = keyof Cypress.Chainable;
+/** Commands we wrap to help us identify new page states. */
+export declare const WRAPPED_COMMANDS: ReadonlyArray<CypressMethod>;

package/dist/cypressCommands.js

@@ -1,27 +1,7 @@
 "use strict";
 /* istanbul ignore file: This file is basically untestable due to how Cypress works. Instead, it's covered by our E2E suite and manual testing. */
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-/** Overwrite the `cy.visit` command to set a flag on the Window. */
-Cypress.Commands.overwrite('visit', function (originalFn, url, options) {
-    if (options === void 0) { options = {}; }
-    var oldOnBeforeLoad = options.onBeforeLoad || (function () { return undefined; });
-    options.onBeforeLoad = function (win) {
-        win.__AXE_WATCHER_HAS_VISITED = true;
-        oldOnBeforeLoad(win);
-    };
-    return originalFn(__assign(__assign({}, options), { url: url }));
-});
+exports.WRAPPED_COMMANDS = void 0;
 /**
  * Has the user stopped automatic mode.
  *
@@ -30,41 +10,40 @@ Cypress.Commands.overwrite('visit', function (originalFn, url, options) {
  * As result, we need this top-level state for managing
  * analyze calls created by "wrapped" methods.
  */
-var isStopped = false;
-Cypress.Commands.add('axeFlush', function () {
-    cy.window().then(function (win) {
+let isStopped = false;
+Cypress.Commands.add('axeFlush', () => {
+    cy.window().then(win => {
         // @ts-expect-error `__AXE_WATCHER_HAS_VISITED` is a global set on the window by axe Watcher.
         // This determines if axe Watcher has ever visited the page. If it hasn't, we don't want to
         // flush results
         if (!win.__AXE_WATCHER_HAS_VISITED) {
             return;
         }
-        return new Promise(function (resolve) {
-            var fn = function () {
+        return new Promise(resolve => {
+            const fn = () => {
                 win.removeEventListener('axe:flush-end', fn);
                 // @ts-expect-error reset `__AXE_WATCHER_HAS_VISITED` to false
                 win.__AXE_WATCHER_HAS_VISITED = false;
                 resolve();
             };
             win.addEventListener('axe:flush-end', fn);
-            var event = new CustomEvent('axe:flush-start');
+            const event = new CustomEvent('axe:flush-start');
             win.dispatchEvent(event);
         });
     });
 });
 Cypress.Commands.add('axeAnalyze', 
 // __UserRequestedAnalyze allows us to differentiate between user-initiated and automatic analysis.
-function (_a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.__UserRequestedAnalyze, __UserRequestedAnalyze = _c === void 0 ? true : _c;
+({ __UserRequestedAnalyze = true } = {}) => {
     if (!__UserRequestedAnalyze && isStopped) {
         return;
     }
-    cy.window().then(function (win) {
-        return new Promise(function (resolve) {
-            var event = new CustomEvent('axe:manual-mode-analyze', {
+    cy.window().then(win => {
+        return new Promise(resolve => {
+            const event = new CustomEvent('axe:manual-mode-analyze', {
                 detail: { userRequestedAnalyze: __UserRequestedAnalyze }
             });
-            var fn = function () {
+            const fn = () => {
                 win.removeEventListener('axe:manual-mode-analyze-done', fn);
                 resolve();
             };
@@ -73,11 +52,11 @@ function (_a) {
         });
     });
 });
-Cypress.Commands.add('axeStart', function () {
-    cy.window().then(function (win) {
-        return new Promise(function (resolve) {
-            var event = new CustomEvent('axe:start-auto-mode');
-            var fn = function () {
+Cypress.Commands.add('axeStart', () => {
+    cy.window().then(win => {
+        return new Promise(resolve => {
+            const event = new CustomEvent('axe:start-auto-mode');
+            const fn = () => {
                 isStopped = false;
                 win.removeEventListener('axe:start-auto-mode-done', fn);
                 resolve();
@@ -87,11 +66,11 @@ Cypress.Commands.add('axeStart', function () {
         });
     });
 });
-Cypress.Commands.add('axeStop', function () {
-    cy.window().then(function (win) {
-        return new Promise(function (resolve) {
-            var event = new CustomEvent('axe:stop-auto-mode');
-            var fn = function () {
+Cypress.Commands.add('axeStop', () => {
+    cy.window().then(win => {
+        return new Promise(resolve => {
+            const event = new CustomEvent('axe:stop-auto-mode');
+            const fn = () => {
                 isStopped = true;
                 win.removeEventListener('axe:stop-auto-mode-done', fn);
                 resolve();
@@ -101,4 +80,94 @@ Cypress.Commands.add('axeStop', function () {
         });
     });
 });
+/** Commands we wrap to help us identify new page states. */
+exports.WRAPPED_COMMANDS = [
+    'blur',
+    'check',
+    'clear',
+    'click',
+    'dblclick',
+    'focus',
+    'go',
+    'reload',
+    'scrollIntoView',
+    'scrollTo',
+    'select',
+    'submit',
+    'trigger',
+    'type',
+    'uncheck',
+    'wait'
+];
+/**
+ * Wrapped commands queue an axe run before calling the original method. This can seem
+ * a little counter-intuitive, but the reason we do this is so that we make sure we wait
+ * for the existing page state to be analyzed before performing our action.
+ *
+ * We rely on future commands to detect any new page state created by the current command.
+ * The last command that runs relies on the flush to catch the last page state.
+ */
+exports.WRAPPED_COMMANDS.forEach(method => Cypress.Commands.overwrite(method, (originalFn, ...args) => {
+    var _a, _b, _c;
+    const currentCommand = (_b = (_a = cy.state('current')) === null || _a === void 0 ? void 0 : _a.attributes) === null || _b === void 0 ? void 0 : _b.name;
+    // Some commands, like "type" call other commands internally, like "click".
+    // We don't want to enqueue a run in these scenarios because it can cause
+    // promises to be returned from commands, which Cypress does not allow.
+    // See: https://github.com/cypress-io/cypress/issues/19086
+    if (currentCommand && currentCommand !== method) {
+        return originalFn(...args);
+    }
+    // Get the previous subject from the chain so we can pass it along to child commands.
+    const subject = (_c = cy.subject) === null || _c === void 0 ? void 0 : _c.call(cy);
+    cy.window()
+        .then((win) => {
+        if (win && !win.__AXE_WATCHER_HAS_VISITED) {
+            /**
+             * Set a flag on the Window to indicate that a wrapped method has been called.
+             * This is used to determine whether we should call `axeFlush` after the test.
+             */
+            win.__AXE_WATCHER_HAS_VISITED = true;
+        }
+    })
+        .axeAnalyze({ __UserRequestedAnalyze: false })
+        // Set the subject back to the previous subject
+        .then(() => subject)
+        .then(() => originalFn(...args));
+}));
+/**
+ * The `visit` command is wrapped differently than the other commands. This is because
+ * we need to actually visit and load the page before we can run axe.
+ *
+ * We run the original visit command, wait for the extension to be initialized, and then
+ * queue an axe run.
+ */
+Cypress.Commands.overwrite('visit', (originalFn, ...args) => {
+    // We use `cy.wrap(null)` here just to get into the Cypress command queue.
+    cy.wrap(null)
+        .then(() => {
+        return originalFn(...args);
+    })
+        .then(visitResult => {
+        cy.window()
+            .then((win) => {
+            if (win && !win.__AXE_WATCHER_HAS_VISITED) {
+                /**
+                 * Set a flag on the Window to indicate that a wrapped method has been called.
+                 * This is used to determine whether we should call `axeFlush` after the test.
+                 */
+                win.__AXE_WATCHER_HAS_VISITED = true;
+            }
+            // Wait for watcher to initialize before continuing.
+            return new Promise(resolve => {
+                const fn = () => {
+                    win.removeEventListener('axe:initialized', fn);
+                    resolve();
+                };
+                win.addEventListener('axe:initialized', fn);
+            });
+        })
+            .axeAnalyze({ __UserRequestedAnalyze: false })
+            .then(() => visitResult);
+    });
+});
 //# sourceMappingURL=cypressCommands.js.map