@applitools/core 2.0.1 → 2.0.2

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

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

package/dist/ufg/open-eyes.js

@@ -85,13 +85,21 @@ function makeOpenEyes({ core, client, spec, logger: defaultLogger }) {
                     });
                     return results;
                 }),
-                checkAndClose: (0, check_and_close_1.makeCheckAndClose)({
+                checkAndClose: utils.general.wrap((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": "2.0.1",
+  "version": "2.0.2",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -56,7 +56,7 @@
     "postversion": "bongo postversion --skip-release-notification"
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.34",
+    "@applitools/core-base": "1.1.35",
     "@applitools/dom-capture": "11.2.1",
     "@applitools/dom-snapshot": "4.7.3",
     "@applitools/driver": "1.11.29",

package/types/ufg/abort.d.ts

@@ -1,9 +1,14 @@
-import type { DriverTarget, AbortSettings, CheckResult } from './types';
+import type { DriverTarget, AbortSettings } 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, CheckResult['promise'][]>;
+    storage: Map<string, Promise<{
+        renderer: Renderer;
+        eyes: baseEyes;
+    }>[]>;
     controller: AbortController;
     target?: DriverTarget<TSpec>;
     spec?: SpecDriver<TSpec>;

package/types/ufg/close.d.ts

@@ -1,8 +1,13 @@
-import type { DriverTarget, CloseSettings, CheckResult } from './types';
+import type { DriverTarget, CloseSettings } 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, CheckResult['promise'][]>;
+    storage: Map<string, Promise<{
+        renderer: Renderer;
+        eyes: baseEyes;
+    }>[]>;
     target?: DriverTarget<TSpec>;
     spec?: SpecDriver<TSpec>;
     logger: Logger;

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

@@ -1,7 +1,12 @@
-import type { GetResultsSettings, CheckResult, TestResult } from './types';
+import type { GetResultsSettings, 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, CheckResult['promise'][]>;
+    storage: Map<string, Promise<{
+        renderer: Renderer;
+        eyes: baseEyes;
+    }>[]>;
     logger: Logger;
 };
 export declare function makeGetResults({ storage, logger: defaultLogger }: Options): ({ settings, logger, }?: {

package/types/ufg/types.d.ts

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