@applitools/core 2.5.10 → 3.0.0

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 (83) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/dist/automation/extract-text.js +3 -2
  3. package/dist/automation/get-viewport-size.js +3 -2
  4. package/dist/automation/locate-text.js +3 -2
  5. package/dist/automation/locate.js +3 -2
  6. package/dist/automation/set-viewport-size.js +3 -2
  7. package/dist/check-and-close.js +27 -2
  8. package/dist/check.js +3 -2
  9. package/dist/classic/abort.js +3 -2
  10. package/dist/classic/check-and-close.js +3 -2
  11. package/dist/classic/check.js +3 -2
  12. package/dist/classic/close.js +3 -2
  13. package/dist/classic/core.js +1 -2
  14. package/dist/classic/get-base-eyes.js +3 -2
  15. package/dist/classic/open-eyes.js +3 -2
  16. package/dist/cli/cli.js +50 -0
  17. package/dist/close-batch.js +3 -3
  18. package/dist/close.js +27 -2
  19. package/dist/core.js +1 -2
  20. package/dist/delete-test.js +3 -3
  21. package/dist/extract-text.js +8 -7
  22. package/dist/get-ec-client.js +3 -2
  23. package/dist/get-eyes-results.js +27 -2
  24. package/dist/get-manager-results.js +27 -2
  25. package/dist/get-typed-eyes.js +3 -2
  26. package/dist/index.js +2 -1
  27. package/dist/locate-text.js +3 -2
  28. package/dist/locate.js +3 -2
  29. package/dist/make-manager.js +4 -2
  30. package/dist/open-eyes.js +3 -2
  31. package/dist/troubleshoot/logs.js +41 -0
  32. package/dist/ufg/abort.js +3 -2
  33. package/dist/ufg/check-and-close.js +18 -24
  34. package/dist/ufg/check.js +18 -14
  35. package/dist/ufg/close.js +3 -2
  36. package/dist/ufg/core.js +1 -2
  37. package/dist/ufg/get-base-eyes.js +4 -3
  38. package/dist/ufg/get-nml-client.js +3 -2
  39. package/dist/ufg/get-results.js +3 -2
  40. package/dist/ufg/get-ufg-client.js +3 -2
  41. package/dist/ufg/open-eyes.js +3 -2
  42. package/dist/ufg/utils/take-dom-snapshots.js +15 -7
  43. package/dist/universal/core-server.js +1 -2
  44. package/package.json +18 -18
  45. package/types/automation/extract-text.d.ts +1 -1
  46. package/types/automation/get-viewport-size.d.ts +1 -1
  47. package/types/automation/locate-text.d.ts +1 -1
  48. package/types/automation/locate.d.ts +1 -1
  49. package/types/automation/set-viewport-size.d.ts +1 -1
  50. package/types/check-and-close.d.ts +1 -1
  51. package/types/check.d.ts +1 -1
  52. package/types/classic/abort.d.ts +1 -1
  53. package/types/classic/check-and-close.d.ts +1 -1
  54. package/types/classic/check.d.ts +1 -1
  55. package/types/classic/close.d.ts +1 -1
  56. package/types/classic/get-base-eyes.d.ts +1 -1
  57. package/types/classic/open-eyes.d.ts +1 -1
  58. package/types/close-batch.d.ts +1 -1
  59. package/types/close.d.ts +1 -1
  60. package/types/delete-test.d.ts +1 -1
  61. package/types/extract-text.d.ts +1 -1
  62. package/types/get-ec-client.d.ts +1 -1
  63. package/types/get-eyes-results.d.ts +1 -1
  64. package/types/get-manager-results.d.ts +1 -1
  65. package/types/get-typed-eyes.d.ts +2 -2
  66. package/types/index.d.ts +1 -0
  67. package/types/locate-text.d.ts +1 -1
  68. package/types/locate.d.ts +1 -1
  69. package/types/make-manager.d.ts +1 -1
  70. package/types/open-eyes.d.ts +1 -1
  71. package/types/troubleshoot/logs.d.ts +10 -0
  72. package/types/types.d.ts +1 -1
  73. package/types/ufg/abort.d.ts +1 -1
  74. package/types/ufg/check-and-close.d.ts +5 -2
  75. package/types/ufg/check.d.ts +1 -1
  76. package/types/ufg/close.d.ts +1 -1
  77. package/types/ufg/get-base-eyes.d.ts +1 -1
  78. package/types/ufg/get-nml-client.d.ts +1 -1
  79. package/types/ufg/get-results.d.ts +1 -1
  80. package/types/ufg/get-ufg-client.d.ts +1 -1
  81. package/types/ufg/open-eyes.d.ts +1 -1
  82. package/types/ufg/types.d.ts +4 -1
  83. package/types/ufg/utils/take-dom-snapshots.d.ts +4 -1
package/CHANGELOG.md CHANGED
@@ -2,6 +2,13 @@
2
2
 
3
3
  ## Unreleased
4
4
 
5
+ ## 3.0.0 - 2023/5/12
6
+
7
+ ### Features
8
+ - Add support for reloading the page when using layoutBreakpoints
9
+ ### Bug fixes
10
+ - Fixed issue with viewport information extraction when switched to webview
11
+
5
12
  ## 2.5.10 - 2023/5/3
6
13
 
7
14
  ### Features
@@ -29,8 +29,9 @@ const take_screenshot_1 = require("./utils/take-screenshot");
29
29
  const take_dom_capture_1 = require("../classic/utils/take-dom-capture");
30
30
  const utils = __importStar(require("@applitools/utils"));
31
31
  const { getText } = require('@applitools/snippets');
32
- function makeExtractText({ core, spec, logger: defaultLogger }) {
33
- return async function extractText({ target, settings, logger = defaultLogger, }) {
32
+ function makeExtractText({ core, spec, logger: mainLogger }) {
33
+ return async function extractText({ target, settings, logger = mainLogger, }) {
34
+ logger = logger.extend(mainLogger);
34
35
  logger.log('Command "extractText" is called with settings', settings);
35
36
  if (!(0, driver_1.isDriver)(target, spec)) {
36
37
  return core.base.extractText({ target, settings: settings, logger });
@@ -2,8 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.makeGetViewportSize = void 0;
4
4
  const driver_1 = require("@applitools/driver");
5
- function makeGetViewportSize({ spec, logger: defaultLogger }) {
6
- return async function getViewportSize({ target, logger = defaultLogger, }) {
5
+ function makeGetViewportSize({ spec, logger: mainLogger }) {
6
+ return async function getViewportSize({ target, logger = mainLogger }) {
7
+ logger = logger.extend(mainLogger);
7
8
  logger.log(`Command "getViewportSize" is called`);
8
9
  const driver = await (0, driver_1.makeDriver)({ driver: target, spec, logger });
9
10
  return driver.getViewportSize();
@@ -28,8 +28,9 @@ const driver_1 = require("@applitools/driver");
28
28
  const take_screenshot_1 = require("./utils/take-screenshot");
29
29
  // import {takeDomCapture} from './utils/take-dom-capture'
30
30
  const utils = __importStar(require("@applitools/utils"));
31
- function makeLocateText({ core, spec, logger: defaultLogger }) {
32
- return async function locateText({ target, settings, logger = defaultLogger, }) {
31
+ function makeLocateText({ core, spec, logger: mainLogger }) {
32
+ return async function locateText({ target, settings, logger = mainLogger, }) {
33
+ logger = logger.extend(mainLogger);
33
34
  logger.log('Command "locateText" is called with settings', settings);
34
35
  if (!(0, driver_1.isDriver)(target, spec)) {
35
36
  return core.base.locateText({ target, settings: settings, logger });
@@ -27,8 +27,9 @@ exports.makeLocate = void 0;
27
27
  const driver_1 = require("@applitools/driver");
28
28
  const take_screenshot_1 = require("./utils/take-screenshot");
29
29
  const utils = __importStar(require("@applitools/utils"));
30
- function makeLocate({ spec, core, logger: defaultLogger }) {
31
- return async function locate({ settings, target, logger = defaultLogger, }) {
30
+ function makeLocate({ spec, core, logger: mainLogger }) {
31
+ return async function locate({ settings, target, logger = mainLogger, }) {
32
+ logger = logger.extend(mainLogger);
32
33
  logger.log(`Command "locate" is called with settings`, settings);
33
34
  if (!(0, driver_1.isDriver)(target, spec)) {
34
35
  return core.base.locate({ target, settings: settings, logger });
@@ -2,8 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.makeSetViewportSize = void 0;
4
4
  const driver_1 = require("@applitools/driver");
5
- function makeSetViewportSize({ spec, logger: defaultLogger }) {
6
- return async function setViewportSize({ target, size, logger = defaultLogger, }) {
5
+ function makeSetViewportSize({ spec, logger: mainLogger }) {
6
+ return async function setViewportSize({ target, size, logger = mainLogger, }) {
7
+ logger = logger.extend(mainLogger);
7
8
  logger.log(`Command "setViewportSize" is called with size`, size);
8
9
  const driver = await (0, driver_1.makeDriver)({ driver: target, spec, logger });
9
10
  return driver.setViewportSize(size);
@@ -1,10 +1,35 @@
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
  Object.defineProperty(exports, "__esModule", { value: true });
3
26
  exports.makeCheckAndClose = void 0;
4
27
  const driver_1 = require("@applitools/driver");
5
- function makeCheckAndClose({ type: defaultType = 'classic', eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
6
- return async function checkAndClose({ type = defaultType, target = defaultTarget, settings = {}, config, logger = defaultLogger, } = {}) {
28
+ const utils = __importStar(require("@applitools/utils"));
29
+ function makeCheckAndClose({ type: defaultType = 'classic', eyes, target: defaultTarget, spec, logger: mainLogger, }) {
30
+ return async function checkAndClose({ type = defaultType, target = defaultTarget, settings = {}, config, logger = mainLogger, } = {}) {
7
31
  var _a;
32
+ logger = logger.extend(mainLogger, { tags: [`check-and-close-${type}-${utils.general.shortid()}`] });
8
33
  settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...config === null || config === void 0 ? void 0 : config.check, ...config === null || config === void 0 ? void 0 : config.close, ...settings };
9
34
  const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
10
35
  const environment = await (driver === null || driver === void 0 ? void 0 : driver.getEnvironment());
package/dist/check.js CHANGED
@@ -30,11 +30,12 @@ exports.makeCheck = void 0;
30
30
  const driver_1 = require("@applitools/driver");
31
31
  const utils = __importStar(require("@applitools/utils"));
32
32
  const chalk_1 = __importDefault(require("chalk"));
33
- function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
33
+ function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget, spec, logger: mainLogger, }) {
34
34
  let stepIndex = 0;
35
- return async function check({ type = defaultType, target = defaultTarget, settings, config, logger = defaultLogger, } = {}) {
35
+ return async function check({ type = defaultType, target = defaultTarget, settings, config, logger = mainLogger, } = {}) {
36
36
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
37
37
  var _s, _t, _u, _v;
38
+ logger = logger.extend(mainLogger, { tags: [`check-${type}-${utils.general.shortid()}`] });
38
39
  settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...config === null || config === void 0 ? void 0 : config.check, ...settings };
39
40
  (_a = settings.fully) !== null && _a !== void 0 ? _a : (settings.fully = !settings.region && (!settings.frames || settings.frames.length === 0));
40
41
  (_b = settings.waitBeforeCapture) !== null && _b !== void 0 ? _b : (settings.waitBeforeCapture = 100);
@@ -2,8 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.makeAbort = void 0;
4
4
  const driver_1 = require("@applitools/driver");
5
- function makeAbort({ eyes, target, spec, logger: defaultLogger }) {
6
- return async function abort({ settings, logger = defaultLogger, } = {}) {
5
+ function makeAbort({ eyes, target, spec, logger: mainLogger }) {
6
+ return async function abort({ settings, logger = mainLogger, } = {}) {
7
+ logger = logger.extend(mainLogger);
7
8
  logger.log('Command "abort" is called with settings', settings);
8
9
  settings !== null && settings !== void 0 ? settings : (settings = {});
9
10
  if (!settings.testMetadata) {
@@ -30,9 +30,10 @@ const take_dom_capture_1 = require("./utils/take-dom-capture");
30
30
  const to_base_check_settings_1 = require("../automation/utils/to-base-check-settings");
31
31
  const wait_for_lazy_load_1 = require("../automation/utils/wait-for-lazy-load");
32
32
  const utils = __importStar(require("@applitools/utils"));
33
- function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
34
- return async function checkAndClose({ target = defaultTarget, settings = {}, logger = defaultLogger, } = {}) {
33
+ function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: mainLogger, }) {
34
+ return async function checkAndClose({ target = defaultTarget, settings = {}, logger = mainLogger, } = {}) {
35
35
  var _a;
36
+ logger = logger.extend(mainLogger);
36
37
  logger.log('Command "checkAndClose" is called with settings', settings);
37
38
  if (!target)
38
39
  throw new Error('Method was called with no target');
@@ -30,9 +30,10 @@ const take_dom_capture_1 = require("./utils/take-dom-capture");
30
30
  const to_base_check_settings_1 = require("../automation/utils/to-base-check-settings");
31
31
  const wait_for_lazy_load_1 = require("../automation/utils/wait-for-lazy-load");
32
32
  const utils = __importStar(require("@applitools/utils"));
33
- function makeCheck({ eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
34
- return async function check({ target = defaultTarget, settings = {}, logger = defaultLogger, } = {}) {
33
+ function makeCheck({ eyes, target: defaultTarget, spec, logger: mainLogger, }) {
34
+ return async function check({ target = defaultTarget, settings = {}, logger = mainLogger, } = {}) {
35
35
  var _a, _b, _c;
36
+ logger = logger.extend(mainLogger);
36
37
  logger.log('Command "check" is called with settings', settings);
37
38
  if (!target)
38
39
  throw new Error('Method was called with no target');
@@ -2,8 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.makeClose = void 0;
4
4
  const driver_1 = require("@applitools/driver");
5
- function makeClose({ eyes, target, spec, logger: defaultLogger }) {
6
- return async function close({ settings, logger = defaultLogger, } = {}) {
5
+ function makeClose({ eyes, target, spec, logger: mainLogger }) {
6
+ return async function close({ settings, logger = mainLogger, } = {}) {
7
+ logger = logger.extend(mainLogger);
7
8
  logger.log('Command "close" is called with settings', settings);
8
9
  settings !== null && settings !== void 0 ? settings : (settings = {});
9
10
  if (!settings.testMetadata) {
@@ -34,8 +34,7 @@ const extract_text_1 = require("../automation/extract-text");
34
34
  const open_eyes_1 = require("./open-eyes");
35
35
  const utils = __importStar(require("@applitools/utils"));
36
36
  function makeCore({ spec, base, agentId = 'core-classic', cwd = process.cwd(), logger: defaultLogger, }) {
37
- var _a;
38
- const logger = (_a = defaultLogger === null || defaultLogger === void 0 ? void 0 : defaultLogger.extend({ label: 'core-classic' })) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ label: 'core-classic' });
37
+ const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'core-classic' } });
39
38
  logger.log(`Core classic is initialized ${base ? 'with' : 'without'} custom base core`);
40
39
  base !== null && base !== void 0 ? base : (base = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
41
40
  return utils.general.extend(base, core => {
@@ -25,12 +25,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.makeGetBaseEyes = void 0;
27
27
  const utils = __importStar(require("@applitools/utils"));
28
- function makeGetBaseEyes({ settings, eyes, base, logger: defaultLogger }) {
28
+ function makeGetBaseEyes({ settings, eyes, base, logger: mainLogger }) {
29
29
  const getBaseEyesWithCache = utils.general.cachify(getBaseEyes, () => 'default');
30
30
  if (base)
31
31
  getBaseEyesWithCache.setCachedValue('default', Promise.resolve(base));
32
32
  return getBaseEyesWithCache;
33
- async function getBaseEyes({ logger = defaultLogger } = {}) {
33
+ async function getBaseEyes({ logger = mainLogger } = {}) {
34
+ logger = logger.extend(mainLogger);
34
35
  logger.log(`Command "getBaseEyes" is called with settings`, settings);
35
36
  const baseEyes = await eyes.core.base.openEyes({ settings, logger });
36
37
  return [baseEyes];
@@ -31,10 +31,11 @@ const check_and_close_1 = require("./check-and-close");
31
31
  const close_1 = require("./close");
32
32
  const abort_1 = require("./abort");
33
33
  const utils = __importStar(require("@applitools/utils"));
34
- function makeOpenEyes({ core, spec, logger: defaultLogger }) {
35
- return async function openEyes({ target, settings, base, logger = defaultLogger, }) {
34
+ function makeOpenEyes({ core, spec, logger: mainLogger }) {
35
+ return async function openEyes({ target, settings, base, logger = mainLogger, }) {
36
36
  var _a, _b, _c;
37
37
  var _d;
38
+ logger = logger.extend(mainLogger);
38
39
  logger.log(`Command "openEyes" is called with ${target ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), base ? 'predefined eyes' : '');
39
40
  const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: settings }));
40
41
  if (driver && !base) {
package/dist/cli/cli.js CHANGED
@@ -1,12 +1,38 @@
1
1
  #!/usr/bin/env node
2
2
  "use strict";
3
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
4
+ if (k2 === undefined) k2 = k;
5
+ var desc = Object.getOwnPropertyDescriptor(m, k);
6
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
7
+ desc = { enumerable: true, get: function() { return m[k]; } };
8
+ }
9
+ Object.defineProperty(o, k2, desc);
10
+ }) : (function(o, m, k, k2) {
11
+ if (k2 === undefined) k2 = k;
12
+ o[k2] = m[k];
13
+ }));
14
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
15
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
16
+ }) : function(o, v) {
17
+ o["default"] = v;
18
+ });
19
+ var __importStar = (this && this.__importStar) || function (mod) {
20
+ if (mod && mod.__esModule) return mod;
21
+ var result = {};
22
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
23
+ __setModuleDefault(result, mod);
24
+ return result;
25
+ };
3
26
  var __importDefault = (this && this.__importDefault) || function (mod) {
4
27
  return (mod && mod.__esModule) ? mod : { "default": mod };
5
28
  };
6
29
  Object.defineProperty(exports, "__esModule", { value: true });
30
+ /* eslint no-console: off */
7
31
  const core_server_1 = require("../universal/core-server");
8
32
  const core_server_process_1 = require("../universal/core-server-process");
33
+ const logs_1 = require("../troubleshoot/logs");
9
34
  const yargs_1 = __importDefault(require("yargs"));
35
+ const utils = __importStar(require("@applitools/utils"));
10
36
  yargs_1.default
11
37
  .example([
12
38
  ['eyes universal', 'Run Eyes Universal server on default port (21077)'],
@@ -85,5 +111,29 @@ yargs_1.default
85
111
  (0, core_server_1.makeCoreServer)({ ...args, ...args.config });
86
112
  }
87
113
  },
114
+ })
115
+ .command({
116
+ command: 'logs [input]',
117
+ builder: yargs => yargs.options({
118
+ input: {
119
+ description: 'log input to process',
120
+ type: 'string',
121
+ },
122
+ structure: {
123
+ description: 'group logs by tag names',
124
+ type: 'boolean',
125
+ },
126
+ }),
127
+ handler: async (args) => {
128
+ var _a;
129
+ const input = (_a = args.input) !== null && _a !== void 0 ? _a : (await utils.streams.toBuffer(process.stdin)).toString('utf8');
130
+ const logs = (0, logs_1.parseLogs)(input);
131
+ if (args.structure) {
132
+ console.log(JSON.stringify((0, logs_1.structureLogs)(logs), null, 2));
133
+ }
134
+ else {
135
+ console.log(JSON.stringify(logs, null, 2));
136
+ }
137
+ },
88
138
  })
89
139
  .wrap(yargs_1.default.terminalWidth()).argv;
@@ -25,9 +25,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.makeCloseBatch = void 0;
27
27
  const utils = __importStar(require("@applitools/utils"));
28
- function makeCloseBatch({ core, logger: defaultLogger }) {
29
- return async function closeBatch({ settings, logger = defaultLogger, }) {
30
- ;
28
+ function makeCloseBatch({ core, logger: mainLogger }) {
29
+ return async function closeBatch({ settings, logger = mainLogger, }) {
30
+ logger = logger.extend(mainLogger, { tags: [`close-batch-${utils.general.shortid()}`] });
31
31
  (utils.types.isArray(settings) ? settings : [settings]).forEach(settings => {
32
32
  var _a, _b, _c;
33
33
  (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
package/dist/close.js CHANGED
@@ -1,9 +1,34 @@
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
  Object.defineProperty(exports, "__esModule", { value: true });
3
26
  exports.makeClose = void 0;
4
- function makeClose({ eyes, logger: defaultLogger, }) {
5
- return async function close({ settings, config, logger = defaultLogger, } = {}) {
27
+ const utils = __importStar(require("@applitools/utils"));
28
+ function makeClose({ eyes, logger: mainLogger, }) {
29
+ return async function close({ settings, config, logger = mainLogger, } = {}) {
6
30
  var _a;
31
+ logger = logger.extend(mainLogger, { tags: [`close-${utils.general.shortid()}`] });
7
32
  settings = { ...config === null || config === void 0 ? void 0 : config.close, ...settings };
8
33
  (_a = settings.updateBaselineIfNew) !== null && _a !== void 0 ? _a : (settings.updateBaselineIfNew = true);
9
34
  const typedEyes = await eyes.getTypedEyes({ logger });
package/dist/core.js CHANGED
@@ -38,8 +38,7 @@ const delete_test_1 = require("./delete-test");
38
38
  const get_ec_client_1 = require("./get-ec-client");
39
39
  const utils = __importStar(require("@applitools/utils"));
40
40
  function makeCore({ spec, concurrency, base: defaultBase, agentId = 'core', cwd = process.cwd(), logger: defaultLogger, } = {}) {
41
- var _a;
42
- const logger = (_a = defaultLogger === null || defaultLogger === void 0 ? void 0 : defaultLogger.extend({ label: 'core' })) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ label: 'core' });
41
+ const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'core' } });
43
42
  logger.log(`Core is initialized ${defaultBase ? 'with' : 'without'} custom base core`);
44
43
  const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, cwd, logger });
45
44
  return utils.general.extend(base, core => {
@@ -25,9 +25,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.makeDeleteTest = void 0;
27
27
  const utils = __importStar(require("@applitools/utils"));
28
- function makeDeleteTest({ core, logger: defaultLogger }) {
29
- return async function deleteTest({ settings, logger = defaultLogger, }) {
30
- ;
28
+ function makeDeleteTest({ core, logger: mainLogger }) {
29
+ return async function deleteTest({ settings, logger = mainLogger, }) {
30
+ logger = logger.extend(mainLogger, { tags: [`delete-test-${utils.general.shortid()}`] });
31
31
  (utils.types.isArray(settings) ? settings : [settings]).forEach(settings => {
32
32
  var _a, _b, _c;
33
33
  (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
@@ -26,14 +26,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.makeExtractText = void 0;
27
27
  const core_1 = require("./classic/core");
28
28
  const utils = __importStar(require("@applitools/utils"));
29
- function makeExtractText({ spec, core, logger: defaultLogger }) {
30
- return async function extractText({ target, settings, config, logger = defaultLogger, }) {
31
- settings = utils.types.isArray(settings) ? settings : [settings];
32
- settings = settings.map(settings => {
33
- var _a, _b, _c;
29
+ function makeExtractText({ spec, core, logger: mainLogger }) {
30
+ return async function extractText({ target, settings, config, logger = mainLogger, }) {
31
+ logger = logger.extend(mainLogger, { tags: [`extract-text-${utils.general.shortid()}`] });
32
+ (utils.types.isArray(settings) ? settings : [settings]).map(settings => {
33
+ var _a, _b, _c, _d;
34
34
  settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
35
- (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
36
- (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
35
+ (_a = settings.userCommandId) !== null && _a !== void 0 ? _a : (settings.userCommandId = `extract-text--${utils.general.guid()}`);
36
+ (_b = settings.serverUrl) !== null && _b !== void 0 ? _b : (settings.serverUrl = (_c = utils.general.getEnvValue('SERVER_URL')) !== null && _c !== void 0 ? _c : 'https://eyesapi.applitools.com');
37
+ (_d = settings.apiKey) !== null && _d !== void 0 ? _d : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
37
38
  return settings;
38
39
  });
39
40
  const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
@@ -26,9 +26,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.makeGetECClient = void 0;
27
27
  const ec_client_1 = require("@applitools/ec-client");
28
28
  const utils = __importStar(require("@applitools/utils"));
29
- function makeGetECClient({ logger: defaultLogger }) {
29
+ function makeGetECClient({ logger: mainLogger }) {
30
30
  return utils.general.cachify(getECClient, ([options]) => [options === null || options === void 0 ? void 0 : options.settings]);
31
- async function getECClient({ settings, logger = defaultLogger, } = {}) {
31
+ async function getECClient({ settings, logger = mainLogger, } = {}) {
32
+ logger = logger.extend(mainLogger);
32
33
  const client = await (0, ec_client_1.makeECClient)({ settings, logger });
33
34
  return client;
34
35
  }
@@ -1,9 +1,34 @@
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
  Object.defineProperty(exports, "__esModule", { value: true });
3
26
  exports.makeGetEyesResults = void 0;
4
27
  const test_error_1 = require("./errors/test-error");
5
- function makeGetEyesResults({ eyes, logger: defaultLogger, }) {
6
- return async function getEyesResults({ settings, logger = defaultLogger, } = {}) {
28
+ const utils = __importStar(require("@applitools/utils"));
29
+ function makeGetEyesResults({ eyes, logger: mainLogger, }) {
30
+ return async function getEyesResults({ settings, logger = mainLogger, } = {}) {
31
+ logger = logger.extend(mainLogger, { tags: [`get-eyes-results-${utils.general.shortid()}`] });
7
32
  const typedEyes = await eyes.getTypedEyes({ logger });
8
33
  const results = await typedEyes.getResults({ settings, logger });
9
34
  if (settings === null || settings === void 0 ? void 0 : settings.throwErr) {
@@ -1,12 +1,37 @@
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
  Object.defineProperty(exports, "__esModule", { value: true });
3
26
  exports.makeGetManagerResults = void 0;
4
27
  const test_error_1 = require("./errors/test-error");
5
28
  const internal_error_1 = require("./errors/internal-error");
6
29
  const separate_duplicate_results_1 = require("./utils/separate-duplicate-results");
7
- function makeGetManagerResults({ core, storage, logger: defaultLogger, }) {
8
- return async function getManagerResults({ settings, logger = defaultLogger, } = {}) {
30
+ const utils = __importStar(require("@applitools/utils"));
31
+ function makeGetManagerResults({ core, storage, logger: mainLogger, }) {
32
+ return async function getManagerResults({ settings, logger = mainLogger, } = {}) {
9
33
  var _a, _b, _c;
34
+ logger = logger.extend(mainLogger, { tags: [`get-eyes-manager-${utils.general.shortid()}`] });
10
35
  let containers = await storage.reduce(async (promise, eyes) => {
11
36
  try {
12
37
  const results = await eyes.getResults({ settings: { ...settings, throwErr: false }, logger });
@@ -1,9 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.makeGetTypedEyes = void 0;
4
- function makeGetTypedEyes({ type: defaultType, settings: defaultSettings, target, cores, logger: defaultLogger, }) {
4
+ function makeGetTypedEyes({ type: defaultType, settings: defaultSettings, target, cores, logger: mainLogger, }) {
5
5
  let eyes;
6
- return async function getTypedEyes({ type = defaultType, settings, logger = defaultLogger, } = {}) {
6
+ return async function getTypedEyes({ type = defaultType, settings, logger = mainLogger, } = {}) {
7
+ logger = logger.extend(mainLogger);
7
8
  if (!eyes) {
8
9
  eyes = await cores[type].openEyes({ target, settings: defaultSettings, logger });
9
10
  return eyes;
package/dist/index.js CHANGED
@@ -26,12 +26,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
26
26
  return result;
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.takeDomSnapshots = exports.formatters = void 0;
29
+ exports.takeDomSnapshots = exports.logs = exports.formatters = void 0;
30
30
  __exportStar(require("./types"), exports);
31
31
  __exportStar(require("./core"), exports);
32
32
  __exportStar(require("./universal/core-server"), exports);
33
33
  __exportStar(require("./universal/core-server-process"), exports);
34
34
  __exportStar(require("@applitools/driver/dist/debug"), exports);
35
35
  exports.formatters = __importStar(require("./utils/format-results"));
36
+ exports.logs = __importStar(require("./troubleshoot/logs"));
36
37
  var take_dom_snapshots_1 = require("./ufg/utils/take-dom-snapshots");
37
38
  Object.defineProperty(exports, "takeDomSnapshots", { enumerable: true, get: function () { return take_dom_snapshots_1.takeDomSnapshots; } });
@@ -26,9 +26,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.makeLocateText = void 0;
27
27
  const core_1 = require("./classic/core");
28
28
  const utils = __importStar(require("@applitools/utils"));
29
- function makeLocateText({ spec, core, logger: defaultLogger }) {
30
- return async function locateText({ target, settings, config, logger = defaultLogger, }) {
29
+ function makeLocateText({ spec, core, logger: mainLogger }) {
30
+ return async function locateText({ target, settings, config, logger = mainLogger, }) {
31
31
  var _a, _b, _c;
32
+ logger = logger.extend(mainLogger, { tags: [`locate-text-${utils.general.shortid()}`] });
32
33
  settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
33
34
  (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
34
35
  (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
package/dist/locate.js CHANGED
@@ -26,9 +26,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.makeLocate = void 0;
27
27
  const core_1 = require("./classic/core");
28
28
  const utils = __importStar(require("@applitools/utils"));
29
- function makeLocate({ spec, core, logger: defaultLogger }) {
30
- return async function locate({ target, settings, config, logger = defaultLogger, }) {
29
+ function makeLocate({ spec, core, logger: mainLogger }) {
30
+ return async function locate({ target, settings, config, logger = mainLogger, }) {
31
31
  var _a, _b, _c;
32
+ logger = logger.extend(mainLogger, { tags: [`locate-${utils.general.shortid()}`] });
32
33
  settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
33
34
  (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
34
35
  (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
@@ -30,15 +30,17 @@ const core_2 = require("./ufg/core");
30
30
  const open_eyes_1 = require("./open-eyes");
31
31
  const get_manager_results_1 = require("./get-manager-results");
32
32
  const utils = __importStar(require("@applitools/utils"));
33
- function makeMakeManager({ spec, concurrency: defaultConcurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), core, base, agentId: defaultAgentId, cwd = process.cwd(), logger: defaultLogger, }) {
34
- return async function makeManager({ type = 'classic', settings, logger = defaultLogger, } = {}) {
33
+ function makeMakeManager({ spec, concurrency: defaultConcurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), core, base, agentId: defaultAgentId, cwd = process.cwd(), logger: mainLogger, }) {
34
+ return async function makeManager({ type = 'classic', settings, logger = mainLogger, } = {}) {
35
35
  var _a, _b, _c, _d, _e;
36
36
  var _f;
37
+ logger = logger.extend(mainLogger, { tags: [`manager-${type}-${utils.general.shortid()}`] });
37
38
  settings !== null && settings !== void 0 ? settings : (settings = {});
38
39
  (_a = settings.concurrency) !== null && _a !== void 0 ? _a : (settings.concurrency = defaultConcurrency !== null && defaultConcurrency !== void 0 ? defaultConcurrency : (utils.types.isInteger(settings.legacyConcurrency) ? settings.legacyConcurrency * 5 : 5));
39
40
  (_b = settings.batch) !== null && _b !== void 0 ? _b : (settings.batch = {});
40
41
  (_c = (_f = settings.batch).id) !== null && _c !== void 0 ? _c : (_f.id = (_d = utils.general.getEnvValue('BATCH_ID')) !== null && _d !== void 0 ? _d : `generated-${utils.general.guid()}`);
41
42
  (_e = settings.agentId) !== null && _e !== void 0 ? _e : (settings.agentId = type === 'ufg' ? defaultAgentId === null || defaultAgentId === void 0 ? void 0 : defaultAgentId.replace(/(\/\d)/, '.visualgrid$1') : defaultAgentId);
43
+ logger.log('Command "makeManager" is called with settings', settings);
42
44
  base !== null && base !== void 0 ? base : (base = (0, core_base_1.makeCore)({ agentId: settings.agentId, concurrency: settings.concurrency, cwd, logger }));
43
45
  const cores = {
44
46
  ufg: (0, core_2.makeCore)({ spec, base, fetchConcurrency: settings.fetchConcurrency, logger }),
package/dist/open-eyes.js CHANGED
@@ -34,10 +34,11 @@ const close_1 = require("./close");
34
34
  const get_eyes_results_1 = require("./get-eyes-results");
35
35
  const extract_ci_provider_1 = require("./utils/extract-ci-provider");
36
36
  const utils = __importStar(require("@applitools/utils"));
37
- function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core, cores, spec, logger: defaultLogger, }) {
38
- return async function openEyes({ type = defaultType, settings, config, target, logger = defaultLogger, }) {
37
+ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core, cores, spec, logger: mainLogger, }) {
38
+ return async function openEyes({ type = defaultType, settings, config, target, logger = mainLogger, }) {
39
39
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
40
40
  var _u, _v, _w, _x;
41
+ logger = logger.extend(mainLogger, { tags: [`eyes-${type}-${utils.general.shortid()}`] });
41
42
  settings = { ...config === null || config === void 0 ? void 0 : config.open, ...settings };
42
43
  (_a = settings.userTestId) !== null && _a !== void 0 ? _a : (settings.userTestId = `${settings.testName}--${utils.general.guid()}`);
43
44
  (_b = settings.serverUrl) !== null && _b !== void 0 ? _b : (settings.serverUrl = (_c = utils.general.getEnvValue('SERVER_URL')) !== null && _c !== void 0 ? _c : 'https://eyesapi.applitools.com');