@cyclonedx/cdxgen 10.3.4 → 10.4.0

package/docker.test.js

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, test } from "@jest/globals";
 import {
   addSkippedSrcFiles,
   exportImage,
@@ -5,9 +6,8 @@ import {
   getImage,
   isWin,
   parseImageName,
-  removeImage
+  removeImage,
 } from "./docker.js";
-import { beforeEach, describe, expect, test } from "@jest/globals";
 
 test("docker connection", async () => {
   if (!(isWin && process.env.CI === "true")) {
@@ -27,7 +27,7 @@ test("parseImageName tests", () => {
     digest: "",
     platform: "",
     group: "",
-    name: "debian"
+    name: "debian",
   });
   expect(parseImageName("debian:latest")).toEqual({
     registry: "",
@@ -36,7 +36,7 @@ test("parseImageName tests", () => {
     digest: "",
     platform: "",
     group: "",
-    name: "debian"
+    name: "debian",
   });
   expect(parseImageName("library/debian:latest")).toEqual({
     registry: "",
@@ -45,7 +45,7 @@ test("parseImageName tests", () => {
     digest: "",
     platform: "",
     group: "library",
-    name: "debian"
+    name: "debian",
   });
   expect(parseImageName("shiftleft/scan:v1.15.6")).toEqual({
     registry: "",
@@ -54,7 +54,7 @@ test("parseImageName tests", () => {
     digest: "",
     platform: "",
     group: "shiftleft",
-    name: "scan"
+    name: "scan",
   });
   expect(parseImageName("localhost:5000/shiftleft/scan:v1.15.6")).toEqual({
     registry: "localhost:5000",
@@ -63,7 +63,7 @@ test("parseImageName tests", () => {
     digest: "",
     platform: "",
     group: "shiftleft",
-    name: "scan"
+    name: "scan",
   });
   expect(parseImageName("localhost:5000/shiftleft/scan")).toEqual({
     registry: "localhost:5000",
@@ -72,10 +72,10 @@ test("parseImageName tests", () => {
     digest: "",
     platform: "",
     group: "shiftleft",
-    name: "scan"
+    name: "scan",
   });
   expect(
-    parseImageName("foocorp.jfrog.io/docker/library/eclipse-temurin:latest")
+    parseImageName("foocorp.jfrog.io/docker/library/eclipse-temurin:latest"),
   ).toEqual({
     registry: "foocorp.jfrog.io",
     repo: "docker/library/eclipse-temurin",
@@ -83,12 +83,12 @@ test("parseImageName tests", () => {
     digest: "",
     platform: "",
     group: "docker/library",
-    name: "eclipse-temurin"
+    name: "eclipse-temurin",
   });
   expect(
     parseImageName(
-      "--platform=linux/amd64 foocorp.jfrog.io/docker/library/eclipse-temurin:latest"
-    )
+      "--platform=linux/amd64 foocorp.jfrog.io/docker/library/eclipse-temurin:latest",
+    ),
   ).toEqual({
     registry: "foocorp.jfrog.io",
     repo: "docker/library/eclipse-temurin",
@@ -96,12 +96,12 @@ test("parseImageName tests", () => {
     digest: "",
     platform: "linux/amd64",
     group: "docker/library",
-    name: "eclipse-temurin"
+    name: "eclipse-temurin",
   });
   expect(
     parseImageName(
-      "quay.io/shiftleft/scan-java@sha256:5d008306a7c5d09ba0161a3408fa3839dc2c9dd991ffb68adecc1040399fe9e1"
-    )
+      "quay.io/shiftleft/scan-java@sha256:5d008306a7c5d09ba0161a3408fa3839dc2c9dd991ffb68adecc1040399fe9e1",
+    ),
   ).toEqual({
     registry: "quay.io",
     repo: "shiftleft/scan-java",
@@ -109,7 +109,7 @@ test("parseImageName tests", () => {
     digest: "5d008306a7c5d09ba0161a3408fa3839dc2c9dd991ffb68adecc1040399fe9e1",
     platform: "",
     group: "shiftleft",
-    name: "scan-java"
+    name: "scan-java",
   });
 }, 120000);
 
@@ -147,14 +147,14 @@ describe("addSkippedSrcFiles tests", () => {
         properties: [
           {
             name: "SrcFile",
-            value: "/some/project/Dockerfile"
+            value: "/some/project/Dockerfile",
           },
           {
             name: "oci:SrcImage",
-            value: "node:20"
-          }
-        ]
-      }
+            value: "node:20",
+          },
+        ],
+      },
     ];
   });
 
@@ -163,10 +163,10 @@ describe("addSkippedSrcFiles tests", () => {
       [
         {
           image: "node:18",
-          src: "/some/project/bitbucket-pipeline.yml"
-        }
+          src: "/some/project/bitbucket-pipeline.yml",
+        },
       ],
-      testComponents
+      testComponents,
     );
 
     expect(testComponents[0].properties).toHaveLength(2);
@@ -177,10 +177,10 @@ describe("addSkippedSrcFiles tests", () => {
       [
         {
           image: "node:20",
-          src: "/some/project/bitbucket-pipeline.yml"
-        }
+          src: "/some/project/bitbucket-pipeline.yml",
+        },
       ],
-      testComponents
+      testComponents,
     );
 
     expect(testComponents[0].properties).toHaveLength(3);
@@ -191,10 +191,10 @@ describe("addSkippedSrcFiles tests", () => {
       [
         {
           image: "node:20",
-          src: "/some/project/Dockerfile"
-        }
+          src: "/some/project/Dockerfile",
+        },
       ],
-      testComponents
+      testComponents,
     );
 
     expect(testComponents[0].properties).toHaveLength(2);

package/envcontext.js

@@ -1,4 +1,6 @@
+import { Buffer } from "node:buffer";
 import { spawnSync } from "node:child_process";
+import process from "node:process";
 import {
   CARGO_CMD,
   DOTNET_CMD,
@@ -9,10 +11,8 @@ import {
   NPM_CMD,
   PYTHON_CMD,
   RUSTC_CMD,
-  isWin
+  isWin,
 } from "./utils.js";
-import process from "node:process";
-import { Buffer } from "node:buffer";
 
 const GIT_COMMAND = process.env.GIT_CMD || "git";
 
@@ -87,7 +87,7 @@ export const listFiles = (dir) => {
     "-l",
     "-r",
     "--full-tree",
-    "HEAD"
+    "HEAD",
   ]);
   if (output) {
     output.split("\n").forEach((l) => {
@@ -101,7 +101,7 @@ export const listFiles = (dir) => {
         filesList.push({
           hash: tmpA[2],
           name: lastParts[lastParts.length - 1],
-          ref: `gitoid:blob:sha1:${tmpA[2]}`
+          ref: `gitoid:blob:sha1:${tmpA[2]}`,
         });
       }
     });
@@ -139,9 +139,9 @@ export const collectJavaInfo = (dir) => {
       properties: [
         {
           name: "java:modules",
-          value: moduleDesc.replaceAll("\n", ", ")
-        }
-      ]
+          value: moduleDesc.replaceAll("\n", ", "),
+        },
+      ],
     };
   }
   return undefined;
@@ -162,7 +162,7 @@ export const collectDotnetInfo = (dir) => {
       type: "platform",
       name: "dotnet",
       version: versionDesc.trim(),
-      description: moduleDesc.replaceAll("\n", "\\n")
+      description: moduleDesc.replaceAll("\n", "\\n"),
     };
   }
   return undefined;
@@ -183,7 +183,7 @@ export const collectPythonInfo = (dir) => {
       type: "platform",
       name: "python",
       version: versionDesc.replace("Python ", ""),
-      description: moduleDesc.replaceAll("\n", "\\n")
+      description: moduleDesc.replaceAll("\n", "\\n"),
     };
   }
   return undefined;
@@ -206,7 +206,7 @@ export const collectNodeInfo = (dir) => {
       type: "platform",
       name: "node",
       version: versionDesc.trim(),
-      description: moduleDesc
+      description: moduleDesc,
     };
   }
   return undefined;
@@ -226,7 +226,7 @@ export const collectGccInfo = (dir) => {
       type: "platform",
       name: "gcc",
       version: versionDesc.split("\n")[0],
-      description: moduleDesc.replaceAll("\n", "\\n")
+      description: moduleDesc.replaceAll("\n", "\\n"),
     };
   }
   return undefined;
@@ -246,7 +246,7 @@ export const collectRustInfo = (dir) => {
       type: "platform",
       name: "rustc",
       version: versionDesc.trim(),
-      description: moduleDesc.trim()
+      description: moduleDesc.trim(),
     };
   }
   return undefined;
@@ -264,7 +264,7 @@ export const collectGoInfo = (dir) => {
     return {
       type: "platform",
       name: "go",
-      version: versionDesc.trim()
+      version: versionDesc.trim(),
     };
   }
   return undefined;
@@ -315,7 +315,7 @@ const getCommandOutput = (cmd, dir, args) => {
   const result = spawnSync(cmd, args, {
     cwd: dir,
     encoding: "utf-8",
-    shell: isWin
+    shell: isWin,
   });
   if (result.status !== 0 || result.error) {
     return undefined;

package/envcontext.test.js

@@ -10,7 +10,7 @@ import {
   collectRustInfo,
   getBranch,
   getOriginUrl,
-  listFiles
+  listFiles,
 } from "./envcontext.js";
 
 test("git tests", () => {