appium-espresso-driver 2.40.1 → 2.40.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/README.md +1 -1
  3. package/build/lib/driver.d.ts +7 -0
  4. package/build/lib/driver.d.ts.map +1 -1
  5. package/build/lib/driver.js +8 -2
  6. package/build/lib/driver.js.map +1 -1
  7. package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
  8. package/lib/driver.ts +8 -2
  9. package/npm-shrinkwrap.json +152 -152
  10. package/package.json +5 -5
package/CHANGELOG.md CHANGED
@@ -1,3 +1,16 @@
1
+ ## [2.40.3](https://github.com/appium/appium-espresso-driver/compare/v2.40.2...v2.40.3) (2024-06-04)
2
+
3
+ ### Miscellaneous Chores
4
+
5
+ * bump semantic-release from 23.1.1 to 24.0.0 and conventional-changelog-conventionalcommits to 8.0.0 ([#1008](https://github.com/appium/appium-espresso-driver/issues/1008)) ([83ecab6](https://github.com/appium/appium-espresso-driver/commit/83ecab6cc56eca3da2ac05e07196ba0843a1bc01))
6
+
7
+ ## [2.40.2](https://github.com/appium/appium-espresso-driver/compare/v2.40.1...v2.40.2) (2024-05-28)
8
+
9
+
10
+ ### Miscellaneous Chores
11
+
12
+ * set animation scale via settings for api level 26+ ([#1007](https://github.com/appium/appium-espresso-driver/issues/1007)) ([5dec6be](https://github.com/appium/appium-espresso-driver/commit/5dec6be6b8f8114d3b3cbda1d58e34633d12d232))
13
+
1
14
  ## [2.40.1](https://github.com/appium/appium-espresso-driver/compare/v2.40.0...v2.40.1) (2024-05-16)
2
15
 
3
16
 
package/README.md CHANGED
@@ -188,7 +188,7 @@ appium:chromeOptions | A mapping, that allows to customize chromedriver options.
188
188
  Capability Name | Description
189
189
  --- | ---
190
190
  appium:disableSuppressAccessibilityService | Being set to `true` tells the instrumentation process to not suppress accessibility services during the automated test. This might be useful if your automated test needs these services. `false` by default
191
- appium:disableWindowAnimation | To avoid flakiness google [recommends](https://developer.android.com/training/testing/espresso/setup#set-up-environment) to disable the window animation of the Android device under test when running espresso test. `true` by default
191
+ appium:disableWindowAnimation | To avoid flakiness google [recommends](https://developer.android.com/training/testing/espresso/setup#set-up-environment) to disable the window animation of the Android device under test when running espresso test. Animation state is restored automatically after the session is stopped if it was enabled before it has started. The restore method may not work if the session ends unexpectedly. `true` by default
192
192
  appium:timeZone | Overrides the current device's time zone since the driver version 2.38.0. This change is preserved until the next override. The time zone identifier must be a valid name from the list of [available time zone identifiers](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), for example `Europe/Kyiv`
193
193
 
194
194
 
package/build/lib/driver.d.ts CHANGED
@@ -347,6 +347,13 @@ export declare class EspressoDriver extends AndroidDriver implements ExternalDri
347
347
  }>;
348
348
  get driverData(): {};
349
349
  startEspressoSession(): Promise<void>;
350
+ /**
351
+ * Turn on or off animation scale.
352
+ * '--no-window-animation' instrument argument for Espresso disables window animations,
353
+ * but it does not bring the animation scale back to the pre-instrument process start state in Espresso
354
+ * unlike Appium UIA2 driver case. We want to disable/enable the animation scale only in an appium espresso session as possible.
355
+ * @param isEnabled
356
+ */
350
357
  setWindowAnimationState(isEnabled: boolean): Promise<void>;
351
358
  initWebview(): Promise<void>;
352
359
  addDeviceInfoToCaps(): Promise<void>;
package/build/lib/driver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
package/build/lib/driver.js CHANGED
@@ -398,8 +398,7 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
398
398
  this._originalIme = await this.adb.defaultIME();
399
399
  }
400
400
  await this.initDevice();
401
- // https://github.com/appium/appium-espresso-driver/issues/72
402
- // default state is window animation disabled
401
+ // Default state is window animation disabled.
403
402
  await this.setWindowAnimationState(this.caps.disableWindowAnimation === false);
404
403
  // set actual device name, udid
405
404
  this.caps.deviceName = this.adb.curDeviceId;
@@ -457,6 +456,13 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
457
456
  this.jwpProxyActive = true;
458
457
  await this.addDeviceInfoToCaps();
459
458
  }
459
+ /**
460
+ * Turn on or off animation scale.
461
+ * '--no-window-animation' instrument argument for Espresso disables window animations,
462
+ * but it does not bring the animation scale back to the pre-instrument process start state in Espresso
463
+ * unlike Appium UIA2 driver case. We want to disable/enable the animation scale only in an appium espresso session as possible.
464
+ * @param isEnabled
465
+ */
460
466
  async setWindowAnimationState(isEnabled) {
461
467
  const isAnimationOn = await this.adb.isAnimationOn();
462
468
  const shouldDisableAnimation = !isEnabled && isAnimationOn;
package/build/lib/driver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUA,oDAAuB;AACvB,gDAAwB;AACxB,wDAAyB;AACzB,0CAA+E;AAC/E,uDAAiE;AACjE,4CAAkD;AAClD,6EAA+D;AAC/D,gEAAkD;AAClD,gEAAkD;AAClD,gEAAkD;AAClD,0DAA4C;AAC5C,kEAAoD;AACpD,sEAAwD;AACxD,iFAAmE;AACnE,gEAAkD;AAClD,2CAA8C;AAC9C,iEAA6D;AAC7D,2DAAwD;AACxD,+CAAqD;AACrD,6CAAgD;AAChD,uCAAyC;AACzC,mCAA8D;AAC9D,6CAA4C;AAG5C,uEAAuE;AACvE,qCAAqC;AACrC,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAEvC,8EAA8E;AAC9E,2EAA2E;AAC3E,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,8EAA8E;AAC9E,+EAA+E;AAC/E,8FAA8F;AAC9F,mFAAmF;AACnF,qDAAqD;AACrD,MAAM,QAAQ,GAA2C;IACvD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACxC,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,gDAAgD,CAAC,CAAC;IACrE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,+CAA+C,CAAC,CAAC;IACpE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,+CAA+C,CAAC,CAAC;IACpE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,iDAAiD,CAAC,CAAC;IACtE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC,CAAC;IAChE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC,CAAC;IAChE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,iCAAiC,CAAC,CAAC;IACtD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC9C,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAC/C,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAChD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,oCAAoC,CAAC,CAAC;IACzD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAC/C,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAC1C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,kCAAkC,CAAC,CAAC;IACxD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,mCAAmC,CAAC,CAAC;IACzD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,kCAAkC,CAAC,CAAC;IACxD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,oCAAoC,CAAC,CAAC;IAC1D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,4CAA4C,CAAC,CAAC;IAClE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,6CAA6C,CAAC,CAAC;IACnE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yCAAyC,CAAC,CAAC;IAC/D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,4CAA4C,CAAC,CAAC;IAClE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,6CAA6C,CAAC,CAAC;IACnE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yCAAyC,CAAC,CAAC;IAC/D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,oCAAoC,CAAC,CAAC;IAC1D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yCAAyC,CAAC,CAAC;IAC/D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yCAAyC,CAAC,CAAC;IAC/D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,0CAA0C,CAAC,CAAC;IAChE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8CAA8C,CAAC,CAAC;IACpE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,6CAA6C,CAAC,CAAC;IACnE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,sCAAsC,CAAC,CAAC;IAC5D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8CAA8C,CAAC,CAAC;IACpE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,iCAAiC,CAAC,CAAC;IACvD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,+CAA+C,CAAC,CAAC;IACrE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8CAA8C,CAAC,CAAC;IACpE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,+BAA+B,CAAC,CAAC;IACrD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8BAA8B,CAAC,CAAC;IACpD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,+BAA+B,CAAC,CAAC;IACrD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,oCAAoC,CAAC,CAAC;IAC1D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAE3C,mBAAmB;IACnB,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAE3C,eAAe;IACf,iDAAiD;IACjD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,8BAA8B,CAAC,CAAC;IACnD,iDAAiD;IACjD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;CAC/C,CAAC;AAEF,kFAAkF;AAClF,qDAAqD;AACrD,MAAM,eAAe,GAA2C;IAC9D,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAC7C,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC9C,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,oCAAoC,CAAC,CAAC;IACzD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAClD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAC9C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,qCAAqC,CAAC,CAAC;IAC3D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,+BAA+B,CAAC,CAAC;IAErD,qEAAqE;IACrE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8BAA8B,CAAC,CAAC;IAEpD,mBAAmB;IACnB,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAE3C,eAAe;IACf,iDAAiD;IACjD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,8BAA8B,CAAC,CAAC;IACnD,iDAAiD;IACjD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;CAC/C,CAAC;AAGF,MAAM,OAAO,GAAG,MAAM,CAAC;AACvB,MAAM,OAAO,GAAG,MAAM,CAAC;AACvB,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAEhD,MAAa,cAAe,SAAQ,qCAAa;IAmB/C,YAAa,OAAoB,EAAiB,EAAE,kBAAkB,GAAG,IAAI;QAC3E,0CAA0C;QAC1C,wCAAwC;QACxC,OAAO,IAAI,CAAC,KAAK,CAAC;QAElB,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAmhBlC,mBAAc,GAAG,WAAW,CAAC,cAAc,CAAC;QAE5C,0BAAqB,GAAG,WAAW,CAAC,qBAAqB,CAAC;QAE1D,wBAAmB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC;QAC5D,kBAAa,GAAG,iBAAiB,CAAC,aAAa,CAAC;QAChD,wBAAmB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC;QAE5D,mBAAc,GAAG,WAAW,CAAC,cAAc,CAAC;QAC5C,6BAAwB,GAAG,WAAW,CAAC,wBAAwB,CAAC;QAEhE,8BAAyB,GAAG,WAAW,CAAC,yBAAyB,CAAC;QAClE,gBAAW,GAAG,WAAW,CAAC,WAAW,CAAC;QACtC,qBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;QAChD,sBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;QAClD,kBAAa,GAAG,WAAW,CAAC,aAAa,CAAC;QAC1C,kBAAa,GAAG,WAAW,CAAC,aAAa,CAAC;QAC1C,qBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;QAChD,uBAAkB,GAAG,WAAW,CAAC,kBAAkB,CAAC;QACpD,uBAAkB,GAAG,WAAW,CAAC,kBAAkB,CAAC;QACpD,sBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;QAClD,0BAAqB,GAAG,WAAW,CAAC,qBAAqB,CAAC;QAE1D,iBAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;QACrC,mBAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QACzC,wBAAmB,GAAG,QAAQ,CAAC,mBAAmB,CAAC;QACnD,yBAAoB,GAAG,QAAQ,CAAC,oBAAoB,CAAC;QACrD,sBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;QAC/C,mBAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QACzC,sBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;QAC/C,gCAA2B,GAAG,QAAQ,CAAC,2BAA2B,CAAC;QACnE,mBAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QACzC,gBAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QAEnC,uBAAkB,GAAG,YAAY,CAAC,kBAAkB,CAAC;QACrD,sBAAiB,GAAG,YAAY,CAAC,iBAAiB,CAAC;QAEnD,kBAAa,GAAG,cAAc,CAAC,aAAa,CAAC;QAC7C,sBAAiB,GAAG,cAAc,CAAC,iBAAiB,CAAC;QAErD,kCAA6B,GAAG,mBAAmB,CAAC,6BAA6B,CAAC;QAClF,oCAA+B,GAAG,mBAAmB,CAAC,+BAA+B,CAAC;QACtF,8BAAyB,GAAG,mBAAmB,CAAC,yBAAyB,CAAC;QAC1E,0BAAqB,GAAG,mBAAmB,CAAC,qBAAqB,CAAC;QA7jBhE,IAAI,CAAC,iBAAiB,GAAG;YACvB,IAAI;YACJ,YAAY;YACZ,kBAAkB;SACnB,CAAC;QACF,IAAI,CAAC,qBAAqB,GAAG,kCAAoB,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC;QAC9B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAEzB,IAAI,CAAC,IAAI,GAAG,EAAwB,CAAC;QACrC,IAAI,CAAC,IAAI,GAAG,IAA0B,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,IAAI,uBAAc,CAAC,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEzE,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;IAChC,CAAC;IAEQ,KAAK,CAAC,UAAU;QACvB,OAAO,MAAM,mBAAU,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,QAA+B,EAC/B,QAAgC,EAChC,QAAgC,EAChC,UAAyB;QAEzB,IAAI,CAAC;YACH,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,mBAAU,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CACtE,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,UAAU,CACX,CAAoD,CAAC;YAEtD,MAAM,aAAa,GAAG;gBACpB,QAAQ,EAAE,OAAO;gBACjB,iBAAiB,EAAE,KAAK;gBACxB,eAAe,EAAE,IAAI;gBACrB,iBAAiB,EAAE,IAAI;gBACvB,eAAe,EAAE,KAAK;gBACtB,wBAAwB,EAAE,IAAI;gBAC9B,sBAAsB,EAAE,KAAK;gBAC7B,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC;aACtC,CAAC;YAEF,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAEpD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAE5C,MAAM,WAAW,GAAG;gBAClB,SAAS,EAAE,KAAK;gBAChB,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE,6BAAgB;gBACzB,qBAAqB,EAAE,KAAK;aAC7B,CAAC;YACF,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAEnC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzB,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;oBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;oBAC1D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wFAAwF;wBAClG,kCAAkC,CAAC,CAAC;gBAC1C,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,qEAAqE;wBAC1F,qDAAqD,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU;mBACtC,MAAM,IAAA,+BAAiB,EAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;YACzE,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,6BAAgB,CAAC;YAC1D,mCAAmC;YACnC,MAAM,EAAC,IAAI,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC1D,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;YACtB,mDAAmD;YACnD,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YAC1B,uEAAuE;YACvE,eAAe;YACf,IAAI,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YAElC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBAClB,0DAA0D;gBAC1D,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC7D,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;oBACjD,mBAAmB,EAAE,oBAAoB;iBAC1C,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC5B,mEAAmE;gBACnE,6DAA6D;gBAC7D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sDAAsD;oBAChE,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,yBAAyB,CAAC,CAAC;gBACtD,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,UAAW,CAAC,EAAE,CAAC;oBAC1D,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,+BAA+B,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI;wBAC5E,yBAAyB,CAAC,CAAC;gBAC/B,CAAC;YACH,CAAC;YAED,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAClC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC3B,CAAC,CAAC,OAAO,IAAI,GAAG,gBAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,SAAS;gBAC5D,mEAAmE;gBACnE,qDAAqD,CAAC;YACxD,IAAI,IAAA,oBAAW,EAAC,CAAC,EAAE,eAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC;gBAClD,MAAM,CAAC,CAAC;YACV,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,eAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACzD,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YACpB,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,QAAQ,CAAE,OAAe;QAC7B,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC;QACjE,MAAM,cAAc,GAAG,gBAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC;eAC9C,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,gBAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,MAAM,iBAAO,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,aAAG,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,EAAC,cAAc,EAAC,CAAC,CAAC;QAE3D,MAAM,WAAW,GAAG,UAAU,oBAAoB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QACrG,MAAM,iBAAiB,GAAG,CAAC,MAAM,YAAE,CAAC,IAAI,CAAC,WAAW,EAAE;YACpD,GAAG,EAAE,OAAO;SACb,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,kCAAkC;YAClC,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,yBAAyB,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBACvG,iHAAiH,CAAC,CAAC;QACvH,CAAC;QACD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAC,CAAC,KAAK,CAAC,iBAAiB,CAAE,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,eAAe,gCAAgC,OAAO,GAAG,CAAC,CAAC;QAC9E,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAE,EAAC,aAAa,EAAE,KAAK,EAAE,OAAO,EAAC;QACvD,MAAM,UAAU,GAAG,KAAK,EAAE,WAAW,EAAE,EAAE;YACvC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yEAAyE;oBACrF,kFAAkF;oBAClF,sCAAsC,CAAC,CAAC;YAC5C,CAAC;iBAAM,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,UAAW,CAAC,EAAE,CAAC;gBAC5E,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACnC,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,mBAAmB,GAAG,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,CAC3D,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAExE,IAAI,WAAW,GAAG,IAAI,CAAC;QACvB,IAAI,4BAA4B,GAAG,KAAK,CAAC;QACzC,IAAI,gBAAC,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;YACnC,MAAM,WAAW,GAAG,MAAM,YAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3C,IAAI,WAAW,KAAK,aAAa,CAAC,WAAW,IAAI,MAAM,YAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACzF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,aAAa,CAAC,QAAQ,2BAA2B,OAAO,GAAG,CAAC,CAAC;gBACrF,4BAA4B,GAAG,IAAI,CAAC;gBACpC,WAAW,GAAG,aAAa,CAAC,QAAQ,CAAC;YACvC,CAAC;QACH,CAAC;QAED,oCAAoC;QACpC,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QACjC,yEAAyE;QACzE,MAAM,2BAA2B,GAAG,CAAC,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC;QAE/D,IAAI,CAAC,4BAA4B,EAAE,CAAC;YAClC,IAAI,2BAA2B,EAAE,CAAC;gBAChC,gCAAgC;gBAEhC,IAAI,eAAe,CAAC;gBACpB,IAAI,aAAa,GAAG,KAAK,CAAC;gBAC1B,IAAI,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;oBAChD,eAAe,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC/C,aAAa,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;gBAC7C,CAAC;gBAED,uDAAuD;gBACvD,WAAW,GAAG,eAAe;oBAC3B,CAAC,CAAC,MAAM,mBAAmB,CAAC,aAAa,EAAE,eAAe,CAAC;oBAC3D,CAAC,CAAC,MAAM,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAE9C,IAAI,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;oBACpB,2DAA2D;oBAC3D,MAAM,YAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC3B,CAAC;gBACD,IAAI,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC;oBAC/B,uCAAuC;oBACvC,MAAM,YAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;gBAC3D,CAAC;gBACD,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC;YAChC,CAAC;iBAAM,IAAI,KAAK,EAAE,CAAC;gBACjB,wEAAwE;gBACxE,wCAAwC;gBACxC,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QACD,OAAO,2BAA2B,CAAC,CAAC,CAAC,EAAC,OAAO,EAAE,WAAW,EAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACtE,CAAC;IAED,IAAI,UAAU;QACZ,oCAAoC;QACpC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,0DAA0D;IAC1D,KAAK,CAAC,oBAAoB;QACxB,MAAM,EAAC,eAAe,EAAC,GAAG,MAAM,IAAA,sBAAc,GAAE,CAAC;QACjD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpE,6HAA6H;QAC7H,IAAI,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,YAAY;YACpD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACjF,CAAC;QAED,kDAAkD;QAClD,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QACzC,IAAI,OAAO,EAAE,CAAC;YACZ,6DAA6D;YAC7D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,CAAC;QAED,kEAAkE;QAClE,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAC3B,IAAI,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;QAClD,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAExB,6DAA6D;QAC7D,6CAA6C;QAC7C,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,KAAK,KAAK,CAAC,CAAC;QAE/E,+BAA+B;QAC/B,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC;QAEvC,0CAA0C;QAC1C,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,6DAA6D;QAC7D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,WAAW,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC5F,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,UAAW,EAAE,WAAW,CAAC,CAAC;QAE/D,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC1B,8CAA8C;YAC9C,wBAAwB;YACxB,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC3E,CAAC;QAED,wBAAwB;QACxB,uDAAuD;QACvD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAErB,+EAA+E;QAC/E,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QAC5C,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;QAClG,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,IAAA,2BAAmB,EACzC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,UAAW,CAC7C,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,IAAA,2BAAmB,EAAC,OAAO,CAAC,WAAY,EAAE,IAAI,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC;QAC3F,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,cAAe,CAAC,CAAC;QACxG,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,IAAA,2BAAmB,EAC7C,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,cAAe,CACnG,CAAC;QACJ,CAAC;QAED,iEAAiE;QACjE,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oFAAoF,CAAC,CAAC;QACtG,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,CAC5B,IAAI,CAAC,IAAI,CAAC,cAAe,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,CAChF,CAAC;QACJ,CAAC;QACD,gEAAgE;QAChE,gBAAgB;QAChB,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;QAED,wEAAwE;QACxE,2DAA2D;QAC3D,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAE3B,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,SAAkB;QAC9C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QACrD,MAAM,sBAAsB,GAAG,CAAC,SAAS,IAAI,aAAa,CAAC;QAC3D,MAAM,qBAAqB,GAAG,SAAS,IAAI,CAAC,aAAa,CAAC;QAE1D,IAAI,sBAAsB,EAAE,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mHAAmH,CAAC,CAAC;YACpI,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAChD,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAClC,CAAC;aAAM,IAAI,qBAAqB,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kFAAkF,CAAC,CAAC;YACnG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC;QACrD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,QAAQ,kBAAkB,OAAO,IAAI,CAAC,CAAC;QACpF,MAAM,IAAA,wBAAa,EAAC,OAAO,GAAG,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,MAAM,EACJ,UAAU,EACV,eAAe,EACf,YAAY,EACZ,KAAK,EACL,eAAe,EACf,cAAc,GACf,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,mBAAmB,GAAG,cAAc,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAC;IAC9C,CAAC;IAED,kBAAkB;QAChB,sEAAsE;QACtE,qCAAqC;QACrC,IAAI,CAAC,QAAQ,GAAG,IAAI,gCAAc,CAAC,IAAI,CAAC,GAAG,EAAE;YAC3C,+CAA+C;YAC/C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,WAAW;YAC9D,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,UAAU,EAAE,WAAW;YACvB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG;YAClB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;YACxB,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAClC,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB;YACtD,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,mBAAmB;YAClD,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa;YACxC,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,2BAA2B;YAC1D,qBAAqB,EAAE,IAAI,CAAC,IAAI,CAAC,qBAAqB;YACtD,sBAAsB,EAAE,IAAI,CAAC,IAAI,CAAC,sBAAsB;YACxD,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAClC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;YACpC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAC5C,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAClC,mCAAmC,EAAE,IAAI,CAAC,IAAI,CAAC,mCAAmC;SACnF,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,OAAO;QACX,oEAAoE;QACpE,IAAI,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,sBAAsB,CAC/B,6BAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAClD,CAAC,uCAAkB,EAAE,8BAAY,CAAC,CACnC,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACnB,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACxB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,6EAA6E,CAAC,CAAC;YACxG,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;YAC1E,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACxB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YAC7B,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC;QACrD,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAClB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAC1B,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0EAA0E,CAAC,CAAC;QAC7F,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;YACrC,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,uCAAkB,EAAE,8BAAY,CAAC,CAAC;YAC5E,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oEAAoE;oBAChF,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;IACH,CAAC;IAEQ,KAAK,CAAC,aAAa;QAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAE5C,MAAM,wBAAwB,GAAG,CAAC,KAAK,IAAI,EAAE;gBAC3C,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,EAAE,CAAC;oBAChD,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACnC,CAAC;YACH,CAAC,EAAE,KAAK,IAAI,EAAE;gBACZ,IAAI,MAAM,IAAI,CAAC,uCAAuC,EAAE,EAAE,CAAC;oBACzD,MAAM,IAAI,CAAC,kCAAkC,EAAE,CAAC;gBAClD,CAAC;YACH,CAAC,EAAE,KAAK,IAAI,EAAE;gBACZ,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC;oBAC3C,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBACzC,CAAC;YACH,CAAC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;YACtC,CAAC;YACD,wBAAwB;YACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAE5B,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,MAAM,kBAAC,CAAC,GAAG,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChD,CAAC,KAAK,IAAI,EAAE;oBACV,IAAI,CAAC;wBACH,MAAM,IAAI,EAAE,CAAC;oBACf,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;gBAClB,CAAC,CAAC,EAAE,CAAC;YACP,CAAC,CAAC,CAAC,CAAC;YACJ,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC7B,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBACjD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;YACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC3C,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACnF,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACzE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;gBACnF,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC;YACrD,CAAC;YACD,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YAC5B,IAAI,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,YAAY;gBACpD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;gBACjF,MAAM,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACnF,CAAC;QACH,CAAC;QACD,MAAM,KAAK,CAAC,aAAa,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACzD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;gBAClE,oEAAoE;gBACpE,gCAAgC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,uEAAuE;QACvE,0CAA0C;IAC5C,CAAC;IAED,6EAA6E;IAC7E,WAAW,CAAE,SAAS;QACpB,wDAAwD;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,6EAA6E;IAC7E,QAAQ,CAAE,SAAS;QACjB,6CAA6C;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,6EAA6E;IAC7E,iBAAiB,CAAE,SAAS;QAC1B,uFAAuF;QACvF,6FAA6F;QAC7F,IAAI,CAAC,aAAa,GAAG,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC;QAC7E,IAAI,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAClC,IAAI,CAAC,aAAa,GAAG,oDAAoD,CAAA,CAAC;gBACxE,GAAG,IAAI,CAAC,aAAa;gBACrB,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,4BAA4B,CAAC,CAAC;aAClD,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC;IACjF,CAAC;;AAziBH,wCAulBC;AA5kBQ,2BAAY,GAAG,yBAAY,AAAf,CAAgB;AA8kBrC,kBAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
package/lib/driver.ts CHANGED
@@ -409,8 +409,7 @@ export class EspressoDriver extends AndroidDriver implements ExternalDriver<
409
409
  }
410
410
  await this.initDevice();
411
411
 
412
- // https://github.com/appium/appium-espresso-driver/issues/72
413
- // default state is window animation disabled
412
+ // Default state is window animation disabled.
414
413
  await this.setWindowAnimationState(this.caps.disableWindowAnimation === false);
415
414
 
416
415
  // set actual device name, udid
@@ -479,6 +478,13 @@ export class EspressoDriver extends AndroidDriver implements ExternalDriver<
479
478
  await this.addDeviceInfoToCaps();
480
479
  }
481
480
 
481
+ /**
482
+ * Turn on or off animation scale.
483
+ * '--no-window-animation' instrument argument for Espresso disables window animations,
484
+ * but it does not bring the animation scale back to the pre-instrument process start state in Espresso
485
+ * unlike Appium UIA2 driver case. We want to disable/enable the animation scale only in an appium espresso session as possible.
486
+ * @param isEnabled
487
+ */
482
488
  async setWindowAnimationState(isEnabled: boolean): Promise<void> {
483
489
  const isAnimationOn = await this.adb.isAnimationOn();
484
490
  const shouldDisableAnimation = !isEnabled && isAnimationOn;
package/npm-shrinkwrap.json CHANGED
@@ -1,19 +1,19 @@
1
1
  {
2
2
  "name": "appium-espresso-driver",
3
- "version": "2.40.1",
3
+ "version": "2.40.3",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "appium-espresso-driver",
9
- "version": "2.40.1",
9
+ "version": "2.40.3",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
- "appium-adb": "^12.2.0",
12
+ "appium-adb": "^12.4.0",
13
13
  "appium-android-driver": "^9.6.0",
14
14
  "asyncbox": "^3.0.0",
15
15
  "bluebird": "^3.5.0",
16
- "io.appium.settings": "^5.7.2",
16
+ "io.appium.settings": "^5.10.0",
17
17
  "lodash": "^4.17.11",
18
18
  "portscanner": "^2.1.1",
19
19
  "source-map-support": "^0.x",
@@ -41,10 +41,10 @@
41
41
  "async-lock": "^1.0.0",
42
42
  "chai": "^4.1.2",
43
43
  "chai-as-promised": "^7.1.1",
44
- "conventional-changelog-conventionalcommits": "^7.0.1",
44
+ "conventional-changelog-conventionalcommits": "^8.0.0",
45
45
  "mocha": "^10.0.0",
46
46
  "rimraf": "^5.0.0",
47
- "semantic-release": "^23.0.0",
47
+ "semantic-release": "^24.0.0",
48
48
  "sinon": "^17.0.0",
49
49
  "ts-node": "^10.9.1",
50
50
  "typescript": "^5.4.2",
@@ -60,34 +60,34 @@
60
60
  }
61
61
  },
62
62
  "node_modules/@appium/base-driver": {
63
- "version": "9.6.0",
64
- "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.6.0.tgz",
65
- "integrity": "sha512-8+pqWHQ4tbvtwOxNCtHa5m0SUwQIvAwHTVKq/YUbgDn18ep4nGhz5rlryvvqyNpXEgEOhbLInIRma1KIrYdX8Q==",
63
+ "version": "9.7.0",
64
+ "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.7.0.tgz",
65
+ "integrity": "sha512-WOikrt0wcwGjVhjyfWtLZ9TkPdov4FIrrhcYa9H4xfLDUirvEIesFHvXf2syV+Y+dn7eofrSWqEokV6SuX5cyA==",
66
66
  "dependencies": {
67
- "@appium/support": "^4.2.5",
68
- "@appium/types": "^0.17.0",
67
+ "@appium/support": "^4.2.6",
68
+ "@appium/types": "^0.18.0",
69
69
  "@colors/colors": "1.6.0",
70
70
  "@types/async-lock": "1.4.2",
71
71
  "@types/bluebird": "3.5.42",
72
72
  "@types/express": "4.17.21",
73
- "@types/lodash": "4.17.0",
73
+ "@types/lodash": "4.17.4",
74
74
  "@types/method-override": "0.0.35",
75
75
  "@types/serve-favicon": "2.5.7",
76
76
  "async-lock": "1.4.1",
77
77
  "asyncbox": "3.0.0",
78
- "axios": "1.6.8",
78
+ "axios": "1.7.2",
79
79
  "bluebird": "3.7.2",
80
80
  "body-parser": "1.20.2",
81
81
  "express": "4.19.2",
82
82
  "http-status-codes": "2.3.0",
83
83
  "lodash": "4.17.21",
84
- "lru-cache": "10.2.0",
84
+ "lru-cache": "10.2.2",
85
85
  "method-override": "3.0.0",
86
86
  "morgan": "1.10.0",
87
87
  "path-to-regexp": "6.2.2",
88
88
  "serve-favicon": "2.5.0",
89
89
  "source-map-support": "0.5.21",
90
- "type-fest": "4.10.1",
90
+ "type-fest": "4.18.3",
91
91
  "validate.js": "0.13.1"
92
92
  },
93
93
  "engines": {
@@ -98,11 +98,6 @@
98
98
  "spdy": "4.0.2"
99
99
  }
100
100
  },
101
- "node_modules/@appium/base-driver/node_modules/@types/lodash": {
102
- "version": "4.17.0",
103
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz",
104
- "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA=="
105
- },
106
101
  "node_modules/@appium/schema": {
107
102
  "version": "0.5.0",
108
103
  "resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.5.0.tgz",
@@ -118,12 +113,12 @@
118
113
  }
119
114
  },
120
115
  "node_modules/@appium/support": {
121
- "version": "4.2.5",
122
- "resolved": "https://registry.npmjs.org/@appium/support/-/support-4.2.5.tgz",
123
- "integrity": "sha512-txTDZHjJF7UjEFi4uyj23gciz3yAq7OwzXFdJgtQBzkK1cIiCnywQ6igLmBg52jZp84ki8eZIDMXsQetVUuDDg==",
116
+ "version": "4.2.6",
117
+ "resolved": "https://registry.npmjs.org/@appium/support/-/support-4.2.6.tgz",
118
+ "integrity": "sha512-uX4OMlatb3zsTOmh2YPZb3owtxdCMfMk9IbcFilIzCMLRAhYEYw29Z8vNe19QN+td2tS0i0NOFae5tz7lB72Uw==",
124
119
  "dependencies": {
125
120
  "@appium/tsconfig": "^0.3.3",
126
- "@appium/types": "^0.17.0",
121
+ "@appium/types": "^0.18.0",
127
122
  "@colors/colors": "1.6.0",
128
123
  "@types/archiver": "6.0.2",
129
124
  "@types/base64-stream": "1.0.5",
@@ -142,14 +137,14 @@
142
137
  "@types/uuid": "9.0.8",
143
138
  "@types/which": "3.0.3",
144
139
  "archiver": "7.0.1",
145
- "axios": "1.6.8",
140
+ "axios": "1.7.2",
146
141
  "base64-stream": "1.0.0",
147
142
  "bluebird": "3.7.2",
148
143
  "bplist-creator": "0.1.1",
149
144
  "bplist-parser": "0.3.2",
150
145
  "form-data": "4.0.0",
151
146
  "get-stream": "6.0.1",
152
- "glob": "10.3.12",
147
+ "glob": "10.4.1",
153
148
  "jsftp": "2.1.3",
154
149
  "klaw": "4.1.0",
155
150
  "lockfile": "1.0.4",
@@ -166,12 +161,12 @@
166
161
  "read-pkg": "5.2.0",
167
162
  "resolve-from": "5.0.0",
168
163
  "sanitize-filename": "1.6.3",
169
- "semver": "7.6.0",
164
+ "semver": "7.6.2",
170
165
  "shell-quote": "1.8.1",
171
166
  "source-map-support": "0.5.21",
172
167
  "supports-color": "8.1.1",
173
- "teen_process": "2.1.1",
174
- "type-fest": "4.10.1",
168
+ "teen_process": "2.1.3",
169
+ "type-fest": "4.18.3",
175
170
  "uuid": "9.0.1",
176
171
  "which": "4.0.0",
177
172
  "yauzl": "3.1.3"
@@ -181,32 +176,22 @@
181
176
  "npm": ">=8"
182
177
  },
183
178
  "optionalDependencies": {
184
- "sharp": "0.33.3"
179
+ "sharp": "0.33.4"
185
180
  }
186
181
  },
187
- "node_modules/@appium/support/node_modules/lru-cache": {
188
- "version": "6.0.0",
189
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
190
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
191
- "dependencies": {
192
- "yallist": "^4.0.0"
193
- },
194
- "engines": {
195
- "node": ">=10"
196
- }
197
- },
198
- "node_modules/@appium/support/node_modules/semver": {
199
- "version": "7.6.0",
200
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
201
- "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
182
+ "node_modules/@appium/support/node_modules/teen_process": {
183
+ "version": "2.1.3",
184
+ "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.1.3.tgz",
185
+ "integrity": "sha512-OBxmDvVOGavBQscCaKn365B5KuQ04uGRekAcKbwCu/2M1YvICpeNgVpqR+z9AhWSYOdB4zKLLwk4M1fyfAwPjw==",
202
186
  "dependencies": {
203
- "lru-cache": "^6.0.0"
204
- },
205
- "bin": {
206
- "semver": "bin/semver.js"
187
+ "bluebird": "^3.7.2",
188
+ "lodash": "^4.17.21",
189
+ "shell-quote": "^1.8.1",
190
+ "source-map-support": "^0.x"
207
191
  },
208
192
  "engines": {
209
- "node": ">=10"
193
+ "node": "^16.13.0 || >=18.0.0",
194
+ "npm": ">=8"
210
195
  }
211
196
  },
212
197
  "node_modules/@appium/tsconfig": {
@@ -222,16 +207,16 @@
222
207
  }
223
208
  },
224
209
  "node_modules/@appium/types": {
225
- "version": "0.17.0",
226
- "resolved": "https://registry.npmjs.org/@appium/types/-/types-0.17.0.tgz",
227
- "integrity": "sha512-7Q9C5Y4G8ZQzdU0uJIlfVqpGMAzNqdXpNWziQTUfZyD7fHbYz9ScZrlgs2/DYMITRrHiIblmzY/5yzfu00rQuA==",
210
+ "version": "0.18.0",
211
+ "resolved": "https://registry.npmjs.org/@appium/types/-/types-0.18.0.tgz",
212
+ "integrity": "sha512-gvR75CbtbHP1dqUr1arWlLzI9ABAtosn/qDTqwjG5OX59ael6OwsWlfrR7wIDiGy7CjmHMRZJ38g+O4QwB9GCQ==",
228
213
  "dependencies": {
229
214
  "@appium/schema": "^0.5.0",
230
215
  "@appium/tsconfig": "^0.3.3",
231
216
  "@types/express": "4.17.21",
232
217
  "@types/npmlog": "7.0.0",
233
218
  "@types/ws": "8.5.10",
234
- "type-fest": "4.10.1"
219
+ "type-fest": "4.18.3"
235
220
  },
236
221
  "engines": {
237
222
  "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
@@ -239,11 +224,11 @@
239
224
  }
240
225
  },
241
226
  "node_modules/@babel/code-frame": {
242
- "version": "7.24.2",
243
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
244
- "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
227
+ "version": "7.24.6",
228
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz",
229
+ "integrity": "sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==",
245
230
  "dependencies": {
246
- "@babel/highlight": "^7.24.2",
231
+ "@babel/highlight": "^7.24.6",
247
232
  "picocolors": "^1.0.0"
248
233
  },
249
234
  "engines": {
@@ -251,19 +236,19 @@
251
236
  }
252
237
  },
253
238
  "node_modules/@babel/helper-validator-identifier": {
254
- "version": "7.24.5",
255
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz",
256
- "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==",
239
+ "version": "7.24.6",
240
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz",
241
+ "integrity": "sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==",
257
242
  "engines": {
258
243
  "node": ">=6.9.0"
259
244
  }
260
245
  },
261
246
  "node_modules/@babel/highlight": {
262
- "version": "7.24.5",
263
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.5.tgz",
264
- "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==",
247
+ "version": "7.24.6",
248
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.6.tgz",
249
+ "integrity": "sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==",
265
250
  "dependencies": {
266
- "@babel/helper-validator-identifier": "^7.24.5",
251
+ "@babel/helper-validator-identifier": "^7.24.6",
267
252
  "chalk": "^2.4.2",
268
253
  "js-tokens": "^4.0.0",
269
254
  "picocolors": "^1.0.0"
@@ -396,9 +381,9 @@
396
381
  }
397
382
  },
398
383
  "node_modules/@img/sharp-linux-x64": {
399
- "version": "0.33.3",
400
- "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.3.tgz",
401
- "integrity": "sha512-Q4I++herIJxJi+qmbySd072oDPRkCg/SClLEIDh5IL9h1zjhqjv82H0Seupd+q2m0yOfD+/fJnjSoDFtKiHu2g==",
384
+ "version": "0.33.4",
385
+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.4.tgz",
386
+ "integrity": "sha512-GoR++s0XW9DGVi8SUGQ/U4AeIzLdNjHka6jidVwapQ/JebGVQIpi52OdyxCNVRE++n1FCLzjDovJNozif7w/Aw==",
402
387
  "cpu": [
403
388
  "x64"
404
389
  ],
@@ -557,9 +542,9 @@
557
542
  }
558
543
  },
559
544
  "node_modules/@types/express-serve-static-core": {
560
- "version": "4.19.0",
561
- "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.0.tgz",
562
- "integrity": "sha512-bGyep3JqPCRry1wq+O5n7oiBgGWmeIJXPjXXCo8EK0u8duZGSYar7cGqd3ML2JUsLGeB7fmc06KYo9fLGWqPvQ==",
545
+ "version": "4.19.3",
546
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.3.tgz",
547
+ "integrity": "sha512-KOzM7MhcBFlmnlr/fzISFF5vGWVSvN6fTd4T+ExOt08bA/dA5kpSzY52nMsI1KDFmUREpJelPYyuslLRSjjgCg==",
563
548
  "dependencies": {
564
549
  "@types/node": "*",
565
550
  "@types/qs": "*",
@@ -603,6 +588,11 @@
603
588
  "resolved": "https://registry.npmjs.org/@types/lockfile/-/lockfile-1.0.4.tgz",
604
589
  "integrity": "sha512-Q8oFIHJHr+htLrTXN2FuZfg+WXVHQRwU/hC2GpUu+Q8e3FUM9EDkS2pE3R2AO1ZGu56f479ybdMCNF1DAu8cAQ=="
605
590
  },
591
+ "node_modules/@types/lodash": {
592
+ "version": "4.17.4",
593
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz",
594
+ "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ=="
595
+ },
606
596
  "node_modules/@types/method-override": {
607
597
  "version": "0.0.35",
608
598
  "resolved": "https://registry.npmjs.org/@types/method-override/-/method-override-0.0.35.tgz",
@@ -630,9 +620,9 @@
630
620
  }
631
621
  },
632
622
  "node_modules/@types/node": {
633
- "version": "20.12.12",
634
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz",
635
- "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==",
623
+ "version": "20.14.1",
624
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.1.tgz",
625
+ "integrity": "sha512-T2MzSGEu+ysB/FkWfqmhV3PLyQlowdptmmgD20C6QxsS8Fmv5SjpZ1ayXaEC0S21/h5UJ9iA6W/5vSNU5l00OA==",
636
626
  "dependencies": {
637
627
  "undici-types": "~5.26.4"
638
628
  }
@@ -795,9 +785,9 @@
795
785
  }
796
786
  },
797
787
  "node_modules/appium-adb": {
798
- "version": "12.3.2",
799
- "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-12.3.2.tgz",
800
- "integrity": "sha512-QyiHDfxU3sUukxOeDiH0FQu5Kg9B3Q8oszO+egqd42813Ac3a5lYaoiS9vdh+Pwr+g5/z37KYVWPaHTpfR4jBA==",
788
+ "version": "12.4.2",
789
+ "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-12.4.2.tgz",
790
+ "integrity": "sha512-iBU61R59NblxZWM4b0JiHiSCEm4TzSR1ZVQ1tnQiFdYKucosrqpyMGL10MY5cfOztsn67yi0bxanGJC2WiV5XQ==",
801
791
  "dependencies": {
802
792
  "@appium/support": "^4.0.0",
803
793
  "@devicefarmer/adbkit-apkreader": "^3.2.4",
@@ -817,9 +807,9 @@
817
807
  }
818
808
  },
819
809
  "node_modules/appium-android-driver": {
820
- "version": "9.6.0",
821
- "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-9.6.0.tgz",
822
- "integrity": "sha512-BVZ6zhc1xQmjXE75t3G1Z3lpJEubiO7fhjhfkzA7SeBBNadCJg/D6r/Fm9SpMuT6+IwuCv6onFOsAkgQW8zNnA==",
810
+ "version": "9.6.2",
811
+ "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-9.6.2.tgz",
812
+ "integrity": "sha512-TDdQlnWZ2QK01lSxBtAh4alFRalY23JD+SfZti/CMeIpyq9HJov27Ys08jEKfDl3mTdo+Gi/3bKkSlYgp8ynyA==",
823
813
  "dependencies": {
824
814
  "@appium/support": "^4.2.0",
825
815
  "@colors/colors": "^1.6.0",
@@ -828,7 +818,7 @@
828
818
  "asyncbox": "^3.0.0",
829
819
  "axios": "^1.x",
830
820
  "bluebird": "^3.4.7",
831
- "io.appium.settings": "^5.8.1",
821
+ "io.appium.settings": "^5.9.1",
832
822
  "lodash": "^4.17.4",
833
823
  "lru-cache": "^10.0.1",
834
824
  "moment": "^2.24.0",
@@ -849,9 +839,9 @@
849
839
  }
850
840
  },
851
841
  "node_modules/appium-chromedriver": {
852
- "version": "5.6.51",
853
- "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-5.6.51.tgz",
854
- "integrity": "sha512-xDPafuZhiYb6J7E71ze3xadC6SNFIttccXJwFCQ8INN7BcinFHgopgsZRvs1vkjR45sEbkt79JjhEyXMBtRlCA==",
842
+ "version": "5.6.56",
843
+ "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-5.6.56.tgz",
844
+ "integrity": "sha512-cPsfsSKwxAKXGC5rZ5qW7lGZX7GXShncJJ8rzsPGQm2gRZl3l5YpTOPT79Bkyr0uN7NaYcEP/x1FSr89+w6JRA==",
855
845
  "hasInstallScript": true,
856
846
  "dependencies": {
857
847
  "@appium/base-driver": "^9.1.0",
@@ -917,6 +907,7 @@
917
907
  "version": "4.0.2",
918
908
  "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.2.tgz",
919
909
  "integrity": "sha512-ncSWAawFhKMJDTdoAeOV+jyW1VCMj5QIAwULIBV0SSR7B/RLPPEQiknKcg/RIIZlUQrxELpsxMiTUoAQ4sIUyg==",
910
+ "deprecated": "This package is no longer supported.",
920
911
  "engines": {
921
912
  "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
922
913
  }
@@ -967,9 +958,9 @@
967
958
  "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
968
959
  },
969
960
  "node_modules/axios": {
970
- "version": "1.6.8",
971
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
972
- "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
961
+ "version": "1.7.2",
962
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
963
+ "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
973
964
  "dependencies": {
974
965
  "follow-redirects": "^1.15.6",
975
966
  "form-data": "^4.0.0",
@@ -987,9 +978,9 @@
987
978
  "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
988
979
  },
989
980
  "node_modules/bare-events": {
990
- "version": "2.2.2",
991
- "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.2.tgz",
992
- "integrity": "sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==",
981
+ "version": "2.3.1",
982
+ "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.3.1.tgz",
983
+ "integrity": "sha512-sJnSOTVESURZ61XgEleqmP255T6zTYwHPwE4r6SssIh0U9/uDvfpdoJYpVUerJJZH2fueO+CdT8ZT+OC/7aZDA==",
993
984
  "optional": true
994
985
  },
995
986
  "node_modules/base64-js": {
@@ -1417,9 +1408,9 @@
1417
1408
  }
1418
1409
  },
1419
1410
  "node_modules/debug": {
1420
- "version": "4.3.4",
1421
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
1422
- "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
1411
+ "version": "4.3.5",
1412
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
1413
+ "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
1423
1414
  "dependencies": {
1424
1415
  "ms": "2.1.2"
1425
1416
  },
@@ -1836,6 +1827,7 @@
1836
1827
  "version": "5.0.2",
1837
1828
  "resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.2.tgz",
1838
1829
  "integrity": "sha512-pMaFftXPtiGIHCJHdcUUx9Rby/rFT/Kkt3fIIGCs+9PMDIljSyRiqraTlxNtBReJRDfUefpa263RQ3vnp5G/LQ==",
1830
+ "deprecated": "This package is no longer supported.",
1839
1831
  "dependencies": {
1840
1832
  "aproba": "^1.0.3 || ^2.0.0",
1841
1833
  "color-support": "^1.1.3",
@@ -1918,21 +1910,21 @@
1918
1910
  }
1919
1911
  },
1920
1912
  "node_modules/glob": {
1921
- "version": "10.3.12",
1922
- "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
1923
- "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
1913
+ "version": "10.4.1",
1914
+ "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz",
1915
+ "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==",
1924
1916
  "dependencies": {
1925
1917
  "foreground-child": "^3.1.0",
1926
- "jackspeak": "^2.3.6",
1927
- "minimatch": "^9.0.1",
1928
- "minipass": "^7.0.4",
1929
- "path-scurry": "^1.10.2"
1918
+ "jackspeak": "^3.1.2",
1919
+ "minimatch": "^9.0.4",
1920
+ "minipass": "^7.1.2",
1921
+ "path-scurry": "^1.11.1"
1930
1922
  },
1931
1923
  "bin": {
1932
1924
  "glob": "dist/esm/bin.mjs"
1933
1925
  },
1934
1926
  "engines": {
1935
- "node": ">=16 || 14 >=14.17"
1927
+ "node": ">=16 || 14 >=14.18"
1936
1928
  },
1937
1929
  "funding": {
1938
1930
  "url": "https://github.com/sponsors/isaacs"
@@ -2130,6 +2122,7 @@
2130
2122
  "version": "1.0.6",
2131
2123
  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
2132
2124
  "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
2125
+ "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
2133
2126
  "dependencies": {
2134
2127
  "once": "^1.3.0",
2135
2128
  "wrappy": "1"
@@ -2141,17 +2134,17 @@
2141
2134
  "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
2142
2135
  },
2143
2136
  "node_modules/ini": {
2144
- "version": "4.1.2",
2145
- "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz",
2146
- "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==",
2137
+ "version": "4.1.3",
2138
+ "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
2139
+ "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
2147
2140
  "engines": {
2148
2141
  "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
2149
2142
  }
2150
2143
  },
2151
2144
  "node_modules/io.appium.settings": {
2152
- "version": "5.9.1",
2153
- "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-5.9.1.tgz",
2154
- "integrity": "sha512-TlVMJDwi9sskGZt8QkiPcDcJ/UUqNCOhKEEXijUPiuyGggkG/XK9vHMUAxRTCRdU3Hc8jkNukqln0yIswJgh5g==",
2145
+ "version": "5.10.2",
2146
+ "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-5.10.2.tgz",
2147
+ "integrity": "sha512-iQE3mFK+juTKNMUawHQkg+AdWlqclt0VLa7iaMIWq4RYWuw8UlzpOP+usdAe2GayNJxkpBO81Nk7DY++iLKjZw==",
2155
2148
  "dependencies": {
2156
2149
  "asyncbox": "^3.0.0",
2157
2150
  "bluebird": "^3.5.1",
@@ -2237,9 +2230,9 @@
2237
2230
  }
2238
2231
  },
2239
2232
  "node_modules/jackspeak": {
2240
- "version": "2.3.6",
2241
- "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
2242
- "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
2233
+ "version": "3.2.3",
2234
+ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.2.3.tgz",
2235
+ "integrity": "sha512-htOzIMPbpLid/Gq9/zaz9SfExABxqRe1sSCdxntlO/aMD6u0issZQiY25n2GKQUtJ02j7z5sfptlAOMpWWOmvw==",
2243
2236
  "dependencies": {
2244
2237
  "@isaacs/cliui": "^8.0.2"
2245
2238
  },
@@ -2402,9 +2395,9 @@
2402
2395
  }
2403
2396
  },
2404
2397
  "node_modules/lru-cache": {
2405
- "version": "10.2.0",
2406
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
2407
- "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
2398
+ "version": "10.2.2",
2399
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
2400
+ "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
2408
2401
  "engines": {
2409
2402
  "node": "14 || >=16.14"
2410
2403
  }
@@ -2520,9 +2513,9 @@
2520
2513
  }
2521
2514
  },
2522
2515
  "node_modules/minipass": {
2523
- "version": "7.1.1",
2524
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.1.tgz",
2525
- "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==",
2516
+ "version": "7.1.2",
2517
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
2518
+ "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
2526
2519
  "engines": {
2527
2520
  "node": ">=16 || 14 >=14.17"
2528
2521
  }
@@ -2627,6 +2620,7 @@
2627
2620
  "version": "6.0.4",
2628
2621
  "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
2629
2622
  "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
2623
+ "deprecated": "Glob versions prior to v9 are no longer supported",
2630
2624
  "dependencies": {
2631
2625
  "inflight": "^1.0.4",
2632
2626
  "inherits": "2",
@@ -2653,6 +2647,7 @@
2653
2647
  "version": "2.4.5",
2654
2648
  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
2655
2649
  "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
2650
+ "deprecated": "Rimraf versions prior to v4 are no longer supported",
2656
2651
  "dependencies": {
2657
2652
  "glob": "^6.0.1"
2658
2653
  },
@@ -2707,6 +2702,7 @@
2707
2702
  "version": "7.0.1",
2708
2703
  "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-7.0.1.tgz",
2709
2704
  "integrity": "sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==",
2705
+ "deprecated": "This package is no longer supported.",
2710
2706
  "dependencies": {
2711
2707
  "are-we-there-yet": "^4.0.0",
2712
2708
  "console-control-strings": "^1.1.0",
@@ -3301,9 +3297,9 @@
3301
3297
  "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
3302
3298
  },
3303
3299
  "node_modules/sharp": {
3304
- "version": "0.33.3",
3305
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.3.tgz",
3306
- "integrity": "sha512-vHUeXJU1UvlO/BNwTpT0x/r53WkLUVxrmb5JTgW92fdFCFk0ispLMAeu/jPO2vjkXM1fYUi3K7/qcLF47pwM1A==",
3300
+ "version": "0.33.4",
3301
+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.4.tgz",
3302
+ "integrity": "sha512-7i/dt5kGl7qR4gwPRD2biwD2/SvBn3O04J77XKFgL2OnZtQw+AG9wnuS/csmu80nPRHLYE9E41fyEiG8nhH6/Q==",
3307
3303
  "hasInstallScript": true,
3308
3304
  "optional": true,
3309
3305
  "dependencies": {
@@ -3319,8 +3315,8 @@
3319
3315
  "url": "https://opencollective.com/libvips"
3320
3316
  },
3321
3317
  "optionalDependencies": {
3322
- "@img/sharp-darwin-arm64": "0.33.3",
3323
- "@img/sharp-darwin-x64": "0.33.3",
3318
+ "@img/sharp-darwin-arm64": "0.33.4",
3319
+ "@img/sharp-darwin-x64": "0.33.4",
3324
3320
  "@img/sharp-libvips-darwin-arm64": "1.0.2",
3325
3321
  "@img/sharp-libvips-darwin-x64": "1.0.2",
3326
3322
  "@img/sharp-libvips-linux-arm": "1.0.2",
@@ -3329,15 +3325,15 @@
3329
3325
  "@img/sharp-libvips-linux-x64": "1.0.2",
3330
3326
  "@img/sharp-libvips-linuxmusl-arm64": "1.0.2",
3331
3327
  "@img/sharp-libvips-linuxmusl-x64": "1.0.2",
3332
- "@img/sharp-linux-arm": "0.33.3",
3333
- "@img/sharp-linux-arm64": "0.33.3",
3334
- "@img/sharp-linux-s390x": "0.33.3",
3335
- "@img/sharp-linux-x64": "0.33.3",
3336
- "@img/sharp-linuxmusl-arm64": "0.33.3",
3337
- "@img/sharp-linuxmusl-x64": "0.33.3",
3338
- "@img/sharp-wasm32": "0.33.3",
3339
- "@img/sharp-win32-ia32": "0.33.3",
3340
- "@img/sharp-win32-x64": "0.33.3"
3328
+ "@img/sharp-linux-arm": "0.33.4",
3329
+ "@img/sharp-linux-arm64": "0.33.4",
3330
+ "@img/sharp-linux-s390x": "0.33.4",
3331
+ "@img/sharp-linux-x64": "0.33.4",
3332
+ "@img/sharp-linuxmusl-arm64": "0.33.4",
3333
+ "@img/sharp-linuxmusl-x64": "0.33.4",
3334
+ "@img/sharp-wasm32": "0.33.4",
3335
+ "@img/sharp-win32-ia32": "0.33.4",
3336
+ "@img/sharp-win32-x64": "0.33.4"
3341
3337
  }
3342
3338
  },
3343
3339
  "node_modules/shebang-command": {
@@ -3443,9 +3439,9 @@
3443
3439
  }
3444
3440
  },
3445
3441
  "node_modules/spdx-license-ids": {
3446
- "version": "3.0.17",
3447
- "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
3448
- "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg=="
3442
+ "version": "3.0.18",
3443
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
3444
+ "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ=="
3449
3445
  },
3450
3446
  "node_modules/spdy": {
3451
3447
  "version": "4.0.2",
@@ -3517,12 +3513,13 @@
3517
3513
  }
3518
3514
  },
3519
3515
  "node_modules/streamx": {
3520
- "version": "2.16.1",
3521
- "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.16.1.tgz",
3522
- "integrity": "sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==",
3516
+ "version": "2.18.0",
3517
+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
3518
+ "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
3523
3519
  "dependencies": {
3524
- "fast-fifo": "^1.1.0",
3525
- "queue-tick": "^1.0.1"
3520
+ "fast-fifo": "^1.3.2",
3521
+ "queue-tick": "^1.0.1",
3522
+ "text-decoder": "^1.1.0"
3526
3523
  },
3527
3524
  "optionalDependencies": {
3528
3525
  "bare-events": "^2.2.0"
@@ -3655,9 +3652,9 @@
3655
3652
  }
3656
3653
  },
3657
3654
  "node_modules/teen_process": {
3658
- "version": "2.1.1",
3659
- "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.1.1.tgz",
3660
- "integrity": "sha512-PIX+PyH6h52uJeGpXfjLdIBRim5pPkJTkO/PPeLCa5NlofqlasTjcvNUUYo6XurnxSTl0o17sBzIrVoXNuqwGg==",
3655
+ "version": "2.1.4",
3656
+ "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.1.4.tgz",
3657
+ "integrity": "sha512-TEaxCYk/aCBsNBCZmgUNXqtCWq8RX94nGoyYYu7YiNR+RnmawMFshTkYe1SFhiNCX6FsYb6wL/irs6NhvfoF5g==",
3661
3658
  "dependencies": {
3662
3659
  "bluebird": "^3.7.2",
3663
3660
  "lodash": "^4.17.21",
@@ -3669,6 +3666,14 @@
3669
3666
  "npm": ">=8"
3670
3667
  }
3671
3668
  },
3669
+ "node_modules/text-decoder": {
3670
+ "version": "1.1.0",
3671
+ "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.0.tgz",
3672
+ "integrity": "sha512-TmLJNj6UgX8xcUZo4UDStGQtDiTzF7BzWlzn9g7UWrjkpHr5uJTK1ld16wZ3LXb2vb6jH8qU89dW5whuMdXYdw==",
3673
+ "dependencies": {
3674
+ "b4a": "^1.6.4"
3675
+ }
3676
+ },
3672
3677
  "node_modules/through": {
3673
3678
  "version": "2.3.8",
3674
3679
  "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -3697,9 +3702,9 @@
3697
3702
  "extraneous": true
3698
3703
  },
3699
3704
  "node_modules/type-fest": {
3700
- "version": "4.10.1",
3701
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.10.1.tgz",
3702
- "integrity": "sha512-7ZnJYTp6uc04uYRISWtiX3DSKB/fxNQT0B5o1OUeCqiQiwF+JC9+rJiZIDrPrNCLLuTqyQmh4VdQqh/ZOkv9MQ==",
3705
+ "version": "4.18.3",
3706
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.18.3.tgz",
3707
+ "integrity": "sha512-Q08/0IrpvM+NMY9PA2rti9Jb+JejTddwmwmVQGskAlhtcrw1wsRzoR6ode6mR+OAabNa75w/dxedSUY2mlphaQ==",
3703
3708
  "engines": {
3704
3709
  "node": ">=16"
3705
3710
  },
@@ -3931,9 +3936,9 @@
3931
3936
  "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
3932
3937
  },
3933
3938
  "node_modules/ws": {
3934
- "version": "8.16.0",
3935
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
3936
- "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
3939
+ "version": "8.17.0",
3940
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
3941
+ "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
3937
3942
  "engines": {
3938
3943
  "node": ">=10.0.0"
3939
3944
  },
@@ -3975,11 +3980,6 @@
3975
3980
  "node": ">=10"
3976
3981
  }
3977
3982
  },
3978
- "node_modules/yallist": {
3979
- "version": "4.0.0",
3980
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
3981
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
3982
- },
3983
3983
  "node_modules/yargs": {
3984
3984
  "version": "17.7.2",
3985
3985
  "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "automated testing",
8
8
  "android"
9
9
  ],
10
- "version": "2.40.1",
10
+ "version": "2.40.3",
11
11
  "author": "Appium Contributors",
12
12
  "license": "Apache-2.0",
13
13
  "repository": {
@@ -72,11 +72,11 @@
72
72
  "npm-shrinkwrap.json"
73
73
  ],
74
74
  "dependencies": {
75
- "appium-adb": "^12.2.0",
75
+ "appium-adb": "^12.4.0",
76
76
  "appium-android-driver": "^9.6.0",
77
77
  "asyncbox": "^3.0.0",
78
78
  "bluebird": "^3.5.0",
79
- "io.appium.settings": "^5.7.2",
79
+ "io.appium.settings": "^5.10.0",
80
80
  "lodash": "^4.17.11",
81
81
  "portscanner": "^2.1.1",
82
82
  "source-map-support": "^0.x",
@@ -126,10 +126,10 @@
126
126
  "async-lock": "^1.0.0",
127
127
  "chai": "^4.1.2",
128
128
  "chai-as-promised": "^7.1.1",
129
- "conventional-changelog-conventionalcommits": "^7.0.1",
129
+ "conventional-changelog-conventionalcommits": "^8.0.0",
130
130
  "mocha": "^10.0.0",
131
131
  "rimraf": "^5.0.0",
132
- "semantic-release": "^23.0.0",
132
+ "semantic-release": "^24.0.0",
133
133
  "sinon": "^17.0.0",
134
134
  "ts-node": "^10.9.1",
135
135
  "typescript": "^5.4.2",