[projmgr] Rework component resolution to avoid picking non-default implementation

Author: spcaipers-arm

tools/projmgr/src/ProjMgrWorker.cpp

@@ -1934,12 +1934,14 @@ RteComponent* ProjMgrWorker::ProcessComponent(ContextItem& context, ComponentIte
   string componentDescriptor = item.component;
 
   set<string> filterSet;
+  bool freeText = false;
   if (componentDescriptor.find_first_of(RteConstants::COMPONENT_DELIMITERS) != string::npos) {
     // Consider a full or partial component identifier was given
     filterSet.insert(RteUtils::GetPrefix(componentDescriptor, RteConstants::PREFIX_CVERSION_CHAR));
   } else {
     // Consider free text was given
     filterSet = RteUtils::SplitStringToSet(componentDescriptor);
+    freeText = true;
   }
 
   vector<string> componentIdVec;
@@ -1967,33 +1969,36 @@ RteComponent* ProjMgrWorker::ProcessComponent(ContextItem& context, ComponentIte
     }
   }
 
-  // Multiple matches, check exact partial identifier
-  string requiredComponentId = RteUtils::RemovePrefixByString(item.component, RteConstants::SUFFIX_CVENDOR);
-  if (filteredComponents.size() > 1) {
-    RteComponentMap matchedComponents;
+  RteComponentMap matchedComponents;
+  if (!freeText) {
+    // Check required identifier mandatory fields
+    string requiredComponentId = RteUtils::GetPrefix(
+      RteUtils::RemovePrefixByString(item.component, RteConstants::SUFFIX_CVENDOR),
+      RteConstants::PREFIX_CVERSION_CHAR);
     for (const auto& [id, component] : filteredComponents) {
       // Get component id without vendor and version
       const string& componentId = component->GetPartialComponentID(true);
       if (requiredComponentId.compare(componentId) == 0) {
         matchedComponents[id] = component;
       }
     }
-    // Select unique exact match
-    if (matchedComponents.size() == 1) {
-      filteredComponents = matchedComponents;
-    }
+  } else {
+    // Free text
+    matchedComponents = filteredComponents;
   }
-  // Evaluate filtered components
-  if (filteredComponents.empty()) {
+ 
+  if (matchedComponents.empty()) {
+    // Check for default variant if requested variant is empty
+    for (const auto& [id, component] : filteredComponents) {
+      if (component->IsDefaultVariant() && !component->GetCvariantName().empty()) {
+        return component;
+      }
+    }
     // No match
     return nullptr;
-  }
-  // One or multiple matches found
-  // check for default variant if requested variant is empty
-  for (const auto& [id, component] : filteredComponents) {
-    if (component->IsDefaultVariant() && !component->GetCvariantName().empty()) {
-      return component;
-    }
+  } else {
+    // One or multiple matches
+    filteredComponents = matchedComponents;
   }
 
   set<string> availableComponentVersions;

tools/projmgr/test/data/TestLayers/variables-redefinition.cproject.yml

@@ -2,5 +2,5 @@
 
 project:
   components:
-    - component: Device:Startup
+    - component: Device:Startup&RteTest Startup
     - component: CORE

tools/projmgr/test/data/TestLayers/variables/target1.clayer.yml

@@ -7,7 +7,7 @@ layer:
   for-device: RteTest_ARMCM0
 
   components:
-    - component: Device:Startup
+    - component: Device:Startup&RteTest Startup
 
   define:
     - Target1-Layer

tools/projmgr/test/data/TestLayers/variables/target2.clayer.yml

@@ -7,7 +7,7 @@ layer:
   for-device: RteTest_ARMCM3
 
   components:
-    - component: Device:Startup
+    - component: Device:Startup&RteTest Startup
 
   define:
     - Target2-Layer

tools/projmgr/test/data/TestLayers/variables/target3.clayer.yml

@@ -7,7 +7,7 @@ layer:
   for-board: RteTest Dummy board
 
   components:
-    - component: Device:Startup
+    - component: Device:Startup&RteTest Startup
 
   define:
     - Target3-Layer

tools/projmgr/test/data/TestProject/test_component_csub.cproject.yml

@@ -0,0 +1,8 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/main/tools/projmgr/schemas/cproject.schema.json
+
+project:
+  device: RteTest_ARMCM0
+  compiler: AC6
+  components:
+    - component: Board:Test:Rev1
+    - component: Board:Test

tools/projmgr/test/data/TestSolution/ConfigFilesUpdate/config.cproject.yml

@@ -4,7 +4,7 @@ project:
 
   components:
     - component: RteTest:CORE
-    - component: Device:Startup
+    - component: Device:Startup&RteTest Startup
 
   rte:
     base-dir: $BuildType$

tools/projmgr/test/data/TestSolution/Executes/project/project.cproject.yml

@@ -4,7 +4,7 @@ project:
 
   components:
     - component: ARM::RteTest:CORE
-    - component: ARM::Device:Startup
+    - component: ARM::Device:Startup&RteTest Startup
 
   groups:
     - group: Source

tools/projmgr/test/data/TestSolution/Instances/instances.cproject.yml

@@ -7,6 +7,6 @@ project:
       instances: 2
       for-context: .Debug
 
-    - component: Device:Startup
+    - component: Device:Startup&RteTest Startup
       instances: 2
       for-context: .Error

tools/projmgr/test/data/TestSolution/LinkerOptions/layer/linker.clayer.yml

@@ -4,7 +4,7 @@ layer:
 
   components:
     - component: Board:Test:Rev1
-    - component: Device:Startup
+    - component: Device:Startup&RteTest Startup
       for-context: [.PriorityRegions, .PriorityDefines]
     - component: RteTest:CORE
       for-context: [.PriorityRegions, .PriorityDefines]