@axe-core/watcher 3.11.1-next.e8fe4379 → 3.11.1-next.f0fb4798

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. package/dist/git.d.ts +2 -1
  2. package/dist/git.js +5 -4
  3. package/dist/git.js.map +1 -1
  4. package/dist/playwright.js +2 -2
  5. package/dist/playwright.js.map +1 -1
  6. package/dist/playwrightTest.js +1 -1
  7. package/dist/puppeteer.js +2 -2
  8. package/dist/puppeteer.js.map +1 -1
  9. package/dist/puppeteerWrapping.d.ts +3 -2
  10. package/dist/puppeteerWrapping.js +59 -1
  11. package/dist/puppeteerWrapping.js.map +1 -1
  12. package/dist/sendResultsToServer.d.ts +3 -1
  13. package/dist/sendResultsToServer.js +2 -42
  14. package/dist/sendResultsToServer.js.map +1 -1
  15. package/dist/util.d.ts +34 -2
  16. package/dist/util.js +75 -7
  17. package/dist/util.js.map +1 -1
  18. package/dist/utils/index.d.ts +2 -0
  19. package/dist/utils/index.js +20 -0
  20. package/dist/utils/index.js.map +1 -0
  21. package/dist/utils/validateAxeRunContext.d.ts +2 -0
  22. package/dist/utils/validateAxeRunContext.js +59 -0
  23. package/dist/utils/validateAxeRunContext.js.map +1 -0
  24. package/dist/utils/validateAxeRunContext.test.d.ts +1 -0
  25. package/dist/utils/validateAxeRunContext.test.js +100 -0
  26. package/dist/utils/validateAxeRunContext.test.js.map +1 -0
  27. package/dist/utils/validateAxeRunOptions.d.ts +13 -0
  28. package/dist/utils/validateAxeRunOptions.js +161 -0
  29. package/dist/utils/validateAxeRunOptions.js.map +1 -0
  30. package/dist/utils/validateAxeRunOptions.test.d.ts +1 -0
  31. package/dist/utils/validateAxeRunOptions.test.js +230 -0
  32. package/dist/utils/validateAxeRunOptions.test.js.map +1 -0
  33. package/dist/wdio.js +6 -4
  34. package/dist/wdio.js.map +1 -1
  35. package/dist/webdriver.js +3 -3
  36. package/dist/webdriver.js.map +1 -1
  37. package/extension/background.js +1 -1
  38. package/extension/content.js +1 -1
  39. package/package.json +7 -7
package/dist/git.d.ts CHANGED
@@ -5,7 +5,8 @@ export declare const getBranchName: (dir?: string) => string | null;
5
5
  /** Get the default branch name. */
6
6
  export declare const getDefaultBranchName: (dir?: string) => string | null;
7
7
  /**
8
- * Parse the default branch name from the output of `git remote show origin`.
8
+ * Parse the default branch name from the output of `git symbolic-ref --short refs/remotes/origin/HEAD`.
9
+ * @param output The output of the command. e.g. 'origin/develop'.
9
10
  * @private Exported only for testing.
10
11
  */
11
12
  export declare const parseDefaultFromShowRemoteOutput: (output: string) => string | null;
package/dist/git.js CHANGED
@@ -36,7 +36,7 @@ exports.getBranchName = getBranchName;
36
36
  /** Get the default branch name. */
37
37
  const getDefaultBranchName = (dir = process.cwd()) => {
38
38
  try {
39
- const stdout = (0, child_process_1.execSync)('git remote show origin', {
39
+ const stdout = (0, child_process_1.execSync)('git symbolic-ref --short refs/remotes/origin/HEAD', {
40
40
  cwd: dir,
41
41
  stdio: ['ignore', 'pipe', 'ignore']
42
42
  }).toString();
@@ -48,12 +48,13 @@ const getDefaultBranchName = (dir = process.cwd()) => {
48
48
  };
49
49
  exports.getDefaultBranchName = getDefaultBranchName;
50
50
  /**
51
- * Parse the default branch name from the output of `git remote show origin`.
51
+ * Parse the default branch name from the output of `git symbolic-ref --short refs/remotes/origin/HEAD`.
52
+ * @param output The output of the command. e.g. 'origin/develop'.
52
53
  * @private Exported only for testing.
53
54
  */
54
55
  const parseDefaultFromShowRemoteOutput = (output) => {
55
- const match = /HEAD branch:\s(.*)/.exec(output);
56
- return match ? match[1].trim() : null;
56
+ const match = output.match(/origin\/(.+)/);
57
+ return match ? match[1] : null;
57
58
  };
58
59
  exports.parseDefaultFromShowRemoteOutput = parseDefaultFromShowRemoteOutput;
59
60
  /** Get the repository's remote URL. */
package/dist/git.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"git.js","sourceRoot":"","sources":["../src/git.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git.js","sourceRoot":"","sources":["../src/git.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.wrapPlaywrightPage = exports.wrapPlaywright = exports.PlaywrightController = exports.playwrightConfig = void 0;
6
+ exports.wrapPlaywrightPage = exports.wrapPlaywright = exports.PlaywrightController = void 0;
7
+ exports.playwrightConfig = playwrightConfig;
7
8
  const util_1 = require("./util");
8
9
  const Controller_1 = __importDefault(require("./Controller"));
9
10
  /**
@@ -26,7 +27,6 @@ function playwrightConfig(opts) {
26
27
  args
27
28
  };
28
29
  }
29
- exports.playwrightConfig = playwrightConfig;
30
30
  class PlaywrightController extends Controller_1.default {
31
31
  constructor(driver) {
32
32
  super({ debugLoggerName: 'PlaywrightController' });
@@ -1 +1 @@
1
- {"version":3,"file":"playwright.js","sourceRoot":"","sources":["../src/playwright.ts"],"names":[],"mappings":";;;;;;AACA,iCAKe;AACf,8DAAqC;AAKrC;;;;GAIG;AAEH,SAAgB,gBAAgB,CAAC,IAAa;IAC5C,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAC/B,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,MAAM,CAAA;IAE1B,IAAA,qBAAc,EAAC,GAAG,CAAC,CAAA;IAEnB,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,MAAM,IAAI,gCAAyB,CACjC,kHAAkH,CACnH,CAAA;IACH,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAA;IACzB,IAAI,GAAG,IAAA,sBAAe,EAAC,YAAY,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAA;IAEtE,OAAO;QACL,GAAG,MAAM;QACT,QAAQ,EAAE,KAAK;QACf,IAAI;KACL,CAAA;AACH,CAAC;AApBD,4CAoBC;AAED,MAAa,oBAAqB,SAAQ,oBAAU;IAGlD,YAAY,MAAY;QACtB,KAAK,CAAC,EAAE,eAAe,EAAE,sBAAsB,EAAE,CAAC,CAAA;QAElD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,EAA+B,EAC/B,GAAG,IAAe;QAElB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,EAAE,CAAA;QACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAI,EAAE,EAAE,GAAG,CAAC,CAAA;QACrD,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAjBD,oDAiBC;AAED;;GAEG;AACI,MAAM,cAAc,GAAG;AAC5B,6DAA6D;AAC7D,cAA8B;AAC9B,6DAA6D;AAC7D,oBAA0C,EAC1B,EAAE;IAClB,MAAM,IAAI,KAAK,CAAC;;;;;;GAMf,CAAC,CAAA;AACJ,CAAC,CAAA;AAbY,QAAA,cAAc,kBAa1B;AAED,2DAAqE;AAA5D,wHAAA,QAAQ,OAAsB"}
1
+ {"version":3,"file":"playwright.js","sourceRoot":"","sources":["../src/playwright.ts"],"names":[],"mappings":";;;;;;AAkBA,4CAoBC;AArCD,iCAKe;AACf,8DAAqC;AAKrC;;;;GAIG;AAEH,SAAgB,gBAAgB,CAAC,IAAa;IAC5C,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAC/B,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,MAAM,CAAA;IAE1B,IAAA,qBAAc,EAAC,GAAG,CAAC,CAAA;IAEnB,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,MAAM,IAAI,gCAAyB,CACjC,kHAAkH,CACnH,CAAA;IACH,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAA;IACzB,IAAI,GAAG,IAAA,sBAAe,EAAC,YAAY,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAA;IAEtE,OAAO;QACL,GAAG,MAAM;QACT,QAAQ,EAAE,KAAK;QACf,IAAI;KACL,CAAA;AACH,CAAC;AAED,MAAa,oBAAqB,SAAQ,oBAAU;IAGlD,YAAY,MAAY;QACtB,KAAK,CAAC,EAAE,eAAe,EAAE,sBAAsB,EAAE,CAAC,CAAA;QAElD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,EAA+B,EAC/B,GAAG,IAAe;QAElB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,EAAE,CAAA;QACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAI,EAAE,EAAE,GAAG,CAAC,CAAA;QACrD,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAjBD,oDAiBC;AAED;;GAEG;AACI,MAAM,cAAc,GAAG;AAC5B,6DAA6D;AAC7D,cAA8B;AAC9B,6DAA6D;AAC7D,oBAA0C,EAC1B,EAAE;IAClB,MAAM,IAAI,KAAK,CAAC;;;;;;GAMf,CAAC,CAAA;AACJ,CAAC,CAAA;AAbY,QAAA,cAAc,kBAa1B;AAED,2DAAqE;AAA5D,wHAAA,QAAQ,OAAsB"}
@@ -17,7 +17,7 @@ const playwrightTest = (options) => {
17
17
  let base;
18
18
  let chromium;
19
19
  try {
20
- // eslint-disable-next-line @typescript-eslint/no-require-imports, import/no-extraneous-dependencies
20
+ // eslint-disable-next-line import/no-extraneous-dependencies, @typescript-eslint/no-require-imports
21
21
  ;
22
22
  ({ test: base, chromium } = require('@playwright/test'));
23
23
  }
package/dist/puppeteer.js CHANGED
@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.wrapPuppeteerPage = exports.wrapPuppeteer = exports.PuppeteerController = exports.puppeteerConfig = void 0;
6
+ exports.wrapPuppeteerPage = exports.wrapPuppeteer = exports.PuppeteerController = void 0;
7
+ exports.puppeteerConfig = puppeteerConfig;
7
8
  const util_1 = require("./util");
8
9
  const Controller_1 = __importDefault(require("./Controller"));
9
10
  function headlessNotSupportedError(config) {
@@ -33,7 +34,6 @@ function puppeteerConfig(opts) {
33
34
  args
34
35
  };
35
36
  }
36
- exports.puppeteerConfig = puppeteerConfig;
37
37
  class PuppeteerController extends Controller_1.default {
38
38
  constructor(driver) {
39
39
  super({ debugLoggerName: 'PuppeteerController' });
@@ -1 +1 @@
1
- {"version":3,"file":"puppeteer.js","sourceRoot":"","sources":["../src/puppeteer.ts"],"names":[],"mappings":";;;;;;AAOA,iCAKe;AACf,8DAAqC;AAWrC,SAAS,yBAAyB,CAChC,MAAuD;IAEvD,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAA,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QACnD,OAAM;IACR,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAChC,MAAM,IAAI,gCAAyB,CACjC,mGAAmG,CACpG,CAAA;IACH,CAAC;IAED,MAAM,IAAI,gCAAyB,CACjC,8HAA8H,CAC/H,CAAA;AACH,CAAC;AAED;;;;GAIG;AAEH,SAAgB,eAAe,CAAC,IAA6B;IAC3D,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAC/B,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,MAAM,CAAA;IAE1B,IAAA,qBAAc,EAAC,GAAG,CAAC,CAAA;IAEnB,yBAAyB,CACvB,MAAyD,CAC1D,CAAA;IAED,MAAM,YAAY,GAAG,IAAI,CAAA;IACzB,IAAI,GAAG,IAAA,sBAAe,EAAC,YAAY,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAA;IAEtE,OAAO;QACL,GAAG,MAAM;QACT,QAAQ,EAAE,KAAK;QACf,IAAI;KACL,CAAA;AACH,CAAC;AAlBD,0CAkBC;AAED,MAAa,mBAAoB,SAAQ,oBAAU;IAGjD,YAAY,MAAY;QACtB,KAAK,CAAC,EAAE,eAAe,EAAE,qBAAqB,EAAE,CAAC,CAAA;QACjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,EAA+B,EAC/B,GAAG,IAAe;QAElB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;QACtD,OAAO,MAAW,CAAA;IACpB,CAAC;CACF;AAfD,kDAeC;AAED;;GAEG;AACI,MAAM,aAAa,GAAG;AAC3B,6DAA6D;AAC7D,cAA8B;AAC9B,6DAA6D;AAC7D,UAA+B,EACf,EAAE;IAClB,MAAM,IAAI,KAAK,CAAC;;;;;;KAMb,CAAC,CAAA;AACN,CAAC,CAAA;AAbY,QAAA,aAAa,iBAazB;AAED,yDAAmE;AAA1D,sHAAA,QAAQ,OAAqB"}
1
+ {"version":3,"file":"puppeteer.js","sourceRoot":"","sources":["../src/puppeteer.ts"],"names":[],"mappings":";;;;;;AAgDA,0CAkBC;AA3DD,iCAKe;AACf,8DAAqC;AAWrC,SAAS,yBAAyB,CAChC,MAAuD;IAEvD,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAA,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QACnD,OAAM;IACR,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAChC,MAAM,IAAI,gCAAyB,CACjC,mGAAmG,CACpG,CAAA;IACH,CAAC;IAED,MAAM,IAAI,gCAAyB,CACjC,8HAA8H,CAC/H,CAAA;AACH,CAAC;AAED;;;;GAIG;AAEH,SAAgB,eAAe,CAAC,IAA6B;IAC3D,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAC/B,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,MAAM,CAAA;IAE1B,IAAA,qBAAc,EAAC,GAAG,CAAC,CAAA;IAEnB,yBAAyB,CACvB,MAAyD,CAC1D,CAAA;IAED,MAAM,YAAY,GAAG,IAAI,CAAA;IACzB,IAAI,GAAG,IAAA,sBAAe,EAAC,YAAY,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAA;IAEtE,OAAO;QACL,GAAG,MAAM;QACT,QAAQ,EAAE,KAAK;QACf,IAAI;KACL,CAAA;AACH,CAAC;AAED,MAAa,mBAAoB,SAAQ,oBAAU;IAGjD,YAAY,MAAY;QACtB,KAAK,CAAC,EAAE,eAAe,EAAE,qBAAqB,EAAE,CAAC,CAAA;QACjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,EAA+B,EAC/B,GAAG,IAAe;QAElB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;QACtD,OAAO,MAAW,CAAA;IACpB,CAAC;CACF;AAfD,kDAeC;AAED;;GAEG;AACI,MAAM,aAAa,GAAG;AAC3B,6DAA6D;AAC7D,cAA8B;AAC9B,6DAA6D;AAC7D,UAA+B,EACf,EAAE;IAClB,MAAM,IAAI,KAAK,CAAC;;;;;;KAMb,CAAC,CAAA;AACN,CAAC,CAAA;AAbY,QAAA,aAAa,iBAazB;AAED,yDAAmE;AAA1D,sHAAA,QAAQ,OAAqB"}
@@ -1,6 +1,6 @@
1
- import type { Browser, BrowserContext, Page, Target, ElementHandle, Keyboard, Mouse, Touchscreen, Dialog, Frame, JSHandle } from 'puppeteer';
2
- import type { PuppeteerController } from './puppeteer';
1
+ import type { Browser, BrowserContext, Page, Target, ElementHandle, Keyboard, Mouse, Touchscreen, Dialog, Frame, JSHandle, Locator } from 'puppeteer';
3
2
  import { type PossiblyWrapped } from './util';
3
+ import type { PuppeteerController } from './puppeteer';
4
4
  export declare const wrapBrowserContext: (browserContext: BrowserContext, controller: PuppeteerController) => BrowserContext;
5
5
  export declare const wrapBrowser: (browser: Browser, controller: PuppeteerController) => Browser;
6
6
  export declare const wrapPage: (page: Page, controller: PuppeteerController) => Page;
@@ -11,4 +11,5 @@ export declare const wrapMouse: (mouse: PossiblyWrapped<Mouse>, controller: Pupp
11
11
  export declare const wrapTouchscreen: (touchscreen: PossiblyWrapped<Touchscreen>, controller: PuppeteerController) => Touchscreen;
12
12
  export declare const wrapDialog: (dialog: PossiblyWrapped<Dialog>, controller: PuppeteerController) => Dialog;
13
13
  export declare const wrapFrame: (frame: PossiblyWrapped<Frame>, controller: PuppeteerController) => Frame;
14
+ export declare const wrapLocator: (locator: PossiblyWrapped<Locator<any>>, controller: PuppeteerController) => Locator<any>;
14
15
  export declare const wrapJSHandle: (frame: PossiblyWrapped<JSHandle>, controller: PuppeteerController) => JSHandle;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.wrapJSHandle = exports.wrapFrame = exports.wrapDialog = exports.wrapTouchscreen = exports.wrapMouse = exports.wrapKeyboard = exports.wrapElementHandle = exports.wrapTarget = exports.wrapPage = exports.wrapBrowser = exports.wrapBrowserContext = void 0;
3
+ exports.wrapJSHandle = exports.wrapLocator = exports.wrapFrame = exports.wrapDialog = exports.wrapTouchscreen = exports.wrapMouse = exports.wrapKeyboard = exports.wrapElementHandle = exports.wrapTarget = exports.wrapPage = exports.wrapBrowser = exports.wrapBrowserContext = void 0;
4
4
  const util_1 = require("./util");
5
5
  const wrapBrowserContext = (browserContext, controller) => {
6
6
  if ((0, util_1.isWrapped)(browserContext)) {
@@ -154,6 +154,13 @@ const wrapPage = (page, controller) => {
154
154
  return (0, exports.wrapTouchscreen)(host.touchscreen, controller);
155
155
  case 'mainFrame':
156
156
  return () => (0, exports.wrapFrame)(host.mainFrame(), controller);
157
+ case 'locator':
158
+ return (arg) => {
159
+ const locator = typeof arg === 'string'
160
+ ? host.locator(arg)
161
+ : host.locator(arg);
162
+ return locator ? (0, exports.wrapLocator)(locator, controller) : null;
163
+ };
157
164
  case 'close':
158
165
  return async (...args) => {
159
166
  await controller.flush();
@@ -386,6 +393,13 @@ const wrapFrame = (frame, controller) => {
386
393
  const f = host.parentFrame();
387
394
  return f ? (0, exports.wrapFrame)(f, controller) : null;
388
395
  };
396
+ case 'locator':
397
+ return (arg) => {
398
+ const locator = typeof arg === 'string'
399
+ ? host.locator(arg)
400
+ : host.locator(arg);
401
+ return locator ? (0, exports.wrapLocator)(locator, controller) : null;
402
+ };
389
403
  case 'click':
390
404
  case 'focus':
391
405
  case 'goto':
@@ -404,6 +418,50 @@ const wrapFrame = (frame, controller) => {
404
418
  return proxy;
405
419
  };
406
420
  exports.wrapFrame = wrapFrame;
421
+ /* eslint-disable @typescript-eslint/no-explicit-any */
422
+ const wrapLocator = (locator, controller) => {
423
+ if ((0, util_1.isWrapped)(locator)) {
424
+ return locator;
425
+ }
426
+ const proxy = new Proxy(locator, {
427
+ get(host, prop) {
428
+ switch (prop) {
429
+ case 'waitHandle':
430
+ return async (...args) => {
431
+ const handle = await host[prop](...args);
432
+ /* eslint-enable @typescript-eslint/no-explicit-any */
433
+ if (Object.prototype.hasOwnProperty.call(handle, '$$')) {
434
+ return (0, exports.wrapElementHandle)(handle, controller);
435
+ }
436
+ else {
437
+ return (0, exports.wrapJSHandle)(handle, controller);
438
+ }
439
+ };
440
+ case 'setTimeout':
441
+ case 'setVisibility':
442
+ case 'setWaitForEnabled':
443
+ case 'setEnsureElementIsInTheViewport':
444
+ case 'setWaitForStableBoundingBox':
445
+ case 'clone':
446
+ case 'map':
447
+ case 'filter':
448
+ return (...args) =>
449
+ // @ts-expect-error TypeScript is angry.
450
+ (0, exports.wrapLocator)(host[prop](...args), controller);
451
+ case 'click':
452
+ case 'fill':
453
+ case 'hover':
454
+ case 'scroll':
455
+ return (0, util_1.proxiedGetFuncWithAnalyze)(host, prop, controller);
456
+ default:
457
+ return (0, util_1.proxiedGetWithoutAnalyze)(host, prop);
458
+ }
459
+ }
460
+ });
461
+ (0, util_1.markAsWrapped)(proxy);
462
+ return proxy;
463
+ };
464
+ exports.wrapLocator = wrapLocator;
407
465
  const wrapJSHandle = (frame, controller) => {
408
466
  if ((0, util_1.isWrapped)(frame)) {
409
467
  return frame;
@@ -1 +1 @@
1
- {"version":3,"file":"puppeteerWrapping.js","sourceRoot":"","sources":["../src/puppeteerWrapping.ts"],"names":[],"mappings":";;;AAcA,iCAMe;AA4CR,MAAM,kBAAkB,GAAG,CAChC,cAA8B,EAC9B,UAA+B,EACf,EAAE;IAClB,IAAI,IAAA,gBAAS,EAAC,cAAc,CAAC,EAAE,CAAC;QAC9B,OAAO,cAAc,CAAA;IACvB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,cAAc,EAAE;QACtC,GAAG,CAAC,IAAI,EAAE,IAA0B;YAClC,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,SAAS;oBACZ,OAAO,KAAK,EACV,GAAG,IAA2C,EAC/B,EAAE;wBACjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;wBACxC,OAAO,IAAA,gBAAQ,EAAC,IAAI,EAAE,UAAU,CAAC,CAAA;oBACnC,CAAC,CAAA;gBACH,KAAK,OAAO;oBACV,OAAO,KAAK,EACV,GAAG,IAAyC,EAC3B,EAAE;wBACnB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;wBACvC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,gBAAQ,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAA;oBAChD,CAAC,CAAA;gBACH,KAAK,SAAS;oBACZ,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,kBAAU,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAA;gBACjE,KAAK,SAAS;oBACZ,OAAO,GAAG,EAAE,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,CAAA;gBACtD,KAAK,eAAe;oBAClB,OAAO,KAAK,EACV,GAAG,IAAiD,EACnC,EAAE;wBACnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAA;wBAChD,OAAO,IAAA,kBAAU,EAAC,MAAM,EAAE,UAAU,CAAC,CAAA;oBACvC,CAAC,CAAA;gBACH,KAAK,OAAO;oBACV,OAAO,KAAK,IAAI,EAAE;wBAChB,MAAM,UAAU,CAAC,KAAK,EAAE,CAAA;wBACxB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;oBACpB,CAAC,CAAA;gBACH;oBACE,OAAO,IAAA,+BAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAA;IAEpB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAlDY,QAAA,kBAAkB,sBAkD9B;AAEM,MAAM,WAAW,GAAG,CACzB,OAAgB,EAChB,UAA+B,EACtB,EAAE;IACX,IAAI,IAAA,gBAAS,EAAC,OAAO,CAAC,EAAE,CAAC;QACvB,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE;QAC/B,GAAG,CAAC,IAAI,EAAE,IAAsC;YAC9C,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,SAAS;oBACZ,OAAO,KAAK,EACV,GAAG,IAAoC,EACxB,EAAE;wBACjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;wBACxC,OAAO,IAAA,gBAAQ,EAAC,IAAI,EAAE,UAAU,CAAC,CAAA;oBACnC,CAAC,CAAA;gBACH,KAAK,+BAA+B;oBAClC,OAAO,KAAK,EACV,GAAG,IAEF,EACwB,EAAE;wBAC3B,MAAM,OAAO,GAAG,MACd,IACD,CAAC,6BAA6B,CAAC,GAAG,IAAI,CAAC,CAAA;wBACxC,OAAO,IAAA,0BAAkB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAA;oBAChD,CAAC,CAAA;gBACH,KAAK,sBAAsB;oBACzB,OAAO,KAAK,EACV,GAAG,IAAiD,EAC3B,EAAE;wBAC3B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC,CAAA;wBACxD,OAAO,IAAA,0BAAkB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAA;oBAChD,CAAC,CAAA;gBACH,KAAK,uBAAuB;oBAC1B,OAAO,GAAG,EAAE,CACV,IAAA,0BAAkB,EAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,UAAU,CAAC,CAAA;gBAChE,KAAK,OAAO;oBACV,OAAO,KAAK,IAAqB,EAAE;wBACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;wBAChC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,gBAAQ,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAA;oBAChD,CAAC,CAAA;gBACH,KAAK,QAAQ;oBACX,OAAO,GAAW,EAAE,CAAC,IAAA,kBAAU,EAAC,IAAI,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC,CAAA;gBAC5D,KAAK,SAAS;oBACZ,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,kBAAU,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAA;gBACjE,KAAK,eAAe;oBAClB,OAAO,KAAK,EACV,GAAG,IAA0C,EAC5B,EAAE;wBACnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAA;wBAChD,OAAO,IAAA,kBAAU,EAAC,MAAM,EAAE,UAAU,CAAC,CAAA;oBACvC,CAAC,CAAA;gBACH,KAAK,iBAAiB;oBACpB,OAAO,GAAG,EAAE,CACV,IAAI,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,0BAAkB,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAA;gBACtE,KAAK,OAAO;oBACV,OAAO,KAAK,IAAI,EAAE;wBAChB,MAAM,UAAU,CAAC,KAAK,EAAE,CAAA;wBACxB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;oBACpB,CAAC,CAAA;gBACH;oBACE,OAAO,IAAA,+BAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAA;IAEpB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAxEY,QAAA,WAAW,eAwEvB;AAEM,MAAM,QAAQ,GAAG,CAAC,IAAU,EAAE,UAA+B,EAAQ,EAAE;IAC5E,IAAI,IAAA,gBAAS,EAAC,IAAI,CAAC,EAAE,CAAC;QACpB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE;QAC5B,GAAG,CAAC,IAAI,EAAE,IAAmC;YAC3C,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,gBAAgB;oBACnB,OAAO,GAAG,EAAE,CAAC,IAAA,0BAAkB,EAAC,IAAI,CAAC,cAAc,EAAE,EAAE,UAAU,CAAC,CAAA;gBAEpE,KAAK,GAAG,CAAC;gBACT,KAAK,cAAc,CAAC;gBACpB,KAAK,aAAa,CAAC;gBACnB,KAAK,iBAAiB,CAAC;gBACvB,KAAK,cAAc;oBACjB,OAAO,KAAK,EAAE,GAAG,IAAe,EAAiC,EAAE;wBACjE,wCAAwC;wBACxC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;wBACpC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;oBACtD,CAAC,CAAA;gBACH,KAAK,IAAI,CAAC;gBACV,KAAK,IAAI;oBACP,OAAO,KAAK,EACV,GAAG,IAA4B,EACL,EAAE;wBAC5B,wCAAwC;wBACxC,MAAM,GAAG,GAAoB,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;wBACtD,OAAO,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,yBAAiB,EAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA;oBACzD,CAAC,CAAA;gBAEH,KAAK,cAAc,CAAC;gBACpB,KAAK,cAAc,CAAC;gBACpB,KAAK,OAAO,CAAC;gBACb,KAAK,cAAc,CAAC;gBACpB,KAAK,UAAU,CAAC;gBAChB,KAAK,OAAO,CAAC;gBACb,KAAK,QAAQ,CAAC;gBACd,KAAK,WAAW,CAAC;gBACjB,KAAK,MAAM,CAAC;gBACZ,KAAK,OAAO,CAAC;gBACb,KAAK,QAAQ,CAAC;gBACd,KAAK,QAAQ,CAAC;gBACd,KAAK,YAAY,CAAC;gBAClB,KAAK,WAAW,CAAC;gBACjB,KAAK,aAAa,CAAC;gBACnB,KAAK,KAAK,CAAC;gBACX,KAAK,MAAM;oBACT,OAAO,IAAA,gCAAyB,EAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;gBAE1D,KAAK,SAAS;oBACZ,OAAO,GAAG,EAAE,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,CAAA;gBACtD,KAAK,QAAQ;oBACX,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAU,EAAC,IAAI,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC,CAAA;gBACpD,KAAK,QAAQ;oBACX,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAA;gBAC/D,KAAK,UAAU;oBACb,OAAO,IAAA,oBAAY,EAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;gBAChD,KAAK,OAAO;oBACV,OAAO,IAAA,iBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;gBAC1C,KAAK,aAAa;oBAChB,OAAO,IAAA,uBAAe,EAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;gBACtD,KAAK,WAAW;oBACd,OAAO,GAAG,EAAE,CAAC,IAAA,iBAAS,EAAC,IAAI,CAAC,SAAS,EAAE,EAAE,UAAU,CAAC,CAAA;gBAEtD,KAAK,OAAO;oBACV,OAAO,KAAK,EAAE,GAAG,IAA+B,EAAE,EAAE;wBAClD,MAAM,UAAU,CAAC,KAAK,EAAE,CAAA;wBACxB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;oBAC5B,CAAC,CAAA;gBAEH;oBACE,OAAO,IAAA,+BAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAA;IAEpB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAhFY,QAAA,QAAQ,YAgFpB;AAEM,MAAM,UAAU,GAAG,CACxB,MAAc,EACd,UAA+B,EACvB,EAAE;IACV,IAAI,IAAA,gBAAS,EAAC,MAAM,CAAC,EAAE,CAAC;QACtB,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE;QAC9B,GAAG,CAAC,IAAI,EAAE,IAAkB;YAC1B,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,gBAAgB;oBACnB,OAAO,GAAG,EAAE,CAAC,IAAA,0BAAkB,EAAC,IAAI,CAAC,cAAc,EAAE,EAAE,UAAU,CAAC,CAAA;gBACpE,KAAK,SAAS;oBACZ,OAAO,GAAG,EAAE,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,CAAA;gBACtD,KAAK,QAAQ;oBACX,OAAO,GAAG,EAAE;wBACV,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;wBAC5B,OAAO,MAAM,CAAC,CAAC,CAAC,IAAA,kBAAU,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;oBACvD,CAAC,CAAA;gBACH,KAAK,MAAM;oBACT,OAAO,KAAK,IAAI,EAAE;wBAChB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;wBAC9B,OAAO,IAAI,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;oBACjD,CAAC,CAAA;gBACH,KAAK,QAAQ;oBACX,OAAO,KAAK,IAAI,EAAE;wBAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;wBAClC,OAAO,MAAM,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;oBACrD,CAAC,CAAA;gBACH;oBACE,OAAO,IAAA,+BAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAA;IAEpB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAvCY,QAAA,UAAU,cAuCtB;AAEM,MAAM,iBAAiB,GAAG;AAC/B,8DAA8D;AAC9D,aAAkD,EAClD,UAA+B,EAChB,EAAE;IACjB,IAAI,IAAA,gBAAS,EAAC,aAAa,CAAC,EAAE,CAAC;QAC7B,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,aAAa,EAAE;QACrC,GAAG,CAAC,IAAI,EAAE,IAA4C;YACpD,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,GAAG,CAAC;gBACT,KAAK,iBAAiB,CAAC;gBACvB,KAAK,cAAc;oBACjB,OAAO,KAAK,EACV,GAAG,IAAoC,EACR,EAAE;wBACjC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;wBAChC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;oBACtD,CAAC,CAAA;gBACH,KAAK,IAAI,CAAC;gBACV,KAAK,IAAI;oBACP,OAAO,KAAK,EAAE,GAAG,IAAe,EAA4B,EAAE;wBAC5D,wCAAwC;wBACxC,MAAM,GAAG,GAAoB,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;wBACtD,OAAO,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,yBAAiB,EAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA;oBACzD,CAAC,CAAA;gBACH,KAAK,WAAW;oBACd,OAAO,GAAG,EAAE,CACV,IAAA,yBAAiB,EAAC,IAAI,CAAC,SAAS,EAAmB,EAAE,UAAU,CAAC,CAAA;gBACpE,KAAK,cAAc;oBACjB,OAAO,KAAK,IAAI,EAAE;wBAChB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;wBACvC,OAAO,KAAK,CAAC,CAAC,CAAC,IAAA,iBAAS,EAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;oBACpD,CAAC,CAAA;gBACH,KAAK,OAAO;oBACV,OAAO,IAAA,iBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;gBAC1C,KAAK,WAAW;oBACd,OAAO,KAAK,EAAE,GAAG,IAA4C,EAAE,EAAE,CAC/D,IAAA,yBAAiB,EAAC,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,EAAE,UAAU,CAAC,CAAA;gBAEhE,KAAK,OAAO,CAAC;gBACb,KAAK,MAAM,CAAC;gBACZ,KAAK,aAAa,CAAC;gBACnB,KAAK,WAAW,CAAC;gBACjB,KAAK,UAAU,CAAC;gBAChB,KAAK,MAAM,CAAC;gBACZ,KAAK,OAAO,CAAC;gBACb,KAAK,OAAO,CAAC;gBACb,KAAK,OAAO,CAAC;gBACb,KAAK,gBAAgB,CAAC;gBACtB,KAAK,QAAQ,CAAC;gBACd,KAAK,KAAK,CAAC;gBACX,KAAK,UAAU,CAAC;gBAChB,KAAK,WAAW,CAAC;gBACjB,KAAK,YAAY,CAAC;gBAClB,KAAK,MAAM;oBACT,OAAO,IAAA,gCAAyB,EAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;gBAE1D;oBACE,OAAO,IAAA,+BAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAA;IAEpB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AArEY,QAAA,iBAAiB,qBAqE7B;AAEM,MAAM,YAAY,GAAG,CAC1B,QAAmC,EACnC,UAA+B,EACrB,EAAE;IACZ,IAAI,IAAA,gBAAS,EAAC,QAAQ,CAAC,EAAE,CAAC;QACxB,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,QAAQ,EAAE;QAChC,GAAG,CAAC,IAAI,EAAE,IAAoB;YAC5B,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,MAAM,CAAC;gBACZ,KAAK,OAAO,CAAC;gBACb,KAAK,IAAI,CAAC;gBACV,KAAK,eAAe,CAAC;gBACrB,KAAK,MAAM;oBACT,OAAO,IAAA,gCAAyB,EAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;gBAC1D;oBACE,OAAO,IAAA,+BAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAA;IAEpB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AA1BY,QAAA,YAAY,gBA0BxB;AAEM,MAAM,SAAS,GAAG,CACvB,KAA6B,EAC7B,UAA+B,EACxB,EAAE;IACT,IAAI,IAAA,gBAAS,EAAC,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE;QAC7B,GAAG,CAAC,IAAI,EAAE,IAAiB;YACzB,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,OAAO,CAAC;gBACb,KAAK,MAAM,CAAC;gBACZ,KAAK,MAAM,CAAC;gBACZ,KAAK,aAAa,CAAC;gBACnB,KAAK,WAAW,CAAC;gBACjB,KAAK,UAAU,CAAC;gBAChB,KAAK,MAAM,CAAC;gBACZ,KAAK,MAAM,CAAC;gBACZ,KAAK,IAAI,CAAC;gBACV,KAAK,OAAO,CAAC;gBACb,KAAK,OAAO;oBACV,OAAO,IAAA,gCAAyB,EAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;gBAC1D;oBACE,OAAO,IAAA,+BAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAA;IAEpB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAhCY,QAAA,SAAS,aAgCrB;AAEM,MAAM,eAAe,GAAG,CAC7B,WAAyC,EACzC,UAA+B,EAClB,EAAE;IACf,IAAI,IAAA,gBAAS,EAAC,WAAW,CAAC,EAAE,CAAC;QAC3B,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,WAAW,EAAE;QACnC,GAAG,CAAC,IAAI,EAAE,IAAuB;YAC/B,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,KAAK,CAAC;gBACX,KAAK,UAAU,CAAC;gBAChB,KAAK,WAAW,CAAC;gBACjB,KAAK,YAAY;oBACf,OAAO,IAAA,gCAAyB,EAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;gBAC1D;oBACE,OAAO,IAAA,+BAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAA;IAEpB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAzBY,QAAA,eAAe,mBAyB3B;AAEM,MAAM,UAAU,GAAG,CACxB,MAA+B,EAC/B,UAA+B,EACvB,EAAE;IACV,IAAI,IAAA,gBAAS,EAAC,MAAM,CAAC,EAAE,CAAC;QACtB,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE;QAC9B,GAAG,CAAC,IAAI,EAAE,IAAkB;YAC1B,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,QAAQ,CAAC;gBACd,KAAK,SAAS;oBACZ,OAAO,IAAA,gCAAyB,EAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;gBAC1D;oBACE,OAAO,IAAA,+BAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAA;IAEpB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAvBY,QAAA,UAAU,cAuBtB;AAEM,MAAM,SAAS,GAAG,CACvB,KAA6B,EAC7B,UAA+B,EACxB,EAAE;IACT,IAAI,IAAA,gBAAS,EAAC,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE;QAC7B,GAAG,CAAC,IAAI,EAAE,IAAoC;YAC5C,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,GAAG,CAAC;gBACT,KAAK,cAAc,CAAC;gBACpB,KAAK,aAAa,CAAC;gBACnB,KAAK,iBAAiB,CAAC;gBACvB,KAAK,cAAc;oBACjB,OAAO,KAAK,EAAE,GAAG,IAAe,EAAiC,EAAE;wBACjE,wCAAwC;wBACxC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;wBACpC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;oBACtD,CAAC,CAAA;gBACH,KAAK,IAAI,CAAC;gBACV,KAAK,IAAI;oBACP,OAAO,KAAK,EAAE,GAAG,IAAe,EAA4B,EAAE;wBAC5D,wCAAwC;wBACxC,MAAM,GAAG,GAAoB,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;wBACtD,OAAO,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,yBAAiB,EAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA;oBACzD,CAAC,CAAA;gBAEH,KAAK,aAAa;oBAChB,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAA;gBACpE,KAAK,MAAM;oBACT,OAAO,GAAG,EAAE,CAAC,IAAA,gBAAQ,EAAC,IAAI,CAAC,IAAI,EAAE,EAAE,UAAU,CAAC,CAAA;gBAChD,KAAK,aAAa;oBAChB,OAAO,GAAG,EAAE;wBACV,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;wBAC5B,OAAO,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAS,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;oBAC5C,CAAC,CAAA;gBAEH,KAAK,OAAO,CAAC;gBACb,KAAK,OAAO,CAAC;gBACb,KAAK,MAAM,CAAC;gBACZ,KAAK,OAAO,CAAC;gBACb,KAAK,QAAQ,CAAC;gBACd,KAAK,YAAY,CAAC;gBAClB,KAAK,KAAK,CAAC;gBACX,KAAK,MAAM;oBACT,OAAO,IAAA,gCAAyB,EAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;gBAC1D;oBACE,OAAO,IAAA,+BAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAA;IAEpB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAzDY,QAAA,SAAS,aAyDrB;AAEM,MAAM,YAAY,GAAG,CAC1B,KAAgC,EAChC,UAA+B,EACrB,EAAE;IACZ,IAAI,IAAA,gBAAS,EAAC,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE;QAC7B,GAAG,CAAC,IAAI,EAAE,IAAoB;YAC5B,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,WAAW;oBACd,OAAO,GAAyB,EAAE;wBAChC,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;wBAC3B,OAAO,EAAE,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;oBACtD,CAAC,CAAA;gBACH;oBACE,OAAO,IAAA,+BAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAA,oBAAa,EAAC,KAAK,CAAC,CAAA;IAEpB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAzBY,QAAA,YAAY,gBAyBxB"}
1
+ {"version":3,"file":"puppeteerWrapping.js","sourceRoot":"","sources":["../src/puppeteerWrapping.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { AxeResults } from 'axe-core';
1
+ import type { AxeResults, ElementContext, RunOptions } from 'axe-core';
2
2
  import type debug from 'debug';
3
3
  /**
4
4
  * Number of page states to send to the server at once.
@@ -12,6 +12,8 @@ export interface Result {
12
12
  results: AxeResults;
13
13
  screenshot: string | null;
14
14
  screenshot_id: string | null;
15
+ run_context: ElementContext | null;
16
+ run_options: RunOptions | null;
15
17
  }
16
18
  interface SendResultsToServerParams {
17
19
  results: Result[];
@@ -1,27 +1,4 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
26
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
4
  };
@@ -30,7 +7,6 @@ exports.sendResultsToServer = exports.MAX_PAGE_STATES_PER_REQUEST = void 0;
30
7
  const node_fetch_1 = __importDefault(require("node-fetch"));
31
8
  const uuid_1 = require("uuid");
32
9
  const util_1 = require("./util");
33
- const git = __importStar(require("./git"));
34
10
  // Read the version from package.json, but do not include the file in the build.
35
11
  // eslint-disable-next-line @typescript-eslint/no-require-imports
36
12
  const { version } = require('../package.json');
@@ -41,21 +17,8 @@ const { version } = require('../package.json');
41
17
  * Entity Too Large), as the request body will be enormous.
42
18
  */
43
19
  exports.MAX_PAGE_STATES_PER_REQUEST = 5;
44
- const gitData = {};
45
- if (git.isRepository()) {
46
- gitData.git_branch = git.getBranchName();
47
- gitData.git_tag = git.getTag();
48
- gitData.git_default_branch = git.getDefaultBranchName();
49
- gitData.git_url = git.getRemoteURL();
50
- gitData.git_is_dirty = git.isDirty();
51
- const info = git.getCommitInfo();
52
- gitData.git_commit_sha = info === null || info === void 0 ? void 0 : info.hash;
53
- gitData.git_commit_author = info === null || info === void 0 ? void 0 : info.author;
54
- gitData.git_commit_email = info === null || info === void 0 ? void 0 : info.email;
55
- gitData.git_commit_message = info === null || info === void 0 ? void 0 : info.message;
56
- }
57
20
  const sendResultsToServer = async ({ results, debugLogger }) => {
58
- const { server_url, api_key, session_id } = (0, util_1.readVariables)();
21
+ const { server_url, api_key, session_id, git_data } = (0, util_1.readVariables)();
59
22
  const resultsURL = new URL(`/api-pub/watcher/sessions/${session_id}`, server_url);
60
23
  const screenshotsURL = new URL(`/api-pub/watcher/sessions/${session_id}/screenshots`, server_url);
61
24
  debugLogger('SendResultsToServer: Received results', {
@@ -63,9 +26,6 @@ const sendResultsToServer = async ({ results, debugLogger }) => {
63
26
  totalBytes: Buffer.byteLength(JSON.stringify(results))
64
27
  });
65
28
  debugLogger('SendResultsToServer: Session ID', { session_id });
66
- debugLogger('SendResultsToServer: git project', {
67
- isGitRepo: git.isRepository()
68
- });
69
29
  // Add an correlation ID to each result/screenshot combination (see #622).
70
30
  results.forEach(result => {
71
31
  if (result.screenshot) {
@@ -81,7 +41,7 @@ const sendResultsToServer = async ({ results, debugLogger }) => {
81
41
  const body = {
82
42
  axe_watcher_version: version,
83
43
  results: batch,
84
- ...gitData
44
+ ...git_data
85
45
  };
86
46
  const res = await (0, node_fetch_1.default)(resultsURL, {
87
47
  method: 'PUT',
@@ -1 +1 @@
1
- {"version":3,"file":"sendResultsToServer.js","sourceRoot":"","sources":["../src/sendResultsToServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sendResultsToServer.js","sourceRoot":"","sources":["../src/sendResultsToServer.ts"],"names":[],"mappings":"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"}
package/dist/util.d.ts CHANGED
@@ -1,4 +1,17 @@
1
1
  import type Controller from './Controller';
2
+ import type axe from 'axe-core';
3
+ import { type RunOptions } from './utils';
4
+ export interface GitData {
5
+ git_branch?: string | null;
6
+ git_tag?: string | null;
7
+ git_default_branch?: string | null;
8
+ git_commit_message?: string | null;
9
+ git_commit_sha?: string | null;
10
+ git_commit_author?: string | null;
11
+ git_commit_email?: string | null;
12
+ git_url?: string | null;
13
+ git_is_dirty?: boolean;
14
+ }
2
15
  export declare const PATH_TO_EXTENSION: string;
3
16
  export declare const DEFAULT_SERVER_URL = "https://axe.deque.com/";
4
17
  export declare const PATH_TO_SESSION_FILE: string;
@@ -19,6 +32,22 @@ interface AxeConfiguration {
19
32
  * when changes are made.
20
33
  */
21
34
  autoAnalyze?: boolean;
35
+ /**
36
+ * By default we'll scan the entire page. Provide a context object to limit
37
+ * the scope of the scan.
38
+ *
39
+ * @see https://www.deque.com/axe/core-documentation/api-documentation/#context-parameter
40
+ */
41
+ runContext?: axe.ElementContext;
42
+ /**
43
+ * Provide options on how to run axe.
44
+ * - `rules`: Enable or disable rules using the enabled property
45
+ * - `runOnly`: Limit which rules are executed, based on names or tags
46
+ * - `ancestry`: Return CSS selector for elements, with all the element's ancestors
47
+ *
48
+ * @see https://www.deque.com/axe/core-documentation/api-documentation/#options-parameter
49
+ */
50
+ runOptions?: RunOptions;
22
51
  }
23
52
  export interface Configuration {
24
53
  axe: AxeConfiguration;
@@ -31,13 +60,16 @@ export interface Variables {
31
60
  api_key: string;
32
61
  server_url: string;
33
62
  auto_analyze: boolean;
34
- session_id?: string;
35
63
  cypress: boolean;
64
+ session_id?: string;
65
+ run_context: axe.ElementContext | null;
66
+ run_options: RunOptions | null;
67
+ git_data?: GitData;
36
68
  take_screenshots?: boolean;
37
69
  experimental_advanced_rules?: boolean;
38
70
  }
39
71
  /** Write the user's settings to the disk, so the extension can load them. */
40
- export declare function writeVariables({ apiKey, serverURL, sessionId, autoAnalyze, cypress, takeScreenshots, experimentalAdvancedRules }: WriteVariablesParams): void;
72
+ export declare function writeVariables({ apiKey, autoAnalyze, cypress, serverURL, sessionId, runContext, runOptions, takeScreenshots, experimentalAdvancedRules }: WriteVariablesParams): void;
41
73
  interface ValidateApiKeyParams {
42
74
  apiKey: string;
43
75
  serverURL: string;
package/dist/util.js CHANGED
@@ -1,15 +1,45 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
2
25
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
27
  };
5
28
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.mergeChromeArgs = exports.proxiedGetWithoutAnalyze = exports.proxiedGetFuncWithAnalyze = exports.markAsWrapped = exports.isWrapped = exports.updateAutoAnalyze = exports.readVariables = exports.writeManifest = exports.validateApiKey = exports.writeVariables = exports.HeadlessNotSupportedError = exports.PATH_TO_EXTENSION_VARIABLES = exports.PATH_TO_SESSION_FILE = exports.DEFAULT_SERVER_URL = exports.PATH_TO_EXTENSION = void 0;
29
+ exports.mergeChromeArgs = exports.proxiedGetWithoutAnalyze = exports.proxiedGetFuncWithAnalyze = exports.markAsWrapped = exports.isWrapped = exports.updateAutoAnalyze = exports.readVariables = exports.validateApiKey = exports.HeadlessNotSupportedError = exports.PATH_TO_EXTENSION_VARIABLES = exports.PATH_TO_SESSION_FILE = exports.DEFAULT_SERVER_URL = exports.PATH_TO_EXTENSION = void 0;
30
+ exports.writeVariables = writeVariables;
31
+ exports.writeManifest = writeManifest;
7
32
  const uuid_1 = require("uuid");
8
33
  const sync_request_1 = __importDefault(require("sync-request"));
9
34
  const assert_1 = __importDefault(require("assert"));
10
35
  const fs_1 = __importDefault(require("fs"));
11
36
  const path_1 = __importDefault(require("path"));
12
37
  const os_1 = __importDefault(require("os"));
38
+ const utils_1 = require("./utils");
39
+ const git = __importStar(require("./git"));
40
+ const createDebugger_1 = __importDefault(require("./createDebugger"));
41
+ const debugLogger = (0, createDebugger_1.default)('Configuration');
42
+ // TODO: https://github.com/dequelabs/jazzband/issues/1227
13
43
  exports.PATH_TO_EXTENSION = path_1.default.join(__dirname, '..', 'extension');
14
44
  exports.DEFAULT_SERVER_URL = 'https://axe.deque.com/';
15
45
  exports.PATH_TO_SESSION_FILE = path_1.default.join(os_1.default.tmpdir(), 'axe-watcher-session.json');
@@ -27,11 +57,20 @@ class HeadlessNotSupportedError extends Error {
27
57
  }
28
58
  exports.HeadlessNotSupportedError = HeadlessNotSupportedError;
29
59
  /** Write the user's settings to the disk, so the extension can load them. */
30
- function writeVariables({ apiKey, serverURL, sessionId, autoAnalyze, cypress,
60
+ function writeVariables({ apiKey, autoAnalyze, cypress, serverURL, sessionId, runContext, runOptions,
31
61
  // @ts-expect-error Feature flag, not part of public type
32
62
  takeScreenshots,
33
63
  // @ts-expect-error Feature flag, not part of public type
34
64
  experimentalAdvancedRules }) {
65
+ // only log the properties if they are not undefined
66
+ debugLogger('Received configuration:', {
67
+ apiKey: '<redacted>',
68
+ ...(autoAnalyze !== undefined && { autoAnalyze }),
69
+ ...(serverURL !== undefined && { serverURL }),
70
+ ...(sessionId !== undefined && { sessionId }),
71
+ ...(runContext !== undefined && { runContext }),
72
+ ...(runOptions !== undefined && { runOptions })
73
+ });
35
74
  if (!serverURL) {
36
75
  serverURL = exports.DEFAULT_SERVER_URL;
37
76
  }
@@ -42,6 +81,30 @@ experimentalAdvancedRules }) {
42
81
  catch (err) {
43
82
  throw new Error(`Error when converting serverURL to URL. Ensure it is formatted properly: ${err}`);
44
83
  }
84
+ if (typeof runContext !== 'undefined') {
85
+ (0, utils_1.validateAxeRunContext)(runContext);
86
+ debugLogger('Validated runContext:', runContext);
87
+ }
88
+ if (typeof runOptions !== 'undefined') {
89
+ (0, utils_1.validateAxeRunOptions)(runOptions);
90
+ debugLogger('Validated runOptions:', runOptions);
91
+ }
92
+ const gitData = {};
93
+ const isGitRepo = git.isRepository();
94
+ if (isGitRepo) {
95
+ debugLogger('Is this a git project?', { isGitRepo });
96
+ gitData.git_branch = git.getBranchName();
97
+ gitData.git_tag = git.getTag();
98
+ gitData.git_default_branch = git.getDefaultBranchName();
99
+ gitData.git_url = git.getRemoteURL();
100
+ gitData.git_is_dirty = git.isDirty();
101
+ const info = git.getCommitInfo();
102
+ gitData.git_commit_sha = info === null || info === void 0 ? void 0 : info.hash;
103
+ gitData.git_commit_author = info === null || info === void 0 ? void 0 : info.author;
104
+ gitData.git_commit_email = info === null || info === void 0 ? void 0 : info.email;
105
+ gitData.git_commit_message = info === null || info === void 0 ? void 0 : info.message;
106
+ }
107
+ debugLogger('Validating API key');
45
108
  (0, exports.validateApiKey)({ apiKey, serverURL: urlString });
46
109
  if (typeof autoAnalyze === 'undefined') {
47
110
  autoAnalyze = true;
@@ -49,6 +112,7 @@ experimentalAdvancedRules }) {
49
112
  // When a custom session ID is not provided, attempt to read it from the filesystem.
50
113
  // This enables multi-process/multi-browser test suites to all use the same session ID.
51
114
  if (!sessionId && fs_1.default.existsSync(exports.PATH_TO_SESSION_FILE)) {
115
+ debugLogger('Reading session ID from file for WDIO Test Runner');
52
116
  try {
53
117
  const data = JSON.parse(fs_1.default.readFileSync(exports.PATH_TO_SESSION_FILE, 'utf8'));
54
118
  sessionId = data.id;
@@ -65,11 +129,13 @@ experimentalAdvancedRules }) {
65
129
  take_screenshots: !!takeScreenshots,
66
130
  auto_analyze: !!autoAnalyze,
67
131
  cypress: !!cypress,
68
- experimental_advanced_rules: !!experimentalAdvancedRules
132
+ experimental_advanced_rules: !!experimentalAdvancedRules,
133
+ run_context: runContext || null,
134
+ run_options: runOptions || null,
135
+ git_data: gitData
69
136
  };
70
137
  fs_1.default.writeFileSync(exports.PATH_TO_EXTENSION_VARIABLES, JSON.stringify(variables));
71
138
  }
72
- exports.writeVariables = writeVariables;
73
139
  /** Validate the given `apiKey`. This method is blocking and should not be called unnecessarily. */
74
140
  const validateApiKey = ({ apiKey, serverURL }) => {
75
141
  (0, assert_1.default)(apiKey, 'API key is required');
@@ -86,8 +152,12 @@ const validateApiKey = ({ apiKey, serverURL }) => {
86
152
  });
87
153
  const body = JSON.parse(res.getBody('utf8'));
88
154
  if (body.error) {
155
+ debugLogger('Error validating API key:', body.error);
89
156
  throw new Error(body.error);
90
157
  }
158
+ else {
159
+ debugLogger('API key validated successfully');
160
+ }
91
161
  };
92
162
  exports.validateApiKey = validateApiKey;
93
163
  /** Update the extension manifest file. */
@@ -98,7 +168,6 @@ function writeManifest({ all_frames, exclude_globs }) {
98
168
  manifest.content_scripts[0].exclude_globs = exclude_globs;
99
169
  fs_1.default.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
100
170
  }
101
- exports.writeManifest = writeManifest;
102
171
  const readVariables = () => {
103
172
  const fileContents = fs_1.default.readFileSync(exports.PATH_TO_EXTENSION_VARIABLES, 'utf-8');
104
173
  return JSON.parse(fileContents);
@@ -135,8 +204,7 @@ const proxiedGetFuncWithAnalyze = (target, prop, controller) => async (...args)
135
204
  });
136
205
  // We use .call(target, ...) for the same reason that
137
206
  // proxiedGetWithoutAnalyze uses .bind(target), see below.
138
- //
139
- // eslint-disable-next-line @typescript-eslint/ban-types
207
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
140
208
  const result = await target[prop].call(target, ...args);
141
209
  return result;
142
210
  };