fix: Add support for locator with -flutter prefix (#64)

* feat: add -flutter prefix to locator strategy

* Prettier fix

* support for backward compatibility

* styling fixes

Author: sudharsan-selvaraj

src/driver.ts

@@ -25,6 +25,7 @@ import {
 import {
    attachAppLaunchArguments,
    fetchFlutterServerPort,
+   FLUTTER_LOCATORS,
    getFreePort,
    isFlutterDriverCommand,
    waitForFlutterServerToBeActive,
@@ -56,16 +57,14 @@ export class AppiumFlutterDriver extends BaseDriver<FlutterDriverConstraints> {
          'xpath',
          'css selector',
          'id',
+         'name',
+         'class name',
          '-android uiautomator',
          'accessibility id',
          '-ios predicate string',
          '-ios class chain',
-         'name',
-         'key',
-         'class name',
-         'semantics label',
-         'text',
-         'type',
+         ...FLUTTER_LOCATORS, //to support backward compatibility
+         ...FLUTTER_LOCATORS.map((locator) => `-flutter ${locator}`),
       ];
    }
 

src/utils.ts

@@ -3,7 +3,7 @@ import { findAPortNotInUse } from 'portscanner';
 import { waitForCondition } from 'asyncbox';
 import { JWProxy } from 'appium/driver';
 import type { PortForwardCallback, PortReleaseCallback } from './types';
-import type { AppiumFlutterDriver } from './driver';
+import { type AppiumFlutterDriver } from './driver';
 import _ from 'lodash';
 import type { StringRecord } from '@appium/types';
 import { node } from 'appium/support';
@@ -17,12 +17,18 @@ const {
    appium: { flutterServerVersion: FLUTTER_SERVER_VERSION_REQ },
    version: PACKAGE_VERSION,
 } = readManifest();
-
+export const FLUTTER_LOCATORS = [
+   'key',
+   'semantics label',
+   'text',
+   'type',
+   'text containing',
+];
 export async function getProxyDriver(
    this: AppiumFlutterDriver,
    strategy: string,
 ): Promise<JWProxy | undefined> {
-   if (['key', 'semantics label', 'text', 'type'].includes(strategy)) {
+   if (strategy.startsWith('-flutter') || FLUTTER_LOCATORS.includes(strategy)) {
       return this.proxy;
    } else if (this.proxydriver instanceof AndroidUiautomator2Driver) {
       // @ts-ignore Proxy instance is OK