Merge pull request #201 from digma-ai/feature/js-remove-redundant-links

Feature/js remove redundant links

Author: noamkfir

src/services/EditorHelper.ts

@@ -156,13 +156,13 @@ export class EditorHelper {
         }
 
         const converters = await languageExtractor.getModulePathToUriConverters();
-        let path;
-        for (let index = 0; !path && index < converters.length; index++) {
+        let uri: vscode.Uri | undefined;
+        for (let index = 0; !uri && index < converters.length; index++) {
             const converter = converters[index];
-            path = await converter.convert(pathInfo);
+            uri = await converter.convert(pathInfo);
         }
 
-        return path;
+        return uri;
     }
 
     public async getExecutedCodeFromScm(uri: vscode.Uri, commit: string, line: integer) : Promise<string |undefined>{

src/services/languages/javascript/packageReader.ts

@@ -7,13 +7,14 @@ type PackagesMap = Map<string, vscode.Uri>;
 export class JSPackageReader {
     private packagesMap: PackagesMap = new Map<string, vscode.Uri>();
 
-    public async findAllPackagesInWorkspace() {
-        const packages = await vscode.workspace.findFiles('**/package.json');
+    private async findPackagesInWorkspace(includeNodeModules = true) {
+        const exclude = includeNodeModules ? undefined : '**/node_modules/**';
+        const packages = await vscode.workspace.findFiles('**/package.json', exclude);
         return packages;
     }
 
     public async findPackage(uri: vscode.Uri): Promise<vscode.Uri | undefined> {
-        const packages = await this.findAllPackagesInWorkspace();
+        const packages = await this.findPackagesInWorkspace();
         const packageFile = packages.find(f => uri.fsPath.startsWith(dirname(f.fsPath)));
         if (!packageFile) {
             Logger.warn(`Could not resolve package file for '${uri.path}'`);
@@ -38,17 +39,17 @@ export class JSPackageReader {
             this.packagesMap.clear();
         }
         if(this.packagesMap.size === 0) {
-            const packages = await this.findAllPackagesInWorkspace();
+            const packages = await this.findPackagesInWorkspace(false);
             for await (const packageFile of packages) {
                 try {
                     const packageName = await this.getPackageName(packageFile);
                     if(packageName) {
                         this.packagesMap.set(packageName, packageFile);
                     }
-                    console.log(packageName, packageFile.fsPath);
+                    Logger.info(`Parsed the package ${packageName} at ${packageFile.fsPath}`);
                 }
                 catch(err) {
-                    console.error('failed to parse package name for', packageFile);
+                    Logger.error(`Failed to parse package name for: ${packageFile}`);
                 }
             }
         }