fix: use nodeSpecific PackageUrlFactory (#108)

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
CycloneDX · May 21, 2024 · 357758c · 357758c
1 parent e16461f
commit 357758c
Show file tree

Hide file tree

Showing 26 changed files with 45 additions and 45 deletions.
diff --git a/src/builders.ts b/src/builders.ts
@@ -44,7 +44,7 @@ interface BomBuilderOptions {
 export class BomBuilder {
   toolBuilder: Builders.FromNodePackageJson.ToolBuilder
   componentBuilder: Builders.FromNodePackageJson.ComponentBuilder
-  purlFactory: Factories.PackageUrlFactory
+  purlFactory: Factories.FromNodePackageJson.PackageUrlFactory
 
   omitDevDependencies: boolean
   metaComponentType: ComponentType

diff --git a/src/commands.ts b/src/commands.ts
@@ -20,7 +20,7 @@ Copyright (c) OWASP Foundation. All Rights Reserved.
 // import sub-modules so to prevent load of unused not-tree-shakable dependencies - like 'AJV'
 import { FromNodePackageJson as PJB } from '@cyclonedx/cyclonedx-library/Builders'
 import { ComponentType } from '@cyclonedx/cyclonedx-library/Enums'
-import { FromNodePackageJson as PJF, LicenseFactory, PackageUrlFactory } from '@cyclonedx/cyclonedx-library/Factories'
+import { FromNodePackageJson as PJF, LicenseFactory } from '@cyclonedx/cyclonedx-library/Factories'
 import * as Serialize from '@cyclonedx/cyclonedx-library/Serialize'
 import { SpecVersionDict, Version as SpecVersion } from '@cyclonedx/cyclonedx-library/Spec'
 import { type CommandContext, Configuration, Project } from '@yarnpkg/core'
@@ -160,7 +160,7 @@ export class MakeSbomCommand extends Command<CommandContext> {
         extRefFactory,
         new LicenseFactory()
       ),
-      new PackageUrlFactory('npm'),
+      new PJF.PackageUrlFactory('npm'),
       {
         omitDevDependencies: this.production,
         metaComponentType: this.mcType,

diff --git a/tests/_data/snapshots/plain_bundled-dependencies.json.bin b/tests/_data/snapshots/plain_bundled-dependencies.json.bin
diff --git a/tests/_data/snapshots/plain_bundled-dependencies.xml.bin b/tests/_data/snapshots/plain_bundled-dependencies.xml.bin
diff --git a/tests/_data/snapshots/plain_concurrent-versions.json.bin b/tests/_data/snapshots/plain_concurrent-versions.json.bin
diff --git a/tests/_data/snapshots/plain_concurrent-versions.xml.bin b/tests/_data/snapshots/plain_concurrent-versions.xml.bin
diff --git a/tests/_data/snapshots/plain_dev-dependencies.json.bin b/tests/_data/snapshots/plain_dev-dependencies.json.bin
diff --git a/tests/_data/snapshots/plain_dev-dependencies.xml.bin b/tests/_data/snapshots/plain_dev-dependencies.xml.bin
diff --git a/tests/_data/snapshots/plain_git-protocol-dependency.json.bin b/tests/_data/snapshots/plain_git-protocol-dependency.json.bin
diff --git a/tests/_data/snapshots/plain_git-protocol-dependency.xml.bin b/tests/_data/snapshots/plain_git-protocol-dependency.xml.bin
diff --git a/tests/_data/snapshots/plain_github-protocol-dependency.json.bin b/tests/_data/snapshots/plain_github-protocol-dependency.json.bin
diff --git a/tests/_data/snapshots/plain_github-protocol-dependency.xml.bin b/tests/_data/snapshots/plain_github-protocol-dependency.xml.bin
diff --git a/tests/_data/snapshots/plain_juice-shop.json.bin b/tests/_data/snapshots/plain_juice-shop.json.bin
diff --git a/tests/_data/snapshots/plain_juice-shop.xml.bin b/tests/_data/snapshots/plain_juice-shop.xml.bin
diff --git a/tests/_data/snapshots/plain_local-dependencies.json.bin b/tests/_data/snapshots/plain_local-dependencies.json.bin
diff --git a/tests/_data/snapshots/plain_local-dependencies.xml.bin b/tests/_data/snapshots/plain_local-dependencies.xml.bin
diff --git a/tests/_data/snapshots/plain_local-workspaces.json.bin b/tests/_data/snapshots/plain_local-workspaces.json.bin
diff --git a/tests/_data/snapshots/plain_local-workspaces.xml.bin b/tests/_data/snapshots/plain_local-workspaces.xml.bin
diff --git a/tests/_data/snapshots/plain_package-aliasing.json.bin b/tests/_data/snapshots/plain_package-aliasing.json.bin
diff --git a/tests/_data/snapshots/plain_package-aliasing.xml.bin b/tests/_data/snapshots/plain_package-aliasing.xml.bin
diff --git a/tests/_data/snapshots/plain_package-with-build-id.json.bin b/tests/_data/snapshots/plain_package-with-build-id.json.bin
diff --git a/tests/_data/snapshots/plain_package-with-build-id.xml.bin b/tests/_data/snapshots/plain_package-with-build-id.xml.bin
diff --git a/tests/_data/snapshots/prod-arg_dev-dependencies.json.bin b/tests/_data/snapshots/prod-arg_dev-dependencies.json.bin
diff --git a/tests/_data/snapshots/prod-arg_dev-dependencies.xml.bin b/tests/_data/snapshots/prod-arg_dev-dependencies.xml.bin
diff --git a/tests/_data/snapshots/prod-env_dev-dependencies.json.bin b/tests/_data/snapshots/prod-env_dev-dependencies.json.bin