@cyclonedx/cdxgen 8.5.3 → 8.6.0

package/utils.test.js

@@ -786,7 +786,7 @@ test("get dart metadata", async () => {
       url: "https://github.com/dart-lang/async"
     }
   });
-});
+}, 120000);
 
 test("parse cabal freeze", async () => {
   expect(await utils.parseCabalData(null)).toEqual([]);
@@ -1629,7 +1629,6 @@ test("parseGemspecData", async () => {
 });
 
 test("parse requirements.txt", async () => {
-  jest.setTimeout(120000);
   let deps = await utils.parseReqFile(
     fs.readFileSync("./test/data/requirements.comments.txt", {
       encoding: "utf-8"
@@ -1661,6 +1660,10 @@ test("parse poetry.lock", async () => {
     fs.readFileSync("./test/data/poetry1.lock", { encoding: "utf-8" })
   );
   expect(deps.length).toEqual(67);
+  deps = await utils.parsePoetrylockData(
+    fs.readFileSync("./test/data/poetry-cpggen.lock", { encoding: "utf-8" })
+  );
+  expect(deps.length).toEqual(68);
 });
 
 test("parse wheel metadata", () => {
@@ -2082,3 +2085,51 @@ test("parse swift deps files", () => {
     repository: { url: "https://github.com/apple/swift-argument-parser.git" }
   });
 });
+
+test("pypi version solver tests", () => {
+  const versionsList = [
+    "1.0.0",
+    "1.0.1",
+    "1.1.0",
+    "1.2.0.dev1+hg.5.b11e5e6f0b0b",
+    "2.0.3",
+    "3.0.12-alpha.12",
+    "4.0.0"
+  ];
+  expect(utils.guessPypiMatchingVersion(versionsList, "<4")).toEqual(
+    "3.0.12-alpha.12"
+  );
+  expect(utils.guessPypiMatchingVersion(versionsList, ">1.0.0 <3.0.0")).toEqual(
+    "2.0.3"
+  );
+  expect(utils.guessPypiMatchingVersion(versionsList, "== 1.0.1")).toEqual(
+    "1.0.1"
+  );
+  expect(utils.guessPypiMatchingVersion(versionsList, "~= 1.0.1")).toEqual(
+    "1.0.1"
+  );
+  expect(
+    utils.guessPypiMatchingVersion(versionsList, ">= 2.0.1, == 2.8.*")
+  ).toEqual(null);
+  expect(
+    utils.guessPypiMatchingVersion(
+      ["2.0.0", "2.0.1", "2.4.0", "2.8.4", "2.9.0", "3.0.1"],
+      ">= 2.0.1, == 2.8.*"
+    )
+  ).toEqual("2.8.4");
+  expect(
+    utils.guessPypiMatchingVersion(
+      versionsList,
+      "== 1.1.0; python_version < '3.8'"
+    )
+  ).toEqual("1.1.0");
+  expect(
+    utils.guessPypiMatchingVersion(versionsList, "<3.6,>1.9,!=1.9.6,<4.0a0")
+  ).toEqual("3.0.12-alpha.12");
+  expect(
+    utils.guessPypiMatchingVersion(versionsList, ">=1.4.2,<2.2,!=1.5.*,!=1.6.*")
+  ).toEqual("2.0.3");
+  expect(utils.guessPypiMatchingVersion(versionsList, ">=1.21.1,<3")).toEqual(
+    "2.0.3"
+  );
+});

package/known-licenses.json

@@ -1,27 +0,0 @@
-[
-    {"license": "Apache-2.0", "group": "cloud.google.com", "name": "go"},
-    {"license": "Apache-2.0", "group": "cloud.google.com/go", "name": "*"},
-    {"license": "Apache-2.0", "group": "cuelang.org", "name": "go"},
-    {"license": "MIT", "group": "pack.ag", "name": "amqp"},
-    {"license": "Apache-2.0", "group": "google.golang.org", "name": "*"},
-    {"license": "BSD-3-Clause", "group": "golang.org/x", "name": "*"},
-    {"license": "BSD-3-Clause", "group": "dmitri.shuralyov.com/gpu", "name": "*"},
-    {"license": "Apache-2.0", "group": "contrib.go.opencensus.io", "name": "*"},
-    {"license": "Apache-2.0", "group": "git.apache.org", "name": "*"},
-    {"license": "Apache-2.0", "group": ".", "name": "go.opencensus.io"},
-    {"license": "MIT", "group": "sigs.k8s.io", "name": "*"},
-    {"license": "BSD-3-Clause", "group": "rsc.io", "name": "*"},
-    {"license": "Apache-2.0", "group": "openpitrix.io", "name": "*"},
-    {"license": "BSD-3-Clause", "group": "modernc.org", "name": "*"},
-    {"license": "Apache-2.0", "group": "kubesphere.io", "name": "*"},
-    {"license": "Apache-2.0", "group": "k8s.io", "name": "*"},
-    {"license": "Apache-2.0", "group": "istio.io", "name": "*"},
-    {"license": "MIT", "group": "honnef.co/go", "name": "*"},
-    {"license": "Apache-2.0", "group": ".", "name": "gotest.tools"},
-    {"license": "Apache-2.0", "group": "gopkg.in", "name": "*"},
-    {"license": "Apache-2.0", "group": "code.cloudfoundry.org", "name": "*"},
-    {"license": "BSD-3-Clause", "group": "gonum.org/v1", "name": "*"},
-    {"license": "Apache-2.0", "group": "gomodules.xyz/jsonpatch", "name": "*"},
-    {"license": "MIT", "group": "go.uber.org", "name": "*"},
-    {"license": "MIT", "group": "go.etcd.io", "name": "*"}
-]

package/vendor-alias.json

@@ -1,10 +0,0 @@
-{
-	"commons-": "org.apache.commons",
-	"spring-": "org.springframework",
-	"jackson-dataformat-": "com.fasterxml.jackson.dataformat",
-	"jackson-databind": "com.fasterxml.jackson.core",
-	"jackson-core": "com.fasterxml.jackson.core",
-	"jackson-annotations": "com.fasterxml.jackson.core",
-	"jackson-jaxrs-": "com.fasterxml.jackson.jaxrs",
-	"spring.boot": "org.springframework.boot"
-}