expect-webdriverio 6.1.0 → 8.0.0-alpha.0

package/types/expect-webdriverio.d.ts

@@ -21,7 +21,7 @@ type ExpectLibAsyncExpectationResult = import('expect').AsyncExpectationResult
 type ExpectLibExpectationResult = import('expect').ExpectationResult
 type ExpectLibMatcherContext = import('expect').MatcherContext
 type MatchersObject = Parameters<typeof import('expect').expect.extend>[0]
-type ExpectLibAnything = ReturnType<typeof expect.any> | ReturnType<typeof expect.anything>
+type ExpectLibAnything = ReturnType<typeof import('expect').expect.any> | ReturnType<typeof import('expect').expect.anything>
 type WdioGetHTMLOptions = NonNullable<Parameters<WebdriverIO.Element['getHTML']>[0]>
 
 // Extracted from the expect library, this is the type of the matcher function used in the expect library.
@@ -54,6 +54,17 @@ type MaybeArrayOrOneOf<T> = T | (T | ExpectWebdriverIO.OneOfPartialMatcher<Exclu
  */
 type MaybeOneOf<T> = T | ExpectWebdriverIO.OneOfPartialMatcher<Exclude<T, ExpectWebdriverIO.PartialMatcherAnything>>
 
+type MultiRemoteValues<T> = Record<string, T>
+type MultiRemoteValuesOrOneOf<T> = T | ExpectWebdriverIO.OneOfPartialMatcher<T> | MultiRemoteValues<T | ExpectWebdriverIO.OneOfPartialMatcher<T>> | ExpectWebdriverIO.MultiRemotePartialMatcher<T | ExpectWebdriverIO.OneOfPartialMatcher<T>>
+type MaybeArrayOrMultiRemoteValues<T> = MaybeArray<T> | MultiRemoteValues<T>
+type MaybeArrayOrMultiRemoteValuesOrOneOf<T> = MaybeArray<T | ExpectWebdriverIO.OneOfPartialMatcher<T>> | MultiRemoteValues<T | ExpectWebdriverIO.OneOfPartialMatcher<T>> | ExpectWebdriverIO.OneOfPartialMatcher<T>
+type MaybeArrayOrMultiRemoteWithArrayValuesOrOneOf<T> = MaybeArray<T | ExpectWebdriverIO.OneOfPartialMatcher<T>> | MultiRemoteValues<MaybeArray<T | ExpectWebdriverIO.OneOfPartialMatcher<T>>> | ExpectWebdriverIO.OneOfPartialMatcher<T> | ExpectWebdriverIO.MultiRemotePartialMatcher<MaybeArray<T | ExpectWebdriverIO.OneOfPartialMatcher<T>>>
+type ArrayOrMultiRemoteValues<T> = T[] | MultiRemoteValues<T>
+/** Multi-remote $(): one expected value for every instance, or one per instance with `expect.multiRemote()` (e.g. numbers, styles) */
+type SingleOrMultiRemoteMatcher<T> = T | ExpectWebdriverIO.MultiRemotePartialMatcher<T>
+/** Multi-remote $$(): one expected value (or one per element) for every instance, or the same per instance with `expect.multiRemote()` (e.g. numbers, styles) */
+type MaybeArrayOrMultiRemoteMatcher<T> = MaybeArray<T> | ExpectWebdriverIO.MultiRemotePartialMatcher<MaybeArray<T>>
+
 /**
  * Real Promise and wdio chainable promise types.
  */
@@ -73,14 +84,18 @@ type ArrayOfElementsPromise = Promise<WebdriverIO.Element[]>
  */
 type ElementOrMaybeSomeArrayLike = ElementLike | MaybeSomeElementArrayLike
 type ElementLike = WebdriverIO.Element | ChainablePromiseElement
-type ElementArrayLike = WebdriverIO.ElementArray | ChainablePromiseArray | WebdriverIO.Element[] | ArrayOfElementsPromise | ElementArrayPromise
-type MaybeSomeElementArrayLike = MaybeSome<WebdriverIO.ElementArray | ChainablePromiseArray | WebdriverIO.Element[] | ArrayOfElementsPromise | ElementArrayPromise>
+type ElementArrayLike = WebdriverIO.ElementArray | ChainablePromiseArray | WebdriverIO.Element[] | ArrayOfElementsPromise | ElementArrayPromise | WebdriverIO.MultiRemoteElement[]
+type MaybeSomeElementArrayLike = MaybeSome<WebdriverIO.ElementArray | ChainablePromiseArray | WebdriverIO.Element[] | ArrayOfElementsPromise | ElementArrayPromise | WebdriverIO.MultiRemoteElement[]>
+type MultiRemoteElementOrElements = WebdriverIO.MultiRemoteElement | WebdriverIO.MultiRemoteElement[]
 type MockPromise = Promise<WebdriverIO.Mock>
+/** Multi-remote `mock()`, one mock per instance: every instance's mock must satisfy the network matcher */
+type MultiRemoteMocks = WebdriverIO.Mock[] | Promise<WebdriverIO.Mock[]>
 
 /**
  * Type helpers allowing to use the function when the expect(actual: T) is of the expected type T.
  */
 type FnWhenBrowser<ActualT, Fn> = ActualT extends WebdriverIO.Browser ? Fn : never
+type FnWhenBrowserOrMultiRemote<ActualT, FnBrowser, FnMultiRemote> = ActualT extends WebdriverIO.Browser ? FnBrowser : ActualT extends WebdriverIO.MultiRemoteBrowser ? FnMultiRemote : never
 /**
  * Enables distinct function signatures for single elements versus arrays of elements.
  *
@@ -89,58 +104,134 @@ type FnWhenBrowser<ActualT, Fn> = ActualT extends WebdriverIO.Browser ? Fn : nev
  *
  * Fix: If type inference issues arise, split the implementation into separate interfaces
  */
-type FnWhenElementOrArrayLike<ActualT, FnElement, FnArray = FnElement> = ActualT extends MaybeSomeElementArrayLike ? FnArray : ActualT extends ElementLike ? FnElement: never
-type FnWhenElementArrayLike<ActualT, Fn> = ActualT extends MaybeSomeElementArrayLike ? Fn : never
+type FnWhenElementOrArrayLike<ActualT, FnElement, FnArray = FnElement, FnMultiRemoteElement = FnElement, FnMultiRemoteElements = FnArray> = ActualT extends WebdriverIO.MultiRemoteElement[] ? FnMultiRemoteElements : ActualT extends WebdriverIO.MultiRemoteElement ? FnMultiRemoteElement : ActualT extends MaybeSomeElementArrayLike ? FnArray : ActualT extends ElementLike ? FnElement : never
+type FnWhenElementArrayLike<ActualT, Fn, FnMultiRemoteElements = Fn> = ActualT extends WebdriverIO.MultiRemoteElement[] ? FnMultiRemoteElements : ActualT extends MaybeSomeElementArrayLike ? Fn : never
 
 /**
  * Same as the other but because of Jasmine and it's expectAsync typing which does not force T to be a promise, then we need to account for `WebdriverIO.Mock
  */
-type FnWhenMock<ActualT, Fn> = ActualT extends MockPromise | WebdriverIO.Mock ? Fn : never
+type FnWhenMock<ActualT, Fn> = ActualT extends MockPromise | WebdriverIO.Mock | MultiRemoteMocks ? Fn : never
 
 interface WdioCustomAsymmetricMatchers {
     oneOf(...values: Array<string | RegExp | ExpectWebdriverIO.PartialMatcher<string> | null>): ExpectWebdriverIO.OneOfPartialMatcher<string | RegExp | ExpectWebdriverIO.PartialMatcher<string> | null>
+
+    /**
+     * One expected value per multi-remote instance, keyed by instance name. Every instance must be listed.
+     * Required for per-instance values of number matchers (`toHaveWidth`, `toHaveHeight`, `toHaveChildren`, `toBeElementsArrayOfSize`)
+     * and of matchers whose expected value is itself an object (`toHaveStyle`, `toHaveSize`, `toHaveElementProperty`),
+     * and the explicit form of the plain object shorthand for the other matchers.
+     *
+     * @example
+     * await expect(multiRemoteBrowser).toHaveTitle(expect.multiRemote({ chrome: 'Title', firefox: 'Titre' }))
+     * await expect(multiRemoteBrowser.$('h1')).toHaveStyle(expect.multiRemote({ chrome: { color: 'red' }, firefox: { color: 'blue' } }))
+     */
+    multiRemote<T>(values: MultiRemoteValues<T>): ExpectWebdriverIO.MultiRemotePartialMatcher<T>
 }
 
 /**
- * Matchers dedicated to Wdio Browser.
+ * Matchers dedicated to Wdio Browser or multi-remote Browser.
  * When asserting on a browser's properties requiring to be awaited, the return type is a Promise.
  * When actual is not a browser, the return type is never, so the function cannot be used.
  */
 interface WdioBrowserMatchers<_R, ActualT>{
     /**
-     * `WebdriverIO.Browser` -> `getUrl`
+     * Browser`s url
      */
-    toHaveUrl: FnWhenBrowser<ActualT, (url: string | RegExp | ExpectWebdriverIO.PartialMatcher<string>, options?: ExpectWebdriverIO.StringOptions) => Promise<void>>
+    toHaveUrl: FnWhenBrowserOrMultiRemote<ActualT,
+        /**
+        * `WebdriverIO.Browser` -> `getUrl`
+        */
+        (
+            url: string | RegExp | ExpectWebdriverIO.PartialMatcher<string>,
+            options?: ExpectWebdriverIO.StringOptions
+        ) => Promise<void>,
 
-    /**
-     * `WebdriverIO.Browser` -> `getTitle`
-     */
-    toHaveTitle: FnWhenBrowser<ActualT, (title: string | RegExp | ExpectWebdriverIO.PartialMatcher<string>, options?: ExpectWebdriverIO.StringOptions) => Promise<void>>
+        /**
+        * `WebdriverIO.MultiRemoteBrowser` -> `getUrl`
+        */
+        (
+            url: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ) => Promise<void>
+    >
 
     /**
-     * `WebdriverIO.Browser` -> `execute`
+     * Browser`s title
      */
-    toHaveClipboardText: FnWhenBrowser<ActualT, (clipboardText: string | RegExp | ExpectWebdriverIO.PartialMatcher<string>, options?: ExpectWebdriverIO.StringOptions) => Promise<void>>
+    toHaveTitle: FnWhenBrowserOrMultiRemote<ActualT,
+        /**
+        * `WebdriverIO.Browser` -> `getTitle`
+        */
+        (
+            title: string | RegExp | ExpectWebdriverIO.PartialMatcher<string>,
+            options?: ExpectWebdriverIO.StringOptions
+        ) => Promise<void>,
+
+        /**
+        * `WebdriverIO.MultiRemoteBrowser` -> `getTitle`
+        */
+        (
+            title: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ) => Promise<void>
+    >
 
     /**
      * `WebdriverIO.Browser` -> `execute`
      */
-    toHaveLocalStorageItem: FnWhenBrowser<ActualT, {
+    toHaveClipboardText: FnWhenBrowserOrMultiRemote<ActualT,
         /**
-         * @deprecated since v6.0.0, removed in v8.0.0. Use `expect.anything()` instead of `undefined` as expected value.
-         */
+        * `WebdriverIO.Browser` -> `getClipboard`
+        */
         (
-            key: string,
-            expectedValue: undefined,
+            clipboardText: MaybeOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
-        ): Promise<void>,
+        ) => Promise<void>,
 
+        /**
+        * `WebdriverIO.MultiRemoteBrowser` -> `getClipboard`
+        */
         (
-            key: string,
-            expectedValue?: string | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything,
+            clipboardText: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything>,
             options?: ExpectWebdriverIO.StringOptions
-        ) : Promise<void>
-    }
+        ) => Promise<void>
+    >
+
+    /**
+     * `WebdriverIO.Browser` -> `execute`
+     */
+    toHaveLocalStorageItem: FnWhenBrowserOrMultiRemote<ActualT,
+        /**
+        * `WebdriverIO.Browser` -> `getLocalStorageItem`
+        */
+        {
+            /**
+             * Only check that the item exists.
+             * Use `toHaveLocalStorageItem(key, expect.anything(), options)` to check it with options.
+             */
+            (key: string): Promise<void>
+            (
+                key: string,
+                expectedValue: MaybeOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything>,
+                options?: ExpectWebdriverIO.StringOptions
+            ): Promise<void>
+        },
+
+        /**
+        * `WebdriverIO.MultiRemoteBrowser` -> `getLocalStorageItem`
+        */
+        {
+            /**
+             * Only check that the item exists.
+             * Use `toHaveLocalStorageItem(key, expect.anything(), options)` to check it with options.
+             */
+            (key: string): Promise<void>
+            (
+                key: string,
+                expectedValue: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything>,
+                options?: ExpectWebdriverIO.StringOptions
+            ): Promise<void>
+        }
     >
 }
 
@@ -151,42 +242,35 @@ interface WdioBrowserMatchers<_R, ActualT>{
  */
 interface WdioNetworkMatchers<_R, ActualT> {
     /**
-     * Check that `WebdriverIO.Mock` was called
+     * Check that `WebdriverIO.Mock` was called.
+     * With multi-remote mocks (`multiRemoteBrowser.mock()`), every instance's mock must be called.
      */
     toBeRequested: FnWhenMock<ActualT, (options?: ExpectWebdriverIO.CommandOptions) => Promise<void>>
 
     /**
-     * Check that `WebdriverIO.Mock` was called N times
+     * Check that `WebdriverIO.Mock` was called N times.
+     * With multi-remote mocks (`multiRemoteBrowser.mock()`), every instance's mock must be called N times.
      */
-    toBeRequestedTimes: FnWhenMock<ActualT, {
-        (
-            times: number | ExpectWebdriverIO.NumberMatcher,
-            options?: ExpectWebdriverIO.CommandOptions
-        ): Promise<void>
-
-        /**
-        * @deprecated since v6.0.0, remove in v8.0.0. Use `NumberMatcher` & `CommandOptions` separately `toBeRequestedTimes(NumberMatcher, options)`.
-        */
-        (
-            times: ExpectWebdriverIO.NumberOptions,
-            options?: ExpectWebdriverIO.CommandOptions
-        ): Promise<void>;
-
-    }>
+    toBeRequestedTimes: FnWhenMock<ActualT, (
+        times: number | ExpectWebdriverIO.NumberMatcher,
+        options?: ExpectWebdriverIO.CommandOptions
+    ) => Promise<void>>
 
     /**
-     * Check that `WebdriverIO.Mock` was called with the specific parameters
+     * Check that `WebdriverIO.Mock` was called with the specific parameters.
+     * With multi-remote mocks (`multiRemoteBrowser.mock()`), every instance's mock must have such a call.
      */
     toBeRequestedWith: FnWhenMock<ActualT, (requestedWith: ExpectWebdriverIO.RequestedWith, options?: ExpectWebdriverIO.CommandOptions) => Promise<void>>
 }
 
 /**
- * Matchers dedicated to WebdriverIO Element or ElementArray (or chainable).
+ * Matchers dedicated to WebdriverIO Element or ElementArray (or chainable) on Browser
+ * For Multi-Remote Browser, MultiRemoteElement or MultiRemoteElement[]
  * When asserting on an element or element array's properties requiring to be awaited, the return type is a Promise.
  * When actual is neither of WebdriverIO.Element, WebdriverIO.ElementArray, ChainableElement, ChainableElementArray, the return type is never, so the function cannot be used.
  */
 interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
-    // ===== $ or $$ =====
+    // ===== $ or $$ with Browser or Multi-Remote Browser=====
     /**
      * `WebdriverIO.Element` -> `isDisplayed`
      */
@@ -244,16 +328,7 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
 
     toHaveAttribute: FnWhenElementOrArrayLike<ActualT, {
         /** Element $() API */
-        /**
-         * @deprecated since v6.0.0, remove in v8.0.0. Passing explicit `undefined` as a value is deprecated. Omit the second argument entirely or pass options instead: `toHaveAttribute(attribute, options)`.
-         */
-        (
-            attribute: string,
-            value: undefined,
-            options?: ExpectWebdriverIO.StringOptions
-        ): Promise<void>;
-
-        /** Check ONLY for the presence of the attribute (and optional configuration options) */
+        /** Check ONLY for the presence of the attribute. For options, use `toHaveAttribute(attribute, expect.anything(), options)` */
         (
             attribute: string,
         ): Promise<void>;
@@ -266,16 +341,7 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
         ): Promise<void>;
     }, {
         /** Elements $$() API */
-        /**
-         * @deprecated Not supported
-         */
-        (
-            attribute: string,
-            value: undefined,
-            options?: ExpectWebdriverIO.StringOptions
-        ): Promise<void>;
-
-        /** Check ONLY for the presence of the attribute (and optional configuration options) */
+        /** Check ONLY for the presence of the attribute. For options, use `toHaveAttribute(attribute, expect.anything(), options)` */
         (
             attribute: string,
         ): Promise<void>;
@@ -286,28 +352,29 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             value: MaybeArrayOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything>,
             options?: ExpectWebdriverIO.StringOptions
         ): Promise<void>;
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            attribute: string
+        ): Promise<void>
+        (
+            attribute: string,
+            value: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            attribute: string
+        ): Promise<void>
+        (
+            attribute: string,
+            value: MaybeArrayOrMultiRemoteWithArrayValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
     }
     >
 
-    /**
-     * @deprecated since v6.0.0, removed in v8.0.0. Use `toHaveAttribute` instead.
-     * `WebdriverIO.Element` -> `getAttribute`
-     */
-    toHaveAttr: FnWhenElementOrArrayLike<ActualT, (
-        attribute: string,
-        value?: string | RegExp | ExpectWebdriverIO.PartialMatcher<string>,
-        options?: ExpectWebdriverIO.StringOptions
-    ) => Promise<void>>
-
-    /**
-     * `WebdriverIO.Element` -> `getAttribute` class
-     * @deprecated since v1.3.1 - use `toHaveElementClass` instead.
-     */
-    toHaveClass: FnWhenElementOrArrayLike<ActualT, (
-        className: string | RegExp | ExpectWebdriverIO.PartialMatcher<string>,
-        options?: ExpectWebdriverIO.StringOptions
-    ) => Promise<void>>
-
     /**
      * `WebdriverIO.Element` -> `getAttribute` class
      *
@@ -330,7 +397,7 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             className: string | RegExp | ExpectWebdriverIO.PartialMatcher<string>,
             options?: ExpectWebdriverIO.StringOptions
         ) :Promise<void>
-        /** @deprecated use `expect.oneOf()` instead of an array */
+        /** @deprecated an array means "has any of these classes", to review in https://github.com/webdriverio/expect-webdriverio/issues/2266 (`expect.oneOf()` compares the full class attribute) */
         (
             className: Array<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
@@ -341,6 +408,18 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             className: MaybeArray<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
         ) :Promise<void>
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            className: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            className: MaybeArrayOrMultiRemoteWithArrayValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
     }>
 
     toHaveElementProperty: FnWhenElementOrArrayLike<ActualT, {
@@ -353,16 +432,6 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             property: string,
         ): Promise<void>;
 
-        /**
-         * @deprecated since v6.0.0, removed in v8.0.0. Passing explicit `undefined` or `null` as a value is deprecated.
-         * Omit the second argument entirely or use expect.anything() with options: `toHaveElementProperty(property, expect.anything(), options)`.
-         */
-        (
-            property: string,
-            value: undefined | null, // Use expect.any(type) or expect.anything() instead of undefined or null
-            options?: ExpectWebdriverIO.StringOptions
-        ): Promise<void>;
-
         /** Assert both property name AND a specific expected value */
         (
             property: string,
@@ -380,31 +449,43 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             property: string,
         ): Promise<void>;
 
-        /**
-         * @deprecated Not supported
-         * Use `expect.anything()` or `[expect.anything()] as value` to check for the presence of the property with options.
-         */
+        /** Assert both property name AND a specific expected value */
         (
             property: string,
-            propertyValue: undefined | null, // Use expect.any(type) or expect.anything() instead of undefined or null
+            value: Exclude<MaybeArrayOrOneOf<string | number | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything | null>, null>,
             options?: ExpectWebdriverIO.StringOptions
-        ): Promise<never>;
-
-        /** Assert both property name AND a specific expected value */
+        ): Promise<void>;
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            property: string
+        ): Promise<void>
         (
             property: string,
-            value: MaybeArrayOrOneOf<string | number | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything | null>,
+            value: SingleOrMultiRemoteMatcher<MaybeOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything> | number>,
             options?: ExpectWebdriverIO.StringOptions
-        ): Promise<void>;
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            property: string
+        ): Promise<void>
+        (
+            property: string,
+            value: Exclude<MaybeArrayOrOneOf<string | number | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything | null>, null> | ExpectWebdriverIO.MultiRemotePartialMatcher<MaybeArrayOrOneOf<string | number | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.PartialMatcherAnything | null>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
     }>
 
     /**
      * `WebdriverIO.Element` -> `getProperty` value
      */
     toHaveValue: FnWhenElementOrArrayLike<ActualT,
+        /**
+         * Element(s) API
+         */
         /** Element $() API */
         (
-
             value: MaybeOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
         ) => Promise<void>,
@@ -414,6 +495,22 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
 
             value: MaybeArrayOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
+        ) => Promise<void>,
+
+        /**
+         * Multi-Remote Elements API
+         */
+        /** $() API */
+        (
+            value: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ) => Promise<void>,
+
+        /** $$() API */
+        (
+
+            value: MaybeArrayOrMultiRemoteWithArrayValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
         ) => Promise<void>
     >
 
@@ -428,15 +525,6 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
          * Same as `expect(el).toHaveChildren({ gte: 1 })` or `expect(el).toHaveChildren({ gte: 1 }, options)`.
          */
         (): Promise<void>;
-        /**
-         * @deprecated since 6.0.0, remove in v8.0.0.
-         * Passing explicit `undefined` or `{ wait : 1 }` (NumberOptions) as a value is deprecated.
-         * Use options with `toHaveChildren({ gte: 1 }, options)`.
-         */
-        (
-            expectedValue: undefined, // {} also deprecated but we cannot use it as a type because it would match any object
-            options?: ExpectWebdriverIO.CommandOptions
-        ): Promise<void>;
 
         /**
          * When called with an expected child count or number matcher.
@@ -445,16 +533,6 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             expectedValue: number | ExpectWebdriverIO.NumberMatcher,
             options?: ExpectWebdriverIO.CommandOptions
         ): Promise<void>;
-
-        /**
-         * @deprecated since 6.0.0, remove in v8.0.0.
-         * NumberOptions is no longer supported. Use `expect(el).toHaveChildren(numberMatcher, options)` instead.
-         * Instead of `expect(el).toHaveChildren({ wait: 1 })` use `expect(el).toHaveChildren({ gte: 1 }, { wait: 1 })`.
-         */
-        (
-            expectedValue: ExpectWebdriverIO.NumberOptions,
-            options?: ExpectWebdriverIO.CommandOptions
-        ): Promise<void>;
     }, {
         /** Element $$() API */
         /**
@@ -463,16 +541,6 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
          */
         (): Promise<void>;
 
-        /**
-         * @deprecated Not supported
-         * NumberOptions is no longer supported. Use `expect(el).toHaveChildren(numberMatcher, options)` instead.
-         * Instead of `expect(el).toHaveChildren({ wait: 1 })` use `expect(el).toHaveChildren({ gte: 1 }, { wait: 1 })`.
-         */
-        (
-            expectedValue: undefined,
-            options?: ExpectWebdriverIO.CommandOptions
-        ): Promise<void>;
-
         /**
          * When called with an expected child count or number matcher.
          */
@@ -480,6 +548,20 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             expectedValue: MaybeArray<number | ExpectWebdriverIO.NumberMatcher>,
             options?: ExpectWebdriverIO.CommandOptions
         ): Promise<void>;
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (): Promise<void>
+        (
+            expectedValue: SingleOrMultiRemoteMatcher<number | ExpectWebdriverIO.NumberMatcher>,
+            options?: ExpectWebdriverIO.CommandOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (): Promise<void>
+        (
+            expectedValue: MaybeArrayOrMultiRemoteMatcher<number | ExpectWebdriverIO.NumberMatcher>,
+            options?: ExpectWebdriverIO.CommandOptions
+        ): Promise<void>
     }>
 
     /**
@@ -497,6 +579,18 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             href: MaybeArrayOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
         ) : Promise<void>
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            href: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            href: MaybeArrayOrMultiRemoteWithArrayValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
     }>
 
     /**
@@ -514,6 +608,18 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             href: MaybeArrayOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
         ) : Promise<void>
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            href: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            href: MaybeArrayOrMultiRemoteWithArrayValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
     }>
 
     /**
@@ -530,6 +636,18 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
         (
             id: MaybeArrayOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
+        ) => Promise<void>,
+
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            id: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ) => Promise<void>,
+
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            id: MaybeArrayOrMultiRemoteWithArrayValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
         ) => Promise<void>
     >
 
@@ -554,23 +672,31 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
      * ```
      */
     toHaveText: FnWhenElementOrArrayLike<ActualT, {
-        /** Element $() API */
+        /** Element browser.$() API */
         (
             text: MaybeOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
         ) : Promise<void>
-        /** @deprecated Use `expect.oneOf()` instead. */
+    }, {
+        /** Elements browser.$$() API */
         (
-            text: Array<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            text: MaybeArrayOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
         ) : Promise<void>
     }, {
-        /** Elements $$() API */
+        /** Element MultiRemoteBrowser.$() API */
         (
-            text: MaybeArrayOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            text: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
         ) : Promise<void>
-    }>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            text: MaybeArrayOrMultiRemoteWithArrayValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ) : Promise<void>
+    }
+    >
 
     /**
      * `WebdriverIO.Element` -> `getHTML`
@@ -582,17 +708,24 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             text: MaybeOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.HTMLOptions
         ) : Promise<void>
-        /** @deprecated to replace by oneOf() or anyOf() when available */
-        (
-            text: Array<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
-            options?: ExpectWebdriverIO.HTMLOptions
-        ) : Promise<void>
     }, {
         /** Elements $$() API */
         (
             text: MaybeArrayOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string> | ExpectWebdriverIO.OneOfPartialMatcher<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>>,
             options?: ExpectWebdriverIO.HTMLOptions
         ): Promise<void>
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            text: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.HTMLOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            text: MaybeArrayOrMultiRemoteWithArrayValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.HTMLOptions
+        ): Promise<void>
     }>
 
     /**
@@ -605,18 +738,24 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             computedLabel: MaybeOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
         ) : Promise<void>
-
-        /** @deprecated use `expect.oneOf()` instead of an array */
-        (
-            computedLabel: Array<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
-            options?: ExpectWebdriverIO.StringOptions
-        ) : Promise<void>
     }, {
         /** Elements $$() API */
         (
             computedLabel: MaybeArrayOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
         ) : Promise<void>
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            computedLabel: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            computedLabel: MaybeArrayOrMultiRemoteWithArrayValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
     }>
 
     /**
@@ -629,18 +768,24 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             computedRole: MaybeOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
         ) : Promise<void>
-
-        /** @deprecated use `expect.oneOf()` instead of an array */
-        (
-            computedRole: Array<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
-            options?: ExpectWebdriverIO.StringOptions
-        ) : Promise<void>
     }, {
         /** Elements $$() API */
         (
             computedRole: MaybeArrayOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
             options?: ExpectWebdriverIO.StringOptions
         ) : Promise<void>
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            computedRole: MultiRemoteValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            computedRole: MaybeArrayOrMultiRemoteWithArrayValuesOrOneOf<string | RegExp | ExpectWebdriverIO.PartialMatcher<string>>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
     }>
 
     /**
@@ -652,21 +797,25 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
         (
             width: number | ExpectWebdriverIO.NumberMatcher,
             options?: ExpectWebdriverIO.CommandOptions
-        ) : Promise<void>,
-
-        /**
-         * @deprecated since v6.0.0, remove in v8.0.0. Use `toHaveWidth` with number | NumberMatcher instead. This matcher will be removed in version 8.0.0.
-         */
-        (
-            size: ExpectWebdriverIO.NumberOptions,
-            options?: ExpectWebdriverIO.CommandOptions
-        ): Promise<void>,
+        ) : Promise<void>
     }, {
         /** Elements $$() API */
         (
             width: MaybeArray<number | ExpectWebdriverIO.NumberMatcher>,
             options?: ExpectWebdriverIO.CommandOptions
         ) : Promise<void>
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            width: SingleOrMultiRemoteMatcher<number | ExpectWebdriverIO.NumberMatcher>,
+            options?: ExpectWebdriverIO.CommandOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            width: MaybeArrayOrMultiRemoteMatcher<number | ExpectWebdriverIO.NumberMatcher>,
+            options?: ExpectWebdriverIO.CommandOptions
+        ): Promise<void>
     }>
 
     /**
@@ -687,20 +836,24 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             height: number | ExpectWebdriverIO.NumberMatcher,
             options?: ExpectWebdriverIO.CommandOptions
         ) : Promise<void>
-
-        /**
-         * @deprecated since v6.0.0, will be removed in version v8.0.0. Use `toHaveHeight` with number | NumberMatcher instead.
-         */
-        (
-            size: ExpectWebdriverIO.NumberOptions,
-            options?: ExpectWebdriverIO.CommandOptions
-        ): Promise<void>,
     }, {
         /** Elements $$() API */
         (
             height: MaybeArray<number | ExpectWebdriverIO.NumberMatcher>,
             options?: ExpectWebdriverIO.CommandOptions
         ) : Promise<void>
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            height: SingleOrMultiRemoteMatcher<number | ExpectWebdriverIO.NumberMatcher>,
+            options?: ExpectWebdriverIO.CommandOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            height: MaybeArrayOrMultiRemoteMatcher<number | ExpectWebdriverIO.NumberMatcher>,
+            options?: ExpectWebdriverIO.CommandOptions
+        ): Promise<void>
     }>
 
     /**
@@ -720,6 +873,18 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             size: MaybeArray<{ height: number; width: number }>,
             options?: ExpectWebdriverIO.CommandOptions
         ) : Promise<void>
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            size: SingleOrMultiRemoteMatcher<{ height: number; width: number }>,
+            options?: ExpectWebdriverIO.CommandOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            size: MaybeArrayOrMultiRemoteMatcher<{ height: number; width: number }>,
+            options?: ExpectWebdriverIO.CommandOptions
+        ): Promise<void>
     }>
 
     /**
@@ -737,6 +902,18 @@ interface WdioElementOrArrayMatchers<_R, ActualT = unknown> {
             style: MaybeArray<{ [key: string]: string }>,
             options?: ExpectWebdriverIO.StringOptions
         ) : Promise<void>
+    }, {
+        /** Element MultiRemoteBrowser.$() API */
+        (
+            style: SingleOrMultiRemoteMatcher<{ [key: string]: string }>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
+    }, {
+        /** Elements MultiRemoteBrowser.$$() API */
+        (
+            style: MaybeArrayOrMultiRemoteMatcher<{ [key: string]: string }>,
+            options?: ExpectWebdriverIO.StringOptions
+        ): Promise<void>
     }>
 }
 
@@ -757,12 +934,13 @@ interface WdioElementArrayOnlyMatchers<_R, ActualT = unknown> {
             size: number | ExpectWebdriverIO.NumberMatcher,
             options?: ExpectWebdriverIO.CommandOptions
         ): Promise<void>,
-
+    }, {
         /**
-         * @deprecated since v6.0.0, remove in v8.0.0. Use `toBeElementsArrayOfSize` with number | NumberMatcher instead. This matcher will be removed in version 8.0.0.
+         * Elements MultiRemoteBrowser.$$() API: the size is checked per browser instance.
+         * A single size applies to every instance, or pass one size per instance, e.g. `expect.multiRemote({ chrome: 2, firefox: { gte: 1 } })`.
          */
         (
-            size: ExpectWebdriverIO.NumberOptions,
+            size: SingleOrMultiRemoteMatcher<number | ExpectWebdriverIO.NumberMatcher>,
             options?: ExpectWebdriverIO.CommandOptions
         ): Promise<void>,
     }>
@@ -779,15 +957,17 @@ interface WdioElementArrayOnlyMatchers<_R, ActualT = unknown> {
 interface WdioJestOverloadedMatchers<R, ActualT> {
     /**
      * snapshot matcher
+     * A plain `Element[]` or `MultiRemoteElement[]` is only recognized from its elements, so an empty one is snapshotted synchronously
      * @param label optional snapshot label
      */
-    toMatchSnapshot(label?: string): ActualT extends WdioElementOrPromiseLike ? Promise<void> : R
+    toMatchSnapshot(label?: string): ActualT extends WdioElementOrPromiseLike | WebdriverIO.MultiRemoteElement | WebdriverIO.ElementArray ? Promise<void> : ActualT extends WebdriverIO.Element[] | WebdriverIO.MultiRemoteElement[] ? Promise<void> | R : R
     /**
      * inline snapshot matcher
+     * A plain `Element[]` or `MultiRemoteElement[]` is only recognized from its elements, so an empty one is snapshotted synchronously
      * @param snapshot snapshot string (autogenerated if not specified)
      * @param label optional snapshot label
      */
-    toMatchInlineSnapshot(snapshot?: string, label?: string): ActualT extends WdioElementOrPromiseLike ? Promise<void> : R
+    toMatchInlineSnapshot(snapshot?: string, label?: string): ActualT extends WdioElementOrPromiseLike | WebdriverIO.MultiRemoteElement | WebdriverIO.ElementArray ? Promise<void> : ActualT extends WebdriverIO.Element[] | WebdriverIO.MultiRemoteElement[] ? Promise<void> | R : R
 }
 
 /**
@@ -900,21 +1080,22 @@ declare namespace ExpectWebdriverIO {
      * Used by the webdriverio main project to configure the matchers in the runner.
      */
     function setDefaultOptions(options: DefaultOptions): void
-    /** @deprecated since v6.0.0, use setDefaultOptions instead, will be removed in v8.0.0 */
-    function setOptions(options: DefaultOptions): void
 
     /**
-     * Allow to enable some new features in the expect-webdriverio library.
-     * @param flags
+     * Get the default options set by the user.
      */
-    function setFeatureFlags(flags: FeatureFlags): void
+    function getDefaultOptions(): DefaultOptions
 
     /**
-     * Get the default options set by the user.
+     * The this context available inside each matcher function.
      */
-    function getDefaultOptions(): DefaultOptions
-    /** @deprecated since v6.0.0, use getDefaultOptions instead, will be removed in v8.0.0 */
-    function getConfig(): DefaultOptions
+    interface MatcherContext /* extends ExpectLibMatcherContext */ {
+        verb?: string
+        expectation?: string
+        isNot?: boolean
+        isMultiRemote?: boolean
+        matcherName?: keyof Matchers<void, unknown>
+    }
 
     /**
      * The below block are overloaded types from the expect library.
@@ -954,7 +1135,7 @@ declare namespace ExpectWebdriverIO {
 
     interface AsymmetricMatchers extends WdioAsymmetricMatchers, WdioCustomAsymmetricMatchers {}
 
-    interface InverseAsymmetricMatchers extends Omit<ExpectWebdriverIO.AsymmetricMatchers, 'anything' | 'any' | 'oneOf'> {}
+    interface InverseAsymmetricMatchers extends Omit<ExpectWebdriverIO.AsymmetricMatchers, 'anything' | 'any' | 'oneOf' | 'multiRemote'> {}
 
     /**
      * End of block overloading types from the expect library.
@@ -1032,11 +1213,6 @@ declare namespace ExpectWebdriverIO {
      */
     const wdioCustomMatchers: MatchersObject
 
-    /**
-     * @deprecated since 5.6.9 use `wdioCustomMatchers` instead, will be removed in v8.0.0?
-     */
-    const matchers: Map<string, RawMatcherFn>
-
     interface AssertionHookParams {
         /**
          * name of the matcher, e.g. `toHaveText` or `toBeClickable`
@@ -1057,25 +1233,15 @@ declare namespace ExpectWebdriverIO {
         /**
          * Options that the user has passed in, e.g. `expect(el).toHaveText('foo', { ignoreCase: true })` -> `{ ignoreCase: true }`
          */
-        options: CommandOptions | HTMLOptions | StringOptions | NumberOptions
+        options: CommandOptions | HTMLOptions | StringOptions
     }
     interface AfterAssertionHookParams extends AssertionHookParams {
         result: AssertionResult
     }
 
-    interface FeatureFlags {
-        /**
-             * Feature flag to enable the new multi-elements comparison for `toHaveText` matcher, allowing to keep the current behavior without breaking changes.
-             * When enabled, the matcher will compare the text of multiple elements in an indexed exact match manner, rather than using the array as a possible match for any of the elements.
-             *
-             * Will be removed in v6.0.0, as the new behavior will become the default and only behavior for `toHaveText` matcher.
-             */
-        useToHaveTextStrictMultiElementsCompareStrategy?: boolean
-    }
-
     interface DefaultOptions {
         /**
-         * time in ms to wait for expectation to succeed. Default: 3000
+         * time in ms to wait for expectation to succeed. Default: 2000
          */
         wait?: number
 
@@ -1093,8 +1259,6 @@ declare namespace ExpectWebdriverIO {
          * hook that gets executed after each assertion, it contains the result of the assertion
          */
         afterAssertion?: (params: AfterAssertionHookParams) => Promise<void>
-
-        featureFlags?: FeatureFlags
     }
 
     interface CommandOptions extends DefaultOptions {
@@ -1153,29 +1317,6 @@ declare namespace ExpectWebdriverIO {
         asString?: boolean
     }
 
-    /**
-     * @deprecated since v6.0.0, remove in v8.0.0. Use `NumberMatcher` & `CommandOptions` as separate parameters instead.
-     * @see NumberMatcher
-     * @see CommandOptions
-     */
-    interface NumberOptions extends CommandOptions {
-
-        /**
-         * equals
-         */
-        eq?: number
-
-        /**
-         * less than or equals
-         */
-        lte?: number
-
-        /**
-         * greater than or equals
-         */
-        gte?: number
-    }
-
     interface ToBeDisplayedOptions extends CommandOptions {
         /**
          * `true` to check if the element is within the viewport. false by default.
@@ -1269,6 +1410,11 @@ declare namespace ExpectWebdriverIO {
      * Allow to match one of the specified value.
      */
     type OneOfPartialMatcher<T> = ExpectWebdriverIO.PartialMatcher<T[]>
+
+    /**
+     * One expected value per multi-remote instance, see `expect.multiRemote()`.
+     */
+    type MultiRemotePartialMatcher<T> = ExpectWebdriverIO.PartialMatcher<MultiRemoteValues<T>>
 }
 
 declare module 'expect-webdriverio' {
@@ -1292,4 +1438,12 @@ declare module 'expect-webdriverio/api' {
     export function some<T extends ElementArrayLike>(
         elements: T
     ): WdioSome<T>
+
+    /**
+     * One expected value per multi-remote instance, keyed by instance name. Same as `expect.multiRemote()`.
+     *
+     * @example
+     * await expect(multiRemoteBrowser.$('h1')).toHaveStyle(multiRemote({ chrome: { color: 'red' }, firefox: { color: 'blue' } }))
+     */
+    export function multiRemote<T>(values: MultiRemoteValues<T>): ExpectWebdriverIO.MultiRemotePartialMatcher<T>
 }