@cyclonedx/cdxgen 9.8.10 → 9.9.1

package/utils.test.js

@@ -1192,7 +1192,7 @@ test("parse github actions workflow data", async () => {
   dep_list = parseGitHubWorkflowData(
     readFileSync("./.github/workflows/repotests.yml", { encoding: "utf-8" })
   );
-  expect(dep_list.length).toEqual(7);
+  expect(dep_list.length).toEqual(8);
   expect(dep_list[0]).toEqual({
     group: "actions",
     name: "checkout",
@@ -1256,6 +1256,7 @@ test("parse project.assets.json", async () => {
   expect(dep_list["pkgList"].length).toEqual(302);
   expect(dep_list["pkgList"][0]).toEqual({
     "bom-ref": "pkg:nuget/Castle.Core.Tests@0.0.0",
+    purl: "pkg:nuget/Castle.Core.Tests@0.0.0",
     group: "",
     name: "Castle.Core.Tests",
     type: "application",
@@ -1265,6 +1266,9 @@ test("parse project.assets.json", async () => {
   expect(dep_list["dependenciesList"][0]).toEqual({
     dependsOn: [
       "pkg:nuget/Castle.Core@0.0.0",
+      "pkg:nuget/Castle.Core-NLog@0.0.0",
+      "pkg:nuget/Castle.Core-Serilog@0.0.0",
+      "pkg:nuget/Castle.Core-log4net@0.0.0",
       "pkg:nuget/Microsoft.NET.Test.Sdk@17.1.0",
       "pkg:nuget/Microsoft.NETCore.App@2.1.0",
       "pkg:nuget/Microsoft.NETFramework.ReferenceAssemblies@1.0.0",
@@ -1299,17 +1303,28 @@ test("parse packages.lock.json", async () => {
 });
 
 test("parse paket.lock", async () => {
-  expect(await parsePaketLockData(null)).toEqual([]);
+  expect(await parsePaketLockData(null)).toEqual({
+    pkgList: [],
+    dependenciesList: []
+  });
   const dep_list = await parsePaketLockData(
     readFileSync("./test/data/paket.lock", { encoding: "utf-8" })
   );
-  expect(dep_list.length).toEqual(13);
-  expect(dep_list[0]).toEqual({
+  expect(dep_list.pkgList.length).toEqual(13);
+  expect(dep_list.pkgList[0]).toEqual({
     group: "",
     name: "0x53A.ReferenceAssemblies.Paket",
     version: "0.2",
     purl: "pkg:nuget/0x53A.ReferenceAssemblies.Paket@0.2"
   });
+  expect(dep_list.dependenciesList.length).toEqual(13);
+  expect(dep_list.dependenciesList[2]).toEqual({
+    ref: "pkg:nuget/FSharp.Compiler.Service@17.0.1",
+    dependsOn: [
+      "pkg:nuget/System.Collections.Immutable@1.4",
+      "pkg:nuget/System.Reflection.Metadata@1.5"
+    ]
+  });
 });
 
 test("parse .net cs proj", async () => {
@@ -1683,6 +1698,13 @@ test("parsePkgLock v3", async () => {
   });
   expect(deps[deps.length - 1].name).toEqual("uid2");
   expect(parsedList.dependenciesList.length).toEqual(161);
+  parsedList = await parsePkgLock("./package-lock.json", {
+    projectVersion: "latest",
+    projectName: "cdxgen"
+  });
+  deps = parsedList.pkgList;
+  expect(deps.length).toEqual(1204);
+  expect(parsedList.dependenciesList.length).toEqual(1204);
 });
 
 test("parseBowerJson", async () => {
@@ -1945,6 +1967,8 @@ test("parseYarnLock", async () => {
     name: "asap",
     version: "2.0.5",
     _integrity: "sha256-522765b50c3510490e52d7dcfe085ef9ba96958f",
+    "bom-ref": "pkg:npm/asap@2.0.5",
+    purl: "pkg:npm/asap@2.0.5",
     properties: [
       {
         name: "SrcFile",
@@ -1977,6 +2001,8 @@ test("parseYarnLock", async () => {
     group: "@babel",
     name: "cli",
     version: "7.10.1",
+    "bom-ref": "pkg:npm/@babel/cli@7.10.1",
+    purl: "pkg:npm/%40babel/cli@7.10.1",
     _integrity:
       "sha512-cVB+dXeGhMOqViIaZs3A9OUAe4pKw4SBNdMw6yHJMYR7s4TB+Cei7ThquV/84O19PdIFWuwe03vxxES0BHUm5g==",
     properties: [
@@ -2013,6 +2039,8 @@ test("parseYarnLock", async () => {
     group: "@apollo",
     name: "client",
     version: "3.2.5",
+    "bom-ref": "pkg:npm/@apollo/client@3.2.5",
+    purl: "pkg:npm/%40apollo/client@3.2.5",
     properties: [
       {
         name: "SrcFile",
@@ -2043,6 +2071,8 @@ test("parseYarnLock", async () => {
     group: "@actions",
     name: "artifact",
     version: "0.6.1",
+    "bom-ref": "pkg:npm/@actions/artifact@0.6.1",
+    purl: "pkg:npm/%40actions/artifact@0.6.1",
     properties: [
       {
         name: "SrcFile",
@@ -2072,6 +2102,8 @@ test("parseYarnLock", async () => {
       "sha512-+X9Jn4mPI+RYV0ITiiLyJSYlT9um111BocJSaztsxXR+9ZxWErpzdfQqyk+EYZUOklugjJkerQZRtJGLfJeClw==",
     group: "",
     name: "lru-cache",
+    "bom-ref": "pkg:npm/lru-cache@6.0.0",
+    purl: "pkg:npm/lru-cache@6.0.0",
     version: "6.0.0",
     properties: [
       {
@@ -2095,7 +2127,7 @@ test("parseYarnLock", async () => {
   });
 
   parsedList = await parseYarnLock("./test/data/yarn_locks/yarnv2.lock");
-  expect(parsedList.pkgList.length).toEqual(1090);
+  expect(parsedList.pkgList.length).toEqual(1088);
   expect(parsedList.dependenciesList.length).toEqual(1088);
   expect(parsedList.pkgList[0]).toEqual({
     _integrity:
@@ -2103,6 +2135,8 @@ test("parseYarnLock", async () => {
     group: "@arcanis",
     name: "slice-ansi",
     version: "1.0.2",
+    "bom-ref": "pkg:npm/@arcanis/slice-ansi@1.0.2",
+    purl: "pkg:npm/%40arcanis/slice-ansi@1.0.2",
     properties: [
       {
         name: "SrcFile",
@@ -2124,14 +2158,16 @@ test("parseYarnLock", async () => {
     }
   });
   parsedList = await parseYarnLock("./test/data/yarn_locks/yarnv3.lock");
-  expect(parsedList.pkgList.length).toEqual(325);
-  expect(parsedList.dependenciesList.length).toEqual(323);
+  expect(parsedList.pkgList.length).toEqual(363);
+  expect(parsedList.dependenciesList.length).toEqual(363);
   expect(parsedList.pkgList[0]).toEqual({
     _integrity:
       "sha512-vtU+q0TmdIDmezU7lKub73vObN6nmd3lkcKWz7R9hyNI8gz5o7grDb+FML9nykOLW+09gGIup2xyJ86j5vBKpg==",
     group: "@babel",
     name: "code-frame",
     version: "7.16.7",
+    "bom-ref": "pkg:npm/@babel/code-frame@7.16.7",
+    purl: "pkg:npm/%40babel/code-frame@7.16.7",
     properties: [
       {
         name: "SrcFile",
@@ -2162,6 +2198,8 @@ test("parseYarnLock", async () => {
     group: "@ac-synth",
     name: "yjs",
     version: "13.5.39-alpha1",
+    "bom-ref": "pkg:npm/@ac-synth/yjs@13.5.39-alpha1",
+    purl: "pkg:npm/%40ac-synth/yjs@13.5.39-alpha1",
     _integrity:
       "sha512-JE93VWVyVa07xkK1wJ5ogjSZ30Nn4ptUuUXdPnu8MsKme1xFHLFFD3UtnHxnxnNDSnGx+WLlhuyHdIFfSCYqYg==",
     properties: [
@@ -2181,6 +2219,42 @@ test("parseYarnLock", async () => {
       }
     }
   });
+  parsedList = await parseYarnLock("./test/data/yarn_locks/yarn5.lock");
+  expect(parsedList.pkgList.length).toEqual(1962);
+  expect(parsedList.dependenciesList.length).toEqual(1962);
+  expect(parsedList.pkgList[0].purl).toEqual(
+    "pkg:npm/%40ampproject/remapping@2.2.0"
+  );
+  expect(parsedList.pkgList[0]["bom-ref"]).toEqual(
+    "pkg:npm/@ampproject/remapping@2.2.0"
+  );
+  parsedList = await parseYarnLock("./test/data/yarn_locks/yarn6.lock");
+  expect(parsedList.pkgList.length).toEqual(1472);
+  expect(parsedList.dependenciesList.length).toEqual(1472);
+  expect(parsedList.pkgList[0].purl).toEqual(
+    "pkg:npm/%40aashutoshrathi/word-wrap@1.2.6"
+  );
+  expect(parsedList.pkgList[0]["bom-ref"]).toEqual(
+    "pkg:npm/@aashutoshrathi/word-wrap@1.2.6"
+  );
+  parsedList = await parseYarnLock("./test/data/yarn_locks/yarn7.lock");
+  expect(parsedList.pkgList.length).toEqual(1350);
+  expect(parsedList.dependenciesList.length).toEqual(1347);
+  expect(parsedList.pkgList[0].purl).toEqual(
+    "pkg:npm/%40aashutoshrathi/word-wrap@1.2.6"
+  );
+  expect(parsedList.pkgList[0]["bom-ref"]).toEqual(
+    "pkg:npm/@aashutoshrathi/word-wrap@1.2.6"
+  );
+  parsedList = await parseYarnLock("./test/data/yarn_locks/yarnv4.lock");
+  expect(parsedList.pkgList.length).toEqual(1851);
+  expect(parsedList.dependenciesList.length).toEqual(1851);
+  expect(parsedList.pkgList[0].purl).toEqual(
+    "pkg:npm/%40aashutoshrathi/word-wrap@1.2.6"
+  );
+  expect(parsedList.pkgList[0]["bom-ref"]).toEqual(
+    "pkg:npm/@aashutoshrathi/word-wrap@1.2.6"
+  );
 });
 
 test("parseComposerLock", () => {