Support latest spec test data

Signed-off-by: Steven Esser <[email protected]>
package-url · May 16, 2024 · 2a4018a · 2a4018a
1 parent 09776a6
commit 2a4018a
Show file tree

Hide file tree

Showing 3 changed files with 208 additions and 146 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/package-url.js b/src/package-url.js
@@ -62,6 +62,32 @@ class PackageURL {
         }
       });
     }
+
+    if (type === 'conan') {
+      if (qualifiers) {
+        if (qualifiers.hasOwnProperty('channel') && !namespace) {
+          throw new Error('Invalid purl: conan has only channel qualifiers.');
+        }
+      }
+      if (namespace && !qualifiers) {
+        throw new Error('Invalid purl: conan has only namespace.');
+      } 
+    }
+
+    if (type === 'cran') {
+      if (!version) {
+        throw new Error('Invalid purl: cran requires a version.');
+      }
+    }
+
+    if (type === 'swift') {
+      if (!namespace) {
+	throw new Error('Invalid purl: swift has no namespace.');
+      }
+      if (!version) {
+	throw new Error('Invalid purl: swift requires a version.');
+      }
+    }
 
     this.type = type;
     this.name = name;
@@ -104,7 +130,7 @@ class PackageURL {
 
     if (this.version) {
       purl.push('@');
-      purl.push(encodeURIComponent(this.version));
+      purl.push(encodeURIComponent(this.version).replace(/%3A/g, ':'));
     }
 
     if (this.qualifiers) {
@@ -116,7 +142,7 @@ class PackageURL {
         qualifierString.push(
           encodeURIComponent(key).replace(/%3A/g, ':')
           + '='
-          + encodeURIComponent(qualifiers[key]).replace(/%2F/g, '/')
+          + encodeURIComponent(qualifiers[key]).replace(/%3A/g, ':').replace(/%2F/g, '/')
         );
       });