feat: Ditch bluebird (#996)

Author: mykola-mokhnach

lib/commands/app-management.ts

@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import B from 'bluebird';
 import {errors} from 'appium/driver';
 import {APK_EXTENSION} from '../extensions';
 import type {AndroidUiautomator2Driver} from '../driver';
@@ -19,7 +18,7 @@ export async function mobileInstallMultipleApks(
   if (!_.isArray(apks) || _.isEmpty(apks)) {
     throw new errors.InvalidArgumentError('No apks are given to install');
   }
-  const configuredApks = await B.all(
+  const configuredApks = await Promise.all(
     apks.map((app) => this.helpers.configureApp(app, [APK_EXTENSION])),
   );
   await this.adb.installMultipleApks(configuredApks, options);

lib/commands/element.ts

@@ -1,5 +1,4 @@
 import {PROTOCOLS} from 'appium/driver';
-import B from 'bluebird';
 import _ from 'lodash';
 import type {DoSetElementValueOpts} from 'appium-android-driver';
 import type {Element as AppiumElement, Position, Rect, Size} from '@appium/types';
@@ -190,7 +189,7 @@ export async function getElementRect(
 
   const chromedriver = this.chromedriver as Chromedriver;
   if (chromedriver.jwproxy.downstreamProtocol === PROTOCOLS.MJSONWP) {
-    const [{x, y}, {width, height}] = (await B.all([
+    const [{x, y}, {width, height}] = (await Promise.all([
       chromedriver.jwproxy.command(`/element/${elementId}/location`, 'GET'),
       chromedriver.jwproxy.command(`/element/${elementId}/size`, 'GET'),
     ])) as [Position, Size];

lib/commands/screenshot.ts

@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import B from 'bluebird';
 import {imageUtil} from 'appium/support';
 import type {AndroidUiautomator2Driver} from '../driver';
 import type {Screenshot} from './types';
@@ -125,7 +124,7 @@ export async function mobileScreenshots(
   const allInfos = _.values(infos).filter(
     (info): info is Partial<Screenshot> & {id: string} => !!info?.id,
   );
-  const screenshots = await B.all(allInfos.map((info) => toB64Screenshot(info.id)));
+  const screenshots = await Promise.all(allInfos.map((info) => toB64Screenshot(info.id)));
   for (const [info, payload] of _.zip(allInfos, screenshots) as Array<
     [Partial<Screenshot>, string]
   >) {

lib/css-converter.ts

@@ -67,50 +67,6 @@ const isAstClassName = (item: {type?: string}): item is AstClassName => item.typ
 const isAstTagName = (item: {type?: string}): item is AstTagName => item.type === 'TagName';
 const isAstId = (item: {type?: string}): item is AstId => item.type === 'Id';
 
-function toSnakeCase(str?: string | null): string {
-  if (!str) {
-    return '';
-  }
-  const tokens = str
-    .split('-')
-    .map((token) => token.charAt(0).toUpperCase() + token.slice(1).toLowerCase());
-  const out = tokens.join('');
-  return out.charAt(0).toLowerCase() + out.slice(1);
-}
-
-function requireBoolean(css: AstAttribute | AstPseudoClass): 'true' | 'false' {
-  const rawValue = (css as any).value?.value ?? (css as any).argument?.value;
-  const value = _.toLower(rawValue ?? 'true');
-  if (value === 'true') {
-    return 'true';
-  }
-  if (value === 'false') {
-    return 'false';
-  }
-  throw new Error(`'${css.name}' must be true, false or empty. Found '${(css as any).value}'`);
-}
-
-function requireEntityName(cssEntity: AstAttribute | AstPseudoClass): string {
-  const attrName = cssEntity.name.toLowerCase();
-
-  if (ALL_ATTRS.includes(attrName)) {
-    return attrName;
-  }
-
-  for (const [officialAttr, aliasAttrs] of ATTRIBUTE_ALIASES) {
-    if (aliasAttrs.includes(attrName)) {
-      return officialAttr;
-    }
-  }
-  throw new Error(
-    `'${attrName}' is not a valid attribute. Supported attributes are '${ALL_ATTRS.join(', ')}'`,
-  );
-}
-
-function getWordMatcherRegex(word: string): string {
-  return `\\b(\\w*${_.escapeRegExp(word)}\\w*)\\b`;
-}
-
 export class CssConverter {
   constructor(
     private readonly selector: string,
@@ -277,3 +233,47 @@ export class CssConverter {
     throw new Error('No rules could be parsed out of the current selector');
   }
 }
+
+function toSnakeCase(str?: string | null): string {
+  if (!str) {
+    return '';
+  }
+  const tokens = str
+    .split('-')
+    .map((token) => token.charAt(0).toUpperCase() + token.slice(1).toLowerCase());
+  const out = tokens.join('');
+  return out.charAt(0).toLowerCase() + out.slice(1);
+}
+
+function requireBoolean(css: AstAttribute | AstPseudoClass): 'true' | 'false' {
+  const rawValue = (css as any).value?.value ?? (css as any).argument?.value;
+  const value = _.toLower(rawValue ?? 'true');
+  if (value === 'true') {
+    return 'true';
+  }
+  if (value === 'false') {
+    return 'false';
+  }
+  throw new Error(`'${css.name}' must be true, false or empty. Found '${(css as any).value}'`);
+}
+
+function requireEntityName(cssEntity: AstAttribute | AstPseudoClass): string {
+  const attrName = cssEntity.name.toLowerCase();
+
+  if (ALL_ATTRS.includes(attrName)) {
+    return attrName;
+  }
+
+  for (const [officialAttr, aliasAttrs] of ATTRIBUTE_ALIASES) {
+    if (aliasAttrs.includes(attrName)) {
+      return officialAttr;
+    }
+  }
+  throw new Error(
+    `'${attrName}' is not a valid attribute. Supported attributes are '${ALL_ATTRS.join(', ')}'`,
+  );
+}
+
+function getWordMatcherRegex(word: string): string {
+  return `\\b(\\w*${_.escapeRegExp(word)}\\w*)\\b`;
+}