Refactor, add some more checks

packages/cli/commands/doctor.js

@@ -8,125 +8,38 @@ const path = require('path');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const SpinniesManager = require('../lib/ui/SpinniesManager');
 const fs = require('fs');
-const DoctorManager = require('../lib/DoctorManager');
+const Doctor = require('../lib/doctor');
+const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 // const i18nKey = 'commands.doctor';
 exports.command = 'doctor';
 exports.describe = 'The doctor is in';
 
-exports.handler = async ({ file }) => {
-  const doctorManager = new DoctorManager();
-  try {
-    trackCommandUsage('doctor', null, doctorManager.accountId);
-  } catch (e) {
-    logger.debug(e);
-  }
-
-  SpinniesManager.init();
-  SpinniesManager.add('loadingProjectDetails', {
-    text: 'Loading project details',
-  });
+exports.handler = async ({ file, verbose }) => {
+  const doctor = new Doctor();
 
-  let projectConfig;
-  let projectDetails;
   try {
-    projectConfig = await getProjectConfig();
-    projectDetails = await doctorManager.fetchProjectDetails(
-      doctorManager.accountId,
-      projectConfig
-    );
+    trackCommandUsage('doctor', null, doctor.accountId);
   } catch (e) {
     logger.debug(e);
   }
 
-  SpinniesManager.succeed('loadingProjectDetails', {
-    text: 'Project details loaded',
-  });
-
-  const { env, authType, personalAccessKey, accountType } = getAccountConfig(
-    doctorManager.accountId
-  );
+  const diagnosis = await doctor.diagnose();
 
-  let accessToken = {};
-  try {
-    accessToken = await getAccessToken(
-      personalAccessKey,
-      env,
-      doctorManager.accountId
-    );
-  } catch (e) {
-    logger.debug(e);
-  }
+  const stringifiedOutput = JSON.stringify(diagnosis, null, 4);
 
-  let files = [];
-  try {
-    files = (await walk(projectConfig.projectDir))
-      .filter(doctorManager.shouldIncludeFile)
-      .map(filename => path.relative(projectConfig.projectDir, filename));
-  } catch (e) {
-    logger.debug(e);
+  if (verbose) {
+    console.log(stringifiedOutput);
   }
 
-  const {
-    platform,
-    arch,
-    versions: { node },
-    mainModule: { path: modulePath },
-  } = process;
-
-  const output = {
-    platform,
-    arch,
-    path: modulePath,
-    versions: {
-      '@hubspot/cli': pkg.version,
-      node,
-      npm: doctorManager.getNpmVersion(),
-    },
-    account: {
-      accountId: doctorManager.accountId,
-      accountType,
-      authType,
-      name: accessToken.hubName,
-      scopeGroups: accessToken?.scopeGroups,
-      enabledFeatures: accessToken?.enabledFeatures,
-    },
-    project: {
-      config:
-        projectConfig && projectConfig.projectConfig
-          ? projectConfig
-          : undefined,
-      details: projectDetails,
-    },
-    packageFiles: files.filter(file => {
-      return path.parse(file).base === 'package.json';
-    }),
-    packageLockFiles: files.filter(file => {
-      return path.parse(file).base === 'package-lock.json';
-    }),
-    envFiles: files.filter(file => file.endsWith('.env')),
-    jsonFiles: files.filter(file => path.extname(file) === '.json'),
-    files,
-  };
-
-  const stringifiedOutput = JSON.stringify(output, null, 4);
-
   if (file) {
     try {
-      SpinniesManager.add('writingToFile', {
-        text: `Writing output to ${file}`,
-      });
-      fs.writeFileSync(file, JSON.stringify(output, null, 4));
-      SpinniesManager.succeed('writingToFile', {
-        text: `Output written to ${file}`,
-      });
+      fs.writeFileSync(file, stringifiedOutput);
+      logger.success(`Output written to ${file}`);
     } catch (e) {
-      SpinniesManager.fail('writingToFile', {
-        text: 'Unable to write to file',
-      });
+      logger.error(`Unable to write output to ${file}, ${e.message}`);
+      process.exit(EXIT_CODES.ERROR);
     }
-  } else {
-    console.log(stringifiedOutput);
   }
 };
 
@@ -136,4 +49,8 @@ exports.builder = yargs =>
       describe: 'Where to write the output',
       type: 'string',
     },
+    verbose: {
+      describe: 'Chatty?',
+      type: 'boolean',
+    },
   });