From f176e09c7428e772d24253d8c01a2076bf86564a Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Tue, 14 Jan 2025 23:28:49 +0000 Subject: [PATCH] Improve parent component name validation rule Signed-off-by: Prabhu Subramanian --- lib/helpers/validator.js | 5 ++++- types/lib/helpers/validator.d.ts.map | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/helpers/validator.js b/lib/helpers/validator.js index b30be62ab..71cfa44aa 100644 --- a/lib/helpers/validator.js +++ b/lib/helpers/validator.js @@ -100,7 +100,10 @@ export const validateMetadata = (bomJson) => { warningsList.push( `Found parent component with ref ${comp["bom-ref"]} in metadata.component.components`, ); - } else if (comp["name"] === bomJson.metadata.component["name"]) { + } else if ( + (!comp["bom-ref"] || !bomJson.metadata.component["bom-ref"]) && + comp["name"] === bomJson.metadata.component["name"] + ) { warningsList.push( `Found parent component with name ${comp["name"]} in metadata.component.components`, ); diff --git a/types/lib/helpers/validator.d.ts.map b/types/lib/helpers/validator.d.ts.map index bc2bf6ece..15126e622 100644 --- a/types/lib/helpers/validator.d.ts.map +++ b/types/lib/helpers/validator.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../lib/helpers/validator.js"],"names":[],"mappings":"AAmBO,qCAFI,MAAM,WA6ChB;AAOM,0CAFI,MAAM,WAqDhB;AAOM,uCAFI,MAAM,WAgEhB;AA6BM,sCAFI,MAAM,WAgDhB"} \ No newline at end of file +{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../lib/helpers/validator.js"],"names":[],"mappings":"AAmBO,qCAFI,MAAM,WA6ChB;AAOM,0CAFI,MAAM,WAwDhB;AAOM,uCAFI,MAAM,WAgEhB;AA6BM,sCAFI,MAAM,WAgDhB"} \ No newline at end of file