@applitools/core 1.2.16 → 1.3.0

package/dist/ufg/check.js

@@ -35,9 +35,9 @@ const generate_safe_selectors_1 = require("./utils/generate-safe-selectors");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
-function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget, logger: defaultLogger, }) {
+function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger: defaultLogger, }) {
     return async function check({ target = defaultTarget, settings = {}, logger = defaultLogger, }) {
-        var _a, _b;
+        var _a, _b, _c;
         logger.log('Command "check" is called with settings', settings);
         if (signal.aborted) {
             logger.warn('Command "check" was called after test was already aborted');
@@ -45,9 +45,9 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
         }
         const { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
         let snapshots, snapshotUrl, snapshotTitle, userAgent, regionToTarget, selectorsToCalculate;
-        if (spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) {
-            // TODO driver custom config
+        if ((0, driver_1.isDriver)(target, spec)) {
             const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
+            await driver.currentContext.setScrollingElement((_a = settings.scrollRootElement) !== null && _a !== void 0 ? _a : null);
             if (driver.isWeb && (!settings.renderers || settings.renderers.length === 0)) {
                 const viewportSize = await driver.getViewportSize();
                 settings.renderers = [{ name: 'chrome', ...viewportSize }];
@@ -61,7 +61,7 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
                 });
                 cleanupGeneratedSelectors = generated.cleanupGeneratedSelectors;
                 if (elementReferenceToTarget) {
-                    regionToTarget = (_a = generated.selectors[0]) === null || _a === void 0 ? void 0 : _a.safeSelector;
+                    regionToTarget = (_b = generated.selectors[0]) === null || _b === void 0 ? void 0 : _b.safeSelector;
                     if (!regionToTarget)
                         throw new Error('Target element not found');
                     selectorsToCalculate = generated.selectors.slice(1);
@@ -74,7 +74,7 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
             snapshots = await (0, take_snapshots_1.takeSnapshots)({
                 driver,
                 settings: {
-                    ...test.server,
+                    ...eyes.test.server,
                     waitBeforeCapture: settings.waitBeforeCapture,
                     disableBrowserFetching: settings.disableBrowserFetching,
                     layoutBreakpoints: settings.layoutBreakpoints,
@@ -83,8 +83,12 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
                 },
                 hooks: {
                     async beforeSnapshots() {
-                        if (driver.isWeb && settings.lazyLoad) {
-                            await (0, wait_for_lazy_load_1.waitForLazyLoad)({ driver, settings: settings.lazyLoad !== true ? settings.lazyLoad : {}, logger });
+                        if (settings.lazyLoad && driver.isWeb) {
+                            await (0, wait_for_lazy_load_1.waitForLazyLoad)({
+                                context: driver.currentContext,
+                                settings: settings.lazyLoad !== true ? settings.lazyLoad : {},
+                                logger,
+                            });
                         }
                     },
                 },
@@ -103,7 +107,7 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
             snapshots = !utils.types.isArray(target) ? Array(settings.renderers.length).fill(target) : target;
             snapshotUrl = utils.types.has(snapshots[0], 'url') ? snapshots[0].url : undefined;
         }
-        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_b = elementReferenceToTarget) !== null && _b !== void 0 ? _b : settings.region);
+        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_c = elementReferenceToTarget) !== null && _c !== void 0 ? _c : settings.region);
         selectorsToCalculate !== null && selectorsToCalculate !== void 0 ? selectorsToCalculate : (selectorsToCalculate = elementReferencesToCalculate.map(selector => ({
             originalSelector: selector,
             safeSelector: selector,
@@ -119,42 +123,48 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
                     throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                 }
                 const { cookies, ...snapshot } = snapshots[index];
+                const snapshotType = utils.types.has(snapshot, 'cdt') ? 'web' : 'native';
                 const renderTargetPromise = client.createRenderTarget({
                     snapshot,
-                    settings: { renderer, referer: snapshotUrl, cookies, proxy: test.server.proxy, autProxy: settings.autProxy, userAgent },
+                    settings: {
+                        renderer,
+                        referer: snapshotUrl,
+                        cookies,
+                        proxy: eyes.test.server.proxy,
+                        autProxy: settings.autProxy,
+                        userAgent,
+                    },
                 });
-                const renderSettings = {
-                    ...settings,
-                    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),
-                };
-                const { rendererId, rawEnvironment } = await client.bookRenderer({ settings: renderSettings });
-                const eyes = await getEyes({ rawEnvironment });
+                const [baseEyes] = await eyes.getBaseEyes({ settings: { renderer, type: snapshotType }, logger });
                 try {
                     if (signal.aborted) {
                         logger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
-                    else if (eyes.aborted) {
-                        logger.warn(`Renderer with id ${rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${rendererId}" was aborted during one of the previous steps`);
+                    else 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`);
                     }
-                    renderSettings.rendererId = rendererId;
                     const renderTarget = await renderTargetPromise;
                     if (signal.aborted) {
                         logger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
-                    else if (eyes.aborted) {
-                        logger.warn(`Renderer with id ${rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${rendererId}" was aborted during one of the previous steps`);
+                    else 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`);
                     }
                     const { renderId, selectorRegions, ...baseTarget } = await client.render({
                         target: renderTarget,
-                        settings: renderSettings,
+                        settings: {
+                            ...settings,
+                            region: regionToTarget,
+                            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;
@@ -171,31 +181,31 @@ function makeCheck({ spec, getEyes, client, test, signal, target: defaultTarget,
                         logger.warn('Command "check" was aborted after rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted after rendering');
                     }
-                    else if (eyes.aborted) {
-                        logger.warn(`Renderer with id ${rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${rendererId}" was aborted during one of the previous steps`);
+                    else 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`);
                     }
-                    const [result] = await eyes.check({ target: { ...baseTarget, isTransformed: true }, settings: baseSettings, logger });
-                    if (eyes.aborted) {
-                        logger.warn(`Renderer with id ${rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${rendererId}" was aborted during one of the previous steps`);
+                    const [result] = await baseEyes.check({ target: { ...baseTarget, isTransformed: true }, 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 eyes.abort();
-                    error.info = { eyes };
+                    await baseEyes.abort();
+                    error.info = { eyes: baseEyes };
                     throw error;
                 }
             }
             catch (error) {
-                error.info = { ...error.info, userTestId: test.userTestId, renderer };
+                error.info = { ...error.info, userTestId: eyes.test.userTestId, renderer };
                 throw error;
             }
         });
         return settings.renderers.map((renderer, index) => ({
             asExpected: true,
-            userTestId: test.userTestId,
+            userTestId: eyes.test.userTestId,
             renderer,
             promise: promises[index],
         }));

package/dist/ufg/get-base-eyes.js

@@ -0,0 +1,40 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeGetBaseEyes = void 0;
+const utils = __importStar(require("@applitools/utils"));
+function makeGetBaseEyes({ settings: defaultSettings, core, client, eyes, logger: defaultLogger }) {
+    const getBaseEyesWithCache = utils.general.cachify(getBaseEyes, ([options]) => options === null || options === void 0 ? void 0 : options.settings);
+    if (eyes)
+        eyes.forEach(eyes => getBaseEyesWithCache.setCachedValue(eyes.test.rendererInfo, Promise.resolve([eyes])));
+    return getBaseEyesWithCache;
+    async function getBaseEyes({ settings, logger = defaultLogger, } = {}) {
+        logger.log(`Command "getBaseEyes" is called with settings`, settings);
+        const environment = await client.bookRenderer({ settings });
+        const eyes = await core.openEyes({ settings: { ...defaultSettings, environment }, logger });
+        return [eyes];
+    }
+}
+exports.makeGetBaseEyes = makeGetBaseEyes;

package/dist/ufg/open-eyes.js

@@ -24,133 +24,83 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeOpenEyes = void 0;
-const abort_controller_1 = require("abort-controller");
 const driver_1 = require("@applitools/driver");
 const ufg_client_1 = require("@applitools/ufg-client");
+const get_base_eyes_1 = require("./get-base-eyes");
 const check_1 = require("./check");
 const check_and_close_1 = require("./check-and-close");
 const close_1 = require("./close");
 const abort_1 = require("./abort");
+const abort_controller_1 = require("abort-controller");
 const utils = __importStar(require("@applitools/utils"));
-function makeOpenEyes({ spec, core, client, logger: defaultLogger, }) {
-    return async function openEyes({ target, settings, logger = defaultLogger, }) {
-        var _a, _b, _c;
-        logger.log(`Command "openEyes" is called with ${(spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? 'default driver and' : ''} settings`, settings);
-        if (spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) {
-            const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: { disableHelper: true } });
+function makeOpenEyes({ core, client, spec, logger: defaultLogger, }) {
+    return async function openEyes({ target, settings, eyes, logger = defaultLogger, }) {
+        var _a, _b;
+        logger.log(`Command "openEyes" is called with ${target ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), eyes ? 'predefined eyes' : '');
+        const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: { disableHelper: true } }));
+        if (driver && !eyes) {
             const currentContext = driver.currentContext;
             if ((_a = settings.environment) === null || _a === void 0 ? void 0 : _a.viewportSize) {
                 await driver.setViewportSize(settings.environment.viewportSize);
             }
             await currentContext.focus();
         }
+        const controller = new abort_controller_1.AbortController();
         const account = await core.getAccountInfo({ settings, logger });
-        const test = {
-            userTestId: settings.userTestId,
-            batchId: (_b = settings.batch) === null || _b === void 0 ? void 0 : _b.id,
-            keepBatchOpen: settings.keepBatchOpen,
-            server: { serverUrl: settings.serverUrl, apiKey: settings.apiKey, proxy: settings.proxy },
-            account,
-        };
         client !== null && client !== void 0 ? client : (client = (0, ufg_client_1.makeUFGClient)({
             config: { ...account.ufg, ...account, proxy: settings.proxy },
-            concurrency: (_c = settings.renderConcurrency) !== null && _c !== void 0 ? _c : 5,
+            concurrency: (_b = settings.renderConcurrency) !== null && _b !== void 0 ? _b : 5,
             logger,
         }));
-        const controller = new abort_controller_1.AbortController();
-        // get eyes per environment
-        const getEyes = utils.general.cachify(async ({ rawEnvironment }) => {
-            const eyes = await core.openEyes({ settings: { ...settings, environment: { rawEnvironment } }, logger });
-            const aborted = makeHolderPromise();
-            const queue = [];
-            eyes.check = utils.general.wrap(eyes.check, async (check, options) => {
-                var _a, _b;
-                var _c;
-                const index = options.settings.index;
-                (_a = queue[index]) !== null && _a !== void 0 ? _a : (queue[index] = makeHolderPromise());
-                if (index > 0)
-                    await Promise.race([((_b = queue[_c = index - 1]) !== null && _b !== void 0 ? _b : (queue[_c] = makeHolderPromise())), aborted]);
-                return check(options).finally(queue[index].resolve);
-            });
-            eyes.abort = utils.general.wrap(eyes.abort, async (abort, options) => {
-                aborted.reject(new Error('Command "check" was aborted due to possible error in previous step'));
-                return abort(options);
-            });
-            return eyes;
-        });
-        const storage = [];
-        let index = 0;
-        // check with indexing and storage
-        const check = utils.general.wrap((0, check_1.makeCheck)({ spec, getEyes, client, signal: controller.signal, test, target, logger }), async (check, options = {}) => {
+        const getBaseEyes = (0, get_base_eyes_1.makeGetBaseEyes)({ settings, eyes, core, client, logger });
+        return utils.general.extend({}, eyes => {
             var _a;
-            (_a = options.settings) !== null && _a !== void 0 ? _a : (options.settings = {});
-            options.settings.index = index++;
-            const results = await check(options);
-            storage.push(...results.map(result => ({ promise: result.promise, renderer: result.renderer })));
-            return results;
+            const storage = [];
+            let stepIndex = 0;
+            let closed = false;
+            let aborted = false;
+            return {
+                type: 'ufg',
+                test: {
+                    userTestId: settings.userTestId,
+                    batchId: (_a = settings.batch) === null || _a === void 0 ? void 0 : _a.id,
+                    keepBatchOpen: settings.keepBatchOpen,
+                    server: { serverUrl: settings.serverUrl, apiKey: settings.apiKey, proxy: settings.proxy },
+                    account,
+                },
+                get running() {
+                    return !closed && !aborted;
+                },
+                get closed() {
+                    return closed;
+                },
+                get aborted() {
+                    return aborted;
+                },
+                getBaseEyes,
+                // check with indexing and storage
+                check: utils.general.wrap((0, check_1.makeCheck)({ eyes, client, target: driver, spec, signal: controller.signal, logger }), async (check, options = {}) => {
+                    const results = await check({ ...options, settings: { ...options.settings, stepIndex: stepIndex++ } });
+                    storage.push(...results.map(result => ({ promise: result.promise, renderer: result.renderer })));
+                    return results;
+                }),
+                checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ eyes, client, target: driver, spec, signal: controller.signal, logger }),
+                // close only once
+                close: utils.general.wrap((0, close_1.makeClose)({ storage, logger }), async (close, options) => {
+                    if (closed || aborted)
+                        return [];
+                    closed = true;
+                    return close(options);
+                }),
+                // abort only once
+                abort: utils.general.wrap((0, abort_1.makeAbort)({ storage, controller, logger }), async (abort, options) => {
+                    if (aborted || closed)
+                        return [];
+                    aborted = true;
+                    return abort(options);
+                }),
+            };
         });
-        let closed = false;
-        // close only once
-        const close = utils.general.wrap((0, close_1.makeClose)({ storage, logger }), async (close, options) => {
-            if (closed || aborted)
-                return [];
-            closed = true;
-            return close(options);
-        });
-        let aborted = false;
-        // abort only once
-        const abort = utils.general.wrap((0, abort_1.makeAbort)({ storage, controller, logger }), async (abort, options) => {
-            if (aborted || closed)
-                return [];
-            aborted = true;
-            return abort(options);
-        });
-        return {
-            test,
-            get running() {
-                return !closed && !aborted;
-            },
-            get closed() {
-                return closed;
-            },
-            get aborted() {
-                return aborted;
-            },
-            check,
-            checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ spec, getEyes, client, test, target, logger }),
-            close,
-            abort,
-        };
     };
 }
 exports.makeOpenEyes = makeOpenEyes;
-function makeHolderPromise() {
-    let promise;
-    let resolve;
-    let reject;
-    let result;
-    return {
-        then(onFulfilled, onRejected) {
-            if (!promise) {
-                promise = new Promise((...args) => ([resolve, reject] = args));
-                if ((result === null || result === void 0 ? void 0 : result.status) === 'fulfilled')
-                    resolve();
-                else if ((result === null || result === void 0 ? void 0 : result.status) === 'rejected')
-                    reject(result.reason);
-            }
-            return promise.then(onFulfilled, onRejected);
-        },
-        resolve() {
-            if (resolve)
-                resolve();
-            else
-                result !== null && result !== void 0 ? result : (result = { status: 'fulfilled' });
-        },
-        reject(reason) {
-            if (reject)
-                reject(reason);
-            else
-                result !== null && result !== void 0 ? result : (result = { status: 'rejected', reason });
-        },
-    };
-}

package/dist/utils/wait-for-lazy-load.js

@@ -2,16 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForLazyLoad = void 0;
 const snippets_1 = require("@applitools/snippets");
-async function waitForLazyLoad({ driver, settings, logger, }) {
+async function waitForLazyLoad({ context, settings, logger, }) {
     var _a, _b, _c, _d, _e;
     logger.log('lazy loading the page before capturing a screenshot');
-    const arg = {
-        scrollLength: (_a = settings.scrollLength) !== null && _a !== void 0 ? _a : 300,
-        waitingTime: (_b = settings.waitingTime) !== null && _b !== void 0 ? _b : 2000,
-        maxAmountToScroll: (_c = settings.maxAmountToScroll) !== null && _c !== void 0 ? _c : 15000,
-    };
-    await driver.currentContext.executePoll(snippets_1.lazyLoad, {
-        main: [arg],
+    await context.executePoll(snippets_1.lazyLoad, {
+        main: [
+            await context.getScrollingElement(),
+            {
+                scrollLength: (_a = settings.scrollLength) !== null && _a !== void 0 ? _a : 300,
+                waitingTime: (_b = settings.waitingTime) !== null && _b !== void 0 ? _b : 2000,
+                maxAmountToScroll: (_c = settings.maxAmountToScroll) !== null && _c !== void 0 ? _c : 15000,
+            },
+        ],
         poll: [],
         executionTimeout: 5 * 60 * 1000,
         pollTimeout: (_e = (_d = settings.pollTimeout) !== null && _d !== void 0 ? _d : settings.waitingTime) !== null && _e !== void 0 ? _e : 2000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "1.2.16",
+  "version": "1.3.0",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -61,28 +61,30 @@
     }
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.15",
+    "@applitools/core-base": "1.1.17",
     "@applitools/dom-capture": "11.2.0",
-    "@applitools/dom-snapshot": "4.7.1",
-    "@applitools/driver": "1.11.9",
-    "@applitools/logger": "1.1.30",
-    "@applitools/nml-client": "1.3.12",
-    "@applitools/req": "1.1.17",
-    "@applitools/screenshoter": "3.7.10",
-    "@applitools/snippets": "2.4.8",
-    "@applitools/ufg-client": "1.1.6",
-    "@applitools/utils": "1.3.16",
+    "@applitools/dom-snapshot": "4.7.2",
+    "@applitools/driver": "1.11.14",
+    "@applitools/logger": "1.1.32",
+    "@applitools/nml-client": "1.3.14",
+    "@applitools/req": "1.1.19",
+    "@applitools/screenshoter": "3.7.13",
+    "@applitools/snippets": "2.4.10",
+    "@applitools/ufg-client": "1.1.8",
+    "@applitools/utils": "1.3.18",
     "abort-controller": "3.0.0",
+    "chalk": "4.1.2",
+    "node-fetch": "2.6.7",
     "throat": "6.0.1"
   },
   "devDependencies": {
     "@applitools/bongo": "^2.2.0",
     "@applitools/sdk-fake-eyes-server": "^2.1.3",
-    "@applitools/spec-driver-puppeteer": "^1.1.23",
-    "@applitools/spec-driver-selenium": "^1.5.9",
-    "@applitools/spec-driver-webdriverio": "^1.4.7",
-    "@applitools/test-server": "^1.1.11",
-    "@applitools/test-utils": "^1.5.2",
+    "@applitools/spec-driver-puppeteer": "^1.1.26",
+    "@applitools/spec-driver-selenium": "^1.5.12",
+    "@applitools/spec-driver-webdriverio": "^1.4.9",
+    "@applitools/test-server": "^1.1.13",
+    "@applitools/test-utils": "^1.5.3",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",
     "@types/selenium-webdriver": "^4.1.2",
@@ -102,7 +104,7 @@
     "puppeteer": "^16.2.0",
     "selenium-webdriver": "4.4",
     "ts-node": "^10.7.0",
-    "typescript": "^4.8.3",
+    "typescript": "^4.9.4",
     "webdriverio": "^7.25.0"
   },
   "engines": {

package/types/automation/get-viewport-size.d.ts

@@ -1,11 +1,12 @@
+import type { DriverTarget } from './types';
 import { type Logger } from '@applitools/logger';
 import { type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+type Options<TDriver, TContext, TElement, TSelector> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeGetViewportSize<TDriver, TContext, TElement, TSelector>({ spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, logger }: {
-    target: TDriver;
+export declare function makeGetViewportSize<TDriver, TContext, TElement, TSelector>({ spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, logger, }: {
+    target: DriverTarget<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 }) => Promise<import("@applitools/utils").Size>;
 export {};

package/types/automation/locate.d.ts

@@ -1,16 +1,15 @@
-import type { Target, LocateSettings, LocateResult } from './types';
-import type { Core as BaseCore, Target as BaseTarget } from '@applitools/core-base';
+import type { DriverTarget, ImageTarget, LocateSettings, LocateResult } from './types';
+import type { Core as BaseCore } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
 import { type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
-    spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
+type Options<TDriver, TContext, TElement, TSelector> = {
     core: BaseCore;
-    target?: Target<TDriver>;
+    spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeLocate<TDriver, TContext, TElement, TSelector>({ spec, core, target: defaultTarget, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): <TLocator extends string>({ target, settings, logger, }?: {
-    target?: Target<TDriver> | BaseTarget;
-    settings?: LocateSettings<TLocator, TElement, TSelector>;
+export declare function makeLocate<TDriver, TContext, TElement, TSelector>({ spec, core, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): <TLocator extends string>({ settings, target, logger, }: {
+    target: DriverTarget<TDriver, TContext, TElement, TSelector> | ImageTarget;
+    settings: LocateSettings<TLocator, TElement, TSelector>;
     logger?: Logger;
 }) => Promise<LocateResult<TLocator>>;
 export {};

package/types/automation/set-viewport-size.d.ts

@@ -1,12 +1,13 @@
 import type { Size } from '@applitools/utils';
+import type { DriverTarget } from './types';
 import { type Logger } from '@applitools/logger';
 import { type SpecDriver } from '@applitools/driver';
-declare type Options<TDriver, TContext, TElement, TSelector> = {
+type Options<TDriver, TContext, TElement, TSelector> = {
     spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
     logger?: Logger;
 };
-export declare function makeSetViewportSize<TDriver, TContext, TElement, TSelector>({ spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, size, logger }: {
-    target: TDriver;
+export declare function makeSetViewportSize<TDriver, TContext, TElement, TSelector>({ spec, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): ({ target, size, logger, }: {
+    target: DriverTarget<TDriver, TContext, TElement, TSelector>;
     size: Size;
     logger?: Logger;
 }) => Promise<void>;