chore: enable 'strict' type-checking in tsconfig (#796)

Author: Strum355

package-lock.json

@@ -387,7 +387,9 @@
     "lint": "eslint -c .eslintrc.js --ext .ts src/"
   },
   "devDependencies": {
-    "@types/chai": "^5.2.2",
+    "@types/babel__core": "^7.20.5",
+    "@types/chai": "^4.3.10",
+    "@types/chai-subset": "^1.3.6",
     "@types/json-to-ast": "^2.1.0",
     "@types/mocha": "^10.0.2",
     "@types/node": "^20.8.4",

package.json

@@ -7,11 +7,11 @@ import { applySettingNameMappings } from './utils';
  * Interface representing the data structure for a Component Analysis (CA) Notification.
  */
 interface CANotificationData {
-  errorMessage: string;
-  done: boolean;
-  uri: Uri;
-  diagCount: number;
-  vulnCount: Map<string, number>;
+  errorMessage: string | null;
+  done: boolean | null;
+  uri: Uri | null;
+  diagCount: number | null;
+  vulnCount: Map<string, number> | null;
 }
 
 /**
@@ -40,10 +40,10 @@ class CANotification {
   constructor(respData: CANotificationData) {
     this.errorMessage = applySettingNameMappings(respData.errorMessage || '');
     this.done = respData.done === true;
-    this.uri = respData.uri;
+    this.uri = respData.uri || Uri.file('');
     this.diagCount = respData.diagCount || 0;
     this.vulnCount = respData.vulnCount || new Map<string, number>();
-    this.totalVulnCount = Object.values(this.vulnCount).reduce((sum, cv) => sum + cv, 0);
+    this.totalVulnCount = Array.from(this.vulnCount.values()).reduce((sum, cv) => sum + cv, 0);
   }
 
   /**
@@ -139,7 +139,7 @@ class CANotification {
    * @returns The text content for the popup notification.
    */
   public popupText(): string {
-    const text: string = Object.entries(this.vulnCount)
+    const text: string = Array.from(this.vulnCount.entries())
       .map(([provider, vulnCount]) => `Found ${vulnCount} direct ${this.singularOrPlural(vulnCount)} for ${this.capitalizeEachWord(provider)} Provider.`)
       .join(' ');
     return text || this.warningText().replace(/\$\((.*?)\)/g, '');

src/caNotification.ts

@@ -34,11 +34,11 @@ function clearCodeActionsMap(uri: Uri) {
  * @param codeAction - The code action to be registered.
  */
 function registerCodeAction(uri: Uri, loc: string, codeAction: CodeAction) {
-  codeActionsMap.set(uri.toString(), codeActionsMap.get(uri.toString()) || new Map<string, CodeAction[]>());
-
-  const innerMap = codeActionsMap.get(uri.toString());
-  innerMap.set(loc, innerMap.get(loc) || []);
-  innerMap.get(loc).push(codeAction);
+  const innerMap = codeActionsMap.get(uri.toString()) || new Map<string, CodeAction[]>();
+  const actionsAtLocation = innerMap.get(loc) || [];
+  actionsAtLocation.push(codeAction);
+  innerMap.set(loc, actionsAtLocation);
+  codeActionsMap.set(uri.toString(), innerMap);
 }
 
 /**
@@ -101,7 +101,7 @@ function generateSwitchToRecommendedVersionAction(title: string, dependency: str
     edit: new WorkspaceEdit()
   };
 
-  codeAction.edit.insert(uri, diagnostic.range.start, versionReplacementString);
+  codeAction.edit!.insert(uri, diagnostic.range.start, versionReplacementString);
 
   codeAction.command = {
     title: 'Track recommendation acceptance',

src/codeActionHandler.ts

@@ -10,39 +10,39 @@ import { getTelemetryId } from './redhatTelemetry';
  * Represents the configuration settings for the extension.
  */
 class Config {
-  telemetryId: string;
-  stackAnalysisCommand: string;
-  trackRecommendationAcceptanceCommand: string;
-  recommendationsEnabled: boolean;
-  utmSource: string;
-  exhortProxyUrl: string;
-  matchManifestVersions: string;
-  usePythonVirtualEnvironment: string;
-  useGoMVS: string;
-  enablePythonBestEffortsInstallation: string;
-  usePipDepTree: string;
-  vulnerabilityAlertSeverity: string;
-  exhortMvnPath: string;
-  exhortPreferMvnw: string;
-  exhortGradlePath: string;
-  exhortPreferGradlew: string;
-  exhortNpmPath: string;
-  exhortPnpmPath: string;
-  exhortYarnPath: string;
-  exhortGoPath: string;
-  exhortPython3Path: string;
-  exhortPip3Path: string;
-  exhortPythonPath: string;
-  exhortPipPath: string;
-  rhdaReportFilePath: string;
-  secrets: vscode.SecretStorage;
-  exhortSyftPath: string;
-  exhortSyftConfigPath: string;
-  exhortSkopeoPath: string;
-  exhortSkopeoConfigPath: string;
-  exhortDockerPath: string;
-  exhortPodmanPath: string;
-  exhortImagePlatform: string;
+  telemetryId: string | undefined;
+  stackAnalysisCommand!: string;
+  trackRecommendationAcceptanceCommand!: string;
+  recommendationsEnabled!: boolean;
+  utmSource!: string;
+  exhortProxyUrl!: string;
+  matchManifestVersions!: string;
+  usePythonVirtualEnvironment!: string;
+  useGoMVS!: string;
+  enablePythonBestEffortsInstallation!: string;
+  usePipDepTree!: string;
+  vulnerabilityAlertSeverity!: string;
+  exhortMvnPath!: string;
+  exhortPreferMvnw!: string;
+  exhortGradlePath!: string;
+  exhortPreferGradlew!: string;
+  exhortNpmPath!: string;
+  exhortPnpmPath!: string;
+  exhortYarnPath!: string;
+  exhortGoPath!: string;
+  exhortPython3Path!: string;
+  exhortPip3Path!: string;
+  exhortPythonPath!: string;
+  exhortPipPath!: string;
+  rhdaReportFilePath!: string;
+  secrets!: vscode.SecretStorage;
+  exhortSyftPath!: string;
+  exhortSyftConfigPath!: string;
+  exhortSkopeoPath!: string;
+  exhortSkopeoConfigPath!: string;
+  exhortDockerPath!: string;
+  exhortPodmanPath!: string;
+  exhortImagePlatform!: string;
 
   private readonly DEFAULT_MVN_EXECUTABLE = 'mvn';
   private readonly DEFAULT_GRADLE_EXECUTABLE = 'gradle';
@@ -208,7 +208,7 @@ class Config {
    * Links the secret storage to the configuration object.
    * @param context The extension context.
    */
-  linkToSecretStorage(context) {
+  linkToSecretStorage(context: { secrets: vscode.SecretStorage }) {
     this.secrets = context.secrets;
   }
 
@@ -224,7 +224,7 @@ class Config {
       await this.secrets.store(SNYK_TOKEN_KEY, token);
       vscode.window.showInformationMessage('Snyk token has been saved successfully');
     } catch (error) {
-      vscode.window.showErrorMessage(`Failed to save Snyk token to VSCode Secret Storage, Error: ${error.message}`);
+      vscode.window.showErrorMessage(`Failed to save Snyk token to VSCode Secret Storage, Error: ${(error as Error).message}`);
     }
   }
 
@@ -237,7 +237,7 @@ class Config {
       const token = await this.secrets.get(SNYK_TOKEN_KEY);
       return token || '';
     } catch (error) {
-      vscode.window.showErrorMessage(`Failed to get Snyk token from VSCode Secret Storage, Error: ${error.message}`);
+      vscode.window.showErrorMessage(`Failed to get Snyk token from VSCode Secret Storage, Error: ${(error as Error).message}`);
       await this.clearSnykToken(false);
       return '';
     }
@@ -254,7 +254,7 @@ class Config {
         vscode.window.showInformationMessage('Snyk token has been removed successfully');
       }
     } catch (error) {
-      const errorMsg = `Failed to delete Snyk token from VSCode Secret Storage, Error: ${error.message}`;
+      const errorMsg = `Failed to delete Snyk token from VSCode Secret Storage, Error: ${(error as Error).message}`;
       if (notify) {
         vscode.window.showErrorMessage(errorMsg);
       } else {

src/config.ts

@@ -87,8 +87,9 @@ class AnalysisResponse implements IAnalysisResponse {
                             : new DependencyData(source.id, issuesCount, this.getRecommendation(d), '', this.getHighestSeverity(d));
 
                         const resolvedRef = this.provider.resolveDependencyFromReference(d.ref);
-                        this.dependencies[resolvedRef] = this.dependencies[resolvedRef] || [];
-                        this.dependencies[resolvedRef].push(dd);
+                        const something = (this.dependencies.get(resolvedRef) || []);
+                        something.push(dd);
+                        this.dependencies.set(resolvedRef, something);
                     }
                 });
             });

src/dependencyAnalysis/analysis.ts

@@ -14,20 +14,18 @@ import { Position, Range } from 'vscode';
  */
 export interface IDependency {
   name: IPositionedString;
-  version: IPositionedString;
-  context: IPositionedContext;
+  version: IPositionedString | undefined;
+  context: IPositionedContext | undefined;
 }
 
 /**
  * Represents a dependency and implements the IDependency interface.
  */
 export class Dependency implements IDependency {
-  public version: IPositionedString;
-  public context: IPositionedContext;
+  public version: IPositionedString | undefined;
+  public context: IPositionedContext | undefined;
 
-  constructor(
-    public name: IPositionedString
-  ) { }
+  constructor(public name: IPositionedString) { }
 }
 
 /**
@@ -47,7 +45,7 @@ export class DependencyMap {
    * @param key - The unique name key for the desired dependency.
    * @returns The dependency object linked to the specified unique name key.
    */
-  public get(key: string): IDependency {
+  public get(key: string): IDependency | undefined {
     return this.mapper.get(key);
   }
 }
@@ -117,6 +115,6 @@ export function getRange(dep: IDependency): Range {
     const length = dep.version.value.length;
     return new Range(new Position(pos.line - 1, pos.column - 1), new Position(pos.line - 1, pos.column + length - 1));
   } else {
-    return dep.context.range;
+    return dep.context!.range;
   }
 }

src/dependencyAnalysis/collector.ts

@@ -37,7 +37,7 @@ class DiagnosticsPipeline extends AbstractDiagnosticsPipeline<DependencyData> {
      * @param ecosystem - The name of the ecosystem in which dependencies are being analyzed.
      */
     runDiagnostics(dependencies: Map<string, DependencyData[]>, ecosystem: string) {
-        Object.entries(dependencies).map(([ref, dependencyData]: [string, DependencyData[]]) => {
+        dependencies.forEach((dependencyData, ref) => {
             const dependencyRef = ecosystem === GRADLE ? ref : ref.split('@')[0];
             const dependency = this.dependencyMap.get(dependencyRef);
 
@@ -62,7 +62,7 @@ class DiagnosticsPipeline extends AbstractDiagnosticsPipeline<DependencyData> {
 
                     const vulnProvider = dd.sourceId.split('(')[0];
                     const issuesCount = dd.issuesCount;
-                    this.vulnCount[vulnProvider] = (this.vulnCount[vulnProvider] || 0) + issuesCount;
+                    this.vulnCount.set(vulnProvider, (this.vulnCount.get(vulnProvider) || 0) + issuesCount);
                 });
             }
             DiagnosticsPipeline.diagnosticsCollection.set(this.diagnosticFilePath, this.diagnostics);
@@ -78,7 +78,7 @@ class DiagnosticsPipeline extends AbstractDiagnosticsPipeline<DependencyData> {
      * @param vulnerabilityDiagnostic - Vulnerability diagnostic object.
      * @private
      */
-    private createCodeAction(loc: string, ref: string, context: IPositionedContext, sourceId: string, vulnerabilityDiagnostic: Diagnostic) {
+    private createCodeAction(loc: string, ref: string, context: IPositionedContext | undefined, sourceId: string, vulnerabilityDiagnostic: Diagnostic) {
         const dependency = ref;
         const switchToVersion = dependency.split('@')[1];
         const versionReplacementString = context ? context.value.replace(VERSION_PLACEHOLDER, switchToVersion) : switchToVersion;
@@ -112,9 +112,9 @@ async function performDiagnostics(diagnosticFilePath: Uri, contents: string, pro
 
         diagnosticsPipeline.reportDiagnostics();
     } catch (error) {
-        outputChannelDep.warn(`Component Analysis Error: ${buildErrorMessage(error)}\n${(error as Error).stack}`);
+        outputChannelDep.warn(`component analysis error: ${buildErrorMessage(error as Error)}\n${(error as Error).stack}`);
         notifications.emit('caError', {
-            errorMessage: error.message,
+            errorMessage: (error as Error).message,
             uri: diagnosticFilePath,
         });
     }

src/dependencyAnalysis/diagnostics.ts

@@ -17,7 +17,7 @@ export class DependencyReportPanel {
   public static currentPanel: DependencyReportPanel | undefined;
 
   public static readonly viewType = 'stackReport';
-  public static data;
+  public static data: any;
 
   private readonly _panel: vscode.WebviewPanel;
   private _disposables: vscode.Disposable[] = [];
@@ -141,7 +141,7 @@ export class DependencyReportPanel {
    * @param column The column to reveal the panel in.
    * @private
    */
-  private _revealWebviewPanel(column: vscode.ViewColumn) {
+  private _revealWebviewPanel(column: vscode.ViewColumn | undefined) {
     this._panel.reveal(column);
   }
 

src/dependencyReportPanel.ts

@@ -68,7 +68,7 @@ async function tokenValidationService(options: { [key: string]: string }, source
         return `Failed to validate token. Status: ${status}`;
     }
   } catch (error) {
-    return `Failed to validate token, Error: ${error.message}`;
+    return `Failed to validate token, Error: ${(error as Error).message}`;
   }
 }