fix: fix all type errors

Author: wswebcreation

packages/ocr-service/src/service.ts

@@ -49,11 +49,11 @@ export default class WdioOcrService {
             log.info('Adding commands to global browser')
             await this.#addCommandsToBrowser(this._browser)
         } else {
-            await this.#extendMultiremoteBrowser(capabilities as Capabilities.MultiRemoteCapabilities)
+            await this.#extendMultiremoteBrowser(capabilities as Capabilities.RequestedMultiremoteCapabilities)
         }
     }
 
-    async #extendMultiremoteBrowser (capabilities: Capabilities.MultiRemoteCapabilities) {
+    async #extendMultiremoteBrowser (capabilities: Capabilities.RequestedMultiremoteCapabilities) {
         const browser = this._browser as WebdriverIO.MultiRemoteBrowser
         const browserNames = Object.keys(capabilities)
         const self = this

packages/visual-service/src/service.ts

@@ -70,7 +70,7 @@ export default class WdioImageComparisonService extends BaseClass {
             log.info('Adding commands to global browser')
             await this.#addCommandsToBrowser(this._browser)
         } else {
-            await this.#extendMultiremoteBrowser(capabilities as Capabilities.MultiRemoteCapabilities)
+            await this.#extendMultiremoteBrowser(capabilities as Capabilities.RequestedMultiremoteCapabilities)
         }
 
         /**
@@ -122,7 +122,7 @@ export default class WdioImageComparisonService extends BaseClass {
         return baselineFolder
     }
 
-    async #extendMultiremoteBrowser (capabilities: Capabilities.MultiRemoteCapabilities) {
+    async #extendMultiremoteBrowser (capabilities: Capabilities.RequestedMultiremoteCapabilities) {
         const browser = this._browser as WebdriverIO.MultiRemoteBrowser
         const browserNames = Object.keys(capabilities)
         log.info(`Adding commands to Multi Browser: ${browserNames.join(', ')}`)

packages/visual-service/src/storybook/Types.ts

@@ -1,4 +1,4 @@
-import type { RemoteCapability } from 'node_modules/@wdio/types/build/Capabilities.js'
+import type { TestrunnerCapabilities } from 'node_modules/@wdio/types/build/Capabilities.js'
 import type { Folders } from 'webdriver-image-comparison'
 
 export interface StorybookData {
@@ -43,10 +43,10 @@ export type CreateTestFileOptions = {
 }
 
 export interface CapabilityMap {
-    chrome: RemoteCapability;
-    firefox: RemoteCapability;
-    safari: RemoteCapability;
-    edge: RemoteCapability;
+    chrome: WebdriverIO.Capabilities;
+    firefox: WebdriverIO.Capabilities;
+    safari: WebdriverIO.Capabilities;
+    edge: WebdriverIO.Capabilities;
 }
 
 export type CreateTestContent = {

packages/visual-service/src/storybook/launcher.ts

@@ -25,7 +25,7 @@ export default class VisualLauncher extends BaseClass  {
         this.#options = options
     }
 
-    async onPrepare (config: Options.Testrunner, capabilities: Capabilities.RemoteCapabilities) {
+    async onPrepare (config: Options.Testrunner, capabilities: Capabilities.TestrunnerCapabilities) {
         const isStorybook = isStorybookMode()
         const framework = config.framework as string
         const isCucumber = isCucumberFramework(framework)

packages/webdriver-image-comparison/src/commands/check.interfaces.ts

@@ -11,7 +11,7 @@ export interface CheckMethodOptions {
     // Block out the tool bar yes or no
     blockOutToolBar?: boolean;
     // Ignore elements and or areas
-    ignore?: (RectanglesOutput | WebdriverIO.Element | ChainablePromiseElement<WebdriverIO.Element>)[];
+    ignore?: (RectanglesOutput | WebdriverIO.Element | ChainablePromiseElement)[];
     // Compare images and discard alpha
     ignoreAlpha?: boolean;
     // Compare images an discard anti aliasing

packages/webdriver-image-comparison/src/commands/element.interfaces.ts

@@ -37,4 +37,4 @@ export interface CheckElementOptions {
     method: CheckElementMethodOptions;
 }
 
-export type WicElement = WebdriverIO.Element | ChainablePromiseElement<WebdriverIO.Element>
+export type WicElement = WebdriverIO.Element | ChainablePromiseElement

packages/webdriver-image-comparison/src/methods/images.ts

@@ -527,7 +527,7 @@ async function takeResizedBase64Screenshot({
     }
 
     // Get the element position
-    const elementRegion = await getElementRect(awaitedElement.elementId)
+    const elementRegion = await getElementRect(awaitedElement.elementId as string)
 
     // Create a screenshot
     const base64Image = await screenShot()
@@ -585,7 +585,7 @@ export async function takeBase64ElementScreenshot({
             if (!isWdioElement(awaitedElement)) {
                 console.error(' takeBase64ElementScreenshot element is not a valid element because of ', JSON.stringify(awaitedElement))
             }
-            return await awaitedElement.takeElementScreenshot(awaitedElement.elementId)
+            return await awaitedElement.takeElementScreenshot(awaitedElement.elementId as string)
         } catch (error) {
             console.error('Error taking an element screenshot with the default `element.takeElementScreenshot(elementId)` method:', error, ' We will retry with a resized screenshot')
         }

packages/webdriver-image-comparison/src/methods/rectangles.ts

@@ -239,7 +239,7 @@ async function getRegionsFromElements(
  * Translate ignores to regions
  */
 export async function determineIgnoreRegions(
-    ignores: (RectanglesOutput | WebdriverIO.Element | ChainablePromiseElement<WebdriverIO.Element>)[],
+    ignores: (RectanglesOutput | WebdriverIO.Element | ChainablePromiseElement)[],
     getElementRect: GetElementRect,
 ): Promise<RectanglesOutput[]>{
     const awaitedIgnores = await Promise.all(ignores)