fix: malformed ingested package versions are fixed (#1246)

--------- Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
CycloneDX · Dec 10, 2023 · 69780c2 · 69780c2
1 parent decc6d8
commit 69780c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 ## unreleased
 
+* Fix
+  * Malformed ingested package versions are fixed (via [#1246]) 
+
+[#1246]: https://github.com/CycloneDX/cyclonedx-webpack-plugin/pull/1246
+
 ## 3.9.0 - 2023-12-10
 
 * Changed

diff --git a/src/extractor.ts b/src/extractor.ts
@@ -62,9 +62,9 @@ export class Extractor {
           const _packageJson = structuredClonePolyfill(pkg.packageJson)
           normalizePackageJson(_packageJson as object /* add debug for warnings? */)
           // region fix normalizations
-          if (typeof pkg.packageJson === 'string') {
+          if (typeof pkg.packageJson.version === 'string') {
             // allow non-SemVer strings
-            _packageJson.version = pkg.packageJson.trim()
+            _packageJson.version = pkg.packageJson.version.trim()
           }
           // endregion fix normalizations
           pkg.packageJson = _packageJson