huge refactoring. dealing with code to be in tsc and with interfaces

Author: Arvid Paeglit

package-lock.json

@@ -227,31 +227,27 @@
     "test": "node ./out/test/runTest.js"
   },
   "devDependencies": {
-    "@types/glob": "^7.1.2",
-    "@types/mocha": "^7.0.2",
-    "@types/node": "^14.0.14",
-    "@types/vscode": "^1.46.0",
+    "@types/glob": "^7.1.3",
+    "@types/mocha": "^8.0.3",
+    "@types/node": "^14.6.2",
+    "@types/vscode": "^1.48.0",
     "@types/nock": "^11.1.0",
+    "@types/lodash": "^4.14.161",
     "glob": "^7.1.6",
-    "mocha": "^8.1.1",
-    "typescript": "^3.9.5",
-    "eslint": "^7.3.1",
-    "eslint-plugin-import": "^2.21.2",
+    "mocha": "^8.1.3",
+    "typescript": "^4.0.2",
+    "eslint": "^7.8.0",
+    "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
     "vscode-test": "^1.4.0",
-    "nock": "^12.0.3"
+    "nock": "^13.0.4"
   },
   "dependencies": {
     "@deepcode/tsc": "^1.3.1",
-    "@deepcode/dcignore": "^1.0.2",
-    "@types/lodash": "^4.14.159",
-    "@types/mz": "^2.7.1",
-    "ignore": "^5.1.8",
     "lodash": "^4.17.19",
-    "mz": "^2.7.0",
-    "open": "^7.0.4"
+    "open": "^7.2.1"
   }
 }

package.json

@@ -19,7 +19,7 @@ import {
   openDeepcodeSettingsCommand,
   createDCIgnoreCommand,
 } from "./utils/vscodeCommandsUtils";
-import { errorsLogs } from "./messages/errorsServerLogMessages";
+import { errorsLogs } from './messages/errorsServerLogMessages';
 import {
   DEEPCODE_VIEW_SUPPORT,
   DEEPCODE_VIEW_ANALYSIS,
@@ -41,7 +41,7 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
       });
     }
   }
-  
+
   public activate(context: vscode.ExtensionContext): void {
     this.statusBarItem.show();
 
@@ -69,7 +69,7 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
         }
       )
     );
-    
+
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_LOGIN_COMMAND,
@@ -80,7 +80,7 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
         )
       )
     );
-    
+
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_APPROVE_COMMAND,
@@ -91,7 +91,7 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
         )
       )
     );
-    
+
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_START_COMMAND,
@@ -102,7 +102,7 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
         )
       )
     );
-    
+
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_SETMODE_COMMAND,
@@ -113,7 +113,7 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
         )
       )
     );
-    
+
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_SETTINGS_COMMAND,
@@ -158,12 +158,12 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
     );
 
     vscode.window.registerTreeDataProvider(
-      DEEPCODE_VIEW_SUPPORT, 
+      DEEPCODE_VIEW_SUPPORT,
       new SupportProvider(this)
     );
 
     vscode.window.registerTreeDataProvider(
-      DEEPCODE_VIEW_ANALYSIS, 
+      DEEPCODE_VIEW_ANALYSIS,
       new IssueProvider(this)
     );
 

src/deepcode/DeepCodeExtension.ts

@@ -29,7 +29,7 @@ class DeepCodeAnalyzer implements DeepCode.AnalyzerInterface {
     | undefined;
   public deepcodeReview: vscode.DiagnosticCollection | undefined;
   public analysisResultsCollection: DeepCode.AnalysisResultsCollectionInterface;
-  
+
   public constructor() {
     this.SEVERITIES = createDeepCodeSeveritiesMap();
     this.deepcodeReview = vscode.languages.createDiagnosticCollection(DEEPCODE_NAME);

src/deepcode/constants/filesConstants.ts

@@ -13,14 +13,14 @@ import { setContext } from "../../utils/vscodeCommandsUtils";
 import { DEEPCODE_CONTEXT, DEEPCODE_VIEW_ANALYSIS } from "../../constants/views";
 import { TELEMETRY_EVENTS } from "../../constants/telemetry";
 import { errorsLogs } from '../../messages/errorsServerLogMessages';
-import { IServiceAI, ServiceAI } from '@deepcode/tsc';
+import { IServiceAI, ServiceAI, IHashesBundles, IRemoteBundlesCollection } from '@deepcode/tsc';
 
 export default abstract class BaseDeepCodeModule implements DeepCode.BaseDeepCodeModuleInterface {
   serviceAI: IServiceAI;
   currentWorkspacePath: string;
   workspacesPaths: Array<string>;
-  hashesBundles: DeepCode.HashesBundlesInterface;
-  remoteBundles: DeepCode.RemoteBundlesCollectionInterface;
+  hashesBundles: IHashesBundles;
+  remoteBundles: IRemoteBundlesCollection;
   analyzer: DeepCode.AnalyzerInterface;
   statusBarItem: DeepCode.StatusBarItemInterface;
   filesWatcher: DeepCode.DeepCodeWatcherInterface;

src/deepcode/lib/analyzer/DeepCodeAnalyzer.ts

@@ -2,9 +2,15 @@ import * as vscode from "vscode";
 import * as _ from "lodash";
 
 import DeepCode from "../../../interfaces/DeepCodeInterfaces";
-import { IQueueAnalysisCheckResult } from "@deepcode/tsc";
-import { checkIfBundleIsEmpty } from "../../utils/bundlesUtils";
-import { createListOfDirFiles } from "@deepcode/tsc/src/utils/packageUtils";
+import {
+  IQueueAnalysisCheckResult,
+  IBundles,
+  IRemoteBundle,
+
+  checkIfBundleIsEmpty,
+  createListOfDirFiles,
+} from '@deepcode/tsc';
+
 import { BUNDLE_EVENTS } from "../../constants/events";
 import LoginModule from "../../lib/modules/LoginModule";
 import { DEEPCODE_ANALYSIS_STATUS, DEEPCODE_CONTEXT } from "../../constants/views";
@@ -17,7 +23,7 @@ abstract class BundlesModule extends LoginModule
   runningAnalysis = false;
 
   files: string[] = [];
-  
+
   constructor() {
     super();
 
@@ -61,7 +67,7 @@ abstract class BundlesModule extends LoginModule
     this.refreshViews();
   }
 
-  
+
   onCollectBundleProgress(value: number) {
     this.updateStatus(DEEPCODE_ANALYSIS_STATUS.COLLECTING, value);
   }
@@ -153,20 +159,6 @@ abstract class BundlesModule extends LoginModule
     this.workspacesPaths.push(workspacePath);
   }
 
-  // procesing filter list of files, acceptable for server
-  public async createFilesFilterList(): Promise<void> {
-    try {
-      this.serverFilesFilterList = await this.serviceAI.getFilters({ 
-        baseURL: this.baseURL,
-        sessionToken: this.token
-      });
-    } catch (err) {
-      await this.processError(err, {
-        message: errorsLogs.filtersFiles
-      })
-    }
-  }
-
   private terminateAnalysis(): void {
     this.serviceAI.removeListeners();
     this.runningAnalysis = false;
@@ -176,25 +168,13 @@ abstract class BundlesModule extends LoginModule
     if (this.runningAnalysis) return;
     this.runningAnalysis = true;
 
-    if (!Object.keys(this.serverFilesFilterList).length) {
-      await this.createFilesFilterList();
-      if (!Object.keys(this.serverFilesFilterList).length) {
-        await this.processError(new Error(errorsLogs.filtersFiles), {
-          message: errorsLogs.filtersFiles,
-          data: {
-            filters: this.serverFilesFilterList
-          }
-        });
-        return;
-      }
-      this.filesWatcher.activate(this);
-    }
+    // this.filesWatcher.activate(this);
 
     if (!this.token) {
       await this.checkSession();
       return;
     }
-    
+
     if (!this.uploadApproved) {
       await this.checkApproval();
       return;
@@ -203,12 +183,12 @@ abstract class BundlesModule extends LoginModule
     const bundle = await this.startCollectingFiles(path);
     const removedFiles = (this.files || []).filter(f => !bundle.includes(f));
     this.files = bundle;
-    
+
     this.serviceAI.analyse({
-      baseURL: this.baseURL, 
-      sessionToken: this.token, 
-      baseDir: path, 
-      files: this.files, 
+      baseURL: this.baseURL,
+      sessionToken: this.token,
+      baseDir: path,
+      files: this.files,
       removedFiles: removedFiles
     }).catch(
       // no need to wait for processError since catch is called asynchronously as well
@@ -222,7 +202,6 @@ abstract class BundlesModule extends LoginModule
     this.updateStatus(DEEPCODE_ANALYSIS_STATUS.COLLECTING, 0);
     console.log("COLLECTING");
     const bundle = await createListOfDirFiles({
-      serverFilesFilterList,
       path: folderPath,
       progress: {
         onProgress: this.onCollectBundleProgress.bind(this),
@@ -235,7 +214,7 @@ abstract class BundlesModule extends LoginModule
 
   private async createSingleHashBundle(
     path: string
-  ): Promise<DeepCode.BundlesInterface> {
+  ): Promise<IBundles> {
     this.rootPath = path;
 
     // convert string[] to BundleInterface
@@ -280,7 +259,7 @@ abstract class BundlesModule extends LoginModule
   // processing remote server bundles
   public async updateExtensionRemoteBundles(
     workspacePath: string,
-    bundle: DeepCode.RemoteBundleInterface | null = null
+    bundle: IRemoteBundle | null = null
   ): Promise<void> {
     if (bundle) {
       this.remoteBundles[workspacePath] = { ...bundle };

src/deepcode/lib/modules/BaseDeepCodeModule.ts

@@ -3,10 +3,10 @@ import DeepCode from "../../../interfaces/DeepCodeInterfaces";
 import BundlesModule from "./BundlesModule";
 import { DEEPCODE_CONTEXT, DEEPCODE_MODE_CODES } from "../../constants/views";
 import { errorsLogs } from "../../messages/errorsServerLogMessages";
-import { 
+import {
   EXECUTION_DEBOUNCE_INTERVAL,
   EXECUTION_THROTTLING_INTERVAL,
-  EXECUTION_PAUSE_INTERVAL, 
+  EXECUTION_PAUSE_INTERVAL,
 } from "../../constants/general";
 
 export default class DeepCodeLib extends BundlesModule implements DeepCode.DeepCodeLibInterface {
@@ -19,19 +19,19 @@ export default class DeepCodeLib extends BundlesModule implements DeepCode.DeepC
     if (this._mode !== DEEPCODE_MODE_CODES.THROTTLED) return false;
     const now = Date.now();
     if (
-      this._lastThrottledExecution === undefined || 
+      this._lastThrottledExecution === undefined ||
       (now - this._lastThrottledExecution) >= EXECUTION_THROTTLING_INTERVAL
     ) {
       this._lastThrottledExecution = now;
       return false;
     }
     return true;
   }
-  
+
   private unpause(): void {
     if (this._mode === DEEPCODE_MODE_CODES.PAUSED) this.setMode(DEEPCODE_MODE_CODES.AUTO);
   }
-  
+
   activateAll(): void {
     // this.filesWatcher.activate(this);
     this.workspacesWatcher.activate(this);
@@ -45,38 +45,41 @@ export default class DeepCodeLib extends BundlesModule implements DeepCode.DeepC
     await this.setContext(DEEPCODE_CONTEXT.ERROR, false);
     this.resetTransientErrors();
     await this.setLoadingBadge(false);
-    
+
     if (!this.token) return;
     const approved = await this.checkApproval();
     if (!approved) return;
-    
+
     await this.startAnalysis();
   }
 
-  // This function is called by commands, error handlers, etc.
-  // We should avoid having duplicate parallel executions.
-  startExtension = _.debounce(
-    async (manual = false): Promise<void> => {
-      // If the execution is suspended, we only allow user-triggered analyses.
-      if (!manual) {
-        if ([
-            DEEPCODE_MODE_CODES.MANUAL,
-            DEEPCODE_MODE_CODES.PAUSED
-          ].includes(this._mode) || 
-          this.shouldBeThrottled()
-        ) return;
-      }
-      try {
-        await this.executeExtensionPipeline();
-      } catch (err) {
-        await this.processError(err, {
-          message: errorsLogs.failedExecutionDebounce,
-        });
-      }
-    },
-    EXECUTION_DEBOUNCE_INTERVAL,
-    { 'leading': true }
-  );
+  public async startExtension(manual: Boolean = false): Promise<void> {
+    // If the execution is suspended, we only allow user-triggered analyses.
+    if (!manual) {
+      if ([
+          DEEPCODE_MODE_CODES.MANUAL,
+          DEEPCODE_MODE_CODES.PAUSED
+        ].includes(this._mode) ||
+        this.shouldBeThrottled()
+      ) return;
+    }
+
+    // This function is called by commands, error handlers, etc.
+    // We should avoid having duplicate parallel executions.
+    _.debounce(
+      async () => {
+        try {
+          await this.executeExtensionPipeline();
+        } catch (err) {
+          await this.processError(err, {
+            message: errorsLogs.failedExecutionDebounce,
+          });
+        }
+      },
+      EXECUTION_DEBOUNCE_INTERVAL,
+      { 'leading': true }
+    );
+  };
 
   async setMode(mode: string): Promise<void> {
     if (!Object.values(DEEPCODE_MODE_CODES).includes(mode)) return;