appium-uiautomator2-driver 7.3.0 → 7.5.0
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.
- package/CHANGELOG.md +12 -0
- package/build/lib/commands/app-management.d.ts.map +1 -1
- package/build/lib/commands/app-management.js +1 -5
- package/build/lib/commands/app-management.js.map +1 -1
- package/build/lib/commands/aut.d.ts +10 -0
- package/build/lib/commands/aut.d.ts.map +1 -0
- package/build/lib/commands/aut.js +122 -0
- package/build/lib/commands/aut.js.map +1 -0
- package/build/lib/commands/element.d.ts.map +1 -1
- package/build/lib/commands/element.js +2 -6
- package/build/lib/commands/element.js.map +1 -1
- package/build/lib/commands/gestures.d.ts.map +1 -1
- package/build/lib/commands/gestures.js +2 -6
- package/build/lib/commands/gestures.js.map +1 -1
- package/build/lib/commands/keyboard.d.ts.map +1 -1
- package/build/lib/commands/keyboard.js +0 -8
- package/build/lib/commands/keyboard.js.map +1 -1
- package/build/lib/commands/screenshot.js +7 -8
- package/build/lib/commands/screenshot.js.map +1 -1
- package/build/lib/css-converter.js +9 -12
- package/build/lib/css-converter.js.map +1 -1
- package/build/lib/driver.d.ts +20 -16
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +25 -391
- package/build/lib/driver.js.map +1 -1
- package/build/lib/{uiautomator2.d.ts → uiautomator2-server/core.d.ts} +1 -3
- package/build/lib/uiautomator2-server/core.d.ts.map +1 -0
- package/build/lib/{uiautomator2.js → uiautomator2-server/core.js} +14 -16
- package/build/lib/uiautomator2-server/core.js.map +1 -0
- package/build/lib/uiautomator2-server/index.d.ts +4 -0
- package/build/lib/uiautomator2-server/index.d.ts.map +1 -0
- package/build/lib/uiautomator2-server/index.js +18 -0
- package/build/lib/uiautomator2-server/index.js.map +1 -0
- package/build/lib/uiautomator2-server/packages.d.ts +3 -0
- package/build/lib/uiautomator2-server/packages.d.ts.map +1 -0
- package/build/lib/uiautomator2-server/packages.js +6 -0
- package/build/lib/uiautomator2-server/packages.js.map +1 -0
- package/build/lib/uiautomator2-server/session.d.ts +25 -0
- package/build/lib/uiautomator2-server/session.d.ts.map +1 -0
- package/build/lib/uiautomator2-server/session.js +303 -0
- package/build/lib/uiautomator2-server/session.js.map +1 -0
- package/build/lib/{helpers.d.ts → utils/app.d.ts} +1 -1
- package/build/lib/utils/app.d.ts.map +1 -0
- package/build/lib/{helpers.js → utils/app.js} +1 -1
- package/build/lib/utils/app.js.map +1 -0
- package/build/lib/utils/index.d.ts +5 -0
- package/build/lib/utils/index.d.ts.map +1 -0
- package/build/lib/utils/index.js +21 -0
- package/build/lib/utils/index.js.map +1 -0
- package/build/lib/utils/lang.d.ts +15 -0
- package/build/lib/utils/lang.d.ts.map +1 -0
- package/build/lib/utils/lang.js +37 -0
- package/build/lib/utils/lang.js.map +1 -0
- package/build/lib/utils/memoize.d.ts +11 -0
- package/build/lib/utils/memoize.d.ts.map +1 -0
- package/build/lib/utils/memoize.js +26 -0
- package/build/lib/utils/memoize.js.map +1 -0
- package/build/lib/utils/object.d.ts +6 -0
- package/build/lib/utils/object.d.ts.map +1 -0
- package/build/lib/utils/object.js +15 -0
- package/build/lib/utils/object.js.map +1 -0
- package/lib/commands/app-management.ts +1 -2
- package/lib/commands/aut.ts +132 -0
- package/lib/commands/element.ts +2 -3
- package/lib/commands/gestures.ts +2 -3
- package/lib/commands/keyboard.ts +0 -5
- package/lib/commands/screenshot.ts +7 -7
- package/lib/css-converter.ts +9 -9
- package/lib/driver.ts +42 -474
- package/lib/{uiautomator2.ts → uiautomator2-server/core.ts} +2 -4
- package/lib/uiautomator2-server/index.ts +14 -0
- package/lib/uiautomator2-server/packages.ts +2 -0
- package/lib/uiautomator2-server/session.ts +354 -0
- package/lib/utils/index.ts +4 -0
- package/lib/utils/lang.ts +34 -0
- package/lib/utils/memoize.ts +26 -0
- package/lib/utils/object.ts +14 -0
- package/npm-shrinkwrap.json +84 -21
- package/package.json +1 -3
- package/build/lib/helpers.d.ts.map +0 -1
- package/build/lib/helpers.js.map +0 -1
- package/build/lib/uiautomator2.d.ts.map +0 -1
- package/build/lib/uiautomator2.js.map +0 -1
- /package/lib/{helpers.ts → utils/app.ts} +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [7.5.0](https://github.com/appium/appium-uiautomator2-driver/compare/v7.4.0...v7.5.0) (2026-05-19)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* Refactor driver helpers to mixins ([#1002](https://github.com/appium/appium-uiautomator2-driver/issues/1002)) ([32de026](https://github.com/appium/appium-uiautomator2-driver/commit/32de0263706566a47d10870a97080186a87ffdcd))
|
|
6
|
+
|
|
7
|
+
## [7.4.0](https://github.com/appium/appium-uiautomator2-driver/compare/v7.3.0...v7.4.0) (2026-05-14)
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* Ditch lodash ([#1001](https://github.com/appium/appium-uiautomator2-driver/issues/1001)) ([d89d7ae](https://github.com/appium/appium-uiautomator2-driver/commit/d89d7ae774f4f2895d06dd704284828e35f88691))
|
|
12
|
+
|
|
1
13
|
## [7.3.0](https://github.com/appium/appium-uiautomator2-driver/compare/v7.2.3...v7.3.0) (2026-05-13)
|
|
2
14
|
|
|
3
15
|
### Features
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,yBAAyB,EAAC,MAAM,WAAW,CAAC;AACzD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,SAAS,CAAC;AAE5C;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,yBAAyB,EAC/B,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,IAAI,CAAC,CAQf"}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.mobileInstallMultipleApks = mobileInstallMultipleApks;
|
|
7
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
8
4
|
const driver_1 = require("appium/driver");
|
|
9
5
|
const extensions_1 = require("../extensions");
|
|
10
6
|
/**
|
|
@@ -14,7 +10,7 @@ const extensions_1 = require("../extensions");
|
|
|
14
10
|
* @throws {errors.InvalidArgumentError} If the apks array is empty or invalid.
|
|
15
11
|
*/
|
|
16
12
|
async function mobileInstallMultipleApks(apks, options) {
|
|
17
|
-
if (!
|
|
13
|
+
if (!Array.isArray(apks) || apks.length === 0) {
|
|
18
14
|
throw new driver_1.errors.InvalidArgumentError('No apks are given to install');
|
|
19
15
|
}
|
|
20
16
|
const configuredApks = await Promise.all(apks.map((app) => this.helpers.configureApp(app, [extensions_1.APK_EXTENSION])));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-management.js","sourceRoot":"","sources":["../../../lib/commands/app-management.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"app-management.js","sourceRoot":"","sources":["../../../lib/commands/app-management.ts"],"names":[],"mappings":";;AAWA,8DAYC;AAvBD,0CAAqC;AACrC,8CAA4C;AAI5C;;;;;GAKG;AACI,KAAK,UAAU,yBAAyB,CAE7C,IAAc,EACd,OAAwB;IAExB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,8BAA8B,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CACtC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,0BAAa,CAAC,CAAC,CAAC,CACnE,CAAC;IACF,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { AndroidUiautomator2Driver } from '../driver';
|
|
2
|
+
/** Configures the app capability and validates the APK path before session start. */
|
|
3
|
+
export declare function prepareSessionApp(this: AndroidUiautomator2Driver): Promise<void>;
|
|
4
|
+
/** Verifies that the app APK path from capabilities exists on the host. */
|
|
5
|
+
export declare function checkAppPresent(this: AndroidUiautomator2Driver): Promise<void>;
|
|
6
|
+
/** Installs and prepares the application under test on the device. */
|
|
7
|
+
export declare function initAUT(this: AndroidUiautomator2Driver): Promise<void>;
|
|
8
|
+
/** Launches the application under test according to session capabilities. */
|
|
9
|
+
export declare function ensureAppStarts(this: AndroidUiautomator2Driver): Promise<void>;
|
|
10
|
+
//# sourceMappingURL=aut.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aut.d.ts","sourceRoot":"","sources":["../../../lib/commands/aut.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,yBAAyB,EAAC,MAAM,WAAW,CAAC;AAKzD,qFAAqF;AACrF,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAetF;AAED,2EAA2E;AAC3E,wBAAsB,eAAe,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKpF;AAED,sEAAsE;AACtE,wBAAsB,OAAO,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwD5E;AAED,6EAA6E;AAC7E,wBAAsB,eAAe,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCpF"}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.prepareSessionApp = prepareSessionApp;
|
|
4
|
+
exports.checkAppPresent = checkAppPresent;
|
|
5
|
+
exports.initAUT = initAUT;
|
|
6
|
+
exports.ensureAppStarts = ensureAppStarts;
|
|
7
|
+
const appium_android_driver_1 = require("appium-android-driver");
|
|
8
|
+
const support_1 = require("appium/support");
|
|
9
|
+
const io_appium_settings_1 = require("io.appium.settings");
|
|
10
|
+
const extensions_1 = require("../extensions");
|
|
11
|
+
const uiautomator2_server_1 = require("../uiautomator2-server");
|
|
12
|
+
const utils_1 = require("../utils");
|
|
13
|
+
/** Configures the app capability and validates the APK path before session start. */
|
|
14
|
+
async function prepareSessionApp() {
|
|
15
|
+
if (this.opts.app) {
|
|
16
|
+
// find and copy, or download and unzip an app url or path
|
|
17
|
+
this.opts.app = await this.helpers.configureApp(this.opts.app, [extensions_1.APK_EXTENSION, extensions_1.APKS_EXTENSION]);
|
|
18
|
+
await this.checkAppPresent();
|
|
19
|
+
}
|
|
20
|
+
else if (this.opts.appPackage) {
|
|
21
|
+
// the app isn't an actual app file but rather something we want to
|
|
22
|
+
// assume is on the device and just launch via the appPackage
|
|
23
|
+
this.log.info(`Starting '${this.opts.appPackage}' directly on the device`);
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
this.log.info(`Neither 'app' nor 'appPackage' was set. Starting UiAutomator2 ` +
|
|
27
|
+
'without the target application');
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
/** Verifies that the app APK path from capabilities exists on the host. */
|
|
31
|
+
async function checkAppPresent() {
|
|
32
|
+
this.log.debug('Checking whether app is actually present');
|
|
33
|
+
if (!this.opts.app || !(await support_1.fs.exists(this.opts.app))) {
|
|
34
|
+
throw this.log.errorWithException(`Could not find app apk at '${this.opts.app}'`);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
/** Installs and prepares the application under test on the device. */
|
|
38
|
+
async function initAUT() {
|
|
39
|
+
// Uninstall any uninstallOtherPackages which were specified in caps
|
|
40
|
+
if (this.opts.uninstallOtherPackages) {
|
|
41
|
+
await this.uninstallOtherPackages(appium_android_driver_1.utils.parseArray(this.opts.uninstallOtherPackages), [
|
|
42
|
+
io_appium_settings_1.SETTINGS_HELPER_ID,
|
|
43
|
+
uiautomator2_server_1.SERVER_PACKAGE_ID,
|
|
44
|
+
uiautomator2_server_1.SERVER_TEST_PACKAGE_ID,
|
|
45
|
+
]);
|
|
46
|
+
}
|
|
47
|
+
// Install any "otherApps" that were specified in caps
|
|
48
|
+
if (this.opts.otherApps) {
|
|
49
|
+
let otherApps;
|
|
50
|
+
try {
|
|
51
|
+
otherApps = appium_android_driver_1.utils.parseArray(this.opts.otherApps);
|
|
52
|
+
}
|
|
53
|
+
catch (e) {
|
|
54
|
+
throw this.log.errorWithException(`Could not parse "otherApps" capability: ${e.message}`);
|
|
55
|
+
}
|
|
56
|
+
otherApps = await Promise.all(otherApps.map((app) => this.helpers.configureApp(app, [extensions_1.APK_EXTENSION, extensions_1.APKS_EXTENSION])));
|
|
57
|
+
await this.installOtherApks(otherApps);
|
|
58
|
+
}
|
|
59
|
+
if (this.opts.app && this.opts.appPackage) {
|
|
60
|
+
const adb = this.requireAdb();
|
|
61
|
+
const appPackage = this.opts.appPackage;
|
|
62
|
+
if ((this.opts.noReset && !(await adb.isAppInstalled(appPackage))) || !this.opts.noReset) {
|
|
63
|
+
if (!this.opts.noSign &&
|
|
64
|
+
!(await adb.checkApkCert(this.opts.app, appPackage, {
|
|
65
|
+
requireDefaultCert: false,
|
|
66
|
+
}))) {
|
|
67
|
+
await (0, utils_1.signApp)(adb, this.opts.app);
|
|
68
|
+
}
|
|
69
|
+
if (!this.opts.skipUninstall) {
|
|
70
|
+
await adb.uninstallApk(appPackage);
|
|
71
|
+
}
|
|
72
|
+
await this.installAUT();
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
this.log.debug('noReset has been requested and the app is already installed. Doing nothing');
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
if (this.opts.fullReset) {
|
|
80
|
+
throw this.log.errorWithException('Full reset requires an app capability, use fastReset if app is not provided');
|
|
81
|
+
}
|
|
82
|
+
this.log.debug('No app capability. Assuming it is already on the device');
|
|
83
|
+
if (this.opts.fastReset && this.opts.appPackage) {
|
|
84
|
+
await this.resetAUT();
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
/** Launches the application under test according to session capabilities. */
|
|
89
|
+
async function ensureAppStarts() {
|
|
90
|
+
const adb = this.requireAdb();
|
|
91
|
+
const appPackage = this.opts.appPackage;
|
|
92
|
+
const appActivity = this.opts.appActivity;
|
|
93
|
+
if (!appPackage) {
|
|
94
|
+
throw this.log.errorWithException('appPackage capability is required to start the application');
|
|
95
|
+
}
|
|
96
|
+
// make sure we have an activity and package to wait for
|
|
97
|
+
const appWaitPackage = this.opts.appWaitPackage || appPackage;
|
|
98
|
+
const appWaitActivity = this.opts.appWaitActivity || appActivity;
|
|
99
|
+
this.log.info(`Starting '${appPackage}${appActivity ? '/' + appActivity : ''}` +
|
|
100
|
+
`and waiting for '${appWaitPackage}${appWaitActivity ? '/' + appWaitActivity : ''}'`);
|
|
101
|
+
if (this.opts.noReset && !this.opts.forceAppLaunch && (await adb.processExists(appPackage))) {
|
|
102
|
+
this.log.info(`'${appPackage}' is already running and noReset is enabled. ` +
|
|
103
|
+
`Set forceAppLaunch capability to true if the app must be forcefully restarted on session startup.`);
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
await adb.startApp({
|
|
107
|
+
pkg: appPackage,
|
|
108
|
+
activity: appActivity,
|
|
109
|
+
action: this.opts.intentAction || 'android.intent.action.MAIN',
|
|
110
|
+
category: this.opts.intentCategory || 'android.intent.category.LAUNCHER',
|
|
111
|
+
flags: this.opts.intentFlags || '0x10200000', // FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
|
|
112
|
+
waitPkg: this.opts.appWaitPackage,
|
|
113
|
+
waitActivity: this.opts.appWaitActivity,
|
|
114
|
+
waitForLaunch: this.opts.appWaitForLaunch,
|
|
115
|
+
waitDuration: this.opts.appWaitDuration,
|
|
116
|
+
optionalIntentArguments: this.opts.optionalIntentArguments,
|
|
117
|
+
stopApp: this.opts.forceAppLaunch || !this.opts.dontStopAppOnReset,
|
|
118
|
+
retry: true,
|
|
119
|
+
user: this.opts.userProfile,
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=aut.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aut.js","sourceRoot":"","sources":["../../../lib/commands/aut.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAC,OAAO,IAAI,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAC;AAClF,OAAO,KAAK,EAAC,yBAAyB,EAAC,MAAM,WAAW,CAAC;AAGzD;;;GAGG;AACH,wBAAsB,MAAM,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,aAAa,CAAC,CAEpF;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,yBAAyB,EAC/B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,yBAAyB,EAC/B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAElB;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,yBAAyB,EAC/B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAElB;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,yBAAyB,EAC/B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAElB;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMjG;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,yBAAyB,EAC/B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,QAAQ,CAAC,CAMnB;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/F;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,yBAAyB,EAC/B,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,yBAAyB,EAC/B,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EACvB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEjG;AAED;;;GAGG;AACH,wBAAsB,KAAK,CAAC,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3F;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,yBAAyB,EAC/B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAIjB;AAED;;;GAGG;AACH,wBAAsB,KAAK,CAAC,IAAI,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7F;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,yBAAyB,EAC/B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAcf;AAED;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,yBAAyB,EAC/B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAKf"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.active = active;
|
|
7
4
|
exports.getAttribute = getAttribute;
|
|
@@ -20,7 +17,6 @@ exports.clear = clear;
|
|
|
20
17
|
exports.getElementRect = getElementRect;
|
|
21
18
|
exports.mobileReplaceElementValue = mobileReplaceElementValue;
|
|
22
19
|
const driver_1 = require("appium/driver");
|
|
23
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
24
20
|
/**
|
|
25
21
|
* Gets the currently active element.
|
|
26
22
|
* @returns The currently active element.
|
|
@@ -100,7 +96,7 @@ async function doSetElementValue(params) {
|
|
|
100
96
|
async function setValueImmediate(keys, elementId) {
|
|
101
97
|
await this.uiautomator2.jwproxy.command(`/element/${elementId}/value`, 'POST', {
|
|
102
98
|
elementId,
|
|
103
|
-
text:
|
|
99
|
+
text: Array.isArray(keys) ? keys.join('') : keys,
|
|
104
100
|
replace: false,
|
|
105
101
|
});
|
|
106
102
|
}
|
|
@@ -165,6 +161,6 @@ async function mobileReplaceElementValue(elementId, text) {
|
|
|
165
161
|
});
|
|
166
162
|
}
|
|
167
163
|
function toBool(value) {
|
|
168
|
-
return
|
|
164
|
+
return typeof value === 'string' ? value.toLowerCase() === 'true' : !!value;
|
|
169
165
|
}
|
|
170
166
|
//# sourceMappingURL=element.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gestures.d.ts","sourceRoot":"","sources":["../../../lib/commands/gestures.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gestures.d.ts","sourceRoot":"","sources":["../../../lib/commands/gestures.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.mobileClickGesture = mobileClickGesture;
|
|
7
4
|
exports.mobileLongClickGesture = mobileLongClickGesture;
|
|
@@ -16,7 +13,6 @@ exports.mobileScrollBackTo = mobileScrollBackTo;
|
|
|
16
13
|
exports.mobileScroll = mobileScroll;
|
|
17
14
|
const driver_1 = require("appium/driver");
|
|
18
15
|
const support_1 = require("appium/support");
|
|
19
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
20
16
|
/**
|
|
21
17
|
* Performs a simple click/tap gesture.
|
|
22
18
|
* @param elementId - Optional element to use as the origin for the click. If not provided, uses screen coordinates.
|
|
@@ -201,10 +197,10 @@ function toOrigin(element) {
|
|
|
201
197
|
return element ? support_1.util.wrapElement(support_1.util.unwrapElement(element)) : undefined;
|
|
202
198
|
}
|
|
203
199
|
function toPoint(x, y) {
|
|
204
|
-
return
|
|
200
|
+
return Number.isFinite(x) && Number.isFinite(y) ? { x, y } : undefined;
|
|
205
201
|
}
|
|
206
202
|
function toRect(left, top, width, height) {
|
|
207
|
-
return [left, top, width, height].some((v) => !
|
|
203
|
+
return [left, top, width, height].some((v) => !Number.isFinite(v))
|
|
208
204
|
? undefined
|
|
209
205
|
: { left, top, width, height };
|
|
210
206
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gestures.js","sourceRoot":"","sources":["../../../lib/commands/gestures.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gestures.js","sourceRoot":"","sources":["../../../lib/commands/gestures.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyboard.d.ts","sourceRoot":"","sources":["../../../lib/commands/keyboard.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"keyboard.d.ts","sourceRoot":"","sources":["../../../lib/commands/keyboard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,yBAAyB,EAAC,MAAM,WAAW,CAAC;AACzD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAExD;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,yBAAyB,EAC/B,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,yBAAyB,EAC/B,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,SAAS,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,yBAAyB,EAC/B,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,GAAE,OAAe,EAC5B,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAWf;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,yBAAyB,EAC/B,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAC9B,OAAO,CAAC,OAAO,CAAC,CAElB;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,yBAAyB,EAC/B,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,yBAAyB,EAC/B,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAGf"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.pressKeyCode = pressKeyCode;
|
|
7
4
|
exports.longPressKeyCode = longPressKeyCode;
|
|
@@ -9,8 +6,6 @@ exports.mobilePressKey = mobilePressKey;
|
|
|
9
6
|
exports.mobileType = mobileType;
|
|
10
7
|
exports.doSendKeys = doSendKeys;
|
|
11
8
|
exports.keyevent = keyevent;
|
|
12
|
-
const driver_1 = require("appium/driver");
|
|
13
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
14
9
|
/**
|
|
15
10
|
* Presses a key code with optional metastate and flags.
|
|
16
11
|
* @param keycode - Android key code to press.
|
|
@@ -62,9 +57,6 @@ async function mobilePressKey(keycode, metastate, flags, isLongPress = false, so
|
|
|
62
57
|
* @throws {errors.InvalidArgumentError} If the text argument is not provided.
|
|
63
58
|
*/
|
|
64
59
|
async function mobileType(text) {
|
|
65
|
-
if (lodash_1.default.isUndefined(text)) {
|
|
66
|
-
throw new driver_1.errors.InvalidArgumentError(`The 'text' argument is mandatory`);
|
|
67
|
-
}
|
|
68
60
|
return await this.settingsApp.typeUnicode(String(text));
|
|
69
61
|
}
|
|
70
62
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyboard.js","sourceRoot":"","sources":["../../../lib/commands/keyboard.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"keyboard.js","sourceRoot":"","sources":["../../../lib/commands/keyboard.ts"],"names":[],"mappings":";;AASA,oCAWC;AAQD,4CAWC;AAYD,wCAkBC;AAQD,gCAKC;AAMD,gCAKC;AAOD,4BAOC;AAxGD;;;;;GAKG;AACI,KAAK,UAAU,YAAY,CAEhC,OAAwB,EACxB,SAAkB,EAClB,KAAc;IAEd,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,8BAA8B,EAAE,MAAM,EAAE;QAC9E,OAAO;QACP,SAAS;QACT,KAAK;KACN,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,gBAAgB,CAEpC,OAAwB,EACxB,SAAiB,EACjB,KAAc;IAEd,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,mCAAmC,EAAE,MAAM,EAAE;QACnF,OAAO;QACP,SAAS;QACT,KAAK;KACN,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,cAAc,CAElC,OAAe,EACf,SAAkB,EAClB,KAAc,EACd,cAAuB,KAAK,EAC5B,MAAe;IAEf,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,kBAAkB,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,eAAe,EAC3D,MAAM,EACN;QACE,OAAO;QACP,SAAS;QACT,KAAK;QACL,MAAM;KACP,CACF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,UAAU,CAE9B,IAA+B;IAE/B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,UAAU,CAE9B,MAAoB;IAEpB,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACnE,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,QAAQ,CAE5B,OAAwB,EACxB,SAAkB;IAElB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,SAAS,EAAE,CAAC,CAAC;IAClD,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.parseSurfaceFlingerDisplays = parseSurfaceFlingerDisplays;
|
|
7
4
|
exports.mobileViewportScreenshot = mobileViewportScreenshot;
|
|
8
5
|
exports.getViewportScreenshot = getViewportScreenshot;
|
|
9
6
|
exports.getScreenshot = getScreenshot;
|
|
10
7
|
exports.mobileScreenshots = mobileScreenshots;
|
|
11
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
12
8
|
const support_1 = require("appium/support");
|
|
9
|
+
const utils_1 = require("../utils");
|
|
13
10
|
// Matches SurfaceFlinger output format:
|
|
14
11
|
// Physical: Display 4619827259835644672 (HWC display 0): port=0 pnpId=GGL displayName="EMU_display_0"
|
|
15
12
|
// Virtual: Display 11529215049243506835 (Virtual display): displayName="Emulator 2D Display" uniqueId="..."
|
|
@@ -80,13 +77,13 @@ async function getScreenshot() {
|
|
|
80
77
|
async function mobileScreenshots(displayId) {
|
|
81
78
|
const displaysInfo = await this.adb.shell(['dumpsys', 'SurfaceFlinger', '--display-id']);
|
|
82
79
|
const infos = parseSurfaceFlingerDisplays(displaysInfo);
|
|
83
|
-
if (
|
|
80
|
+
if ((0, utils_1.isEmpty)(infos)) {
|
|
84
81
|
this.log.debug(displaysInfo);
|
|
85
82
|
throw new Error('Cannot determine the information about connected Android displays');
|
|
86
83
|
}
|
|
87
84
|
this.log.info(`Parsed Android display infos: ${JSON.stringify(infos)}`);
|
|
88
85
|
const toB64Screenshot = async (dispId) => (await this.adb.takeScreenshot(dispId)).toString('base64');
|
|
89
|
-
const displayIdStr =
|
|
86
|
+
const displayIdStr = displayId == null || displayId === '' ? null : String(displayId);
|
|
90
87
|
if (displayIdStr) {
|
|
91
88
|
if (!infos[displayIdStr]) {
|
|
92
89
|
throw new Error(`The provided display identifier '${displayId}' is not known. ` +
|
|
@@ -99,9 +96,11 @@ async function mobileScreenshots(displayId) {
|
|
|
99
96
|
},
|
|
100
97
|
};
|
|
101
98
|
}
|
|
102
|
-
const allInfos =
|
|
99
|
+
const allInfos = Object.values(infos).filter((info) => !!info?.id);
|
|
103
100
|
const screenshots = await Promise.all(allInfos.map((info) => toB64Screenshot(info.id)));
|
|
104
|
-
for (
|
|
101
|
+
for (let i = 0; i < allInfos.length; i++) {
|
|
102
|
+
const info = allInfos[i];
|
|
103
|
+
const payload = screenshots[i];
|
|
105
104
|
if (info && payload) {
|
|
106
105
|
info.payload = payload;
|
|
107
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"screenshot.js","sourceRoot":"","sources":["../../../lib/commands/screenshot.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"screenshot.js","sourceRoot":"","sources":["../../../lib/commands/screenshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.CssConverter = void 0;
|
|
7
4
|
const css_selector_parser_1 = require("css-selector-parser");
|
|
8
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
9
5
|
const driver_1 = require("appium/driver");
|
|
10
6
|
const logger_1 = require("./logger");
|
|
7
|
+
const utils_1 = require("./utils");
|
|
11
8
|
const parseCssSelector = (0, css_selector_parser_1.createParser)({
|
|
12
9
|
syntax: {
|
|
13
10
|
pseudoClasses: {
|
|
@@ -84,7 +81,7 @@ class CssConverter {
|
|
|
84
81
|
parseAttr(cssAttr) {
|
|
85
82
|
const attrValueNode = cssAttr.value;
|
|
86
83
|
const attrValue = attrValueNode?.value;
|
|
87
|
-
if (
|
|
84
|
+
if (typeof attrValue !== 'string' && !(0, utils_1.isEmpty)(attrValue)) {
|
|
88
85
|
throw new Error(`'${cssAttr.name}=${attrValue}' is an invalid attribute. Only 'string' and empty attribute types are supported. Found '${attrValue}'`);
|
|
89
86
|
}
|
|
90
87
|
const attrName = requireEntityName(cssAttr);
|
|
@@ -110,14 +107,14 @@ class CssConverter {
|
|
|
110
107
|
if (['description', 'text'].includes(attrName)) {
|
|
111
108
|
return `.${methodName}Contains("${value}")`;
|
|
112
109
|
}
|
|
113
|
-
return `.${methodName}Matches("${
|
|
110
|
+
return `.${methodName}Matches("${(0, utils_1.escapeRegExp)(value)}")`;
|
|
114
111
|
case '^=':
|
|
115
112
|
if (['description', 'text'].includes(attrName)) {
|
|
116
113
|
return `.${methodName}StartsWith("${value}")`;
|
|
117
114
|
}
|
|
118
|
-
return `.${methodName}Matches("^${
|
|
115
|
+
return `.${methodName}Matches("^${(0, utils_1.escapeRegExp)(value)}")`;
|
|
119
116
|
case '$=':
|
|
120
|
-
return `.${methodName}Matches("${
|
|
117
|
+
return `.${methodName}Matches("${(0, utils_1.escapeRegExp)(value)}$")`;
|
|
121
118
|
case '~=':
|
|
122
119
|
return `.${methodName}Matches("${getWordMatcherRegex(value)}")`;
|
|
123
120
|
default:
|
|
@@ -126,7 +123,7 @@ class CssConverter {
|
|
|
126
123
|
}
|
|
127
124
|
parsePseudo(cssPseudo) {
|
|
128
125
|
const argValue = cssPseudo.argument?.value;
|
|
129
|
-
if (
|
|
126
|
+
if (typeof argValue !== 'string' && !(0, utils_1.isEmpty)(argValue)) {
|
|
130
127
|
throw new Error(`'${cssPseudo.name}=${argValue}'. Unsupported css pseudo class value: '${argValue}'. Only 'string' type or empty is supported.`);
|
|
131
128
|
}
|
|
132
129
|
const pseudoName = requireEntityName(cssPseudo);
|
|
@@ -184,7 +181,7 @@ class CssConverter {
|
|
|
184
181
|
return uiAutomatorSelector.join('');
|
|
185
182
|
}
|
|
186
183
|
parseCssObject(css) {
|
|
187
|
-
if (!
|
|
184
|
+
if (!(0, utils_1.isEmpty)(css.rules)) {
|
|
188
185
|
return this.parseCssRule(css.rules[0]);
|
|
189
186
|
}
|
|
190
187
|
throw new Error('No rules could be parsed out of the current selector');
|
|
@@ -203,7 +200,7 @@ function toSnakeCase(str) {
|
|
|
203
200
|
}
|
|
204
201
|
function requireBoolean(css) {
|
|
205
202
|
const rawValue = css.value?.value ?? css.argument?.value;
|
|
206
|
-
const value =
|
|
203
|
+
const value = String(rawValue ?? 'true').toLowerCase();
|
|
207
204
|
if (value === 'true') {
|
|
208
205
|
return 'true';
|
|
209
206
|
}
|
|
@@ -225,6 +222,6 @@ function requireEntityName(cssEntity) {
|
|
|
225
222
|
throw new Error(`'${attrName}' is not a valid attribute. Supported attributes are '${ALL_ATTRS.join(', ')}'`);
|
|
226
223
|
}
|
|
227
224
|
function getWordMatcherRegex(word) {
|
|
228
|
-
return `\\b(\\w*${
|
|
225
|
+
return `\\b(\\w*${(0, utils_1.escapeRegExp)(word)}\\w*)\\b`;
|
|
229
226
|
}
|
|
230
227
|
//# sourceMappingURL=css-converter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"css-converter.js","sourceRoot":"","sources":["../../lib/css-converter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"css-converter.js","sourceRoot":"","sources":["../../lib/css-converter.ts"],"names":[],"mappings":"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"}
|