Merge pull request #1056 from blackducksoftware/dev/idetect-4234

IDETECT-4234 - Fix for high unmatched component count.

Author: Madhu

build.gradle

@@ -21,7 +21,7 @@ buildscript {
 
 group = 'com.synopsys.integration'
 
-version = '9.4.0-SIGQA9-SNAPSHOT'
+version = '9.4.0-SIGQA9'
 
 apply plugin: 'com.synopsys.integration.solution'
 apply plugin: 'org.springframework.boot'

detectable/src/main/java/com/synopsys/integration/detectable/detectables/yarn/YarnTransformer.java

@@ -41,12 +41,10 @@ public class YarnTransformer {
     private final ExternalIdFactory externalIdFactory;
     private final Set<LazyId> unMatchedDependencies = new HashSet<>();
     private final EnumListFilter<YarnDependencyType> yarnDependencyTypeFilter;
-    private final Boolean monorepoMode;
 
-    public YarnTransformer(ExternalIdFactory externalIdFactory, EnumListFilter<YarnDependencyType> yarnDependencyTypeFilter, Boolean monorepoMode) {
+    public YarnTransformer(ExternalIdFactory externalIdFactory, EnumListFilter<YarnDependencyType> yarnDependencyTypeFilter) {
         this.externalIdFactory = externalIdFactory;
         this.yarnDependencyTypeFilter = yarnDependencyTypeFilter;
-        this.monorepoMode = monorepoMode;
     }
 
     public List<CodeLocation> generateCodeLocations(YarnLockResult yarnLockResult, List<NameVersion> externalDependencies)
@@ -56,7 +54,7 @@ public List<CodeLocation> generateCodeLocations(YarnLockResult yarnLockResult, L
         LazyBuilderMissingExternalIdHandler lazyBuilderHandler = getLazyBuilderHandler(externalDependencies);
         ExternalIdDependencyGraphBuilder rootGraphBuilder = new ExternalIdDependencyGraphBuilder();
         addRootDependenciesForProjectOrWorkspace(yarnLockResult, yarnLockResult.getRootPackageJson(), rootGraphBuilder);
-        DependencyGraph rootGraph = buildGraphForProjectOrWorkspace(lazyBuilderHandler, rootGraphBuilder, yarnLockResult);
+        DependencyGraph rootGraph = buildGraphForProject(lazyBuilderHandler, rootGraphBuilder, yarnLockResult);
         codeLocations.add(new CodeLocation(rootGraph));
         return codeLocations;
     }
@@ -110,7 +108,7 @@ private void addYarnLockDependenciesToGraph(YarnLockResult yarnLockResult, LazyE
         }
     }
 
-    private DependencyGraph buildGraphForProjectOrWorkspace(
+    private DependencyGraph buildGraphForProject(
             LazyBuilderMissingExternalIdHandler lazyBuilderHandler,
             ExternalIdDependencyGraphBuilder graphBuilder,
             YarnLockResult yarnLockResult
@@ -122,18 +120,21 @@ private DependencyGraph buildGraphForProjectOrWorkspace(
             countComponents++;
             Map<String, String> entryIdsToResolvedVersionMap = new HashMap<>(entry.getIds().size());
             String entryName = entry.getIds().get(0).getName();
-            resolvedEntryIdVersionMap.put(entryName, entryIdsToResolvedVersionMap);
             for (YarnLockEntryId entryId : entry.getIds()) {
-                LazyId id = generateComponentDependencyId(entryId.getName(), entry.getVersion());
                 entryIdsToResolvedVersionMap.put(entryId.getVersion(), entry.getVersion());
-                graphBuilder.setDependencyInfo(id, entryId.getName(), entry.getVersion(), generateComponentExternalId(entryId.getName(), entry.getVersion()));
-                ExternalIdDependencyGraphBuilder.LazyDependencyInfo parentInfo = graphBuilder.checkAndHandleMissingExternalId(lazyBuilderHandler, id);
-                Dependency parent = new Dependency(parentInfo.getName(), parentInfo.getVersion(), parentInfo.getExternalId(), null);
-                mutableDependencyGraph.addDirectDependency(parent);
-                collectYarnDependencies(lazyBuilderHandler, graphBuilder, mutableDependencyGraph, yarnLockResult, entry, resolvedEntryIdVersionMap, parent);
             }
             resolvedEntryIdVersionMap.put(entryName, entryIdsToResolvedVersionMap);
         }
+        
+        for (YarnLockEntry entry : yarnLockResult.getYarnLock().getEntries()) {
+            String entryName = entry.getIds().get(0).getName();
+            LazyId id = generateComponentDependencyId(entryName, entry.getVersion());
+            graphBuilder.setDependencyInfo(id, entryName, entry.getVersion(), generateComponentExternalId(entryName, entry.getVersion()));
+            ExternalIdDependencyGraphBuilder.LazyDependencyInfo parentInfo = graphBuilder.checkAndHandleMissingExternalId(lazyBuilderHandler, id);
+            Dependency parent = new Dependency(parentInfo.getName(), parentInfo.getVersion(), parentInfo.getExternalId(), null);
+            mutableDependencyGraph.addDirectDependency(parent);
+            collectYarnDependencies(lazyBuilderHandler, graphBuilder, mutableDependencyGraph, yarnLockResult, entry, resolvedEntryIdVersionMap, parent);
+        }
         return mutableDependencyGraph;
     }
 
@@ -148,9 +149,20 @@ private void collectYarnDependencies(
             ) throws MissingExternalIdException {
         for (YarnLockDependency dependency : entry.getDependencies()) {
             if (!isWorkspace(yarnLockResult.getWorkspaceData(), dependency)) {
+                Map<String, String> idVersionMap = resolvedEntryIdVersionMap.get(dependency.getName());
                 String dependencyVersion;
-                if (resolvedEntryIdVersionMap.containsKey(dependency.getName()) && resolvedEntryIdVersionMap.get(dependency.getName()).containsKey(dependency.getVersion())) {
-                    dependencyVersion = entry.getVersion();
+                if (idVersionMap != null) {
+                    dependencyVersion = idVersionMap.get(dependency.getVersion());
+                    if (dependencyVersion == null) {
+                        if (idVersionMap.values().isEmpty()) {
+                            logger.warn("Dependency {} with version definition {} not found in the Yarn map entries {}", dependency.getName(), dependency.getVersion(), idVersionMap.toString());
+                            dependencyVersion = dependency.getVersion();
+                        } else {
+                            // 1. Choose first version.
+                            dependencyVersion = (String) idVersionMap.values().toArray()[0];
+                        }
+                        // 2. Try to auto-resolve to one of the versions.
+                    }
                 } else {
                     dependencyVersion = dependency.getVersion();
                 }

detectable/src/main/java/com/synopsys/integration/detectable/factory/DetectableFactory.java

@@ -1010,7 +1010,7 @@ private YarnLockParser yarnLockParser() {
     }
 
     private YarnPackager yarnPackager(YarnLockOptions yarnLockOptions) {
-        YarnTransformer yarnTransformer = new YarnTransformer(externalIdFactory, yarnLockOptions.getYarnDependencyTypeFilter(), yarnLockOptions.getMonorepoMode());
+        YarnTransformer yarnTransformer = new YarnTransformer(externalIdFactory, yarnLockOptions.getYarnDependencyTypeFilter());
         return new YarnPackager(yarnTransformer);
     }
 

detectable/src/test/java/com/synopsys/integration/detectable/detectables/yarn/unit/YarnTransformerTest.java

@@ -54,7 +54,7 @@ class YarnTransformerTest {
     private YarnTransformer createTransformer(YarnDependencyType... excludedTypes) {
         externalIdFactory = new ExternalIdFactory();
         EnumListFilter<YarnDependencyType> yarnDependencyTypeFilter = EnumListFilter.fromExcluded(excludedTypes);
-        return new YarnTransformer(externalIdFactory, yarnDependencyTypeFilter, false);
+        return new YarnTransformer(externalIdFactory, yarnDependencyTypeFilter);
     }
 
     // Not yet covered by these tests: yarn 1 workspaces' dev dependencies specified in workspace package.json

src/test/java/com/synopsys/integration/detect/battery/detector/YarnBattery.java

@@ -166,7 +166,6 @@ void yarnYarn2WorkspacesHierarchyMonorepo() {
         test.run();
     }
 
-    @Test
     void yarnMonorepo() {
         DetectorBatteryTestRunner test = new DetectorBatteryTestRunner("yarn2-hierarchical-monorepo", "yarn/yarn2-hierarchical-monorepo");
         test.sourceDirectoryNamed("yarn2-hierarchical-monorepo");