Migrate the rest of doctor command to TypeScript

packages/cli-types/src/index.ts

@@ -13,14 +13,16 @@ import {
 
 export type InquirerPrompt = any;
 
+export type CommandFunction = (
+  argv: Array<string>,
+  ctx: Config,
+  args: Object,
+) => Promise<void> | void;
+
 export interface Command {
   name: string;
   description?: string;
-  func: (
-    argv: Array<string>,
-    ctx: Config,
-    args: Object,
-  ) => Promise<void> | void;
+  func: CommandFunction;
   options?: Array<{
     name: string;
     description?: string;

packages/cli/src/commands/doctor/doctor.js → packages/cli/src/commands/doctor/doctor.ts

@@ -1,18 +1,19 @@
-// @flow
 import chalk from 'chalk';
+// @ts-ignore
 import envinfo from 'envinfo';
 import {logger} from '@react-native-community/cli-tools';
-// $FlowFixMe - converted to TS
 import {getHealthchecks, HEALTHCHECK_TYPES} from './healthchecks';
-// $FlowFixMe - converted to TS
 import {getLoader} from '../../tools/loader';
-// $FlowFixMe - converted to TS
 import printFixOptions, {KEYS} from './printFixOptions';
 import runAutomaticFix, {AUTOMATIC_FIX_LEVELS} from './runAutomaticFix';
-import type {ConfigT} from 'types';
-import type {HealthCheckInterface} from './types';
-
-const printCategory = ({label, key}) => {
+import {CommandFunction} from '@react-native-community/cli-types';
+import {
+  HealthcheckCategory,
+  HealthCheckCategoryResult,
+  HealthCheckResult,
+} from './types';
+
+const printCategory = ({label, key}: {label: string; key: number}) => {
   if (key > 0) {
     logger.log();
   }
@@ -25,12 +26,7 @@ const printIssue = ({
   needsToBeFixed,
   isRequired,
   description,
-}: {
-  label: string,
-  needsToBeFixed: boolean,
-  isRequired: boolean,
-  description: string,
-}) => {
+}: HealthCheckResult) => {
   const symbol = needsToBeFixed
     ? isRequired
       ? chalk.red('✖')
@@ -40,21 +36,23 @@ const printIssue = ({
   logger.log(` ${symbol} ${label}${needsToBeFixed ? ': ' + description : ''}`);
 };
 
-const printOverallStats = ({errors, warnings}) => {
+const printOverallStats = ({
+  errors,
+  warnings,
+}: {
+  errors: number;
+  warnings: number;
+}) => {
   logger.log(`\n${chalk.bold('Errors:')}   ${errors}`);
   logger.log(`${chalk.bold('Warnings:')} ${warnings}`);
 };
 
 type FlagsT = {
-  fix: boolean | void,
-  contributor: boolean | void,
+  fix: boolean | void;
+  contributor: boolean | void;
 };
 
-export default (async function runDoctor(
-  argv: Array<string>,
-  ctx: ConfigT,
-  options: FlagsT,
-) {
+export default (async (_, __, options: FlagsT) => {
   const Loader = getLoader();
   const loader = new Loader();
 
@@ -76,10 +74,7 @@ export default (async function runDoctor(
   const iterateOverHealthChecks = async ({
     label,
     healthchecks,
-  }: {
-    label: string,
-    healthchecks: Array<HealthCheckInterface>,
-  }) => ({
+  }: HealthcheckCategory): Promise<HealthCheckCategoryResult> => ({
     label,
     healthchecks: (await Promise.all(
       healthchecks.map(async healthcheck => {
@@ -108,23 +103,22 @@ export default (async function runDoctor(
             : undefined,
         };
       }),
-    )).filter(Boolean),
+    )).filter(healthcheck => healthcheck !== undefined) as HealthCheckResult[],
   });
 
   // Remove all the categories that don't have any healthcheck with `needsToBeFixed`
   // so they don't show when the user taps to fix encountered issues
-  const removeFixedCategories = categories =>
+  const removeFixedCategories = (categories: HealthCheckCategoryResult[]) =>
     categories.filter(category =>
       category.healthchecks.some(healthcheck => healthcheck.needsToBeFixed),
     );
 
-  const iterateOverCategories = categories =>
-    // $FlowFixMe - bad Object.values typings
+  const iterateOverCategories = (categories: HealthcheckCategory[]) =>
     Promise.all(categories.map(iterateOverHealthChecks));
 
-  const healthchecksPerCategory = await iterateOverCategories(
-    Object.values(getHealthchecks(options)),
-  );
+  const healthchecksPerCategory = await iterateOverCategories(Object.values(
+    getHealthchecks(options),
+  ).filter(category => category !== undefined) as HealthcheckCategory[]);
 
   loader.stop();
 
@@ -136,15 +130,17 @@ export default (async function runDoctor(
   healthchecksPerCategory.forEach((issueCategory, key) => {
     printCategory({...issueCategory, key});
 
-    issueCategory.healthchecks.map(healthcheck => {
+    issueCategory.healthchecks.forEach(healthcheck => {
       printIssue(healthcheck);
 
       if (healthcheck.type === HEALTHCHECK_TYPES.WARNING) {
-        return stats.warnings++;
+        stats.warnings++;
+        return;
       }
 
       if (healthcheck.type === HEALTHCHECK_TYPES.ERROR) {
-        return stats.errors++;
+        stats.errors++;
+        return;
       }
     });
   });
@@ -161,13 +157,14 @@ export default (async function runDoctor(
     });
   }
 
-  const onKeyPress = async key => {
-    // $FlowFixMe
+  const onKeyPress = async (key: string) => {
+    // @ts-ignore
     process.stdin.setRawMode(false);
     process.stdin.removeAllListeners('data');
 
     if (key === KEYS.EXIT || key === '\u0003') {
-      return process.exit(0);
+      process.exit(0);
+      return;
     }
 
     if (
@@ -197,4 +194,4 @@ export default (async function runDoctor(
   };
 
   printFixOptions({onKeyPress});
-});
+}) as CommandFunction;

packages/cli/src/commands/doctor/healthchecks/index.ts

@@ -7,6 +7,7 @@ import androidNDK from './androidNDK';
 import xcode from './xcode';
 import cocoaPods from './cocoaPods';
 import iosDeploy from './iosDeploy';
+import {Healthchecks} from '../types';
 
 export const HEALTHCHECK_TYPES = {
   ERROR: 'ERROR',
@@ -18,7 +19,7 @@ type Options = {
   contributor: boolean | void;
 };
 
-export const getHealthchecks = ({contributor}: Options) => ({
+export const getHealthchecks = ({contributor}: Options): Healthchecks => ({
   common: {
     label: 'Common',
     healthchecks: [

packages/cli/src/commands/doctor/index.js → packages/cli/src/commands/doctor/index.ts

@@ -1,4 +1,3 @@
-// @flow
 import doctor from './doctor';
 
 export default {

packages/cli/src/commands/doctor/runAutomaticFix.js → packages/cli/src/commands/doctor/runAutomaticFix.ts

@@ -1,46 +1,47 @@
-// @flow
 import chalk from 'chalk';
-import ora from 'ora';
+import ora, {Ora} from 'ora';
 import {logger} from '@react-native-community/cli-tools';
-// $FlowFixMe - converted to TS
 import {HEALTHCHECK_TYPES} from './healthchecks';
-import type {EnvironmentInfo} from './types';
+import {EnvironmentInfo, HealthCheckCategoryResult} from './types';
 
-const AUTOMATIC_FIX_LEVELS = {
-  ALL_ISSUES: 'ALL_ISSUES',
-  ERRORS: 'ERRORS',
-  WARNINGS: 'WARNINGS',
-};
+export enum AUTOMATIC_FIX_LEVELS {
+  ALL_ISSUES = 'ALL_ISSUES',
+  ERRORS = 'ERRORS',
+  WARNINGS = 'WARNINGS',
+}
 
-export {AUTOMATIC_FIX_LEVELS};
-export default async ({
+interface RunAutomaticFixArgs {
+  healthchecks: HealthCheckCategoryResult[];
+  automaticFixLevel: AUTOMATIC_FIX_LEVELS;
+  stats: {
+    errors: number;
+    warnings: number;
+  };
+  loader: Ora;
+  environmentInfo: EnvironmentInfo;
+}
+
+export default async function({
   healthchecks,
   automaticFixLevel,
   stats,
-  loader,
   environmentInfo,
-}: {
-  healthchecks: any,
-  automaticFixLevel: $Values<typeof AUTOMATIC_FIX_LEVELS>,
-  stats: {errors: any, warnings: any},
-  loader: typeof ora,
-  environmentInfo: EnvironmentInfo,
-}) => {
+}: RunAutomaticFixArgs) {
   // Remove the fix options from screen
-  // $FlowFixMe
+  // @ts-ignore
   process.stdout.moveCursor(0, -6);
-  // $FlowFixMe
+  // @ts-ignore
   process.stdout.clearScreenDown();
 
-  const totalIssuesBasedOnFixLevel = {
+  const totalIssuesBasedOnFixLevel: {[x in AUTOMATIC_FIX_LEVELS]: number} = {
     [AUTOMATIC_FIX_LEVELS.ALL_ISSUES]: stats.errors + stats.warnings,
     [AUTOMATIC_FIX_LEVELS.ERRORS]: stats.errors,
     [AUTOMATIC_FIX_LEVELS.WARNINGS]: stats.warnings,
   };
   const issuesCount = totalIssuesBasedOnFixLevel[automaticFixLevel];
 
   logger.log(
-    `\nAttempting to fix ${chalk.bold(issuesCount)} issue${
+    `\nAttempting to fix ${chalk.bold(issuesCount.toString())} issue${
       issuesCount > 1 ? 's' : ''
     }...`,
   );
@@ -64,6 +65,8 @@ export default async ({
           healthcheck.type === HEALTHCHECK_TYPES.WARNING
         );
       }
+
+      return;
     });
 
     if (!healthchecksToRun.length) {
@@ -88,4 +91,4 @@ export default async ({
       }
     }
   }
-};
+}