@applitools/driver 1.13.0 → 1.13.2

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [1.13.2](https://github.com/applitools/eyes.sdk.javascript1/compare/js/driver@1.13.1...js/driver@1.13.2) (2023-07-21)
+
+
+### Bug Fixes
+
+* improve performance by not resetting the environment ([#1779](https://github.com/applitools/eyes.sdk.javascript1/issues/1779)) ([8178978](https://github.com/applitools/eyes.sdk.javascript1/commit/8178978e9443e60f3e8b10693395e4c80cb9e02f))
+
+
+### Code Refactoring
+
+* ufg client ([#1780](https://github.com/applitools/eyes.sdk.javascript1/issues/1780)) ([d60cf16](https://github.com/applitools/eyes.sdk.javascript1/commit/d60cf1616741a96b152a1548760bb98116e5c3f9))
+
+
+### Dependencies
+
+
+
+## [1.13.1](https://github.com/applitools/eyes.sdk.javascript1/compare/js/driver@1.13.0...js/driver@1.13.1) (2023-07-13)
+
+
+### Bug Fixes
+
+* replaced NML prefixed appium env vars with APPLITOOLS prefixed ([8905b90](https://github.com/applitools/eyes.sdk.javascript1/commit/8905b90e7c4ec6e310f6e52c03bbcc7acf1ff2ab))
+
 ## [1.13.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/driver@1.12.4...js/driver@1.13.0) (2023-07-05)
 
 

package/dist/capabilities.js

@@ -52,12 +52,12 @@ function extractCapabilitiesEnvironment(capabilities) {
         if (!environment.browserName) {
             environment.isNative = true;
             if (environment.isAndroid) {
-                environment.isApplitoolsLib = !!((_t = capabilities.optionalIntentArguments) === null || _t === void 0 ? void 0 : _t.includes('NML_API_KEY'));
+                environment.isApplitoolsLib = !!((_t = capabilities.optionalIntentArguments) === null || _t === void 0 ? void 0 : _t.includes('APPLITOOLS_API_KEY'));
             }
             else if (environment.isIOS) {
                 environment.isApplitoolsLib = utils.types.isString(capabilities.processArguments)
-                    ? capabilities.processArguments.includes('NML_API_KEY')
-                    : !!((_v = (_u = capabilities.processArguments) === null || _u === void 0 ? void 0 : _u.env) === null || _v === void 0 ? void 0 : _v.NML_API_KEY);
+                    ? capabilities.processArguments.includes('APPLITOOLS_API_KEY')
+                    : !!((_v = (_u = capabilities.processArguments) === null || _u === void 0 ? void 0 : _u.env) === null || _v === void 0 ? void 0 : _v.APPLITOOLS_API_KEY);
             }
         }
         else if (environment.isIOS &&

package/dist/driver.js

@@ -38,6 +38,7 @@ class Driver {
         var _a, _b, _c, _d, _e, _f, _g;
         this._state = {};
         this._customConfig = {};
+        this._original = this;
         this._logger = (0, logger_1.makeLogger)({ logger: options.logger, format: { label: 'driver' } });
         this._customConfig = (_a = options.customConfig) !== null && _a !== void 0 ? _a : {};
         this._guid = utils.general.guid();
@@ -76,15 +77,17 @@ class Driver {
     }
     async reloadPage() {
         await this.mainContext.execute(snippets.reloadPage).catch(() => null);
-        return this.refresh();
-    }
-    async refresh() {
-        this._driverInfo = undefined;
-        this._environment = undefined;
-        this._viewport = undefined;
-        this._features = undefined;
-        this._helper = undefined;
-        this._state = {};
+        return this.refresh({ reset: false });
+    }
+    async refresh({ reset } = {}) {
+        if (reset) {
+            this._driverInfo = undefined;
+            this._environment = undefined;
+            this._viewport = undefined;
+            this._features = undefined;
+            this._helper = undefined;
+            this._state = {};
+        }
         const spec = this._spec;
         let currentContext = this.currentContext.target;
         let contextInfo;
@@ -92,7 +95,7 @@ class Driver {
             contextInfo = await getContextInfo(currentContext);
         }
         catch (err) {
-            return this;
+            return reset ? resetReference(this) : this;
         }
         const path = [];
         if (spec.parentContext) {
@@ -111,7 +114,16 @@ class Driver {
         }
         this._currentContext = this._mainContext;
         await this.switchToChildContext(...path);
-        return this;
+        return reset ? resetReference(this) : this;
+        function resetReference(driver) {
+            return new Proxy(driver._original, {
+                get(driver, key, receiver) {
+                    if (key === '_original')
+                        return driver;
+                    return Reflect.get(driver, key, receiver);
+                },
+            });
+        }
         function transformSelector(selector) {
             return specUtils.transformSelector(spec, selector, { isWeb: true });
         }
@@ -188,7 +200,11 @@ class Driver {
         var _f;
         if (((_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.userAgent) === undefined || force) {
             (_b = this._driverInfo) !== null && _b !== void 0 ? _b : (this._driverInfo = {});
-            (_c = (_f = this._driverInfo).userAgent) !== null && _c !== void 0 ? _c : (_f.userAgent = (_d = (await this.currentContext.executePoll(snippets.getUserAgent))) !== null && _d !== void 0 ? _d : null);
+            (_c = (_f = this._driverInfo).userAgent) !== null && _c !== void 0 ? _c : (_f.userAgent = (_d = (await this.currentContext.executePoll(snippets.getUserAgent, {
+                main: undefined,
+                poll: undefined,
+                pollTimeout: 100,
+            }))) !== null && _d !== void 0 ? _d : null);
             this._logger.log('Extracted user agent', this._driverInfo.userAgent);
         }
         return (_e = this._driverInfo.userAgent) !== null && _e !== void 0 ? _e : undefined;
@@ -493,7 +509,7 @@ class Driver {
         }
         try {
             await this._spec.switchWorld(this.target, name);
-            this.refresh();
+            this.refresh({ reset: true });
         }
         catch (error) {
             this._logger.error('Unable to switch world due to the error', error);
@@ -813,6 +829,6 @@ async function makeDriver(options) {
     const driver = options.driver instanceof Driver ? options.driver : new Driver(options);
     if (options.logger)
         driver.updateLogger(options.logger);
-    return driver.refresh();
+    return driver.refresh({ reset: options.reset });
 }
 exports.makeDriver = makeDriver;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -73,10 +73,10 @@
     "test": "run --top-level mocha './test/**/*.spec.ts'"
   },
   "dependencies": {
-    "@applitools/logger": "2.0.5",
-    "@applitools/snippets": "2.4.21",
-    "@applitools/utils": "1.5.0",
-    "semver": "7.3.7"
+    "@applitools/logger": "2.0.6",
+    "@applitools/snippets": "",
+    "@applitools/utils": "",
+    "semver": "7.5.4"
   },
   "devDependencies": {
     "@types/node": "^12.20.55"

package/types/driver.d.ts

@@ -30,6 +30,7 @@ export declare class Driver<T extends SpecType> {
     private _customConfig;
     private _logger;
     protected readonly _spec: SpecDriver<T>;
+    protected readonly _original: this;
     constructor(options: DriverOptions<T>);
     get logger(): Logger;
     get target(): T['driver'];
@@ -39,7 +40,9 @@ export declare class Driver<T extends SpecType> {
     updateLogger(logger: Logger): void;
     updateCurrentContext(context: Context<T>): void;
     reloadPage(): Promise<this>;
-    refresh(): Promise<this>;
+    refresh({ reset }?: {
+        reset?: boolean;
+    }): Promise<this>;
     getDriverInfo({ force }?: {
         force?: boolean;
     }): Promise<DriverInfo>;
@@ -91,6 +94,7 @@ export declare function makeDriver<T extends SpecType>(options: {
     customConfig?: {
         useCeilForViewportSize?: boolean;
     };
+    reset?: boolean;
     logger?: Logger;
 }): Promise<Driver<T>>;
 export {};