@cyclonedx/cdxgen 10.6.1 → 10.7.0

package/utils.test.js

@@ -2463,6 +2463,45 @@ test("parseSetupPyFile", async () => {
 ]`);
   expect(deps.length).toEqual(2);
   expect(deps[0].name).toEqual("colorama");
+
+  deps = await parseSetupPyFile(
+    readFileSync("./test/data/setup-impacket.py", "utf-8"),
+  );
+  expect(deps.length).toEqual(7);
+  expect(deps).toEqual([
+    {
+      name: "pyasn1",
+      version: "0.2.3",
+      properties: [{ name: "cdx:pypi:versionSpecifiers", value: ">=0.2.3" }],
+    },
+    {
+      name: "pycryptodomex",
+      version: null,
+      properties: [{ name: "cdx:pypi:versionSpecifiers", value: undefined }],
+    },
+    {
+      name: "pyOpenSSL",
+      version: "0.13.1",
+      properties: [{ name: "cdx:pypi:versionSpecifiers", value: ">=0.13.1" }],
+    },
+    {
+      name: "six",
+      version: null,
+      properties: [{ name: "cdx:pypi:versionSpecifiers", value: undefined }],
+    },
+    { name: "ldap3", version: "2.5.1", scope: undefined },
+    {
+      name: "ldapdomaindump",
+      version: "0.9.0",
+      scope: undefined,
+      properties: [{ name: "cdx:pypi:versionSpecifiers", value: ">=0.9.0" }],
+    },
+    {
+      name: "flask",
+      version: "1.0",
+      properties: [{ name: "cdx:pypi:versionSpecifiers", value: ">=1.0" }],
+    },
+  ]);
 });
 
 test("parsePnpmLock", async () => {
@@ -2679,9 +2718,15 @@ test("parsePnpmLock", async () => {
       },
     },
   });
+  parsedList = await parsePnpmLock("./test/data/pnpm-lock9a.yaml");
+  expect(parsedList.pkgList.length).toEqual(1007);
+  expect(parsedList.dependenciesList.length).toEqual(1005);
+  parsedList = await parsePnpmLock("./test/data/pnpm-lock9b.yaml");
+  expect(parsedList.pkgList.length).toEqual(1366);
+  expect(parsedList.dependenciesList.length).toEqual(1352);
   parsedList = await parsePnpmLock("./pnpm-lock.yaml");
-  expect(parsedList.pkgList.length).toEqual(644);
-  expect(parsedList.dependenciesList.length).toEqual(644);
+  expect(parsedList.pkgList.length).toEqual(654);
+  expect(parsedList.dependenciesList.length).toEqual(654);
   expect(parsedList.pkgList[0]).toEqual({
     group: "@ampproject",
     name: "remapping",
@@ -3024,6 +3069,11 @@ test("parseYarnLock", async () => {
   expect(parsedList.pkgList[0]._integrity).toEqual(
     "sha512-U8KyMaYaRnkrOaDUO8T093a7RUKqV+4EkwZ2gC5VASgsL8iqwU5M0fESD/i1Jha2/1q1Oa0wqiJ31yZES3Fhnw==",
   );
+
+  parsedList = await parseYarnLock("./test/data/yarn_locks/yarnv1-fs.lock");
+  expect(parsedList.pkgList.length).toEqual(882);
+  expect(parsedList.dependenciesList.length).toEqual(882);
+  expect(parsedList.pkgList[0].purl).toEqual("pkg:npm/abbrev@1.0.9");
 });
 
 test("parseComposerLock", () => {
@@ -3307,7 +3357,7 @@ test("parse requirements.txt", async () => {
 });
 
 test("parse pyproject.toml", () => {
-  const pkg = parsePyProjectToml("./test/data/pyproject.toml");
+  let pkg = parsePyProjectToml("./test/data/pyproject.toml");
   expect(pkg).toEqual({
     name: "cpggen",
     version: "1.9.0",
@@ -3317,6 +3367,16 @@ test("parse pyproject.toml", () => {
     homepage: { url: "https://github.com/AppThreat/cpggen" },
     repository: { url: "https://github.com/AppThreat/cpggen" },
   });
+  pkg = parsePyProjectToml("./test/data/pyproject-author-comma.toml");
+  expect(pkg).toEqual({
+    name: "rasa",
+    version: "3.7.0a1",
+    description:
+      "Open source machine learning framework to automate text- and voice-based conversations: NLU, dialogue management, connect to Slack, Facebook, and more - Create chatbots and voice assistants",
+    author: "Rasa Technologies GmbH <hi@rasa.com>",
+    homepage: { url: "https://rasa.com" },
+    repository: { url: "https://github.com/rasahq/rasa" },
+  });
 });
 
 test("parse pyproject.toml with custom poetry source", () => {
@@ -4102,6 +4162,12 @@ test.each([
   ["http://gitlab.com/behat-chrome/chrome-mink-driver.git", true],
   ["git+https://github.com/Alex-D/check-disk-space.git", true],
   ["UNKNOWN", false],
+  ["http://", false],
+  ["http", false],
+  ["https", false],
+  ["https://", false],
+  ["http://www", true],
+  ["http://www.", true],
 ])("isValidIriReference tests: %s", (url, isValid) => {
   expect(isValidIriReference(url)).toBe(isValid);
 });