@applitools/core 1.4.6 → 1.4.8

package/dist/ufg/utils/take-vhses.js

@@ -1,131 +1,109 @@
 "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.takeVHSes = void 0;
-const utils = __importStar(require("@applitools/utils"));
 async function takeVHSes({ driver, settings, hooks, logger, }) {
     var _a;
     logger.log('taking VHS');
     if (!driver.isAndroid && !driver.isIOS) {
-        throwError('cannot take VHS on mobile device other than iOS or Android');
+        throw new Error('cannot take VHS on mobile device other than iOS or Android');
     }
     await ((_a = hooks === null || hooks === void 0 ? void 0 : hooks.beforeSnapshots) === null || _a === void 0 ? void 0 : _a.call(hooks));
-    const trigger = await findElement({
-        driver,
-        selector: 'UFG_TriggerArea',
-        type: 'Button',
-        timeout: 30000,
-    });
+    const trigger = await driver.waitFor(driver.isAndroid
+        ? { type: 'xpath', selector: `//android.widget.Button[@content-desc="UFG_TriggerArea"]` }
+        : { type: 'accessibility id', selector: 'UFG_TriggerArea' }, { timeout: 30000 });
+    if (!trigger)
+        throw new Error('Trigger element could not be found');
     if (driver.isAndroid) {
-        const apiKeyInput = await findElement({
-            driver,
-            selector: 'UFG_Apikey',
-            type: 'EditText',
-            throwErr: false,
+        const apiKeyInput = await driver.element({
+            type: 'xpath',
+            selector: `//android.widget.EditText[@content-desc="UFG_Apikey"]`,
         });
         if (apiKeyInput) {
             // in case 'apiKeyInput' does not exist, it means it was already triggered on previous cycle
             // this condition is to avoid re-sending 'inputJson' multiple times
             const inputString = JSON.stringify({
-                serverUrl: settings.serverUrl || undefined,
+                serverUrl: settings.serverUrl,
                 apiKey: settings.apiKey,
-                proxy: settings.proxy ? transformProxy(settings.proxy) : undefined,
+                proxy: settings.proxy && transformProxy(settings.proxy),
             });
-            log('sending API key to UFG lib', inputString);
+            logger.log('sending API key to UFG lib', inputString);
             await apiKeyInput.type(inputString);
-            const ready = await findElement({
-                driver,
-                selector: 'UFG_ApikeyReady',
-                type: 'Button',
+            const ready = await driver.element({
+                type: 'xpath',
+                selector: `//android.widget.Button[@content-desc="UFG_ApikeyReady"]`,
             });
+            if (!ready)
+                throw new Error('Api key readiness element could not be found');
             await ready.click();
         }
         else {
-            log('UFG_Apikey was skipped');
+            logger.log('UFG_Apikey was skipped');
         }
     }
     await trigger.click(); // TODO handle stale element exception and then find the trigger again and click it
-    let label = await findElement({
-        driver,
-        selector: 'UFG_SecondaryLabel',
-        type: 'TextView',
-        timeout: 10000,
-        throwErr: false,
-    });
+    let label = await driver.waitFor(driver.isAndroid
+        ? { type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_SecondaryLabel"]` }
+        : { type: 'accessibility id', selector: 'UFG_SecondaryLabel' }, { timeout: 10000 });
     if (!label) {
         // This might happen if the tap on the trigger area didn't happen due to Appium bug. So we try to find the trigger again and if it's present, we'll tap it.
         // If the trigger area is not present, then we're probably at the middle of taking the VHS - give it 50 seconds more until we give up
-        log('UFG_SecondaryLabel was not found after 10 seconds, trying to click UFG_TriggerArea again');
-        const triggerRetry = await findElement({
-            driver,
-            selector: 'UFG_TriggerArea',
-            type: 'Button',
-            timeout: 30000,
-            throwErr: false,
-        });
+        logger.log('UFG_SecondaryLabel was not found after 10 seconds, trying to click UFG_TriggerArea again');
+        const triggerRetry = await driver.waitFor(driver.isAndroid
+            ? { type: 'xpath', selector: `//android.widget.Button[@content-desc="UFG_TriggerArea"]` }
+            : { type: 'accessibility id', selector: 'UFG_TriggerArea' }, { timeout: 30000 });
         if (triggerRetry) {
-            log('UFG_TriggerArea was found on retry. clicking it.');
+            logger.log('UFG_TriggerArea was found on retry. clicking it.');
             await triggerRetry.click();
         }
         else {
-            log('UFG_TriggerArea was NOT found on retry. Probably VHS is being taken.');
+            logger.log('UFG_TriggerArea was NOT found on retry. Probably VHS is being taken.');
         }
-        label = await findElement({
-            driver,
-            selector: 'UFG_SecondaryLabel',
-            type: 'TextView',
-            timeout: 50000,
-        });
+        label = await driver.waitFor(driver.isAndroid
+            ? { type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_SecondaryLabel"]` }
+            : { type: 'accessibility id', selector: 'UFG_SecondaryLabel' }, { timeout: 50000 });
         if (!label) {
-            log('UFG_SecondaryLabel was not found eventually. Giving up.');
+            logger.log('UFG_SecondaryLabel was not found eventually. Giving up.');
+            throw new Error('Secondary label element could not be found');
         }
     }
     const info = JSON.parse(await label.getText());
-    log('VHS info', info);
-    if (info.error) {
-        throwError(info.error);
-    }
-    let vhs;
+    logger.log('VHS info', info);
+    if (info.error)
+        throw new Error(`Error while taking VHS - ${info.error}`);
+    let vhs = '';
     if (driver.isIOS) {
-        vhs = await extractVHS();
+        const label = await driver.element({ type: 'accessibility id', selector: 'UFG_Label' });
+        if (!label)
+            throw new Error('VHS label element could not be found');
+        vhs = await label.getText();
     }
     else if (info.mode === 'labels') {
-        vhs = await collectChunkedVHS({ count: info.partsCount });
+        const labels = [
+            await driver.element({ type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_Label_0"]` }),
+            await driver.element({ type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_Label_1"]` }),
+            await driver.element({ type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_Label_2"]` }),
+        ];
+        if (labels.some(label => !label))
+            throw new Error('VHS label element could not be found');
+        for (let chunk = 0; chunk < info.partsCount / labels.length; ++chunk) {
+            for (let label = 0; label < Math.min(labels.length, info.partsCount - chunk * labels.length); ++label) {
+                vhs += await labels[label].getText();
+            }
+            if (chunk * labels.length < info.partsCount)
+                await trigger.click();
+        }
     }
     else if (info.mode === 'network') {
         // do nothing
     }
     else {
-        throwError(`unknown mode for android: ${info.mode}`);
+        throw new Error(`unknown mode for android: ${info.mode}`);
     }
-    const clear = await findElement({
-        driver,
-        selector: 'UFG_ClearArea',
-        type: 'Button',
-        timeout: 30000,
-    });
+    const clear = await driver.waitFor(driver.isAndroid
+        ? { type: 'xpath', selector: `//android.widget.Button[@content-desc="UFG_ClearArea"]` }
+        : { type: 'accessibility id', selector: 'UFG_ClearArea' }, { timeout: 30000 });
+    if (!clear)
+        throw new Error('Clear element could not be found');
     await clear.click();
     let snapshot;
     if (driver.isAndroid) {
@@ -155,46 +133,6 @@ async function takeVHSes({ driver, settings, hooks, logger, }) {
         };
     }
     return Array(settings.renderers.length).fill(snapshot);
-    async function extractVHS() {
-        const label = await findElement({
-            driver,
-            selector: 'UFG_Label',
-            type: 'TextView',
-        });
-        return await label.getText();
-    }
-    async function collectChunkedVHS({ count }) {
-        const labels = [
-            await findElement({
-                driver,
-                selector: 'UFG_Label_0',
-                type: 'TextView',
-            }),
-            await findElement({
-                driver,
-                selector: 'UFG_Label_1',
-                type: 'TextView',
-            }),
-            await findElement({
-                driver,
-                selector: 'UFG_Label_2',
-                type: 'TextView',
-            }),
-        ];
-        let vhs = '';
-        for (let chunk = 0; chunk < count / labels.length; ++chunk) {
-            for (let label = 0; label < Math.min(labels.length, count - chunk * labels.length); ++label) {
-                vhs += await labels[label].getText();
-            }
-            if (chunk * labels.length < count) {
-                await trigger.click();
-            }
-        }
-        return vhs;
-    }
-    function log(...msg) {
-        logger.log('[takeVHSes]', ...msg);
-    }
 }
 exports.takeVHSes = takeVHSes;
 function transformProxy(proxy) {
@@ -212,47 +150,3 @@ function transformProxy(proxy) {
     }
     return transformedProxy;
 }
-function throwError(msg) {
-    throw new Error(`Error while taking VHS - ${msg}`);
-}
-async function findElement(options) {
-    const { selector, timeout = 0, throwErr = true } = options;
-    let element = await findElementBySelector(options);
-    if (!element && timeout)
-        element = await waitFor(options);
-    if (!element && throwErr) {
-        const timeoutError = timeout ? `, (waited for ${timeout} ms)` : '.';
-        throwError(`${selector} element could not be found${timeoutError}`);
-    }
-    return element;
-    async function waitFor(options) {
-        const { timeout } = options;
-        const interval = 500;
-        let waiting = true;
-        const waitTime = setTimeout(() => (waiting = false), timeout);
-        while (waiting) {
-            const element = await findElementBySelector(options);
-            if (element) {
-                clearTimeout(waitTime);
-                return element;
-            }
-            await utils.general.sleep(interval);
-        }
-        return null;
-    }
-    async function findElementBySelector(options) {
-        const { driver, selector, type } = options;
-        const context = driver.currentContext;
-        let element;
-        if (driver.isAndroid) {
-            element = await driver.element({
-                type: 'xpath',
-                selector: `//android.widget.${type}[@content-desc="${selector}"]`,
-            });
-        }
-        else {
-            element = await context.element({ type: 'accessibility id', selector });
-        }
-        return element;
-    }
-}

package/dist/utils/format-results.js

@@ -4,13 +4,13 @@ exports.toJsonOutput = exports.toXmlOutput = exports.toFlattenedTAPString = expo
 const OK = 'ok';
 const NOT_OK = 'not ok';
 function toFormatterString(results, { includeSubTests = true, markNewAsPassed = false } = {}) {
-    if (results.length === 0) {
+    var _a;
+    if (results.length === 0)
         return 'No results found.';
-    }
     let formattedString = '[EYES: TEST RESULTS]:\n';
-    for (let i = 0; i < results.length; i += 1) {
-        /** @type {TestResults} */ const currentResult = results[i];
-        const testTitle = `${currentResult.name} [${currentResult.hostDisplaySize.width}x${currentResult.hostDisplaySize.height}]`;
+    results.forEach(currentResult => {
+        var _a, _b, _c, _d;
+        const testTitle = `${currentResult.name} [${(_a = currentResult.hostDisplaySize) === null || _a === void 0 ? void 0 : _a.width}x${(_b = currentResult.hostDisplaySize) === null || _b === void 0 ? void 0 : _b.height}]`;
         let testResult = '';
         if (currentResult.isNew) {
             testResult = markNewAsPassed ? 'Passed' : 'New';
@@ -19,39 +19,35 @@ function toFormatterString(results, { includeSubTests = true, markNewAsPassed =
             testResult = 'Passed';
         }
         else {
-            const stepsFailed = currentResult.mismatches + currentResult.missing;
+            const stepsFailed = ((_c = currentResult.mismatches) !== null && _c !== void 0 ? _c : 0) + ((_d = currentResult.missing) !== null && _d !== void 0 ? _d : 0);
             testResult = `Failed ${stepsFailed} of ${currentResult.steps}`;
         }
         formattedString += `${testTitle} - ${testResult}\n`;
         if (includeSubTests) {
-            if (currentResult.stepsInfo.length > 0) {
-                for (let j = 0; j < currentResult.stepsInfo.length; j += 1) {
-                    const currentStep = currentResult.stepsInfo[j];
+            if (currentResult.stepsInfo && currentResult.stepsInfo.length > 0) {
+                currentResult.stepsInfo.forEach(currentStep => {
                     const subTestTitle = currentStep.name;
                     const subTestResult = currentStep.isDifferent ? 'Passed' : 'Failed';
                     formattedString += `\t> ${subTestTitle} - ${subTestResult}\n`;
-                }
+                });
             }
             else {
                 formattedString += '\tNo steps exist for this test.\n';
             }
         }
-    }
-    formattedString += `See details at ${results[0].appUrls.batch}`;
+    });
+    formattedString += `See details at ${(_a = results[0].appUrls) === null || _a === void 0 ? void 0 : _a.batch}`;
     return formattedString;
 }
 exports.toFormatterString = toFormatterString;
 function toHierarchicTAPString(results, { includeSubTests = true, markNewAsPassed = false } = {}) {
-    if (results.length === 0) {
+    if (results.length === 0)
         return '';
-    }
     let tapString = `1..${results.length}\n`;
-    for (let i = 0; i < results.length; i += 1) {
-        /** @type {TestResults} */ const currentResult = results[i];
-        const tapIndex = i + 1;
-        if (i > 0) {
+    results.forEach((currentResult, index) => {
+        if (index > 0)
             tapString += '#\n';
-        }
+        const tapIndex = index + 1;
         const name = `Test: '${currentResult.name}', Application: '${currentResult.appName}'`;
         if (!currentResult.isDifferent) {
             tapString += `${OK} ${tapIndex} - [PASSED TEST] ${name}\n`;
@@ -73,24 +69,26 @@ function toHierarchicTAPString(results, { includeSubTests = true, markNewAsPasse
             }
             tapString += `#\tMismatches: ${currentResult.mismatches}\n`;
         }
-        const url = currentResult.appUrls && currentResult.appUrls.session ? currentResult.appUrls.session : "No URL (session didn't start).";
+        const url = currentResult.appUrls && currentResult.appUrls.session
+            ? currentResult.appUrls.session
+            : "No URL (session didn't start).";
         tapString += `#\tTest url: ${url}\n`;
         tapString += `#\tBrowser: ${currentResult.hostApp}, Viewport: ${currentResult.hostDisplaySize}\n`;
         if (includeSubTests) {
-            if (currentResult.stepsInfo.length > 0) {
+            if (currentResult.stepsInfo && currentResult.stepsInfo.length > 0) {
                 tapString += `\t1..${currentResult.stepsInfo.length}\n`;
-                for (let j = 0; j < currentResult.stepsInfo.length; j += 1) {
-                    const currentStep = currentResult.stepsInfo[j];
+                currentResult.stepsInfo.forEach(currentStep => {
+                    var _a;
                     tapString += '\t';
                     tapString += currentStep.isDifferent ? NOT_OK : OK;
-                    tapString += ` '${currentStep.name}', URL: ${currentStep.appUrls.step}\n`;
-                }
+                    tapString += ` '${currentStep.name}', URL: ${(_a = currentStep.appUrls) === null || _a === void 0 ? void 0 : _a.step}\n`;
+                });
             }
             else {
                 tapString += '\tNo steps exist for this test.\n';
             }
         }
-    }
+    });
     return tapString;
 }
 exports.toHierarchicTAPString = toHierarchicTAPString;
@@ -98,10 +96,9 @@ function toFlattenedTAPString(results, { markNewAsPassed = false } = {}) {
     let tapString = '';
     let stepsCounter = 0;
     // We'll add the TAP plan at the beginning, after we calculate the total number of steps.
-    for (let i = 0; i < results.length; i += 1) {
+    results.forEach((currentResult, index) => {
         tapString += '#\n';
-        /** @type {TestResults} */ const currentResult = results[i];
-        const tapIndex = i + 1;
+        const tapIndex = index + 1;
         const name = `Test: '${currentResult.name}', Application: '${currentResult.appName}'`;
         if (!currentResult.isDifferent) {
             tapString += `# ${OK} ${tapIndex} - [PASSED TEST] ${name}\n`;
@@ -123,20 +120,22 @@ function toFlattenedTAPString(results, { markNewAsPassed = false } = {}) {
             }
             tapString += `#\tMismatches: ${currentResult.mismatches}\n`;
         }
-        const url = currentResult.appUrls && currentResult.appUrls.session ? currentResult.appUrls.session : "No URL (session didn't start).";
+        const url = currentResult.appUrls && currentResult.appUrls.session
+            ? currentResult.appUrls.session
+            : "No URL (session didn't start).";
         tapString += `#\tTest url: ${url}\n`;
-        if (currentResult.stepsInfo.length > 0) {
-            for (let j = 0; j < currentResult.stepsInfo.length; j += 1) {
+        if (currentResult.stepsInfo && currentResult.stepsInfo.length > 0) {
+            currentResult.stepsInfo.forEach(currentStep => {
+                var _a;
                 stepsCounter += 1;
-                const currentStep = currentResult.stepsInfo[j];
                 tapString += currentStep.isDifferent ? NOT_OK : OK;
-                tapString += ` ${stepsCounter} '${currentStep.name}', URL: ${currentStep.appUrls.step}\n`;
-            }
+                tapString += ` ${stepsCounter} '${currentStep.name}', URL: ${(_a = currentStep.appUrls) === null || _a === void 0 ? void 0 : _a.step}\n`;
+            });
         }
         else {
             tapString += '#\tNo steps exist for this test.\n';
         }
-    }
+    });
     if (stepsCounter > 0) {
         tapString = `1..${stepsCounter}\n${tapString}`;
     }
@@ -148,6 +147,7 @@ function toXmlOutput(results, { totalTime } = {}) {
     let output = `<?xml version="1.0" encoding="UTF-8" ?>`;
     output += `\n<testsuite name="${suiteName}" tests="${results.length}" time="${totalTime}">`;
     results.forEach(result => {
+        var _a;
         output += `\n<testcase name="${result.name}"${result.duration ? ` time="${result.duration}"` : ''}>`;
         const properties = {};
         if (result.hostOS)
@@ -165,7 +165,7 @@ function toXmlOutput(results, { totalTime } = {}) {
         }
         if (result.isDifferent) {
             output += `\n<failure>`;
-            output += `\nDifference found. See ${result.appUrls.batch} for details.`;
+            output += `\nDifference found. See ${(_a = result.appUrls) === null || _a === void 0 ? void 0 : _a.batch} for details.`;
             output += `\n</failure>`;
         }
         else if (result.isAborted) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -40,74 +40,57 @@
     "types"
   ],
   "scripts": {
-    "lint": "eslint '**/*.ts'",
-    "build": "tsc --project ./tsconfig.build.json",
+    "lint": "node ../../node_modules/.bin/eslint '**/*.ts'",
+    "build": "node ../../node_modules/.bin/tsc --project ./tsconfig.build.json",
     "test": "mocha --no-timeouts -r ts-node/register --parallel --jobs 15 './test/**/*.spec.ts'",
     "test:sanity": "yarn test:unit",
     "test:e2e": "mocha --no-timeouts -r ts-node/register --parallel --jobs 15 './test/e2e/**/*.spec.ts'",
     "test:it": "mocha --no-timeouts -r ts-node/register './test/it/**/*.spec.ts'",
     "test:unit": "mocha --no-timeouts -r ts-node/register './test/unit/**/*.spec.ts'",
     "setup": "yarn docker:setup",
-    "docker:setup": "node ../scripts/scripts/generate-docker-compose-config.js && docker-compose up -d",
+    "docker:setup": "node ../../scripts/generate-docker-compose-config.js && docker-compose up -d",
     "docker:teardown": "docker-compose down",
     "deps": "bongo deps",
     "preversion": "bongo preversion",
     "version": "bongo version",
     "postversion": "bongo postversion --skip-release-notification"
   },
-  "husky": {
-    "hooks": {
-      "pre-push": "yarn bongo lint"
-    }
-  },
   "dependencies": {
-    "@applitools/core-base": "1.1.32",
+    "@applitools/core-base": "1.1.35",
     "@applitools/dom-capture": "11.2.1",
     "@applitools/dom-snapshot": "4.7.3",
-    "@applitools/driver": "1.11.26",
-    "@applitools/logger": "1.1.42",
-    "@applitools/nml-client": "1.3.29",
-    "@applitools/req": "1.1.28",
-    "@applitools/screenshoter": "3.7.23",
-    "@applitools/snippets": "2.4.14",
-    "@applitools/ufg-client": "1.1.22",
-    "@applitools/utils": "1.3.28",
+    "@applitools/driver": "1.11.29",
+    "@applitools/logger": "1.1.45",
+    "@applitools/nml-client": "1.3.32",
+    "@applitools/req": "1.1.30",
+    "@applitools/screenshoter": "3.7.25",
+    "@applitools/snippets": "2.4.15",
+    "@applitools/ufg-client": "1.1.24",
+    "@applitools/utils": "1.3.30",
     "abort-controller": "3.0.0",
     "chalk": "4.1.2",
     "node-fetch": "2.6.7",
     "throat": "6.0.1"
   },
   "optionalDependencies": {
-    "@applitools/ec-client": "^1.2.5"
+    "@applitools/ec-client": "1.2.6"
   },
   "devDependencies": {
     "@applitools/bongo": "^2.2.2",
-    "@applitools/sdk-fake-eyes-server": "^2.1.3",
-    "@applitools/spec-driver-puppeteer": "^1.1.38",
-    "@applitools/spec-driver-selenium": "^1.5.25",
-    "@applitools/spec-driver-webdriverio": "^1.4.22",
-    "@applitools/test-server": "^1.1.22",
-    "@applitools/test-utils": "^1.5.10",
+    "@applitools/spec-driver-puppeteer": "^1.1.40",
+    "@applitools/spec-driver-selenium": "^1.5.27",
+    "@applitools/spec-driver-webdriverio": "^1.4.24",
+    "@applitools/test-server": "^1.1.24",
+    "@applitools/test-utils": "^1.5.12",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",
     "@types/selenium-webdriver": "^4.1.2",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
     "chromedriver": "^106.0.0",
-    "eslint": "^8.23.1",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-no-only-tests": "^3.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^4.3.7",
     "mocha": "^10.0.0",
     "nock": "^13.2.8",
     "png-async": "^0.9.4",
-    "prettier": "^2.6.2",
     "puppeteer": "^16.2.0",
     "selenium-webdriver": "4.4",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.9.4",
     "webdriverio": "^7.25.0"
   },
   "engines": {

package/types/automation/extract-text.d.ts

@@ -0,0 +1,16 @@
+import type { MaybeArray } from '@applitools/utils';
+import type { DriverTarget, ImageTarget, ExtractTextSettings } from '../classic/types';
+import type { Core as BaseCore } from '@applitools/core-base';
+import { type Logger } from '@applitools/logger';
+import { type SpecType, type SpecDriver } from '@applitools/driver';
+type Options<TSpec extends SpecType> = {
+    core: BaseCore;
+    spec?: SpecDriver<TSpec>;
+    logger: Logger;
+};
+export declare function makeExtractText<TSpec extends SpecType>({ core, spec, logger: defaultLogger }: Options<TSpec>): ({ target, settings, logger, }: {
+    target: DriverTarget<TSpec> | ImageTarget;
+    settings: MaybeArray<ExtractTextSettings<TSpec>>;
+    logger?: Logger | undefined;
+}) => Promise<string[]>;
+export {};

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

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

package/types/automation/locate-text.d.ts

@@ -0,0 +1,15 @@
+import type { DriverTarget, ImageTarget, LocateTextSettings, LocateTextResult } from './types';
+import type { Core as BaseCore } from '@applitools/core-base';
+import { type Logger } from '@applitools/logger';
+import { type SpecType, type SpecDriver } from '@applitools/driver';
+type Options<TSpec extends SpecType> = {
+    core: BaseCore;
+    spec?: SpecDriver<TSpec>;
+    logger: Logger;
+};
+export declare function makeLocateText<TSpec extends SpecType>({ core, spec, logger: defaultLogger }: Options<TSpec>): <TPattern extends string>({ target, settings, logger, }: {
+    target: DriverTarget<TSpec> | ImageTarget;
+    settings: LocateTextSettings<TPattern, TSpec>;
+    logger?: Logger | undefined;
+}) => Promise<LocateTextResult<TPattern>>;
+export {};

package/types/automation/locate.d.ts

@@ -1,15 +1,15 @@
 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';
-type Options<TDriver, TContext, TElement, TSelector> = {
+import { type SpecType, type SpecDriver } from '@applitools/driver';
+type Options<TSpec extends SpecType> = {
     core: BaseCore;
-    spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
-    logger?: Logger;
+    spec?: SpecDriver<TSpec>;
+    logger: Logger;
 };
-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;
+export declare function makeLocate<TSpec extends SpecType>({ spec, core, logger: defaultLogger }: Options<TSpec>): <TLocator extends string>({ settings, target, logger, }: {
+    target: DriverTarget<TSpec> | ImageTarget;
+    settings: LocateSettings<TLocator, TSpec>;
+    logger?: Logger | undefined;
 }) => Promise<LocateResult<TLocator>>;
 export {};

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

@@ -1,14 +1,14 @@
 import type { Size } from '@applitools/utils';
 import type { DriverTarget } from './types';
 import { type Logger } from '@applitools/logger';
-import { type SpecDriver } from '@applitools/driver';
-type Options<TDriver, TContext, TElement, TSelector> = {
-    spec: SpecDriver<TDriver, TContext, TElement, TSelector>;
-    logger?: Logger;
+import { type SpecType, type SpecDriver } from '@applitools/driver';
+type Options<TSpec extends SpecType> = {
+    spec: SpecDriver<TSpec>;
+    logger: Logger;
 };
-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>;
+export declare function makeSetViewportSize<TSpec extends SpecType>({ spec, logger: defaultLogger }: Options<TSpec>): ({ target, size, logger, }: {
+    target: DriverTarget<TSpec>;
     size: Size;
-    logger?: Logger;
+    logger?: Logger | undefined;
 }) => Promise<void>;
 export {};