@applitools/core 1.4.8 → 1.4.10

package/dist/automation/get-viewport-size.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetViewportSize = void 0;
 const driver_1 = require("@applitools/driver");
-function makeGetViewportSize({ spec, logger: defaultLogger }) {
+function makeGetViewportSize({ spec, logger: defaultLogger, }) {
     return async function getViewportSize({ target, logger = defaultLogger, }) {
         logger.log(`Command "getViewportSize" is called`);
         const driver = await (0, driver_1.makeDriver)({ driver: target, spec, logger });

package/dist/automation/locate.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeLocate = void 0;
 const driver_1 = require("@applitools/driver");
 const take_screenshot_1 = require("./utils/take-screenshot");
-function makeLocate({ spec, core, logger: defaultLogger }) {
+function makeLocate({ spec, core, logger: defaultLogger, }) {
     return async function locate({ settings, target, logger = defaultLogger, }) {
         logger.log(`Command "locate" is called with settings`, settings);
         if (!(0, driver_1.isDriver)(target, spec)) {

package/dist/automation/set-viewport-size.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSetViewportSize = void 0;
 const driver_1 = require("@applitools/driver");
-function makeSetViewportSize({ spec, logger: defaultLogger }) {
+function makeSetViewportSize({ spec, logger: defaultLogger, }) {
     return async function setViewportSize({ target, size, logger = defaultLogger, }) {
         logger.log(`Command "setViewportSize" is called with size`, size);
         const driver = await (0, driver_1.makeDriver)({ driver: target, spec, logger });

package/dist/check.js

@@ -63,7 +63,10 @@ function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget,
         const typedEyes = await eyes.getTypedEyes({
             type,
             settings: driver
-                ? { type: driver.isNative ? 'native' : 'web', renderers: settings.renderers }
+                ? {
+                    type: driver.isNative ? 'native' : 'web',
+                    renderers: settings.renderers,
+                }
                 : undefined,
             logger,
         });

package/dist/classic/abort.js

@@ -2,21 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAbort = void 0;
 const driver_1 = require("@applitools/driver");
-function makeAbort({ eyes, target, spec, logger: defaultLogger }) {
+function makeAbort({ eyes, target, spec, logger: defaultLogger, }) {
     return async function abort({ settings, logger = defaultLogger, } = {}) {
-        logger.log('Command "abort" is called with settings', settings);
-        settings !== null && settings !== void 0 ? settings : (settings = {});
-        if (!settings.testMetadata) {
-            try {
-                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) {
-                logger.warn('Command "abort" received an error during extracting driver metadata', error);
-            }
-        }
-        const baseEyes = await eyes.getBaseEyes();
-        await Promise.all(baseEyes.map(baseEyes => baseEyes.abort({ settings, logger })));
+        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 [baseEyes] = await eyes.getBaseEyes();
+        return await baseEyes.abort({ settings: { ...settings, testMetadata }, logger });
     };
 }
 exports.makeAbort = makeAbort;

package/dist/classic/close.js

@@ -2,21 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeClose = void 0;
 const driver_1 = require("@applitools/driver");
-function makeClose({ eyes, target, spec, logger: defaultLogger }) {
+function makeClose({ eyes, target, spec, logger: defaultLogger, }) {
     return async function close({ settings, logger = defaultLogger, } = {}) {
-        logger.log('Command "close" is called with settings', settings);
-        settings !== null && settings !== void 0 ? settings : (settings = {});
-        if (!settings.testMetadata) {
-            try {
-                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) {
-                logger.warn('Command "close" 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 baseEyes = await eyes.getBaseEyes();
-        await Promise.all(baseEyes.map(baseEyes => baseEyes.close({ settings, logger })));
+        return (await Promise.all(baseEyes.map(baseEyes => baseEyes.close({ settings: { ...settings, testMetadata }, logger })))).flat();
     };
 }
 exports.makeClose = makeClose;

package/dist/classic/core.js

@@ -29,8 +29,6 @@ const core_base_1 = require("@applitools/core-base");
 const get_viewport_size_1 = require("../automation/get-viewport-size");
 const set_viewport_size_1 = require("../automation/set-viewport-size");
 const locate_1 = require("../automation/locate");
-const locate_text_1 = require("../automation/locate-text");
-const extract_text_1 = require("../automation/extract-text");
 const open_eyes_1 = require("./open-eyes");
 const utils = __importStar(require("@applitools/utils"));
 function makeCore({ spec, core, agentId = 'core-classic', cwd = process.cwd(), logger: defaultLogger, }) {
@@ -46,8 +44,6 @@ function makeCore({ spec, core, agentId = 'core-classic', cwd = process.cwd(), l
         getViewportSize: spec && (0, get_viewport_size_1.makeGetViewportSize)({ spec, logger }),
         setViewportSize: spec && (0, set_viewport_size_1.makeSetViewportSize)({ spec, logger }),
         locate: (0, locate_1.makeLocate)({ spec, core, logger }),
-        locateText: (0, locate_text_1.makeLocateText)({ spec, core, logger }),
-        extractText: (0, extract_text_1.makeExtractText)({ spec, core, logger }),
         openEyes: (0, open_eyes_1.makeOpenEyes)({ spec, core, logger }),
     });
 }

package/dist/{automation → classic}/extract-text.js

@@ -25,15 +25,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeExtractText = void 0;
 const driver_1 = require("@applitools/driver");
-const take_screenshot_1 = require("./utils/take-screenshot");
-const take_dom_capture_1 = require("../classic/utils/take-dom-capture");
+const take_screenshot_1 = require("../automation/utils/take-screenshot");
+const take_dom_capture_1 = require("./utils/take-dom-capture");
 const utils = __importStar(require("@applitools/utils"));
 const { getText } = require('@applitools/snippets');
-function makeExtractText({ core, spec, logger: defaultLogger }) {
-    return async function extractText({ target, settings, logger = defaultLogger, }) {
+function makeExtractText({ eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
+    return async function extractText({ target = defaultTarget, settings, logger = defaultLogger, }) {
         logger.log('Command "extractText" is called with settings', settings);
+        if (!target)
+            throw new Error('Method was called with no target');
+        const [baseEyes] = await eyes.getBaseEyes();
         if (!(0, driver_1.isDriver)(target, spec)) {
-            return core.extractText({ target, settings: settings, logger });
+            return baseEyes.extractText({ target, settings: settings, logger });
         }
         settings = utils.types.isArray(settings) ? settings : [settings];
         const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
@@ -63,7 +66,7 @@ function makeExtractText({ core, spec, logger: defaultLogger }) {
             }
             delete settings.region;
             delete settings.normalization;
-            const results = await core.extractText({
+            const results = await baseEyes.extractText({
                 target: baseTarget,
                 settings: settings,
                 logger,

package/dist/{automation → classic}/locate-text.js

@@ -25,14 +25,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeLocateText = void 0;
 const driver_1 = require("@applitools/driver");
-const take_screenshot_1 = require("./utils/take-screenshot");
+const take_screenshot_1 = require("../automation/utils/take-screenshot");
 // import {takeDomCapture} from './utils/take-dom-capture'
 const utils = __importStar(require("@applitools/utils"));
-function makeLocateText({ core, spec, logger: defaultLogger }) {
-    return async function locateText({ target, settings, logger = defaultLogger, }) {
+function makeLocateText({ eyes, target: defaultTarget, spec, logger: defaultLogger, }) {
+    return async function locateText({ target = defaultTarget, settings, logger = defaultLogger, }) {
         logger.log('Command "locateText" is called with settings', settings);
+        if (!target)
+            throw new Error('Method was called with no target');
+        const [baseEyes] = await eyes.getBaseEyes();
         if (!(0, driver_1.isDriver)(target, spec)) {
-            return core.locateText({ target, settings: settings, logger });
+            return baseEyes.locateText({ target, settings: settings, logger });
         }
         const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
         const screenshot = await (0, take_screenshot_1.takeScreenshot)({ driver, settings, logger });
@@ -45,7 +48,7 @@ function makeLocateText({ core, spec, logger: defaultLogger }) {
             // else await screenshot.element?.setAttribute('data-applitools-scroll', 'true')
             // baseTarget.dom = await takeDomCapture({driver, logger}).catch(() => null)
         }
-        const results = await core.locateText({
+        const results = await baseEyes.locateText({
             target: baseTarget,
             settings: settings,
             logger,

package/dist/classic/open-eyes.js

@@ -28,10 +28,12 @@ const driver_1 = require("@applitools/driver");
 const get_base_eyes_1 = require("./get-base-eyes");
 const check_1 = require("./check");
 const check_and_close_1 = require("./check-and-close");
+const locate_text_1 = require("./locate-text");
+const extract_text_1 = require("./extract-text");
 const close_1 = require("./close");
 const abort_1 = require("./abort");
 const utils = __importStar(require("@applitools/utils"));
-function makeOpenEyes({ core, spec, logger: defaultLogger }) {
+function makeOpenEyes({ core, spec, logger: defaultLogger, }) {
     return async function openEyes({ target, settings, eyes, logger = defaultLogger, }) {
         var _a, _b, _c, _d, _e;
         var _f;
@@ -86,6 +88,8 @@ function makeOpenEyes({ core, spec, logger: defaultLogger }) {
             getBaseEyes,
             check: (0, check_1.makeCheck)({ eyes, target: driver, spec, logger }),
             checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ eyes, target: driver, spec, logger }),
+            locateText: (0, locate_text_1.makeLocateText)({ eyes, target: driver, spec, logger }),
+            extractText: (0, extract_text_1.makeExtractText)({ eyes, target: driver, spec, logger }),
             close: (0, close_1.makeClose)({ eyes, target: driver, spec, logger }),
             abort: (0, abort_1.makeAbort)({ eyes, target: driver, spec, logger }),
         }));

package/dist/{get-manager-results.js → close-manager.js}

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeGetManagerResults = void 0;
+exports.makeCloseManager = void 0;
 const test_error_1 = require("./errors/test-error");
 const internal_error_1 = require("./errors/internal-error");
-function makeGetManagerResults({ core, storage, logger: defaultLogger, }) {
-    return async function getManagerResults({ settings, logger = defaultLogger, } = {}) {
+function makeCloseManager({ core, storage, logger: defaultLogger, }) {
+    return async function closeManager({ settings, logger = defaultLogger, } = {}) {
         var _a, _b, _c;
-        const containers = await Promise.all(storage.map(async (eyes) => {
+        const containers = await Promise.all(storage.map(async ({ eyes, promise }) => {
+            if (!promise)
+                logger.warn(`The eyes with id "${eyes.test.userTestId}" are going to be auto aborted`);
             try {
-                const results = await eyes.getResults({ settings: { ...settings, throwErr: false }, logger });
+                const results = await (promise !== null && promise !== void 0 ? promise : eyes.abort({ logger }));
                 return results.map(result => {
                     return {
                         result,
@@ -22,7 +24,7 @@ function makeGetManagerResults({ core, storage, logger: defaultLogger, }) {
                 return [{ error: new internal_error_1.InternalError(error), ...error.info }];
             }
         }));
-        const batches = storage.reduce((batches, eyes) => {
+        const batches = storage.reduce((batches, { eyes }) => {
             if (!eyes.test.keepBatchOpen) {
                 const settings = { ...eyes.test.server, batchId: eyes.test.batchId };
                 batches[`${settings.serverUrl}:${settings.apiKey}:${settings.batchId}`] = settings;
@@ -61,4 +63,4 @@ function makeGetManagerResults({ core, storage, logger: defaultLogger, }) {
         return summary;
     };
 }
-exports.makeGetManagerResults = makeGetManagerResults;
+exports.makeCloseManager = makeCloseManager;

package/dist/close.js

@@ -1,13 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeClose = void 0;
+const test_error_1 = require("./errors/test-error");
 function makeClose({ eyes, logger: defaultLogger, }) {
     return async function close({ settings, config, logger = defaultLogger, } = {}) {
         var _a;
         settings = { ...config === null || config === void 0 ? void 0 : config.close, ...settings };
         (_a = settings.updateBaselineIfNew) !== null && _a !== void 0 ? _a : (settings.updateBaselineIfNew = true);
         const typedEyes = await eyes.getTypedEyes({ logger });
-        await typedEyes.close({ settings, logger });
+        const results = await typedEyes.close({ settings, logger });
+        if (settings.throwErr) {
+            results.forEach(result => {
+                if (result.status !== 'Passed')
+                    throw new test_error_1.TestError(result);
+            });
+        }
+        return results.length > 0
+            ? results
+            : [
+                {
+                    userTestId: eyes.test.userTestId,
+                    name: '',
+                    steps: 0,
+                    matches: 0,
+                    mismatches: 0,
+                    missing: 0,
+                    exactMatches: 0,
+                    strictMatches: 0,
+                    contentMatches: 0,
+                    layoutMatches: 0,
+                    noneMatches: 0,
+                },
+            ];
     };
 }
 exports.makeClose = makeClose;

package/dist/core.js

@@ -29,8 +29,6 @@ const core_base_1 = require("@applitools/core-base");
 const get_viewport_size_1 = require("./automation/get-viewport-size");
 const set_viewport_size_1 = require("./automation/set-viewport-size");
 const locate_1 = require("./locate");
-const locate_text_1 = require("./locate-text");
-const extract_text_1 = require("./extract-text");
 const open_eyes_1 = require("./open-eyes");
 const make_manager_1 = require("./make-manager");
 const close_batch_1 = require("./close-batch");
@@ -49,8 +47,6 @@ function makeCore({ spec, concurrency, core, agentId = 'core', cwd = process.cwd
         getViewportSize: spec && (0, get_viewport_size_1.makeGetViewportSize)({ spec, logger }),
         setViewportSize: spec && (0, set_viewport_size_1.makeSetViewportSize)({ spec, logger }),
         locate: (0, locate_1.makeLocate)({ spec, core, logger }),
-        locateText: (0, locate_text_1.makeLocateText)({ spec, core, logger }),
-        extractText: (0, extract_text_1.makeExtractText)({ spec, core, logger }),
         openEyes: (0, open_eyes_1.makeOpenEyes)({ spec, core, concurrency, logger }),
         makeManager: (0, make_manager_1.makeMakeManager)({ spec, concurrency, agentId, logger }),
         closeBatch: (0, close_batch_1.makeCloseBatch)({ core, logger }),

package/dist/errors/abort-error.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbortError = void 0;
-const core_base_1 = require("@applitools/core-base");
-class AbortError extends core_base_1.CoreError {
-    constructor(message, info) {
-        super(message, { reason: 'abort', ...info });
-    }
+class AbortError extends Error {
 }
 exports.AbortError = AbortError;

package/dist/extract-text.js

@@ -24,20 +24,24 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeExtractText = void 0;
-const core_1 = require("./classic/core");
 const utils = __importStar(require("@applitools/utils"));
-function makeExtractText({ spec, core, logger: defaultLogger }) {
-    return async function extractText({ target, settings, config, logger = defaultLogger, }) {
-        settings = utils.types.isArray(settings) ? settings : [settings];
-        settings = settings.map(settings => {
-            var _a, _b, _c;
-            settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
-            (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
-            (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
-            return settings;
-        });
-        const classicCore = (0, core_1.makeCore)({ spec, core, logger });
-        const results = await classicCore.extractText({ target, settings, logger });
+function makeExtractText({ eyes, target: defaultTarget, logger: defaultLogger, }) {
+    return async function extractText({ target = defaultTarget, settings, config, logger = defaultLogger, }) {
+        var _a;
+        if (utils.types.isArray(settings)) {
+            settings = settings.map(settings => {
+                var _a;
+                settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
+                (_a = settings.autProxy) !== null && _a !== void 0 ? _a : (settings.autProxy = eyes.test.server.proxy);
+                return settings;
+            });
+        }
+        else {
+            settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
+            (_a = settings.autProxy) !== null && _a !== void 0 ? _a : (settings.autProxy = eyes.test.server.proxy);
+        }
+        const classicEyes = await eyes.getTypedEyes({ type: 'classic', logger });
+        const results = await classicEyes.extractText({ target, settings, logger });
         return results;
     };
 }

package/dist/get-typed-eyes.js

@@ -13,13 +13,11 @@ function makeGetTypedEyes({ type: defaultType, settings: defaultSettings, target
         }
         else if (type === 'ufg') {
             const baseEyes = await eyes.getBaseEyes();
-            const typedEyes = await cores.ufg.openEyes({ target, settings: defaultSettings, eyes: baseEyes, logger });
-            return typedEyes;
+            return cores.ufg.openEyes({ target, settings: defaultSettings, eyes: baseEyes, logger });
         }
         else {
             const baseEyes = (await Promise.all(settings.renderers.map(renderer => eyes.getBaseEyes({ settings: { type: settings.type, renderer } })))).flat();
-            const typedEyes = await cores.classic.openEyes({ target, settings: defaultSettings, eyes: baseEyes, logger });
-            return typedEyes;
+            return cores.classic.openEyes({ target, settings: defaultSettings, eyes: baseEyes, logger });
         }
     };
 }

package/dist/index.js

@@ -26,10 +26,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.takeDomSnapshots = exports.formatters = void 0;
+exports.formatters = exports.takeDomSnapshots = void 0;
 __exportStar(require("./types"), exports);
 __exportStar(require("./core"), exports);
-__exportStar(require("@applitools/driver/dist/debug"), exports);
-exports.formatters = __importStar(require("./utils/format-results"));
 var take_dom_snapshots_1 = require("./ufg/utils/take-dom-snapshots");
 Object.defineProperty(exports, "takeDomSnapshots", { enumerable: true, get: function () { return take_dom_snapshots_1.takeDomSnapshots; } });
+exports.formatters = __importStar(require("./utils/format-results"));
+__exportStar(require("@applitools/driver/dist/debug"), exports);

package/dist/locate-text.js

@@ -1,39 +1,13 @@
 "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.makeLocateText = void 0;
-const core_1 = require("./classic/core");
-const utils = __importStar(require("@applitools/utils"));
-function makeLocateText({ spec, core, logger: defaultLogger }) {
-    return async function locateText({ target, settings, config, logger = defaultLogger, }) {
-        var _a, _b, _c;
-        settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
-        (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
-        (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
-        const classicCore = (0, core_1.makeCore)({ spec, core, logger });
-        const results = await classicCore.locateText({ target, settings, logger });
+function makeLocateText({ eyes, target: defaultTarget, logger: defaultLogger, }) {
+    return async function locateText({ target = defaultTarget, settings, config, logger = defaultLogger, }) {
+        var _a;
+        settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
+        (_a = settings.autProxy) !== null && _a !== void 0 ? _a : (settings.autProxy = eyes.test.server.proxy);
+        const classicEyes = await eyes.getTypedEyes({ type: 'classic', logger });
+        const results = await classicEyes.locateText({ target, settings, logger });
         return results;
     };
 }

package/dist/locate.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeLocate = void 0;
 const core_1 = require("./classic/core");
 const utils = __importStar(require("@applitools/utils"));
-function makeLocate({ spec, core, logger: defaultLogger }) {
+function makeLocate({ spec, core, logger: defaultLogger, }) {
     return async function locate({ target, settings, config, logger = defaultLogger, }) {
         var _a, _b, _c;
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };

package/dist/make-manager.js

@@ -28,7 +28,7 @@ const core_base_1 = require("@applitools/core-base");
 const core_1 = require("./classic/core");
 const core_2 = require("./ufg/core");
 const open_eyes_1 = require("./open-eyes");
-const get_manager_results_1 = require("./get-manager-results");
+const close_manager_1 = require("./close-manager");
 const utils = __importStar(require("@applitools/utils"));
 function makeMakeManager({ spec, core, concurrency: defaultConcurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), agentId: defaultAgentId, cwd = process.cwd(), logger: defaultLogger, }) {
     return async function makeManager({ type = 'classic', concurrency = defaultConcurrency, legacyConcurrency, batch, agentId = type === 'ufg' ? defaultAgentId === null || defaultAgentId === void 0 ? void 0 : defaultAgentId.replace(/(\/\d)/, '.visualgrid$1') : defaultAgentId, logger = defaultLogger, } = {}) {
@@ -37,15 +37,38 @@ function makeMakeManager({ spec, core, concurrency: defaultConcurrency = utils.g
         batch !== null && batch !== void 0 ? batch : (batch = {});
         (_a = batch.id) !== null && _a !== void 0 ? _a : (batch.id = `generated-${utils.general.guid()}`);
         core !== null && core !== void 0 ? core : (core = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
-        const cores = { ufg: (0, core_2.makeCore)({ spec, core, concurrency, logger }), classic: (0, core_1.makeCore)({ spec, core, logger }) };
+        const cores = {
+            ufg: (0, core_2.makeCore)({ spec, core, concurrency, logger }),
+            classic: (0, core_1.makeCore)({ spec, core, logger }),
+        };
         const storage = [];
         return {
             openEyes: utils.general.wrap((0, open_eyes_1.makeOpenEyes)({ type, batch, spec, core, cores, logger }), async (openEyes, options) => {
                 const eyes = await openEyes(options);
-                storage.push(eyes);
-                return eyes;
+                const item = { eyes };
+                storage.push(item);
+                return utils.general.extend(eyes, {
+                    checkAndClose: utils.general.wrap(eyes.checkAndClose, (checkAndClose, options) => {
+                        var _a;
+                        const promise = checkAndClose(options);
+                        (_a = item.promise) !== null && _a !== void 0 ? _a : (item.promise = promise);
+                        return promise;
+                    }),
+                    close: utils.general.wrap(eyes.close, (close, options) => {
+                        var _a;
+                        const promise = close(options);
+                        (_a = item.promise) !== null && _a !== void 0 ? _a : (item.promise = promise);
+                        return promise;
+                    }),
+                    abort: utils.general.wrap(eyes.abort, (abort, options) => {
+                        var _a;
+                        const promise = abort(options);
+                        (_a = item.promise) !== null && _a !== void 0 ? _a : (item.promise = promise);
+                        return promise;
+                    }),
+                });
             }),
-            getResults: (0, get_manager_results_1.makeGetManagerResults)({ core, storage, logger }),
+            closeManager: (0, close_manager_1.makeCloseManager)({ core, storage, logger }),
         };
     };
 }

package/dist/open-eyes.js

@@ -30,8 +30,9 @@ const core_2 = require("./ufg/core");
 const get_typed_eyes_1 = require("./get-typed-eyes");
 const check_1 = require("./check");
 const check_and_close_1 = require("./check-and-close");
+const locate_text_1 = require("./locate-text");
+const extract_text_1 = require("./extract-text");
 const close_1 = require("./close");
-const get_eyes_results_1 = require("./get-eyes-results");
 const extract_ci_provider_1 = require("./utils/extract-ci-provider");
 const utils = __importStar(require("@applitools/utils"));
 function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core, cores, spec, logger: defaultLogger, }) {
@@ -96,9 +97,10 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
             getTypedEyes,
             check: (0, check_1.makeCheck)({ type, eyes, target: driver, spec, logger }),
             checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ type, eyes, target: driver, spec, logger }),
+            locateText: (0, locate_text_1.makeLocateText)({ eyes, target: driver, logger }),
+            extractText: (0, extract_text_1.makeExtractText)({ eyes, target: driver, logger }),
             close: (0, close_1.makeClose)({ eyes, logger }),
-            getResults: (0, get_eyes_results_1.makeGetEyesResults)({ eyes, logger }),
-        })); // TODO solve the types issue
+        }));
     };
 }
 exports.makeOpenEyes = makeOpenEyes;

package/dist/types.js

@@ -14,4 +14,5 @@ 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

@@ -3,30 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAbort = void 0;
 const driver_1 = require("@applitools/driver");
 function makeAbort({ storage, target, spec, controller, logger: defaultLogger, }) {
-    return async function abort({ settings, logger = defaultLogger, } = {}) {
-        logger.log('Command "abort" is called with settings', settings);
+    return async function ({ settings, logger = defaultLogger, } = {}) {
         controller.abort();
-        settings !== null && settings !== void 0 ? settings : (settings = {});
-        if (!settings.testMetadata) {
+        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;
             try {
-                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());
+                const value = await promise;
+                eyes = value.eyes;
+                renderer = value.renderer;
             }
             catch (error) {
-                logger.warn('Command "abort" received an error during extracting driver metadata', error);
+                eyes = error.info.eyes;
+                renderer = error.info.renderer;
+                if (!eyes)
+                    throw error;
             }
-        }
-        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 }));
-            }
-        });
+            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 };
+        }));
     };
 }
 exports.makeAbort = makeAbort;