@applitools/core 1.4.8 → 1.4.9

package/dist/classic/abort.js

@@ -4,19 +4,10 @@ exports.makeAbort = void 0;
 const driver_1 = require("@applitools/driver");
 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 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.abort({ settings, logger })));
+        await Promise.all(baseEyes.map(baseEyes => baseEyes.abort({ settings: { ...settings, testMetadata }, logger })));
     };
 }
 exports.makeAbort = makeAbort;

package/dist/classic/close.js

@@ -4,19 +4,10 @@ exports.makeClose = void 0;
 const driver_1 = require("@applitools/driver");
 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 })));
+        await Promise.all(baseEyes.map(baseEyes => baseEyes.close({ settings: { ...settings, testMetadata }, logger })));
     };
 }
 exports.makeClose = makeClose;

package/dist/get-manager-results.js

@@ -8,7 +8,7 @@ function makeGetManagerResults({ core, storage, logger: defaultLogger, }) {
         var _a, _b, _c;
         const containers = await Promise.all(storage.map(async (eyes) => {
             try {
-                const results = await eyes.getResults({ settings: { ...settings, throwErr: false }, logger });
+                const results = await eyes.getResults({ settings, logger });
                 return results.map(result => {
                     return {
                         result,

package/dist/ufg/abort.js

@@ -6,25 +6,17 @@ function makeAbort({ storage, target, spec, controller, logger: defaultLogger, }
     return async function abort({ settings, logger = defaultLogger, } = {}) {
         logger.log('Command "abort" is called with settings', settings);
         controller.abort();
-        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 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());
         storage.forEach(async (promises) => {
             var _a, _b;
             try {
                 const { eyes } = await Promise.race(promises);
-                await eyes.abort({ settings, logger });
+                await eyes.abort({ settings: { ...settings, testMetadata }, 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 }));
+                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: { ...settings, testMetadata }, logger }));
             }
         });
     };

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

@@ -206,7 +206,11 @@ function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget,
                         settings: baseSettings,
                         logger,
                     });
-                    return { ...result, eyes: baseEyes, renderer };
+                    if (!baseEyes.running) {
+                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
+                    }
+                    return { ...result, eyes, renderer };
                 }
                 catch (error) {
                     await baseEyes.abort();
@@ -223,7 +227,7 @@ function makeCheckAndClose({ spec, eyes, client, signal, target: defaultTarget,
             var _a, _b;
             try {
                 const result = await promise;
-                return { ...result, userTestId: eyes.test.userTestId };
+                return { ...result, userTestId: eyes.test.userTestId, asExpected: true };
             }
             catch (error) {
                 await ((_b = (_a = error.info) === null || _a === void 0 ? void 0 : _a.eyes) === null || _b === void 0 ? void 0 : _b.abort({ logger }));

package/dist/ufg/close.js

@@ -5,31 +5,23 @@ const driver_1 = require("@applitools/driver");
 function makeClose({ storage, 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());
         storage.forEach(async (promises) => {
             var _a, _b;
             try {
                 const [{ eyes }] = await Promise.all(promises);
                 try {
-                    await eyes.close({ settings, logger });
+                    await eyes.close({ settings: { ...settings, testMetadata }, logger });
                 }
                 catch (error) {
                     logger.warn('Command "close" received an error during performing, trying to perform abort instead', error);
-                    await eyes.abort({ settings, logger });
+                    await eyes.abort({ settings: { ...settings, testMetadata }, logger });
                 }
             }
             catch (error) {
                 logger.warn('Command "close" received an error during waiting for eyes instances in background', error);
-                await ((_b = (_a = error.info) === null || _a === void 0 ? void 0 : _a.eyes) === null || _b === void 0 ? void 0 : _b.abort({ settings, logger }));
+                await ((_b = (_a = error.info) === null || _a === void 0 ? void 0 : _a.eyes) === null || _b === void 0 ? void 0 : _b.abort({ settings: { ...settings, testMetadata }, logger }));
             }
         });
     };

package/dist/ufg/open-eyes.js

@@ -85,21 +85,13 @@ function makeOpenEyes({ core, client, spec, logger: defaultLogger }) {
                     });
                     return results;
                 }),
-                checkAndClose: utils.general.wrap((0, check_and_close_1.makeCheckAndClose)({
+                checkAndClose: (0, check_and_close_1.makeCheckAndClose)({
                     eyes,
                     client: client,
                     target: driver,
                     spec,
                     signal: controller.signal,
                     logger,
-                }), async (checkAndClose, options = {}) => {
-                    const results = await checkAndClose(options);
-                    results.forEach(result => {
-                        var _a;
-                        const key = JSON.stringify(result.renderer);
-                        storage.set(key, [...((_a = storage.get(key)) !== null && _a !== void 0 ? _a : []), { eyes: result.eyes, renderer: result.renderer }]);
-                    });
-                    return results;
                 }),
                 close: utils.general.wrap((0, close_1.makeClose)({ storage, target: driver, logger }), async (close, options) => {
                     running = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"

package/types/ufg/abort.d.ts

@@ -1,14 +1,9 @@
-import type { DriverTarget, AbortSettings } from './types';
+import type { DriverTarget, AbortSettings, CheckResult } from './types';
 import { type Logger } from '@applitools/logger';
 import { type AbortController } from 'abort-controller';
 import { type SpecType, type SpecDriver } from '@applitools/driver';
-import { Renderer } from '@applitools/ufg-client';
-import { Eyes as baseEyes } from '@applitools/core-base';
 type Options<TSpec extends SpecType> = {
-    storage: Map<string, Promise<{
-        renderer: Renderer;
-        eyes: baseEyes;
-    }>[]>;
+    storage: Map<string, CheckResult['promise'][]>;
     controller: AbortController;
     target?: DriverTarget<TSpec>;
     spec?: SpecDriver<TSpec>;

package/types/ufg/close.d.ts

@@ -1,13 +1,8 @@
-import type { DriverTarget, CloseSettings } from './types';
+import type { DriverTarget, CloseSettings, CheckResult } from './types';
 import { type Logger } from '@applitools/logger';
 import { type SpecType, type SpecDriver } from '@applitools/driver';
-import { Renderer } from '@applitools/ufg-client';
-import { Eyes as baseEyes } from '@applitools/core-base';
 type Options<TSpec extends SpecType> = {
-    storage: Map<string, Promise<{
-        renderer: Renderer;
-        eyes: baseEyes;
-    }>[]>;
+    storage: Map<string, CheckResult['promise'][]>;
     target?: DriverTarget<TSpec>;
     spec?: SpecDriver<TSpec>;
     logger: Logger;

package/types/ufg/get-results.d.ts

@@ -1,12 +1,7 @@
-import type { GetResultsSettings, TestResult } from './types';
+import type { GetResultsSettings, CheckResult, TestResult } from './types';
 import { type Logger } from '@applitools/logger';
-import { Renderer } from '@applitools/ufg-client';
-import { Eyes as baseEyes } from '@applitools/core-base';
 type Options = {
-    storage: Map<string, Promise<{
-        renderer: Renderer;
-        eyes: baseEyes;
-    }>[]>;
+    storage: Map<string, CheckResult['promise'][]>;
     logger: Logger;
 };
 export declare function makeGetResults({ storage, logger: defaultLogger }: Options): ({ settings, logger, }?: {

package/types/ufg/types.d.ts

@@ -66,6 +66,4 @@ export type CheckResult = AutomationCore.CheckResult & {
 };
 export type TestResult = AutomationCore.TestResult & {
     readonly renderer: Renderer;
-} & {
-    eyes: BaseCore.Eyes;
 };