detox 20.1.0 → 20.1.2-smoke.0

package/.eslintrc.js

@@ -17,7 +17,7 @@ module.exports = {
     node: true
   },
   globals: {
-    'callCli': true,
+    // TODO: remove use of fail() across the project because Jest Circus doesn't support it
     'fail': true
   },
   rules: {
@@ -54,12 +54,7 @@ module.exports = {
       }
     ],
     'no-prototype-builtins': 'off',
-    'no-unused-vars': [
-      'error',
-      {
-        'argsIgnorePattern': '^_'
-      }
-    ],
+    'no-unused-vars': 'off',
     'node/no-unpublished-require': 'warn',
     'object-curly-spacing': [
       'error',

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0-javadoc.jar.md5

@@ -0,0 +1 @@
+2404390554f0a58a8c83de4356054af7

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0-javadoc.jar.sha1

@@ -0,0 +1 @@
+de3ea3bbcec812cdb35d023b31c656e6c380a045

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0-javadoc.jar.sha256

@@ -0,0 +1 @@
+bcaa3a0ef51d6204c62aefc07a63ffc0c45870d2011bd1af0f5cf53379c0905e

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0-javadoc.jar.sha512

@@ -0,0 +1 @@
+e415f41fdf06288d88d2cfae606c2df3b3f89ccec4c21e5bf7519c7dc826436e5a2a6de3bfa1b631a8cc5ba389517268ff33bdae52e98fc3a2c318c288273f7d

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0-sources.jar.md5

@@ -0,0 +1 @@
+e4bcf456d940da8b99a8c183df600d82

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0-sources.jar.sha1

@@ -0,0 +1 @@
+4414db80ae56d2554b36652967dbbf56885cc863

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0-sources.jar.sha256

@@ -0,0 +1 @@
+15ce7d6769c07b17f5c6ff3f657fa7ab75aeb743b22ac166e403e525e39b1335

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0-sources.jar.sha512

@@ -0,0 +1 @@
+b532ea60ab0d5d3e9ec68f90e01122f3a75a4860931c2ebcc3e724c9683f6d59240d758145cf3a898ca4ef4c79844b9c7c204948174e8c06b0f6323c09df5355

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0.aar.md5

@@ -0,0 +1 @@
+c7eb63b23e9fec3154e5402cc0f65283

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0.aar.sha1

@@ -0,0 +1 @@
+16bed62cec4774262c71a7daad13efcdac3c7942

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0.aar.sha256

@@ -0,0 +1 @@
+c12164b0a26a6db45c65d984af4c2a880e2bf5d516ceb582361576eff713e378

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0.aar.sha512

@@ -0,0 +1 @@
+d50db96253552903c6acf2328ff2baa9788aac5846622bc01c4c9e6026738991f6eea1ea2723afe21ffdec692a3caeadb39b6ac5cfb31bf40c7d184e058701bb

package/Detox-android/com/wix/detox/{20.1.0/detox-20.1.0.pom → 20.1.2-smoke.0/detox-20.1.2-smoke.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.1.0</version>
+  <version>20.1.2-smoke.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0.pom.md5

@@ -0,0 +1 @@
+ecbf499e00240159b3d89df62b910eae

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0.pom.sha1

@@ -0,0 +1 @@
+ed7b6cc7287326028300ef01a031e052d9ef23b0

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0.pom.sha256

@@ -0,0 +1 @@
+cfe17398a02674e1f5db351f654790ebb88283f2a3d43fe933200e89bd0e3eda

package/Detox-android/com/wix/detox/20.1.2-smoke.0/detox-20.1.2-smoke.0.pom.sha512

@@ -0,0 +1 @@
+7343382e5178dbc01f307240f2ce5bdef46127ac76e6e4275478322efad0ac87c4140577fcace1c2ebfbb2adcc681eb05112daaa75a688ba43d90b0c8812816c

package/Detox-android/com/wix/detox/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.1.0</latest>
-    <release>20.1.0</release>
+    <latest>20.1.2-smoke.0</latest>
+    <release>20.1.2-smoke.0</release>
     <versions>
-      <version>20.1.0</version>
+      <version>20.1.2-smoke.0</version>
     </versions>
-    <lastUpdated>20221212153534</lastUpdated>
+    <lastUpdated>20230226120508</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox/maven-metadata.xml.md5

@@ -1 +1 @@
-b02bbab8a120f411b8c9e07c75d6c54b
+4f6f367f872fdf9edd0ea82712d91962

package/Detox-android/com/wix/detox/maven-metadata.xml.sha1

@@ -1 +1 @@
-2e0d0ea05c62fd6d2bbe0cdb43a2efb6315e8c29
+a737a197ff1050816c221a23db0f37ed7f147352

package/Detox-android/com/wix/detox/maven-metadata.xml.sha256

@@ -1 +1 @@
-6bd3e259aefe68a101c55de5de010ad3a84cc3f30116c87cf35a668264329310
+34db7a2a95e60a0c43c893ab47668ea733510ded4dd879300ece56764cc6f33f

package/Detox-android/com/wix/detox/maven-metadata.xml.sha512

@@ -1 +1 @@
-c14e8fe0813c1b8f97b59b54f76c28fe1d1b3293908d5226b2c584a902a7a247c5fcc33aad5295b13729b83c415f29699da133dc9127d138f3be5f0be3ddff8b
+6d10ced6105fad2ea0780c96026e8ef25e34956a4cfe8d29ecb04e00b15edabe500f06d9d1b32f4cbc9473edd129839154088220f101ea5f03e228ef56696efc

package/android/detox/src/full/java/com/wix/detox/espresso/idlingresources/DescriptiveIdlingResource.kt

@@ -4,5 +4,5 @@ import androidx.test.espresso.IdlingResource
 
 interface DescriptiveIdlingResource: IdlingResource {
     fun getDebugName(): String
-    fun getBusyHint(): Map<String, Any>? = null
+    fun getBusyHint(): Map<String, Any>?
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/AsyncStorageIdlingResource.kt

@@ -52,6 +52,7 @@ open class AsyncStorageIdlingResource
 
     override fun getName(): String = javaClass.name
     override fun getDebugName() = "io"
+    override fun getBusyHint(): Map<String, Any>? = null
 
     override fun isIdleNow(): Boolean =
         checkIdle().also { idle ->

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/BridgeIdlingResource.java

@@ -48,6 +48,12 @@ public class BridgeIdlingResource extends DetoxBaseIdlingResource implements Not
         return "bridge";
     }
 
+    @Nullable
+    @Override
+    public Map<String, Object> getBusyHint() {
+        return null;
+    }
+
     @Override
     protected boolean checkIdle() {
         boolean ret = idleNow.get();
@@ -85,10 +91,4 @@ public class BridgeIdlingResource extends DetoxBaseIdlingResource implements Not
             callback.onTransitionToIdle();
         }
     }
-
-    @Nullable
-    @Override
-    public Map<String, Object> getBusyHint() {
-        return null;
-    }
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/TimersIdlingResource.kt

@@ -13,6 +13,7 @@ class TimersIdlingResource @JvmOverloads constructor(
 
     override fun getName(): String = this.javaClass.name
     override fun getDebugName(): String = "timers"
+    override fun getBusyHint(): Map<String, Any>? = null
 
     override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
         this.callback = callback

package/index.js

@@ -1 +1,12 @@
-module.exports = require('./src/realms');
+function create() {
+  if (process.env.DETOX_CONFIG_SNAPSHOT_PATH) {
+    return require('./src/realms/secondary');
+  } else {
+    return require('./src/realms/primary');
+  }
+}
+
+/** @type {Detox.DetoxExportWrapper} */
+module.exports = global['__detox__']
+  ? global['__detox__'].clientApi
+  : create();

package/internals.js

@@ -1,4 +1,11 @@
-const realm = require('./src/realms');
-const DetoxInternalsFacade = require('./src/realms/DetoxInternalsFacade');
+function create() {
+  const context = require('./index');
+  const DetoxInternalsFacade = require('./src/realms/DetoxInternalsFacade');
 
-module.exports = new DetoxInternalsFacade(realm);
+  return new DetoxInternalsFacade(context);
+}
+
+/** @type {DetoxInternals.Facade} */
+module.exports = global['__detox__']
+  ? global['__detox__'].internalsApi
+  : create();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.1.0",
+  "version": "20.1.2-smoke.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -41,12 +41,14 @@
     "@types/ws": "^7.4.0",
     "@typescript-eslint/eslint-plugin": "^5.4.0",
     "@typescript-eslint/parser": "^5.4.0",
+    "cross-env": "^7.0.3",
     "eslint": "^8.3.0",
     "eslint-plugin-import": "^2.23.3",
     "eslint-plugin-no-only-tests": "^2.6.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-unicorn": "^39.0.0",
     "jest": "^28.1.3",
+    "jest-allure2-reporter": "^1.2.1",
     "mockdate": "^2.0.1",
     "prettier": "1.7.0",
     "react-native": "0.69.7",
@@ -68,7 +70,6 @@
     "ini": "^1.3.4",
     "json-cycle": "^1.3.0",
     "lodash": "^4.17.5",
-    "minimist": "^1.2.0",
     "multi-sort-stream": "^1.0.3",
     "multipipe": "^4.0.0",
     "node-ipc": "^9.2.1",
@@ -122,6 +123,8 @@
       "__tests__",
       ".test.js$",
       ".mock.js$",
+      "index.js",
+      "internals.js",
       "local-cli/utils",
       "src/environmentFactory",
       "src/android/espressoapi",
@@ -166,6 +169,15 @@
     ],
     "resetMocks": true,
     "resetModules": true,
+    "reporters": [
+      "default",
+      [
+        "jest-allure2-reporter",
+        {
+          "getEnvironmentInfo": false
+        }
+      ]
+    ],
     "coverageReporters": [
       "html",
       "json",
@@ -187,5 +199,5 @@
       }
     }
   },
-  "gitHead": "57097c7301cae2460bd3b36c1749c4048d84dd39"
+  "gitHead": "0d8f8a8781ab5dddfff0d372ef48b72fce9c2600"
 }

package/src/DetoxWorker.js

@@ -5,7 +5,7 @@ const Client = require('./client/Client');
 const environmentFactory = require('./environmentFactory');
 const { DetoxRuntimeErrorComposer } = require('./errors');
 const { InvocationManager } = require('./invoke');
-const symbols = require('./symbols');
+const symbols = require('./realms/symbols');
 const AsyncEmitter = require('./utils/AsyncEmitter');
 const uuid = require('./utils/uuid');
 

package/src/android/core/NativeMatcher.js

@@ -2,29 +2,33 @@ const invoke = require('../../invoke');
 const DetoxMatcherApi = require('../espressoapi/DetoxMatcher');
 
 class NativeMatcher {
+  constructor(call) {
+    this._call = call || null;
+  }
+
   withAncestor(matcher) {
-    this._call = invoke.callDirectly(DetoxMatcherApi.matcherWithAncestor(this, matcher));
-    return this;
+    const call = invoke.callDirectly(DetoxMatcherApi.matcherWithAncestor(this, matcher));
+    return new NativeMatcher(call);
   }
 
   withDescendant(matcher) {
-    this._call = invoke.callDirectly(DetoxMatcherApi.matcherWithDescendant(this, matcher));
-    return this;
+    const call = invoke.callDirectly(DetoxMatcherApi.matcherWithDescendant(this, matcher));
+    return new NativeMatcher(call);
   }
 
   and(matcher) {
-    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForAnd(this, matcher));
-    return this;
+    const call = invoke.callDirectly(DetoxMatcherApi.matcherForAnd(this, matcher));
+    return new NativeMatcher(call);
   }
 
   or(matcher) {
-    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForOr(this, matcher));
-    return this;
+    const call = invoke.callDirectly(DetoxMatcherApi.matcherForOr(this, matcher));
+    return new NativeMatcher(call);
   }
 
   get not() {
-    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForNot(this));
-    return this;
+    const call = invoke.callDirectly(DetoxMatcherApi.matcherForNot(this));
+    return new NativeMatcher(call);
   }
 
   _avoidProblematicReactNativeElements() {

package/src/android/espressoapi/EspressoDetox.js

@@ -52,7 +52,7 @@ class EspressoDetox {
   }
 
   static setURLBlacklist(urls) {
-    if (typeof urls !== 'object' || !urls instanceof Array) {
+    if (typeof urls !== 'object' || !Array.isArray(urls)) {
       throw new Error('urls must be an array, got ' + typeof urls);
     }
 

package/src/android/espressoapi/web/WebElement.js

@@ -69,7 +69,7 @@ class WebElement {
   static runScriptWithArgs(element, script, args) {
     if (typeof script !== "string") throw new Error("script should be a string, but got " + (script + (" (" + (typeof script + ")"))));
 
-    if (typeof args !== 'object' || !args instanceof Array) {
+    if (typeof args !== 'object' || !Array.isArray(args)) {
       throw new Error('args must be an array, got ' + typeof args);
     }
 

package/src/android/matchers/native.js

@@ -64,8 +64,7 @@ class ToggleMatcher extends NativeMatcher {
   }
 }
 
-// TODO
-// Please be aware, that this is just a dummy matcher
+// TODO: Please be aware, that this is just a dummy matcher
 class TraitsMatcher extends NativeMatcher {
   constructor(value) {
     super();

package/src/artifacts/templates/plugin/ArtifactPlugin.js

@@ -1,5 +1,5 @@
+/* eslint @typescript-eslint/no-unused-vars: ["error", { "args": "none" }] */
 // @ts-nocheck
-/* eslint-disable no-unused-vars */
 
 const _ = require('lodash');
 

package/src/artifacts/templates/plugin/TwoSnapshotsPerTestPlugin.js

@@ -1,3 +1,4 @@
+/* eslint @typescript-eslint/no-unused-vars: ["error", { "args": "none" }] */
 // @ts-nocheck
 const DetoxRuntimeError = require('../../../errors/DetoxRuntimeError');
 
@@ -85,7 +86,7 @@ class TwoSnapshotsPerTestPlugin extends ArtifactPlugin {
    * @protected
    * @abstract
    */
-  async preparePathForSnapshot(testSummary, snapshotName) {} // eslint-disable-line no-unused-vars
+  async preparePathForSnapshot(testSummary, snapshotName) {}
 
   /***
    * Creates a handle for a test artifact (video recording, log, etc.)

package/src/artifacts/templates/plugin/WholeTestRecorderPlugin.js

@@ -1,4 +1,4 @@
-// @ts-nocheck
+/* eslint @typescript-eslint/no-unused-vars: ["error", { "args": "none" }] */
 const ArtifactPlugin = require('./ArtifactPlugin');
 
 /***
@@ -8,6 +8,7 @@ class WholeTestRecorderPlugin extends ArtifactPlugin {
   constructor({ api }) {
     super({ api });
 
+    /** @type {*} */
     this.testRecording = null;
   }
 
@@ -51,7 +52,7 @@ class WholeTestRecorderPlugin extends ArtifactPlugin {
    * @abstract
    * @protected
    */
-  createTestRecording() {}
+  createTestRecording(config) {}
 
   /***
    * @abstract

package/src/client/AsyncWebSocket.js

@@ -1,3 +1,4 @@
+/* eslint @typescript-eslint/no-unused-vars: ["error", { "args": "none" }] */
 // @ts-nocheck
 const _ = require('lodash');
 const WebSocket = require('ws');
@@ -176,7 +177,7 @@ class AsyncWebSocket {
    * @param {WebSocket.OpenEvent} event
    * @private
    */
-  _onOpen(event) { // eslint-disable-line no-unused-vars
+  _onOpen(event) {
     log.trace(`opened web socket to: ${this._url}`);
     this._opening.resolve();
     this._opening = null;
@@ -268,7 +269,7 @@ class AsyncWebSocket {
    * @param {WebSocket.CloseEvent | null} event
    * @private
    */
-  _onClose(event) { // eslint-disable-line no-unused-vars
+  _onClose(event) {
     if (this._closing) {
       this._closing.resolve();
     }

package/src/configuration/collectCliConfig.js

@@ -23,7 +23,7 @@ const asNumber = (value) => {
 };
 
 function collectCliConfig({ argv }) {
-  const env = (key) => argparse.getArgValue(key);
+  const env = (key) => argparse.getEnvValue(key);
   const get = (key, fallback) => {
     const value = argv && Reflect.has(argv, key) ? argv[key] : env(key);
     return value === undefined ? fallback : value;

package/src/configuration/composeLoggerConfig.js

@@ -1,3 +1,4 @@
+/* eslint @typescript-eslint/no-unused-vars: ["error", { "args": "none" }] */
 const _ = require('lodash');
 
 const { castLevel, defaultOptions } = require('../logger/DetoxLogger');

package/src/devices/allocation/drivers/AllocationDriverBase.js

@@ -1,4 +1,6 @@
+/* eslint @typescript-eslint/no-unused-vars: ["error", { "args": "none" }] */
 // @ts-nocheck
+
 /**
  * @typedef DeallocOptions
  * @property shutdown { Boolean }
@@ -9,14 +11,14 @@ class AllocationDriverBase {
    * @param deviceConfig { Object }
    * @return {Promise<DeviceCookie>}
    */
-  async allocate(deviceConfig) {} // eslint-disable-line no-unused-vars
+  async allocate(deviceConfig) {}
 
   /**
    * @param cookie { DeviceCookie }
    * @param options { DeallocOptions }
    * @return {Promise<void>}
    */
-  async free(cookie, options) {} // eslint-disable-line no-unused-vars
+  async free(cookie, options) {}
 }
 
 module.exports = AllocationDriverBase;

package/src/devices/allocation/factories/base.js

@@ -16,7 +16,7 @@ class DeviceAllocatorFactory {
    * @returns { AllocationDriverBase }
    * @private
    */
-  _createDriver(deps) {} // eslint-disable-line no-unused-vars
+  _createDriver(deps) {} // eslint-disable-line @typescript-eslint/no-unused-vars
 }
 
 module.exports = DeviceAllocatorFactory;

package/src/devices/common/drivers/android/tools/AppInstallHelper.js

@@ -1,13 +1,13 @@
 // TODO Tweak such that if apk's already exist on the device (need to store uniquely), they will not be resent (would optimize cloud, for example)
 
 class AppInstallHelper {
-  constructor(adb, fileXfer) {
+  constructor(adb, fileTransfer) {
     this._adb = adb;
-    this._fileXfer = fileXfer;
+    this._fileTransfer = fileTransfer;
   }
 
   async install(deviceId, appBinaryPath, testBinaryPath) {
-    await this._fileXfer.prepareDestinationDir(deviceId);
+    await this._fileTransfer.prepareDestinationDir(deviceId);
     await this._pushAndInstallBinary(deviceId, appBinaryPath, 'Application.apk');
     if (testBinaryPath) {
       await this._pushAndInstallBinary(deviceId, testBinaryPath, 'Test.apk');
@@ -15,7 +15,7 @@ class AppInstallHelper {
   }
 
   async _pushAndInstallBinary(deviceId, binaryPath, binaryFilenameOnTarget) {
-    const binaryPathOnTarget = await this._fileXfer.send(deviceId, binaryPath, binaryFilenameOnTarget);
+    const binaryPathOnTarget = await this._fileTransfer.send(deviceId, binaryPath, binaryFilenameOnTarget);
     await this._adb.remoteInstall(deviceId, binaryPathOnTarget);
   }
 }

package/src/devices/common/drivers/android/tools/{FileXfer.js → FileTransfer.js}

@@ -1,6 +1,6 @@
 const path = require('path');
 
-class FileXfer {
+class FileTransfer {
   constructor(adb, destinationDir) {
     this._adb = adb;
     this._dir = destinationDir;
@@ -18,4 +18,4 @@ class FileXfer {
   }
 }
 
-module.exports = FileXfer;
+module.exports = FileTransfer;

package/src/devices/common/drivers/android/tools/TempFileTransfer.js

@@ -0,0 +1,14 @@
+const FileTransfer = require('./FileTransfer');
+
+const FILE_PATH = '/data/local/tmp/detox';
+
+class TempFileTransfer extends FileTransfer {
+  constructor(adb) {
+    super(adb, FILE_PATH);
+  }
+}
+
+module.exports = {
+  TempFileTransfer,
+  FILE_PATH
+};

package/src/devices/lifecycle/GenyGlobalLifecycleHandler.js

@@ -12,8 +12,6 @@ class GenyGlobalLifecycleHandler {
     this._instanceLifecycleService = instanceLifecycleService;
   }
 
-  // TODO: remove this ignore as soon as DetoxPrimaryContext is covered with tests
-  /* istanbul ignore next */
   async globalInit() {}
 
   emergencyCleanup() {

package/src/devices/runtime/drivers/android/AndroidDriver.js

@@ -1,3 +1,4 @@
+/* eslint @typescript-eslint/no-unused-vars: ["error", { "args": "none" }] */
 // @ts-nocheck
 const path = require('path');
 const URL = require('url').URL;
@@ -31,7 +32,7 @@ const log = logger.child({ cat: 'device' });
  * @property adb { ADB }
  * @property aapt { AAPT }
  * @property apkValidator { ApkValidator }
- * @property fileXfer { FileXfer }
+ * @property fileTransfer { FileTransfer }
  * @property appInstallHelper { AppInstallHelper }
  * @property appUninstallHelper { AppUninstallHelper }
  * @property devicePathBuilder { AndroidDevicePathBuilder }
@@ -51,7 +52,7 @@ class AndroidDriver extends DeviceDriverBase {
     this.aapt = deps.aapt;
     this.apkValidator = deps.apkValidator;
     this.invocationManager = deps.invocationManager;
-    this.fileXfer = deps.fileXfer;
+    this.fileTransfer = deps.fileTransfer;
     this.appInstallHelper = deps.appInstallHelper;
     this.appUninstallHelper = deps.appUninstallHelper;
     this.devicePathBuilder = deps.devicePathBuilder;
@@ -162,11 +163,11 @@ class AndroidDriver extends DeviceDriverBase {
       }
   }
 
-  async pressBack() { // eslint-disable-line no-unused-vars
+  async pressBack() {
     await this.uiDevice.pressBack();
   }
 
-  async sendToHome(params) { // eslint-disable-line no-unused-vars
+  async sendToHome(params) {
     await this.uiDevice.pressHome();
   }
 
@@ -331,8 +332,8 @@ class AndroidDriver extends DeviceDriverBase {
   }
 
   async _sendNotificationDataToDevice(dataFileLocalPath, adbName) {
-    await this.fileXfer.prepareDestinationDir(adbName);
-    return await this.fileXfer.send(adbName, dataFileLocalPath, 'notification.json');
+    await this.fileTransfer.prepareDestinationDir(adbName);
+    return await this.fileTransfer.send(adbName, dataFileLocalPath, 'notification.json');
   }
 
   _startActivityWithUrl(url) {

package/src/devices/runtime/factories/android.js

@@ -1,3 +1,4 @@
+/* eslint @typescript-eslint/no-unused-vars: ["error", { "args": "none" }] */
 const RuntimeDeviceFactory = require('./base');
 
 class RuntimeDriverFactoryAndroid extends RuntimeDeviceFactory {
@@ -6,7 +7,7 @@ class RuntimeDriverFactoryAndroid extends RuntimeDeviceFactory {
     const adb = serviceLocator.adb;
     const aapt = serviceLocator.aapt;
     const apkValidator = serviceLocator.apkValidator;
-    const fileXfer = serviceLocator.fileXfer;
+    const fileTransfer = serviceLocator.fileTransfer;
     const devicePathBuilder = serviceLocator.devicePathBuilder;
 
     const AppInstallHelper = require('../../common/drivers/android/tools/AppInstallHelper');
@@ -18,9 +19,9 @@ class RuntimeDriverFactoryAndroid extends RuntimeDeviceFactory {
       adb,
       aapt,
       apkValidator,
-      fileXfer,
+      fileTransfer,
       devicePathBuilder,
-      appInstallHelper: new AppInstallHelper(adb, fileXfer),
+      appInstallHelper: new AppInstallHelper(adb, fileTransfer),
       appUninstallHelper: new AppUninstallHelper(adb),
       instrumentation: new MonitoredInstrumentation(adb),
     };
@@ -41,7 +42,7 @@ class AndroidEmulator extends RuntimeDriverFactoryAndroid {
 }
 
 class AndroidAttached extends RuntimeDriverFactoryAndroid {
-  _createDriver(deviceCookie, deps, configs) { // eslint-disable-line no-unused-vars
+  _createDriver(deviceCookie, deps, configs) {
     const props = {
       adbName: deviceCookie.adbName,
     };
@@ -52,7 +53,7 @@ class AndroidAttached extends RuntimeDriverFactoryAndroid {
 }
 
 class Genycloud extends RuntimeDriverFactoryAndroid {
-  _createDriver(deviceCookie, deps, configs) { // eslint-disable-line no-unused-vars
+  _createDriver(deviceCookie, deps, configs) {
     const props = {
       instance: deviceCookie.instance,
     };

package/src/devices/runtime/factories/base.js

@@ -1,3 +1,4 @@
+/* eslint @typescript-eslint/no-unused-vars: ["error", { "args": "none" }] */
 const RuntimeDevice = require('../RuntimeDevice');
 
 class RuntimeDeviceFactory {
@@ -7,8 +8,8 @@ class RuntimeDeviceFactory {
     return new RuntimeDevice({ ...commonDeps, ...configs }, runtimeDriver);
   }
 
-  _createDriverDependencies(commonDeps) { } // eslint-disable-line no-unused-vars
-  _createDriver(deviceCookie, deps, configs) {} // eslint-disable-line no-unused-vars
+  _createDriverDependencies(commonDeps) { }
+  _createDriver(deviceCookie, deps, configs) {}
 }
 
 module.exports = RuntimeDeviceFactory;

package/src/ios/expectTwo.js

@@ -438,8 +438,7 @@ class Matcher {
       throwMatcherError(matcher);
     }
 
-    this.and({ predicate: { type: 'ancestor', predicate: matcher.predicate } });
-    return this;
+    return this.and({ predicate: { type: 'ancestor', predicate: matcher.predicate } });
   }
 
   withDescendant(matcher) {
@@ -447,21 +446,30 @@ class Matcher {
       throwMatcherError(matcher);
     }
 
-    this.and({ predicate: { type: 'descendant', predicate: matcher.predicate } });
-    return this;
+    return this.and({ predicate: { type: 'descendant', predicate: matcher.predicate } });
   }
 
   and(matcher) {
-    const tempPredicate = this.predicate;
-    delete this.predicate;
-    this.predicate = { type: 'and', predicates: [] };
-    this.predicate.predicates.push(tempPredicate);
+    const result = new Matcher();
+
+    result.predicate = {
+      type: 'and',
+      predicates: [
+        ...Matcher.predicates(this),
+        ...Matcher.predicates(matcher),
+      ].map(x => _.cloneDeep(x))
+    };
+
+    return result;
+  }
+
+  /** @private */
+  static *predicates(matcher) {
     if (matcher.predicate.type === 'and') {
-      this.predicate.predicates = this.predicate.predicates.concat(matcher.predicate.predicates);
+      yield* matcher.predicate.predicates;
     } else {
-      this.predicate.predicates.push(matcher.predicate);
+      yield matcher.predicate;
     }
-    return this;
   }
 }
 

package/src/logger/DetoxLogger.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 
 const { DetoxInternalError, DetoxError } = require('../errors');
 const { shortFormat } = require('../utils/dateUtils');
-const isPromise = require('../utils/isPromise');
+const { isPromiseLike } = require('../utils/isPromise');
 
 const BunyanLogger = require('./utils/BunyanLogger');
 const CategoryThreadDispatcher = require('./utils/CategoryThreadDispatcher');
@@ -263,7 +263,7 @@ class DetoxLogger {
         ? action()
         : action;
 
-      if (!isPromise(result)) {
+      if (!isPromiseLike(result)) {
         end({ success: true });
       } else {
         result.then(
@@ -310,19 +310,19 @@ class DetoxLogger {
   /** @internal */
   static defaultOptions({ level }) {
     const ph = level === 'trace' || level === 'debug'
-      ? value => require('chalk').grey(value) + ' '
-      : value => require('chalk').grey(value);
+      ? value => require('chalk').default.grey(value) + ' '
+      : value => require('chalk').default.grey(value);
 
     const id = level === 'trace'
-      ? value => require('chalk').yellow(`@${value}`)
+      ? value => require('chalk').default.yellow(`@${value}`)
       : undefined;
 
     const cat = level === 'trace' || level === 'debug'
-      ? (value) => require('chalk').yellow(`${value}`.split(',', 1)[0])
+      ? (value) => require('chalk').default.yellow(`${value}`.split(',', 1)[0])
       : undefined;
 
     const event = level === 'trace' || level === 'debug'
-      ? (value) => require('chalk').grey(`:${value}`)
+      ? (value) => require('chalk').default.grey(`:${value}`)
       : undefined;
 
     const identity = x => x;

package/src/logger/utils/BunyanLogger.js

@@ -41,13 +41,14 @@ class BunyanLogger {
       streamOptions.out = new PassThrough().pipe(process.stderr);
     }
 
-    this._debugStream = {
+    this._bunyan.addStream({
       type: 'raw',
       level: config.level,
       stream: bds.default(streamOptions),
-    };
+    });
+
+    this._debugStream = _.last(this._bunyan['streams']);
 
-    this._bunyan.addStream(this._debugStream);
     return this;
   }
 
@@ -93,7 +94,7 @@ class BunyanLogger {
           : bunyanStream.stream;
 
         /* istanbul ignore next */
-        return stream.fd !== undefined && !stream.closed;
+        return stream.fd > 2 && !stream.closed;
     }
   };
 

package/src/realms/DetoxContext.js

@@ -3,9 +3,9 @@ const funpermaproxy = require('funpermaproxy');
 const temporary = require('../artifacts/utils/temporaryPath');
 const { DetoxRuntimeError } = require('../errors');
 const { DetoxLogger, DetoxLogFinalizer, installLegacyTracerInterface } = require('../logger');
-const symbols = require('../symbols');
 
 const DetoxConstants = require('./DetoxConstants');
+const symbols = require('./symbols');
 
 //#region Protected symbols
 const $cleanup = Symbol('cleanup');
@@ -135,7 +135,10 @@ class DetoxContext {
    */
   async [symbols.installWorker](opts) {
     if (opts.global) {
-      opts.global['__detox__'] = this;
+      opts.global['__detox__'] = {
+        clientApi: require('../../index'),
+        internalsApi: require('../../internals'),
+      };
       this.log.overrideConsole(opts.global);
     }
 

package/src/realms/DetoxInternalsFacade.js

@@ -1,6 +1,6 @@
 const funpermaproxy = require('funpermaproxy');
 
-const symbols = require('../symbols');
+const symbols = require('./symbols');
 
 class DetoxInternalsFacade {
   /**

package/src/realms/DetoxPrimaryContext.js

@@ -6,11 +6,11 @@ const onSignalExit = require('signal-exit');
 const temporary = require('../artifacts/utils/temporaryPath');
 const { DetoxRuntimeError } = require('../errors');
 const SessionState = require('../ipc/SessionState');
-const symbols = require('../symbols');
 const { getCurrentCommand } = require('../utils/argparse');
 const uuid = require('../utils/uuid');
 
 const DetoxContext = require('./DetoxContext');
+const symbols = require('./symbols');
 
 // Protected symbols
 const { $logFinalizer, $restoreSessionState, $sessionState, $worker } = DetoxContext.protected;
@@ -135,7 +135,7 @@ class DetoxPrimaryContext extends DetoxContext {
     process.env.DETOX_CONFIG_SNAPSHOT_PATH = this[_sessionFile];
     this[_lifecycleLogger].trace(`Serialized the session state at: ${this[_sessionFile]}`);
 
-    if (opts.workerId != null) {
+    if (opts.workerId !== null) {
       await this[symbols.installWorker](opts);
     }
   }

package/src/realms/DetoxSecondaryContext.js

@@ -2,9 +2,9 @@ const fs = require('fs-extra');
 
 const { DetoxInternalError } = require('../errors');
 const SessionState = require('../ipc/SessionState');
-const symbols = require('../symbols');
 
 const DetoxContext = require('./DetoxContext');
+const symbols = require('./symbols');
 
 // Protected symbols
 const { $restoreSessionState, $sessionState, $worker } = DetoxContext.protected;

package/src/servicelocator/android/index.js

@@ -3,7 +3,7 @@ const DeviceRegistry = require('../../devices/DeviceRegistry');
 const AAPT = require('../../devices/common/drivers/android/exec/AAPT');
 const ADB = require('../../devices/common/drivers/android/exec/ADB');
 const ApkValidator = require('../../devices/common/drivers/android/tools/ApkValidator');
-const TempFileXfer = require('../../devices/common/drivers/android/tools/TempFileXfer');
+const { TempFileTransfer } = require('../../devices/common/drivers/android/tools/TempFileTransfer');
 
 const AndroidServiceLocator = {
   get emulator() {
@@ -18,7 +18,7 @@ const AndroidServiceLocator = {
 AndroidServiceLocator.adb = new ADB();
 AndroidServiceLocator.aapt = new AAPT();
 AndroidServiceLocator.apkValidator = new ApkValidator(AndroidServiceLocator.aapt);
-AndroidServiceLocator.fileXfer = new TempFileXfer(AndroidServiceLocator.adb);
+AndroidServiceLocator.fileTransfer = new TempFileTransfer(AndroidServiceLocator.adb);
 AndroidServiceLocator.deviceRegistry = DeviceRegistry.forAndroid();
 AndroidServiceLocator.devicePathBuilder = new AndroidDevicePathBuilder();
 

package/src/utils/ExclusiveLockfile.js

@@ -86,6 +86,7 @@ class ExclusiveLockfile {
    */
   _doRead() {
     const contents = fs.readFileSync(this._lockFilePath, this._options.read);
+    // @ts-ignore Node.js can parse buffer as JSON
     return JSON.parse(contents);
   }
 

package/src/utils/argparse.js

@@ -1,15 +1,9 @@
 const path = require('path');
 
 const _ = require('lodash');
-const argv = require('minimist')(process.argv.slice(2));
 
 const { escape } = require('./pipeCommands');
 
-function getArgValue(key, alias) {
-  const value = _getArgvValue(key, alias);
-  return value === undefined ? getEnvValue(key) : value;
-}
-
 function getEnvValue(key) {
   const envKey = _.findKey(process.env, matchesKey(
     `DETOX_${_.snakeCase(key)}`.toUpperCase()
@@ -23,31 +17,12 @@ function getEnvValue(key) {
   return value;
 }
 
-function _getArgvValue(...aliases) {
-  if (!argv) {
-    return;
-  }
-
-  for (const alias of aliases) {
-    if (alias && argv[alias]) {
-      return argv[alias];
-    }
-  }
-}
-
 function matchesKey(key) {
   return /* istanbul ignore next */ process.platform === 'win32'
     ? (value, envKey) => envKey.toUpperCase() === key
     : (value, envKey) => envKey === key;
 }
 
-function getFlag(key) {
-  if (argv && argv[key]) {
-    return true;
-  }
-  return false;
-}
-
 const DEFAULT_JOIN_ARGUMENTS_OPTIONS = {
   prefix: '--',
   joiner: ' ',
@@ -92,9 +67,7 @@ function getCurrentCommand() {
 }
 
 module.exports = {
-  getArgValue,
   getEnvValue,
-  getFlag,
   joinArgs,
   getCurrentCommand,
 };

package/src/utils/isPromise.js

@@ -2,4 +2,11 @@ function isPromise(value) {
   return Promise.resolve(value) === value;
 }
 
-module.exports = isPromise;
+function isPromiseLike(value) {
+  return value ? typeof value.then === 'function' : false;
+}
+
+module.exports = {
+  isPromise,
+  isPromiseLike,
+};

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0-javadoc.jar.md5

@@ -1 +0,0 @@
-ea6186058d129e19888773c331920f40

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-c345c57a09f415daef9a23832141b5af2e18647e

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-de444279abdbbef76d881b8130460cf395410b1076c87fc63e249167138ce04a

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-a336b4f6dfcf0681162be31e004aa9f407876c27ed27d08e1f5261e351782b57e96fcd419a35acd0c45292c5ba11705b595d5f751c2fd548025161c9189ab7ef

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0-sources.jar.md5

@@ -1 +0,0 @@
-d1cc2d23f8f9f2b0a4bc726bbb62bfe8

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0-sources.jar.sha1

@@ -1 +0,0 @@
-0dfff4938eb6cdcbad7c459e00e03e5f74cf63e2

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0-sources.jar.sha256

@@ -1 +0,0 @@
-57d1a4ca0a22818cacb3fc0612ef95d2f2e2619975c678a96360c58564667d01

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0-sources.jar.sha512

@@ -1 +0,0 @@
-c3aa7640f8f4d7fe4515fd64f6bf5dd2d086125b50e355fb7b7267c2973a992f159ab5723ffce5d52c90ced2c2e899692fa503804ebec6a28ecf9520c7fb4253

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0.aar.md5

@@ -1 +0,0 @@
-9f4287a9139d94b1eb35aef80da68b65

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0.aar.sha1

@@ -1 +0,0 @@
-dfa1ae19ebfa0add0b2392b3287e5885bd492768

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0.aar.sha256

@@ -1 +0,0 @@
-a0f706c4d9f8a2c9b33603874ac9c107ad50e4f74177c98f84cd28b2cfe305ec

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0.aar.sha512

@@ -1 +0,0 @@
-7c5616e2dff6896bccaa3b98bbd0eb4085cfc2493ef4e0f3a6a75d4f6623059ab5ce912d80881eda8daa85f6d94aeecdc4661648f335523eb8e2e90cb47d40ae

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0.pom.md5

@@ -1 +0,0 @@
-707f23a53e4df7c923928f8ee9d9532b

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0.pom.sha1

@@ -1 +0,0 @@
-314e61210f92969bb0b274cbe3e0dac1f04c0bdc

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0.pom.sha256

@@ -1 +0,0 @@
-65a2960ffce341d2c351849d7d164f6fee2164dee2d3ca6963094444c28e15e5

package/Detox-android/com/wix/detox/20.1.0/detox-20.1.0.pom.sha512

@@ -1 +0,0 @@
-8542c39f3f0b79257898244daaf665d4bca3f445833cbac16c11ba8a858928e38bae73227c2996f12c2ffa744ce350e00e96636a1ff212dfaa6730d6274bb559

package/src/devices/common/drivers/android/tools/TempFileXfer.js

@@ -1,16 +0,0 @@
-// @ts-nocheck
-const FileXfer = require('./FileXfer');
-
-const EMU_TEMP_PATH = '/data/local/tmp';
-const EMU_TEMP_INSTALL_PATH = `${EMU_TEMP_PATH}/detox`;
-
-class TempFileXfer extends FileXfer {
-  /**
-   * @param adb { ADB }
-   */
-  constructor(adb) {
-    super(adb, EMU_TEMP_INSTALL_PATH);
-  }
-}
-
-module.exports = TempFileXfer;

package/src/realms/index.js

@@ -1,10 +0,0 @@
-function current() {
-  if (process.env.DETOX_CONFIG_SNAPSHOT_PATH) {
-    return require('./secondary');
-  } else {
-    return require('./primary');
-  }
-}
-
-/** @type {DetoxInternals.Facade} */
-module.exports = global['__detox__'] || current();