@applitools/core 1.4.6 → 1.4.8

package/dist/troubleshoot/check-network.js

@@ -29,46 +29,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkNetwork = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const utils_1 = require("./utils");
 const eyes_1 = __importDefault(require("./eyes"));
 const ufg_1 = __importDefault(require("./ufg"));
 const utils = __importStar(require("@applitools/utils"));
 const TIMEOUT = 15000;
 const config = utils.config.getConfig({ params: ['apiKey', 'serverUrl', 'proxy'] });
 async function checkNetwork({ stream = process.stdout, eyes = eyes_1.default, ufg = ufg_1.default } = {}) {
-    const hasClearLine = stream.clearLine && stream.cursorTo;
-    async function doTest(func, name) {
-        const delimiterLength = 30 - name.length;
-        const delimiter = new Array(delimiterLength).join(' ');
-        hasClearLine && printSuccess(name, delimiter, '[ ?  ]');
-        const start = Date.now();
-        const funcWithTimeout = (0, utils_1.ptimeoutWithError)(func(), TIMEOUT, new Error('request timeout!'));
-        const [err] = await (0, utils_1.presult)(funcWithTimeout);
-        const end = (Date.now() - start) / 1000;
-        clearLine();
-        if (err) {
-            printErr(name, delimiter, `[ X  ]  +${end}`, err.message, err.message[err.message.length - 1] !== '\n' ? '\n' : '');
-        }
-        else {
-            printSuccess(name, delimiter, `[ OK ]  +${end}`, '\n');
-        }
-        return !!err;
-    }
-    function print(...msg) {
-        stream.write((0, chalk_1.default)(...msg));
-    }
-    function printErr(...msg) {
-        stream.write(chalk_1.default.red(...msg));
-    }
-    function printSuccess(...msg) {
-        stream.write(chalk_1.default.green(...msg));
-    }
-    function clearLine() {
-        if (hasClearLine) {
-            stream.clearLine(0);
-            stream.cursorTo(0);
-        }
-    }
+    const hasClearLine = !!stream.clearLine && !!stream.cursorTo;
     if (!config.apiKey) {
         printErr('Missing "apiKey". Add APPLITOOLS_API_KEY as an env variable or add "apiKey" in applitools.config.js\n');
         return;
@@ -102,6 +69,46 @@ async function checkNetwork({ stream = process.stdout, eyes = eyes_1.default, uf
     else if (curlVgErr) {
         printErr(proxyMsg, '\n', await ufg.getCmd());
     }
+    async function doTest(func, name) {
+        const delimiterLength = 30 - name.length;
+        const delimiter = new Array(delimiterLength).join(' ');
+        hasClearLine && printSuccess(name, delimiter, '[ ?  ]');
+        const start = Date.now();
+        const [err] = await ptimeoutWithError(func(), TIMEOUT, new Error('request timeout!'));
+        const end = (Date.now() - start) / 1000;
+        clearLine();
+        if (err) {
+            printErr(name, delimiter, `[ X  ]  +${end}`, err.message, err.message[err.message.length - 1] !== '\n' ? '\n' : '');
+        }
+        else {
+            printSuccess(name, delimiter, `[ OK ]  +${end}`, '\n');
+        }
+        return !!err;
+    }
+    function print(...msg) {
+        stream.write((0, chalk_1.default)(...msg));
+    }
+    function printErr(...msg) {
+        stream.write(chalk_1.default.red(...msg));
+    }
+    function printSuccess(...msg) {
+        stream.write(chalk_1.default.green(...msg));
+    }
+    function clearLine() {
+        if (hasClearLine) {
+            stream.clearLine(0);
+            stream.cursorTo(0);
+        }
+    }
+    async function ptimeoutWithError(promise, timeout, err) {
+        let timer;
+        return Promise.race([
+            promise.then(v => (timer && clearTimeout(timer), [undefined, v]), err => (timer && clearTimeout(timer), [err])),
+            new Promise(res => {
+                timer = setTimeout(() => res([err]), timeout);
+            }),
+        ]);
+    }
 }
 exports.checkNetwork = checkNetwork;
 checkNetwork();

package/dist/troubleshoot/eyes.js

@@ -34,12 +34,12 @@ const utils = __importStar(require("@applitools/utils"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
 exports.RENDER_INFO_URL = `${utils_1.config.serverUrl}/api/sessions/renderinfo?apiKey=${utils_1.config.apiKey}`;
 exports.CURL_CMD = `curl ${exports.RENDER_INFO_URL} ${(0, utils_1.getProxyCurlArg)()}`;
-const validateRawAccountInfo = res => {
+const validateRawAccountInfo = (res) => {
     if (!res || !res.accessToken || !res.resultsUrl) {
         throw new Error(`bad render info result ${JSON.stringify(res)}`);
     }
 };
-const validateAccountInfo = res => {
+const validateAccountInfo = (res) => {
     if (!res || !res.ufg || !res.ufg.accessToken || !res.uploadUrl) {
         throw new Error(`bad render info result ${JSON.stringify(res)}`);
     }

package/dist/troubleshoot/ufg.js

@@ -29,9 +29,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCmd = void 0;
 const https_1 = require("https");
 const crypto_1 = require("crypto");
-const eyes_1 = require("./eyes");
+const logger_1 = require("@applitools/logger");
 const ufg_client_1 = require("@applitools/ufg-client");
 const utils_1 = require("./utils");
+const eyes_1 = require("./eyes");
 const utils = __importStar(require("@applitools/utils"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const value = Buffer.from(JSON.stringify({ resources: {}, domNodes: [] }));
@@ -91,7 +92,7 @@ exports.default = {
         const url = new URL(UFG_PUT_RESOURCE_URL);
         const requests = (0, ufg_client_1.makeUFGRequests)({
             config: { serverUrl: url.origin, accessToken: await accessTokenPromise, uploadUrl: '', stitchingServiceUrl: '' },
-            logger: null,
+            logger: (0, logger_1.makeLogger)(),
         });
         await requests.uploadResource({ resource });
     },

package/dist/troubleshoot/utils.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ptimeoutWithError = exports.presult = exports.getProxyCurlArg = exports.config = void 0;
+exports.getProxyCurlArg = exports.config = void 0;
 const utils = __importStar(require("@applitools/utils"));
 exports.config = {
     serverUrl: 'https://eyesapi.applitools.com',
@@ -42,27 +42,3 @@ function getProxyCurlArg() {
     return proxyUrl ? `-x ${proxyUrl.href}` : '';
 }
 exports.getProxyCurlArg = getProxyCurlArg;
-function presult(promise) {
-    return promise.then(v => [undefined, v], err => [err]);
-}
-exports.presult = presult;
-async function ptimeoutWithError(promiseOrPromiseFunc, timeout, err) {
-    let promiseResolved = false;
-    const hasAborted = () => promiseResolved;
-    const promise = promiseOrPromiseFunc.then ? promiseOrPromiseFunc : promiseOrPromiseFunc(hasAborted);
-    let cancel;
-    const v = await Promise.race([
-        promise.then(v => ((promiseResolved = true), cancel && clearTimeout(cancel), v), err => ((promiseResolved = true), cancel && clearTimeout(cancel), Promise.reject(err))),
-        new Promise(res => (cancel = setTimeout(() => {
-            if (promiseResolved)
-                res(undefined);
-            else {
-                cancel = undefined;
-                promiseResolved = true;
-                res(Promise.reject(err));
-            }
-        }, timeout))),
-    ]);
-    return v;
-}
-exports.ptimeoutWithError = ptimeoutWithError;

package/dist/types.js

@@ -14,5 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@applitools/core-base/types"), exports);
 __exportStar(require("./automation/types"), exports);

package/dist/ufg/abort.js

@@ -1,37 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAbort = void 0;
-const abort_error_1 = require("../errors/abort-error");
 const driver_1 = require("@applitools/driver");
 function makeAbort({ storage, target, spec, controller, logger: defaultLogger, }) {
-    return async function ({ settings, logger = defaultLogger, } = {}) {
+    return async function abort({ settings, logger = defaultLogger, } = {}) {
+        logger.log('Command "abort" is called with settings', settings);
         controller.abort();
-        const tests = storage.reduce((tests, { renderer, promise }) => {
-            const key = JSON.stringify(renderer);
-            return tests.set(key, promise);
-        }, new Map());
-        return Promise.all(Array.from(tests.values(), async (promise) => {
-            let eyes, renderer;
+        settings !== null && settings !== void 0 ? settings : (settings = {});
+        if (!settings.testMetadata) {
             try {
-                const value = await promise;
-                eyes = value.eyes;
-                renderer = value.renderer;
+                const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
+                settings.testMetadata = await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata());
             }
             catch (error) {
-                eyes = error.info.eyes;
-                renderer = error.info.renderer;
-                if (!eyes) {
-                    if (error instanceof abort_error_1.AbortError)
-                        return error.info;
-                    else
-                        throw error;
-                }
+                logger.warn('Command "abort" received an error during extracting driver metadata', error);
             }
-            const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
-            const testMetadata = await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata());
-            const [result] = await eyes.abort({ settings: { ...settings, testMetadata }, logger });
-            return { ...result, renderer };
-        }));
+        }
+        storage.forEach(async (promises) => {
+            var _a, _b;
+            try {
+                const { eyes } = await Promise.race(promises);
+                await eyes.abort({ settings, logger });
+            }
+            catch (error) {
+                logger.warn('Command "abort" received an error during waiting for eyes instances in background', error);
+                await ((_b = (_a = error === null || error === void 0 ? void 0 : error.info) === null || _a === void 0 ? void 0 : _a.eyes) === null || _b === void 0 ? void 0 : _b.abort({ settings, logger }));
+            }
+        });
     };
 }
 exports.makeAbort = makeAbort;

package/dist/ufg/check-and-close.js

@@ -29,22 +29,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCheckAndClose = void 0;
 const driver_1 = require("@applitools/driver");
 const take_snapshots_1 = require("./utils/take-snapshots");
-const wait_for_lazy_load_1 = require("../utils/wait-for-lazy-load");
-const to_base_check_settings_1 = require("../utils/to-base-check-settings");
+const wait_for_lazy_load_1 = require("../automation/utils/wait-for-lazy-load");
+const to_base_check_settings_1 = require("../automation/utils/to-base-check-settings");
 const generate_safe_selectors_1 = require("./utils/generate-safe-selectors");
 const uniquify_renderers_1 = require("./utils/uniquify-renderers");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
 function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget, logger: defaultLogger, }) {
-    return async function checkAndClose({ target = defaultTarget, settings = {}, logger = defaultLogger, snapshots, }) {
+    return async function checkAndClose({ target = defaultTarget, settings = {}, logger = defaultLogger, }) {
         var _a, _b, _c;
         logger.log('Command "checkAndClose" is called with settings', settings);
-        if (signal.aborted) {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
             logger.warn('Command "checkAndClose" was called after test was already aborted');
             throw new abort_error_1.AbortError('Command "checkAndClose" was called after test was already aborted');
         }
-        const { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
+        const { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({
+            settings,
+        });
+        let snapshots;
         let snapshotUrl;
         let snapshotTitle;
         let userAgent;
@@ -67,13 +70,16 @@ function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget,
                 userAgent = driver.userAgent;
                 const generated = await (0, generate_safe_selectors_1.generateSafeSelectors)({
                     context: driver.currentContext,
-                    elementReferences: [...(elementReferenceToTarget ? [elementReferenceToTarget] : []), ...elementReferencesToCalculate],
+                    elementReferences: [
+                        ...(elementReferenceToTarget ? [elementReferenceToTarget] : []),
+                        ...elementReferencesToCalculate,
+                    ],
                 });
                 cleanupGeneratedSelectors = generated.cleanupGeneratedSelectors;
                 if (elementReferenceToTarget) {
-                    regionToTarget = (_b = generated.selectors[0]) === null || _b === void 0 ? void 0 : _b.safeSelector;
-                    if (!regionToTarget)
+                    if (!((_b = generated.selectors[0]) === null || _b === void 0 ? void 0 : _b.safeSelector))
                         throw new Error('Target element not found');
+                    regionToTarget = generated.selectors[0].safeSelector;
                     selectorsToCalculate = generated.selectors.slice(1);
                 }
                 else {
@@ -81,42 +87,40 @@ function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget,
                 }
             }
             const currentContext = driver.currentContext;
-            if (!snapshots) {
-                snapshots = await (0, take_snapshots_1.takeSnapshots)({
-                    driver,
-                    settings: {
-                        ...eyes.test.server,
-                        waitBeforeCapture: settings.waitBeforeCapture,
-                        disableBrowserFetching: settings.disableBrowserFetching,
-                        layoutBreakpoints: settings.layoutBreakpoints,
-                        renderers: settings.renderers,
-                        skipResources: client.getCachedResourceUrls(),
-                    },
-                    hooks: {
-                        async beforeSnapshots() {
-                            if (driver.isWeb && settings.lazyLoad) {
-                                await (0, wait_for_lazy_load_1.waitForLazyLoad)({
-                                    context: driver.currentContext,
-                                    settings: settings.lazyLoad !== true ? settings.lazyLoad : {},
-                                    logger,
-                                });
-                            }
-                        },
+            snapshots = await (0, take_snapshots_1.takeSnapshots)({
+                driver,
+                settings: {
+                    ...eyes.test.server,
+                    waitBeforeCapture: settings.waitBeforeCapture,
+                    disableBrowserFetching: settings.disableBrowserFetching,
+                    layoutBreakpoints: settings.layoutBreakpoints,
+                    renderers: uniqueRenderers,
+                    skipResources: client.getCachedResourceUrls(),
+                },
+                hooks: {
+                    async beforeSnapshots() {
+                        if (settings.lazyLoad && driver.isWeb) {
+                            await (0, wait_for_lazy_load_1.waitForLazyLoad)({
+                                context: driver.currentContext,
+                                settings: settings.lazyLoad !== true ? settings.lazyLoad : {},
+                                logger,
+                            });
+                        }
                     },
-                    provides: {
-                        getChromeEmulationDevices: client.getChromeEmulationDevices,
-                        getIOSDevices: client.getIOSDevices,
-                    },
-                    logger,
-                });
-            }
+                },
+                provides: {
+                    getChromeEmulationDevices: client.getChromeEmulationDevices,
+                    getIOSDevices: client.getIOSDevices,
+                },
+                logger,
+            });
             await currentContext.focus();
             snapshotUrl = await driver.getUrl();
             snapshotTitle = await driver.getTitle();
             await (cleanupGeneratedSelectors === null || cleanupGeneratedSelectors === void 0 ? void 0 : cleanupGeneratedSelectors());
         }
         else {
-            snapshots = !utils.types.isArray(target) ? Array(settings.renderers.length).fill(target) : target;
+            snapshots = !utils.types.isArray(target) ? Array(uniqueRenderers.length).fill(target) : target;
             snapshotUrl = utils.types.has(snapshots[0], 'url') ? snapshots[0].url : undefined;
         }
         regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_c = elementReferenceToTarget) !== null && _c !== void 0 ? _c : settings.region);
@@ -124,13 +128,13 @@ function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget,
             originalSelector: selector,
             safeSelector: selector,
         })));
-        const promises = settings.renderers.map(async (renderer, index) => {
+        const promises = uniqueRenderers.map(async (renderer, index) => {
             if (utils.types.has(renderer, 'name') && renderer.name === 'edge') {
                 const message = chalk_1.default.yellow(`The 'edge' option that is being used in your browsers' configuration will soon be deprecated. Please change it to either 'edgelegacy' for the legacy version or to 'edgechromium' for the new Chromium-based version. Please note, when using the built-in BrowserType enum, then the values are BrowserType.EDGE_LEGACY and BrowserType.EDGE_CHROMIUM, respectively.`);
                 logger.console.log(message);
             }
             try {
-                if (signal.aborted) {
+                if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                     logger.warn('Command "check" was aborted before rendering');
                     throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                 }
@@ -149,20 +153,20 @@ function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget,
                 });
                 const [baseEyes] = await eyes.getBaseEyes({ settings: { renderer, type: snapshotType }, logger });
                 try {
-                    if (signal.aborted) {
+                    if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                         logger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
-                    else if (baseEyes.aborted) {
+                    else if (!baseEyes.running) {
                         logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
                     const renderTarget = await renderTargetPromise;
-                    if (signal.aborted) {
+                    if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                         logger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
-                    else if (baseEyes.aborted) {
+                    else if (!baseEyes.running) {
                         logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
@@ -170,30 +174,30 @@ function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget,
                         target: renderTarget,
                         settings: {
                             ...settings,
-                            rendererId: baseEyes.test.rendererId,
                             region: regionToTarget,
-                            type: utils.types.has(snapshot, 'cdt') ? 'web' : 'native',
-                            renderer,
                             selectorsToCalculate: selectorsToCalculate.flatMap(({ safeSelector }) => safeSelector !== null && safeSelector !== void 0 ? safeSelector : []),
                             includeFullPageSize: Boolean(settings.pageId),
+                            type: snapshotType,
+                            renderer,
+                            rendererId: baseEyes.test.rendererId,
                         },
                         signal,
                     });
                     let offset = 0;
                     const baseSettings = getBaseCheckSettings({
                         calculatedRegions: selectorsToCalculate.map(({ originalSelector, safeSelector }) => ({
-                            selector: originalSelector,
+                            selector: originalSelector !== null && originalSelector !== void 0 ? originalSelector : undefined,
                             regions: safeSelector ? selectorRegions[offset++] : [],
                         })),
                     });
                     baseSettings.renderId = renderId;
                     baseTarget.source = snapshotUrl;
                     baseTarget.name = snapshotTitle;
-                    if (signal.aborted) {
+                    if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                         logger.warn('Command "check" was aborted after rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted after rendering');
                     }
-                    else if (baseEyes.aborted) {
+                    else if (!baseEyes.running) {
                         logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
@@ -202,11 +206,7 @@ function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget,
                         settings: baseSettings,
                         logger,
                     });
-                    if (baseEyes.aborted) {
-                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
-                    }
-                    return { ...result, eyes, renderer };
+                    return { ...result, eyes: baseEyes, renderer };
                 }
                 catch (error) {
                     await baseEyes.abort();
@@ -223,7 +223,7 @@ function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget,
             var _a, _b;
             try {
                 const result = await promise;
-                return { ...result, userTestId: eyes.test.userTestId, asExpected: true };
+                return { ...result, userTestId: eyes.test.userTestId };
             }
             catch (error) {
                 await ((_b = (_a = error.info) === null || _a === void 0 ? void 0 : _a.eyes) === null || _b === void 0 ? void 0 : _b.abort({ logger }));

package/dist/ufg/check.js

@@ -29,8 +29,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCheck = void 0;
 const driver_1 = require("@applitools/driver");
 const take_snapshots_1 = require("./utils/take-snapshots");
-const wait_for_lazy_load_1 = require("../utils/wait-for-lazy-load");
-const to_base_check_settings_1 = require("../utils/to-base-check-settings");
+const wait_for_lazy_load_1 = require("../automation/utils/wait-for-lazy-load");
+const to_base_check_settings_1 = require("../automation/utils/to-base-check-settings");
 const generate_safe_selectors_1 = require("./utils/generate-safe-selectors");
 const uniquify_renderers_1 = require("./utils/uniquify-renderers");
 const abort_error_1 = require("../errors/abort-error");
@@ -38,13 +38,15 @@ const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
 function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger: defaultLogger, }) {
     return async function check({ target = defaultTarget, settings = {}, logger = defaultLogger, }) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         logger.log('Command "check" is called with settings', settings);
-        if (signal.aborted) {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
             logger.warn('Command "check" was called after test was already aborted');
             throw new abort_error_1.AbortError('Command "check" was called after test was already aborted');
         }
-        const { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
+        const { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({
+            settings,
+        });
         let snapshots;
         let snapshotUrl;
         let snapshotTitle;
@@ -52,8 +54,8 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
         let regionToTarget;
         let selectorsToCalculate;
         const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
-        if ((0, driver_1.isDriver)(target, spec)) {
-            const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
+        const driver = spec && (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
+        if (driver) {
             await driver.currentContext.setScrollingElement((_b = settings.scrollRootElement) !== null && _b !== void 0 ? _b : null);
             if (uniqueRenderers.length === 0) {
                 if (driver.isWeb) {
@@ -69,13 +71,16 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
                 userAgent = driver.userAgent;
                 const generated = await (0, generate_safe_selectors_1.generateSafeSelectors)({
                     context: driver.currentContext,
-                    elementReferences: [...(elementReferenceToTarget ? [elementReferenceToTarget] : []), ...elementReferencesToCalculate],
+                    elementReferences: [
+                        ...(elementReferenceToTarget ? [elementReferenceToTarget] : []),
+                        ...elementReferencesToCalculate,
+                    ],
                 });
                 cleanupGeneratedSelectors = generated.cleanupGeneratedSelectors;
                 if (elementReferenceToTarget) {
-                    regionToTarget = (_c = generated.selectors[0]) === null || _c === void 0 ? void 0 : _c.safeSelector;
-                    if (!regionToTarget)
+                    if (!((_c = generated.selectors[0]) === null || _c === void 0 ? void 0 : _c.safeSelector))
                         throw new Error('Target element not found');
+                    regionToTarget = (_d = generated.selectors[0]) === null || _d === void 0 ? void 0 : _d.safeSelector;
                     selectorsToCalculate = generated.selectors.slice(1);
                 }
                 else {
@@ -119,7 +124,7 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
             snapshots = !utils.types.isArray(target) ? Array(uniqueRenderers.length).fill(target) : target;
             snapshotUrl = utils.types.has(snapshots[0], 'url') ? snapshots[0].url : undefined;
         }
-        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_d = elementReferenceToTarget) !== null && _d !== void 0 ? _d : settings.region);
+        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_e = elementReferenceToTarget) !== null && _e !== void 0 ? _e : settings.region);
         selectorsToCalculate !== null && selectorsToCalculate !== void 0 ? selectorsToCalculate : (selectorsToCalculate = elementReferencesToCalculate.map(selector => ({
             originalSelector: selector,
             safeSelector: selector,
@@ -130,7 +135,7 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
                 logger.console.log(message);
             }
             try {
-                if (signal.aborted) {
+                if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                     logger.warn('Command "check" was aborted before rendering');
                     throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                 }
@@ -149,20 +154,20 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
                 });
                 const [baseEyes] = await eyes.getBaseEyes({ settings: { renderer, type: snapshotType }, logger });
                 try {
-                    if (signal.aborted) {
+                    if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                         logger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
-                    else if (baseEyes.aborted) {
+                    else if (!baseEyes.running) {
                         logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
                     const renderTarget = await renderTargetPromise;
-                    if (signal.aborted) {
+                    if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                         logger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
-                    else if (baseEyes.aborted) {
+                    else if (!baseEyes.running) {
                         logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
@@ -182,32 +187,36 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
                     let offset = 0;
                     const baseSettings = getBaseCheckSettings({
                         calculatedRegions: selectorsToCalculate.map(({ originalSelector, safeSelector }) => ({
-                            selector: originalSelector,
+                            selector: originalSelector !== null && originalSelector !== void 0 ? originalSelector : undefined,
                             regions: safeSelector ? selectorRegions[offset++] : [],
                         })),
                     });
                     baseSettings.renderId = renderId;
                     baseTarget.source = snapshotUrl;
                     baseTarget.name = snapshotTitle;
-                    if (signal.aborted) {
+                    if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                         logger.warn('Command "check" was aborted after rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted after rendering');
                     }
-                    else if (baseEyes.aborted) {
+                    else if (!baseEyes.running) {
                         logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
-                    const [result] = await baseEyes.check({ target: { ...baseTarget, isTransformed: true }, settings: baseSettings, logger });
-                    if (baseEyes.aborted) {
+                    const [result] = await baseEyes.check({
+                        target: { ...baseTarget, isTransformed: true },
+                        settings: baseSettings,
+                        logger,
+                    });
+                    if (!baseEyes.running) {
                         logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
                     return { ...result, eyes: baseEyes, renderer };
                 }
                 catch (error) {
-                    const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
-                    const testMetadata = await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata());
-                    await baseEyes.abort({ settings: { testMetadata } });
+                    if (baseEyes.running && !(signal === null || signal === void 0 ? void 0 : signal.aborted)) {
+                        await baseEyes.abort({ settings: { testMetadata: await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata()) } });
+                    }
                     error.info = { eyes: baseEyes };
                     throw error;
                 }