migrate

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

src/_helpers/packageUrl.ts

@@ -27,11 +27,11 @@ Copyright (c) OWASP Foundation. All Rights Reserved.
  */
 
 import type { PackageURL } from 'packageurl-js'
+import { PurlQualifierNames } from 'packageurl-js'
 
 import {tryCanonicalizeGitUrl} from "../_helpers/gitUrl"
 import { isNotUndefined } from '../_helpers/notUndefined'
 import type { PackageJson } from '../_helpers/packageJson'
-import { PackageUrlQualifierNames } from '../_helpers/packageUrl'
 import { ExternalReferenceType } from '../enums/externalReferenceType'
 import type { Component } from '../models/component'
 import { ExternalReference } from '../models/externalReference'
@@ -137,16 +137,16 @@ export class PackageUrlFactory extends PlainPackageUrlFactory<'npm'> {
   #finalizeQualifiers (purl: PackageURL): PackageURL {
     const qualifiers = new Map(Object.entries(purl.qualifiers ?? {}))
 
-    const downloadUrl = qualifiers.get(PackageUrlQualifierNames.DownloadURL)
+    const downloadUrl = qualifiers.get(PurlQualifierNames.DownloadUrl)
     if (downloadUrl !== undefined) {
-      qualifiers.delete(PackageUrlQualifierNames.VcsUrl)
+      qualifiers.delete(PurlQualifierNames.VcsUrl)
       if (npmDefaultRepositoryMatcher.test(downloadUrl)) {
-        qualifiers.delete(PackageUrlQualifierNames.DownloadURL)
+        qualifiers.delete(PurlQualifierNames.DownloadUrl)
       }
     }
-    if (!qualifiers.has(PackageUrlQualifierNames.DownloadURL) && !qualifiers.has(PackageUrlQualifierNames.VcsUrl)) {
+    if (!qualifiers.has(PurlQualifierNames.DownloadUrl) && !qualifiers.has(PurlQualifierNames.VcsUrl)) {
       // nothing to base a checksum on
-      qualifiers.delete(PackageUrlQualifierNames.Checksum)
+      qualifiers.delete(PurlQualifierNames.Checksum)
     }
     purl.qualifiers = qualifiers.size > 0
       ? Object.fromEntries(qualifiers.entries())

src/factories/fromNodePackageJson.node.ts

@@ -17,9 +17,8 @@ SPDX-License-Identifier: Apache-2.0
 Copyright (c) OWASP Foundation. All Rights Reserved.
 */
 
-import { PackageURL } from 'packageurl-js'
+import { PackageURL, PurlQualifierNames } from 'packageurl-js'
 
-import { PackageUrlQualifierNames } from '../_helpers/packageUrl'
 import { ExternalReferenceType } from '../enums/externalReferenceType'
 import type { Component } from '../models/component'
 
@@ -55,17 +54,17 @@ export class PackageUrlFactory<PurlType extends PackageURL['type'] = PackageURL[
       /* eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- intended */
       switch (extRef.type) {
         case ExternalReferenceType.VCS:
-          [qualifiers[PackageUrlQualifierNames.VcsUrl], subpath] = url.split('#', 2)
+          [qualifiers[PurlQualifierNames.VcsUrl], subpath] = url.split('#', 2)
           break
         case ExternalReferenceType.Distribution:
-          qualifiers[PackageUrlQualifierNames.DownloadURL] = url
+          qualifiers[PurlQualifierNames.DownloadUrl] = url
           break
       }
     }
 
     const hashes = component.hashes
     if (hashes.size > 0) {
-      qualifiers[PackageUrlQualifierNames.Checksum] = Array.from(
+      qualifiers[PurlQualifierNames.Checksum] = Array.from(
         sort
           ? hashes.sorted()
           : hashes,