Fix doctor type errors

HubSpot · Dec 16, 2024 · aa9eb07 · aa9eb07
1 parent 4b51e05
commit aa9eb07
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/lib/doctor/DiagnosticInfoBuilder.ts b/lib/doctor/DiagnosticInfoBuilder.ts
@@ -87,12 +87,14 @@ export class DiagnosticInfoBuilder {
   }
 
   async generateDiagnosticInfo(): Promise<DiagnosticInfo> {
-    // @ts-expect-error getProjectConfig not typed yet
     this._projectConfig = await getProjectConfig();
 
     if (this._projectConfig?.projectConfig) {
       await this.fetchProjectDetails();
       await this.fetchAccessToken();
+    }
+
+    if (this._projectConfig?.projectDir) {
       await this.fetchProjectFilenames();
     }
 
@@ -134,7 +136,8 @@ export class DiagnosticInfoBuilder {
     try {
       const { data } = await fetchProject(
         this.accountId!,
-        this._projectConfig?.projectConfig?.name
+        // We check that config exists before running this function
+        this._projectConfig!.projectConfig!.name
       );
       this.projectDetails = data;
     } catch (e) {
@@ -158,10 +161,11 @@ export class DiagnosticInfoBuilder {
 
   private async fetchProjectFilenames(): Promise<void> {
     try {
-      this.files = (await walk(this._projectConfig?.projectDir))
+      // We check that projectDir exists before running this function
+      this.files = (await walk(this._projectConfig!.projectDir!))
         .filter(file => !path.dirname(file).includes('node_modules'))
         .map(filename =>
-          path.relative(this._projectConfig?.projectDir, filename)
+          path.relative(this._projectConfig!.projectDir!, filename)
         );
     } catch (e) {
       logger.debug(e);

diff --git a/lib/doctor/Doctor.ts b/lib/doctor/Doctor.ts
@@ -51,7 +51,8 @@ export class Doctor {
       text: i18n(`${i18nKey}.runningDiagnostics`),
     });
 
-    this.diagnosticInfo = await this.diagnosticInfoBuilder.generateDiagnosticInfo();
+    this.diagnosticInfo =
+      await this.diagnosticInfoBuilder.generateDiagnosticInfo();
 
     this.projectConfig = this.diagnosticInfo?.project.config;
 
@@ -279,7 +280,7 @@ export class Doctor {
       const packageDirName = path.dirname(packageFile);
       try {
         const needsInstall = await hasMissingPackages(
-          path.join(this.projectConfig?.projectDir, packageDirName)
+          path.join(this.projectConfig?.projectDir || '', packageDirName)
         );
 
         if (needsInstall) {
@@ -343,7 +344,10 @@ export class Doctor {
   private async checkProjectConfigJsonFiles(): Promise<void> {
     let foundError = false;
     for (const jsonFile of this.diagnosticInfo?.jsonFiles || []) {
-      const fileToCheck = path.join(this.projectConfig?.projectDir, jsonFile);
+      const fileToCheck = path.join(
+        this.projectConfig?.projectDir || '',
+        jsonFile
+      );
       if (!(await this.isValidJsonFile(fileToCheck))) {
         foundError = true;
         this.diagnosis?.addProjectSection({