@axe-core/watcher 3.11.0-rc.e230efa3 → 3.11.1-next.06e682d4

package/dist/Controller.d.ts

@@ -1,9 +1,17 @@
+import type { Debugger } from 'debug';
+interface ControllerParams {
+    /** The namespace for the debug logger. */
+    debugLoggerName: string;
+}
 declare abstract class Controller {
     protected abstract executeScript<A = unknown, T = void>(fn: string | ((...args: A[]) => Promise<T>), ...args: unknown[]): Promise<T>;
     protected isStopped: boolean;
+    protected debugLogger: Debugger;
+    constructor({ debugLoggerName }: ControllerParams);
     start(): Promise<void>;
     stop(): Promise<void>;
-    analyze({ __UserRequestedAnalyze }?: {
+    analyze({ __Method, __UserRequestedAnalyze }?: {
+        __Method?: string;
         __UserRequestedAnalyze?: boolean;
     }): Promise<void>;
     flush(): Promise<void>;

package/dist/Controller.js

@@ -3,14 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("./util");
+const updateAutoAnalyze_1 = __importDefault(require("./utils/updateAutoAnalyze"));
 const sendResultsToServer_1 = __importDefault(require("./sendResultsToServer"));
+const createDebugger_1 = __importDefault(require("./createDebugger"));
 class Controller {
-    constructor() {
+    constructor({ debugLoggerName }) {
         this.isStopped = false;
+        this.debugLogger = (0, createDebugger_1.default)(debugLoggerName);
     }
     async start() {
-        (0, util_1.updateAutoAnalyze)(true);
+        (0, updateAutoAnalyze_1.default)(true);
         this.isStopped = false;
         await this.executeScript(() => {
             if (!['http:', 'https:', 'file:'].includes(window.location.protocol)) {
@@ -28,7 +30,7 @@ class Controller {
         });
     }
     async stop() {
-        (0, util_1.updateAutoAnalyze)(false);
+        (0, updateAutoAnalyze_1.default)(false);
         this.isStopped = true;
         await this.executeScript(() => {
             if (!['http:', 'https:', 'file:'].includes(window.location.protocol)) {
@@ -45,19 +47,24 @@ class Controller {
             });
         });
     }
-    async analyze({ __UserRequestedAnalyze = true } = {}) {
+    async analyze({ __Method, __UserRequestedAnalyze = true } = {}) {
+        this.debugLogger(`Analyze: Invoked${__Method ? ` - ${__Method}` : ''}`);
         // If the user didn't request an analyze, and we're in manual mode, don't do anything.
         if (this.isStopped && !__UserRequestedAnalyze) {
+            this.debugLogger('Analyze: Skipped', {
+                isStopped: this.isStopped,
+                __UserRequestedAnalyze
+            });
             return;
         }
-        await this.executeScript((userRequestedAnalyze) => {
+        const result = await this.executeScript((userRequestedAnalyze) => {
             if (!['http:', 'https:', 'file:'].includes(window.location.protocol)) {
-                return Promise.resolve();
+                return Promise.resolve({ message: 'Skipped - Invalid protocol' });
             }
             return new Promise(resolve => {
-                const fn = () => {
+                const fn = (event) => {
                     window.removeEventListener('axe:manual-mode-analyze-done', fn);
-                    resolve();
+                    resolve(event.detail);
                 };
                 window.addEventListener('axe:manual-mode-analyze-done', fn);
                 const event = new CustomEvent('axe:manual-mode-analyze', {
@@ -66,8 +73,10 @@ class Controller {
                 window.dispatchEvent(event);
             });
         }, __UserRequestedAnalyze);
+        this.debugLogger(`Analyze: ${result.message}`);
     }
     async flush() {
+        this.debugLogger('Flush: Invoked (may analyze implicitly)');
         const results = await this.executeScript(() => {
             if (!['http:', 'https:', 'file:'].includes(window.location.protocol)) {
                 return Promise.resolve([]);
@@ -88,7 +97,12 @@ class Controller {
                 window.dispatchEvent(event);
             });
         });
-        await (0, sendResultsToServer_1.default)(results);
+        this.debugLogger(`Flush: Received ${results.length} results`);
+        await (0, sendResultsToServer_1.default)({
+            results,
+            debugLogger: this.debugLogger
+        });
+        this.debugLogger('Flush: Complete');
     }
 }
 exports.default = Controller;

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":";;;;;AAAA,kFAAyD;AACzD,gFAAwE;AACxE,sEAA6C;AAQ7C,MAAe,UAAU;IASvB,YAAY,EAAE,eAAe,EAAoB;QAHvC,cAAS,GAAG,KAAK,CAAA;QAIzB,IAAI,CAAC,WAAW,GAAG,IAAA,wBAAc,EAAC,eAAe,CAAC,CAAA;IACpD,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAA,2BAAiB,EAAC,IAAI,CAAC,CAAA;QACvB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;QAEtB,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;YAC1B,CAAC;YAED,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;gBACjC,MAAM,EAAE,GAAG,GAAS,EAAE;oBACpB,MAAM,CAAC,mBAAmB,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAA;oBAC1D,OAAO,EAAE,CAAA;gBACX,CAAC,CAAA;gBACD,MAAM,CAAC,gBAAgB,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAA;gBACvD,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,qBAAqB,CAAC,CAAA;gBACpD,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;YAC7B,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,IAAA,2BAAiB,EAAC,KAAK,CAAC,CAAA;QACxB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QAErB,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;YAC1B,CAAC;YAED,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;gBACjC,MAAM,EAAE,GAAG,GAAS,EAAE;oBACpB,MAAM,CAAC,mBAAmB,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAA;oBACzD,OAAO,EAAE,CAAA;gBACX,CAAC,CAAA;gBACD,MAAM,CAAC,gBAAgB,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAA;gBACtD,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,oBAAoB,CAAC,CAAA;gBACnD,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;YAC7B,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,EACnB,QAAQ,EACR,sBAAsB,GAAG,IAAI,KAI3B,EAAE;QACJ,IAAI,CAAC,WAAW,CAAC,mBAAmB,QAAQ,CAAC,CAAC,CAAC,MAAM,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QACvE,sFAAsF;QACtF,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9C,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE;gBACnC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,sBAAsB;aACvB,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC,oBAA6B,EAAE,EAAE;YACxE,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAA;YACnE,CAAC;YAED,OAAO,IAAI,OAAO,CAAsB,OAAO,CAAC,EAAE;gBAChD,MAAM,EAAE,GAAG,CAAC,KAAkB,EAAQ,EAAE;oBACtC,MAAM,CAAC,mBAAmB,CACxB,8BAA8B,EAC9B,EAAgB,CACjB,CAAA;oBACD,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBACvB,CAAC,CAAA;gBACD,MAAM,CAAC,gBAAgB,CACrB,8BAA8B,EAC9B,EAAgB,CACjB,CAAA;gBACD,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,yBAAyB,EAAE;oBACvD,MAAM,EAAE,EAAE,oBAAoB,EAAE;iBACjC,CAAC,CAAA;gBACF,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;YAC7B,CAAC,CAAC,CAAA;QACJ,CAAC,EAAE,sBAAsB,CAAC,CAAA;QAE1B,IAAI,CAAC,WAAW,CAAC,YAAY,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;IAChD,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,WAAW,CAAC,yCAAyC,CAAC,CAAA;QAC3D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE;YAC5C,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YAC5B,CAAC;YAED,OAAO,IAAI,OAAO,CAAW,OAAO,CAAC,EAAE;gBACrC,MAAM,eAAe,GAAa,EAAE,CAAA;gBAEpC,MAAM,UAAU,GAAG,GAAS,EAAE;oBAC5B,MAAM,CAAC,mBAAmB,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;oBACvD,MAAM,CAAC,mBAAmB,CAAC,YAAY,EAAE,WAAyB,CAAC,CAAA;oBACnE,OAAO,CAAC,eAAe,CAAC,CAAA;gBAC1B,CAAC,CAAA;gBAED,MAAM,WAAW,GAAG,CAAC,CAAwB,EAAQ,EAAE;oBACrD,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAA;gBACnC,CAAC,CAAA;gBAED,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,WAAyB,CAAC,CAAA;gBAChE,MAAM,CAAC,gBAAgB,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;gBACpD,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,iBAAiB,CAAC,CAAA;gBAChD,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;YAC7B,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,WAAW,CAAC,mBAAmB,OAAO,CAAC,MAAM,UAAU,CAAC,CAAA;QAC7D,MAAM,IAAA,6BAAmB,EAAC;YACxB,OAAO;YACP,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAA;IACrC,CAAC;CACF;AAED,kBAAe,UAAU,CAAA"}

package/dist/EventForwarder.js

@@ -34,12 +34,10 @@ class EventForwarder {
                     .reduce((prevLaunchOptions, listener) => listener(browser, prevLaunchOptions), launchOptions));
             }
             else {
-                /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-                on(event, async (...args) => {
-                    for (const listener of this.emitter.listeners(event)) {
-                        await listener(...args);
-                    }
-                });
+                for (const listener of this.emitter.listeners(event)) {
+                    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+                    on(event, listener);
+                }
             }
         }
     }

package/dist/EventForwarder.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventForwarder.js","sourceRoot":"","sources":["../src/EventForwarder.ts"],"names":[],"mappings":";;;;;AAYA,kEAAwC;AAExC,MAAM,cAAc;IAKlB;QACE,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAY,EAAE,CAAA;QACjC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;QACf,IAAI,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,EAAQ,EAAE;YAC7B,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gBACtB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YAC/B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,EAAqC,CAAC,CAAA;YAChE,CAAC;QACH,CAAC,CAAA;IACH,CAAC;IAED;;OAEG;IACI,OAAO,CAAC,EAAwB;QACrC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;YAC9C,0EAA0E;YAC1E,wEAAwE;YACxE,uBAAuB;YACvB,IAAI,KAAK,KAAK,uBAAuB,EAAE,CAAC;gBACtC,EAAE,CACA,uBAAuB,EACvB,CACE,OAAwB,EACxB,aAAiD,EACjD,EAAE,CACF,IAAI,CAAC,OAAO;qBACT,SAAS,CAAC,KAAK,CAAC;qBAChB,MAAM,CACL,CAAC,iBAAiB,EAAE,QAAQ,EAAE,EAAE,CAC9B,QAAQ,CACN,OAAO,EACP,iBAAiB,CAC+B,EACpD,aAAa,CACd,CACN,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,iEAAiE;gBACjE,EAAE,CAAC,KAAY,EAAE,KAAK,EAAE,GAAG,IAAe,EAAE,EAAE;oBAC5C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;wBACrD,MAAM,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAA;oBACzB,CAAC;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,kBAAe,cAAc,CAAA"}
+{"version":3,"file":"EventForwarder.js","sourceRoot":"","sources":["../src/EventForwarder.ts"],"names":[],"mappings":";;;;;AAYA,kEAAwC;AAExC,MAAM,cAAc;IAKlB;QACE,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAY,EAAE,CAAA;QACjC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;QACf,IAAI,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,EAAQ,EAAE;YAC7B,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gBACtB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YAC/B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,EAAqC,CAAC,CAAA;YAChE,CAAC;QACH,CAAC,CAAA;IACH,CAAC;IAED;;OAEG;IACI,OAAO,CAAC,EAAwB;QACrC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;YAC9C,0EAA0E;YAC1E,wEAAwE;YACxE,uBAAuB;YACvB,IAAI,KAAK,KAAK,uBAAuB,EAAE,CAAC;gBACtC,EAAE,CACA,uBAAuB,EACvB,CACE,OAAwB,EACxB,aAAiD,EACjD,EAAE,CACF,IAAI,CAAC,OAAO;qBACT,SAAS,CAAC,KAAK,CAAC;qBAChB,MAAM,CACL,CAAC,iBAAiB,EAAE,QAAQ,EAAE,EAAE,CAC9B,QAAQ,CACN,OAAO,EACP,iBAAiB,CAC+B,EACpD,aAAa,CACd,CACN,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;oBACrD,iEAAiE;oBACjE,EAAE,CAAC,KAAY,EAAE,QAAQ,CAAC,CAAA;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,kBAAe,cAAc,CAAA"}

package/dist/createDebugger.d.ts

@@ -0,0 +1,9 @@
+import debug from 'debug';
+/**
+ * Creates a debug logger with the given namespace
+ *
+ * @param namespace The namespace for the debug logger for example: `PlaywrightController` or `PlaywrightWrapping`.
+ * @returns debug instance
+ */
+declare function createDebugger(namespace: string): debug.Debugger;
+export default createDebugger;

package/dist/createDebugger.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const debug_1 = __importDefault(require("debug"));
+/**
+ * The prefix for the debug logger allows users to filter logs by the prefix
+ * using the debug package.
+ *
+ * @example
+ * ```bash
+ * DEBUG=axe-watcher:* yarn test
+ * ```
+ */
+const NAMESPACE_PREFIX = 'axe-watcher';
+/**
+ * Creates a debug logger with the given namespace
+ *
+ * @param namespace The namespace for the debug logger for example: `PlaywrightController` or `PlaywrightWrapping`.
+ * @returns debug instance
+ */
+function createDebugger(namespace) {
+    return (0, debug_1.default)(`${NAMESPACE_PREFIX}:${namespace}`);
+}
+exports.default = createDebugger;
+//# sourceMappingURL=createDebugger.js.map

package/dist/createDebugger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createDebugger.js","sourceRoot":"","sources":["../src/createDebugger.ts"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AAEzB;;;;;;;;GAQG;AACH,MAAM,gBAAgB,GAAG,aAAa,CAAA;AAEtC;;;;;GAKG;AAEH,SAAS,cAAc,CAAC,SAAiB;IACvC,OAAO,IAAA,eAAK,EAAC,GAAG,gBAAgB,IAAI,SAAS,EAAE,CAAC,CAAA;AAClD,CAAC;AAED,kBAAe,cAAc,CAAA"}

package/dist/cypress.d.ts

@@ -1,4 +1,4 @@
-import { type Configuration } from './util';
+import { type Configuration } from './utils/writeVariables';
 /**
  * Create a Cypress config that uses the axe Watcher extension.
  *

package/dist/cypress.js

@@ -4,10 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressConfig = void 0;
-const fs_1 = __importDefault(require("fs"));
-const util_1 = require("./util");
 const sendResultsToServer_1 = __importDefault(require("./sendResultsToServer"));
 const EventForwarder_1 = __importDefault(require("./EventForwarder"));
+const writeVariables_1 = __importDefault(require("./utils/writeVariables"));
+const writeExtensionManifest_1 = __importDefault(require("./utils/writeExtensionManifest"));
+const headlessNotSupportedError_1 = require("./utils/headlessNotSupportedError");
+const mergeChromeArgs_1 = __importDefault(require("./utils/mergeChromeArgs"));
+const createDebugger_1 = __importDefault(require("./createDebugger"));
+const debugLogger = (0, createDebugger_1.default)('CypressController');
 /**
  * Create a Cypress config that uses the axe Watcher extension.
  *
@@ -15,12 +19,14 @@ const EventForwarder_1 = __importDefault(require("./EventForwarder"));
  */
 const cypressConfig = (config) => {
     const { axe, ...userConfig } = config;
-    (0, util_1.writeVariables)({
+    const { DEBUG } = process.env;
+    const hasWatcherDebug = DEBUG && DEBUG.includes('axe-watcher');
+    (0, writeVariables_1.default)({
         ...axe,
         // Let the extension know to check for Cypress frames.
         cypress: true
     });
-    (0, util_1.writeManifest)({
+    (0, writeExtensionManifest_1.default)({
         all_frames: true,
         exclude_globs: [
             // Top-level Cypress page.
@@ -30,6 +36,12 @@ const cypressConfig = (config) => {
         ]
     });
     return {
+        ...(hasWatcherDebug && {
+            env: {
+                ...config.env,
+                __AXE_WATCHER_DEBUG: hasWatcherDebug
+            }
+        }),
         ...userConfig,
         e2e: {
             ...userConfig.e2e,
@@ -61,53 +73,41 @@ const cypressConfig = (config) => {
                  * ensure we wait for the user's `setupNodeEvents` to resolve.
                  */
                 const userNodeEventConfig = await ((_b = (_a = userConfig.e2e) === null || _a === void 0 ? void 0 : _a.setupNodeEvents) === null || _b === void 0 ? void 0 : _b.call(_a, on, ...args));
+                on('task', {
+                    __uploadAxeWatcherResults: async (results) => {
+                        if (!results.length) {
+                            // Indicates to Cypress that the event has been handled.
+                            // @see https://docs.cypress.io/api/commands/task#Usage
+                            return null;
+                        }
+                        await (0, sendResultsToServer_1.default)({
+                            results,
+                            debugLogger
+                        });
+                        return null;
+                    },
+                    __debugAxeWatcher: (message) => {
+                        debugLogger(message);
+                        return null;
+                    }
+                });
                 on('before:browser:launch', (browser, launchOptions) => {
-                    if (browser.name !== 'chrome') {
-                        throw new Error('The @axe-core/watcher package only supports running in Chrome. Please refer to our System Requirements for more information: https://docs.deque.com/developer-hub/2/en/dh-system-requirements');
+                    // We only officially support Chrome, but for backcompat we are permissive and accept other
+                    // Chromium-based browsers (eg, "chromium", "chrome:beta", "edge").
+                    if (browser.name.startsWith('firefox') ||
+                        browser.name.startsWith('electron')) {
+                        throw new Error(`The @axe-core/watcher package only supports running in Chrome, but Cypress is configured with browser "${browser.name}". Please refer to our System Requirements for more information: https://docs.deque.com/developer-hub/2/en/dh-system-requirements`);
                     }
                     if (browser.isHeadless && launchOptions.args.includes('--headless')) {
-                        throw new util_1.HeadlessNotSupportedError('In Cypress, "--headless=new" became the default headless mode in Cypress version 12.15.0. Ensure your Cypress version is up to date and that you are not using a "before:browser:launch" configuration that adds "--headless" to launchOptions.args.');
+                        throw new headlessNotSupportedError_1.HeadlessNotSupportedError('In Cypress, "--headless=new" became the default headless mode in Cypress version 12.15.0. Ensure your Cypress version is up to date and that you are not using a "before:browser:launch" configuration that adds "--headless" to launchOptions.args.');
                     }
-                    // Load the extension. Merge extention args if provided by the user
-                    const launchOptionsArgs = [
-                        ...launchOptions.args,
-                        ...util_1.extensionArgs
-                    ].reduce((prev, arg) => {
-                        const [key, value] = arg.split('=');
-                        if (!prev[key]) {
-                            prev[key] = [];
-                        }
-                        if (value) {
-                            prev[key].push(value);
-                        }
-                        return prev;
-                    }, {});
-                    launchOptions.args = Object.entries(launchOptionsArgs).map(([key, value]) => value.length > 0 ? [key, value.join(',')].join('=') : key);
+                    // Load the extension. Merge extension args if provided by the user
+                    const existingArgs = launchOptions.args;
+                    launchOptions.args = (0, mergeChromeArgs_1.default)(existingArgs, {
+                        disableOtherExtensions: false
+                    });
                     return launchOptions;
                 });
-                // Read the results sent from the extension, then forward to the server.
-                on('after:run', async () => {
-                    let results;
-                    try {
-                        results = fs_1.default
-                            .readdirSync('cypress/axe-watcher')
-                            .filter(f => f.endsWith('.json'));
-                    }
-                    catch (error) {
-                        // this is a non-error; the test suite likely just failed early
-                        // without running any scans
-                        if (error.code === 'ENOENT') {
-                            return;
-                        }
-                        throw error;
-                    }
-                    for (const result of results) {
-                        const data = fs_1.default.readFileSync(`cypress/axe-watcher/${result}`, 'utf8');
-                        const parsed = JSON.parse(data);
-                        await (0, sendResultsToServer_1.default)(parsed);
-                        fs_1.default.unlinkSync(`cypress/axe-watcher/${result}`);
-                    }
-                });
                 /**
                  * Forward the accumulated events to cypress.
                  * For more information, see comment on #44

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":"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"}

package/dist/cypressCommands.d.ts

@@ -1,4 +1,3 @@
-export {};
 declare global {
     namespace Cypress {
         interface Chainable {
@@ -12,6 +11,7 @@ declare global {
             axeFlush(): Chainable<void>;
             /** Perform an axe-core analysis. */
             axeWatcherAnalyze(params?: {
+                __Method?: string;
                 __UserRequestedAnalyze?: boolean;
             }): Chainable<void>;
             /**
@@ -20,6 +20,7 @@ declare global {
              * @Deprecated Use cy.axeWatcherAnalyze() instead
              */
             axeAnalyze(params?: {
+                __Method?: string;
                 __UserRequestedAnalyze?: boolean;
             }): Chainable<void>;
             /**
@@ -48,3 +49,4 @@ declare global {
 type CypressMethod = keyof Cypress.Chainable;
 /** Commands we wrap to help us identify new page states. */
 export declare const WRAPPED_COMMANDS: ReadonlyArray<CypressMethod>;
+export {};

package/dist/cypressCommands.js

@@ -27,8 +27,17 @@ exports.WRAPPED_COMMANDS = [
     'trigger',
     'type',
     'uncheck',
+    'visit',
     'wait'
 ];
+/** Helper function to log debug messages */
+const logDebugAxeWatcher = ({ message }) => {
+    // perf: we only want to log debug messages if the env has been set
+    // so it doesn't enqueue a Cypress command
+    if (Cypress.env('__AXE_WATCHER_DEBUG')) {
+        cy.task('__debugAxeWatcher', message, { log: false });
+    }
+};
 const shouldAnalyzeLocation = (location) => ['http:', 'https:', 'file:'].includes(location.protocol);
 /**
  * Wrapped commands queue an axe run before calling the original method. This can seem
@@ -39,99 +48,91 @@ const shouldAnalyzeLocation = (location) => ['http:', 'https:', 'file:'].include
  * 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, _d, _e, _f;
-    const currentCommand = (_b = (_a = cy.state('current')) === null || _a === void 0 ? void 0 : _a.attributes) === null || _b === void 0 ? void 0 : _b.name;
+    var _a, _b, _c, _d, _e;
+    const currentCommand = cy.state('current');
+    const currentCommandName = currentCommand === null || currentCommand === void 0 ? void 0 : currentCommand.get('name');
+    const currentCommandType = currentCommand === null || currentCommand === void 0 ? void 0 : currentCommand.get('type');
+    // TODO: Remove the feature flag once #1109 is fully resolved.
+    const tryRequerySubject = !!Cypress.env('__AXE_WATCHER_CYPRESS_REQUERY_SUBJECT_AFTER_ANALYZE') &&
+        'getSubjectFromChain' in cy;
     // 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) {
+    if (currentCommandName && currentCommandName !== method) {
         return originalFn(...args);
     }
-    // The "Subject" is a handle to the current DOM element(s) that the command is acting on.
-    const originalSubject = (_d = (_c = cy).subject) === null || _d === void 0 ? void 0 : _d.call(_c);
+    // axeWatcherAnalyze is slow; it's possible for the Cypress subject to become invalidated
+    // while it's running (eg, if the subject is in some sort of remount-loop). To account for
+    // this, we ask Cypress to requery the subject object from the subjectChain before returning
+    // control to the original function.
+    // Note that we don't always have access to an original subjectChain to restore; the API is
+    // only available in Cypress 12+, and even then we might be wrapping a command that doesn't
+    // necessarily operate on a subject.
     // The "Subject Chain" represents the chain of Cypress selection operations that lead up
     // to finding the "Subject". cy.getSubjectFromChain() requeries those operations to retrieve
     // a fresh "Subject" handle.
-    const originalSubjectChain = (_f = (_e = cy).subjectChain) === null || _f === void 0 ? void 0 : _f.call(_e);
-    cy.window()
-        .then(win => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        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.
-             */
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            ;
-            win.__AXE_WATCHER_HAS_VISITED = true;
-        }
-    })
-        .axeWatcherAnalyze({ __UserRequestedAnalyze: false })
-        // axeWatcherAnalyze is slow; it's possible for the Cypress subject to become invalidated
-        // while it's running (eg, if the subject is in some sort of remount-loop). To account for
-        // this, we ask Cypress to requery the subject object from the subjectChain before returning
-        // control to the original function.
-        //
-        // Note that we don't always have access to an original subjectChain to restore; the API is
-        // only available in Cypress 12+, and even then we might be wrapping a command that doesn't
-        // necessarily operate on a subject.
-        .then(() => {
-        var _a, _b;
-        // Some Cypress commands pick up the subject from cy.subject(), and some pick it up from a
-        // subject parameter that's passed to the command. Returning the updated subject from this
-        // .then() sets cy.subject() to handle the former...
-        return originalSubjectChain &&
-            ((_b = (_a = cy).getSubjectFromChain) === null || _b === void 0 ? void 0 : _b.call(_a, originalSubjectChain));
-    })
-        .then(updatedSubject => {
-        // ...and this map handles the latter.
-        const argsWithRefreshedSubject = args.map(arg => originalSubject && arg === originalSubject ? updatedSubject : arg);
-        // originalFn might return a Promise that Cypress needs to be able to track, so it's important
-        // to propagate its return value even though we're not chaining any further cypress commands
-        // ourselves.
-        return originalFn(...argsWithRefreshedSubject);
+    const originalSubject = (_b = (_a = cy).subject) === null || _b === void 0 ? void 0 : _b.call(_a);
+    const originalSubjectChain = (_d = (_c = cy).subjectChain) === null || _d === void 0 ? void 0 : _d.call(_c);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let commandChain = cy.window().axeWatcherAnalyze({
+        __Method: method,
+        __UserRequestedAnalyze: false
     });
+    // This version has issues if the subject is remounting continuously because Cypress
+    // considers the ".then" to be an action (not a query) and so isn't willing to re-run
+    // it if necessary for actionability checks
+    //
+    // commandChain = commandChain.then(() => (cy as CyInternal).getSubjectFromChain!(originalSubjectChain))
+    //
+    if (tryRequerySubject) {
+        const timeout = (_e = args.find(arg => arg.timeout)) === null || _e === void 0 ? void 0 : _e.timeout;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        commandChain = commandChain.__axeRestoreSubject(originalSubjectChain, timeout);
+        // In all hooked cases, originalFn can have its own timeout.
+        // Setting our own very long timeout here both maintains the original timeout
+        // and correctly attributes an error thrown because of it to the originalFn timing out,
+        // rather than to our wrapper.
+        commandChain.then({ timeout: 999999 }, refreshedSubject => originalFn(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        ...updateSubject(args, currentCommandType, refreshedSubject)));
+    }
+    else {
+        commandChain
+            // Set the subject back to the previous subject
+            .then(() => originalSubject)
+            .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 queue an axe run, run the original visit command, and then mark
- * the page visited before returning visit result.
- */
-Cypress.Commands.overwrite('visit', (originalFn, ...args) => {
-    // We use `cy.wrap(null)` here just to get into the Cypress command queue.
-    cy.wrap(null)
-        .axeWatcherAnalyze({ __UserRequestedAnalyze: false })
-        .then(() => originalFn(...args))
-        .then(visitResult => {
-        cy.window()
-            .then(win => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            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.
-                 */
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                ;
-                win.__AXE_WATCHER_HAS_VISITED = true;
-            }
-        })
-            .then(() => visitResult);
+function updateSubject(args, commandType, refreshedSubject) {
+    if (commandType === 'parent') {
+        return args;
+    }
+    else {
+        return [refreshedSubject, ...args.slice(1)];
+    }
+}
+Cypress.Commands.addQuery(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+'__axeRestoreSubject', 
+// This must be a regular function because timeouts rely on `this`
+// https://docs.cypress.io/api/cypress-api/custom-queries#Arguments
+function (subjectChain, timeout) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    this.set('timeout', timeout);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    this.set('onFail', (err) => {
+        const runner = cy.state('runnable');
+        err.codeFrame = runner.invocationDetails;
     });
+    return () => cy.getSubjectFromChain(subjectChain);
 });
 function axeWatcherFlushCommand() {
+    logDebugAxeWatcher({ message: 'Flush: Invoked (may analyze implicitly)' });
     cy.window().then(win => {
         if (!shouldAnalyzeLocation(win.location)) {
             return Promise.resolve();
         }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const hasVisited = win.__AXE_WATCHER_HAS_VISITED;
-        if (!hasVisited) {
-            return Promise.resolve();
-        }
         return new Promise(resolve => {
             const results = [];
             const onAxeResult = (event) => {
@@ -140,7 +141,6 @@ function axeWatcherFlushCommand() {
             const onFlushEnd = () => {
                 win.removeEventListener('axe:flush-end', onFlushEnd);
                 win.removeEventListener('axe:result', onAxeResult);
-                win.__AXE_WATCHER_HAS_VISITED = false;
                 resolve(results);
             };
             win.addEventListener('axe:flush-end', onFlushEnd);
@@ -148,11 +148,8 @@ function axeWatcherFlushCommand() {
             const event = new CustomEvent('axe:flush-start');
             win.dispatchEvent(event);
         }).then(results => {
-            // Generate a random-enough filename to avoid collisions.
-            const time = new Date().getTime();
-            const rnd = Math.random().toString(36).slice(2);
-            const filename = `cypress/axe-watcher/${time}-${rnd}.json`;
-            cy.writeFile(filename, JSON.stringify(results, null, 2));
+            cy.task('__uploadAxeWatcherResults', results, { log: false });
+            logDebugAxeWatcher({ message: 'Flush: complete' });
         });
     });
 }
@@ -160,26 +157,31 @@ const doesCypressCommandExist = (commandName) => {
     //@ts-expect-error - Property 'cy' does not exist on type 'Cypress & CyEventEmitter'.ts(2339)
     return !!Cypress.cy[commandName];
 };
-function axeWatcherAnalyzeCommand({ __UserRequestedAnalyze = true } = {}) {
+function axeWatcherAnalyzeCommand({ __Method, __UserRequestedAnalyze = true } = {}) {
+    logDebugAxeWatcher({
+        message: `Analyze: Invoked${__Method ? ` - ${__Method}` : ''}`
+    });
     const userRequestedAnalyze = __UserRequestedAnalyze;
     cy.window().then(win => {
         if (!shouldAnalyzeLocation(win.location)) {
-            return Promise.resolve();
+            return Promise.resolve({ message: `Skipped - Invalid protocol` });
         }
         // If the user didn't request an analyze, and we're in manual mode, don't do anything.
         if (isStopped && !userRequestedAnalyze) {
-            return Promise.resolve();
+            return Promise.resolve({ message: `Skipped (Manual mode)` });
         }
         return new Promise(resolve => {
-            const fn = () => {
+            const fn = (event) => {
                 win.removeEventListener('axe:manual-mode-analyze-done', fn);
-                resolve();
+                resolve(event.detail);
             };
             win.addEventListener('axe:manual-mode-analyze-done', fn);
             const event = new CustomEvent('axe:manual-mode-analyze', {
                 detail: { userRequestedAnalyze }
             });
             win.dispatchEvent(event);
+        }).then(result => {
+            logDebugAxeWatcher({ message: `Analyze: ${result === null || result === void 0 ? void 0 : result.message}` });
         });
     });
 }