@cyclonedx/cdxgen 10.4.0 → 10.4.2

package/analyzer.js

@@ -72,9 +72,7 @@ const getAllFiles = (deep, dir, extn, files, result, regex) => {
           result,
           regex,
         );
-      } catch (error) {
-        continue;
-      }
+      } catch (error) {}
     } else {
       if (regex.test(file)) {
         result.push(file);
@@ -143,8 +141,8 @@ const setFileRef = (
     exportedModules,
     isExternal: true,
     fileName: fileRelativeLoc,
-    lineNumber: sourceLoc && sourceLoc.line ? sourceLoc.line : undefined,
-    columnNumber: sourceLoc && sourceLoc.column ? sourceLoc.column : undefined,
+    lineNumber: sourceLoc?.line ? sourceLoc.line : undefined,
+    columnNumber: sourceLoc?.column ? sourceLoc.column : undefined,
   };
   // replace relative imports with full path
   let moduleFullPath = pathway;
@@ -169,7 +167,7 @@ const setFileRef = (
     allImports[modPkg] = allImports[modPkg] || new Set();
     allImports[modPkg].add(occurrence);
   }
-  if (exportedModules && exportedModules.length) {
+  if (exportedModules?.length) {
     moduleFullPath = moduleFullPath
       .replace("node_modules/", "")
       .replace("dist/", "")
@@ -194,7 +192,7 @@ const fileToParseableCode = (file) => {
       .replace(vueCommentRegex, (match) => match.replaceAll(/\S/g, " "))
       .replace(
         vueCleaningRegex,
-        (match) => match.replaceAll(/\S/g, " ").substring(1) + ";",
+        (match) => `${match.replaceAll(/\S/g, " ").substring(1)};`,
       )
       .replace(
         vueBindRegex,
@@ -203,7 +201,7 @@ const fileToParseableCode = (file) => {
       )
       .replace(
         vuePropRegex,
-        (match, grA, grB) => " " + grA.replace(/[.:@]/g, " ") + grB,
+        (match, grA, grB) => ` ${grA.replace(/[.:@]/g, " ")}${grB}`,
       )
       .replace(
         vueTemplateRegex,
@@ -222,7 +220,7 @@ const parseFileASTTree = (src, file, allImports, allExports) => {
   const ast = parse(fileToParseableCode(file), babelParserOptions);
   traverse.default(ast, {
     ImportDeclaration: (path) => {
-      if (path && path.node) {
+      if (path?.node) {
         setFileRef(
           allImports,
           allExports,
@@ -236,8 +234,7 @@ const parseFileASTTree = (src, file, allImports, allExports) => {
     // For require('') statements
     Identifier: (path) => {
       if (
-        path &&
-        path.node &&
+        path?.node &&
         path.node.name === "require" &&
         path.parent.type === "CallExpression"
       ) {
@@ -246,7 +243,7 @@ const parseFileASTTree = (src, file, allImports, allExports) => {
     },
     // Use for dynamic imports like routes.jsx
     CallExpression: (path) => {
-      if (path && path.node && path.node.callee.type === "Import") {
+      if (path?.node && path.node.callee.type === "Import") {
         setFileRef(allImports, allExports, src, file, path.node.arguments[0]);
       }
     },
@@ -256,7 +253,7 @@ const parseFileASTTree = (src, file, allImports, allExports) => {
     },
     ExportNamedDeclaration: (path) => {
       // ensure there is a path export
-      if (path && path.node && path.node.source) {
+      if (path?.node?.source) {
         setFileRef(
           allImports,
           allExports,

package/bin/cdxgen.js

@@ -591,7 +591,7 @@ const checkPermissions = (filePath) => {
     }
     // bom ns mapping
     if (bomNSData.nsMapping && Object.keys(bomNSData.nsMapping).length) {
-      const nsFile = jsonFile + ".map";
+      const nsFile = `${jsonFile}.map`;
       fs.writeFileSync(nsFile, JSON.stringify(bomNSData.nsMapping));
     }
   } else if (!options.print) {
@@ -646,6 +646,7 @@ const checkPermissions = (filePath) => {
     }
   }
   // Automatically submit the bom data
+  // biome-ignore lint/suspicious/noDoubleEquals: yargs passes true for empty values
   if (options.serverUrl && options.serverUrl != true && options.apiKey) {
     try {
       const dbody = await submitBom(options, bomNSData.bomJson);

package/bin/repl.js

@@ -58,7 +58,7 @@ if (!process.env.CDXGEN_REPL_HISTORY && !fs.existsSync(historyConfigDir)) {
 }
 
 export const importSbom = (sbomOrPath) => {
-  if (sbomOrPath && sbomOrPath.endsWith(".json") && fs.existsSync(sbomOrPath)) {
+  if (sbomOrPath?.endsWith(".json") && fs.existsSync(sbomOrPath)) {
     try {
       sbom = JSON.parse(fs.readFileSync(sbomOrPath, "utf-8"));
       console.log(`✅ SBOM imported successfully from ${sbomOrPath}`);
@@ -298,12 +298,12 @@ cdxgenRepl.defineCommand("update", {
         return;
       }
       if (!updateSpec.startsWith("|")) {
-        updateSpec = "|" + updateSpec;
+        updateSpec = `|${updateSpec}`;
       }
       if (!updateSpec.endsWith("|")) {
-        updateSpec = updateSpec + "|";
+        updateSpec = `${updateSpec}|`;
       }
-      updateSpec = "$ ~> " + updateSpec;
+      updateSpec = `$ ~> ${updateSpec}`;
       const expression = jsonata(updateSpec);
       const newSbom = await expression.evaluate(sbom);
       if (newSbom && newSbom.components.length <= sbom.components.length) {

package/bin/verify.js

@@ -61,10 +61,9 @@ for (const comp of bomJson.components) {
 if (hasInvalidComp) {
   process.exit(1);
 }
-const bomSignature =
-  bomJson.signature && bomJson.signature.value
-    ? bomJson.signature.value
-    : undefined;
+const bomSignature = bomJson.signature?.value
+  ? bomJson.signature.value
+  : undefined;
 if (!bomSignature) {
   console.log("No signature was found!");
 } else {

package/binary.js

@@ -83,7 +83,7 @@ if (
       dirName,
       "node_modules",
       "@cyclonedx",
-      "cdxgen-plugins-bin" + pluginsBinSuffix,
+      `cdxgen-plugins-bin${pluginsBinSuffix}`,
       "plugins",
     ),
   ) &&
@@ -92,7 +92,7 @@ if (
       dirName,
       "node_modules",
       "@cyclonedx",
-      "cdxgen-plugins-bin" + pluginsBinSuffix,
+      `cdxgen-plugins-bin${pluginsBinSuffix}`,
       "plugins",
       "goversion",
     ),
@@ -102,7 +102,7 @@ if (
     dirName,
     "node_modules",
     "@cyclonedx",
-    "cdxgen-plugins-bin" + pluginsBinSuffix,
+    `cdxgen-plugins-bin${pluginsBinSuffix}`,
     "plugins",
   );
 }
@@ -120,7 +120,7 @@ if (!CDXGEN_PLUGINS_DIR) {
     if (result) {
       const stdout = result.stdout;
       if (stdout) {
-        globalNodePath = Buffer.from(stdout).toString().trim() + "/";
+        globalNodePath = `${Buffer.from(stdout).toString().trim()}/`;
       }
     }
   }
@@ -128,7 +128,7 @@ if (!CDXGEN_PLUGINS_DIR) {
     const globalPlugins = join(
       globalNodePath,
       "@cyclonedx",
-      "cdxgen-plugins-bin" + pluginsBinSuffix,
+      `cdxgen-plugins-bin${pluginsBinSuffix}`,
       "plugins",
     );
     if (existsSync(globalPlugins)) {
@@ -153,7 +153,7 @@ if (existsSync(join(CDXGEN_PLUGINS_DIR, "goversion"))) {
   GOVERSION_BIN = join(
     CDXGEN_PLUGINS_DIR,
     "goversion",
-    "goversion-" + platform + "-" + arch + extn,
+    `goversion-${platform}-${arch}${extn}`,
   );
 }
 let TRIVY_BIN = null;
@@ -161,7 +161,7 @@ if (existsSync(join(CDXGEN_PLUGINS_DIR, "trivy"))) {
   TRIVY_BIN = join(
     CDXGEN_PLUGINS_DIR,
     "trivy",
-    "trivy-cdxgen-" + platform + "-" + arch + extn,
+    `trivy-cdxgen-${platform}-${arch}${extn}`,
   );
 } else if (process.env.TRIVY_CMD) {
   TRIVY_BIN = process.env.TRIVY_CMD;
@@ -171,7 +171,7 @@ if (existsSync(join(CDXGEN_PLUGINS_DIR, "cargo-auditable"))) {
   CARGO_AUDITABLE_BIN = join(
     CDXGEN_PLUGINS_DIR,
     "cargo-auditable",
-    "cargo-auditable-cdxgen-" + platform + "-" + arch + extn,
+    `cargo-auditable-cdxgen-${platform}-${arch}${extn}`,
   );
 } else if (process.env.CARGO_AUDITABLE_CMD) {
   CARGO_AUDITABLE_BIN = process.env.CARGO_AUDITABLE_CMD;
@@ -181,7 +181,7 @@ if (existsSync(join(CDXGEN_PLUGINS_DIR, "osquery"))) {
   OSQUERY_BIN = join(
     CDXGEN_PLUGINS_DIR,
     "osquery",
-    "osqueryi-" + platform + "-" + arch + extn,
+    `osqueryi-${platform}-${arch}${extn}`,
   );
   // osqueryi-darwin-amd64.app/Contents/MacOS/osqueryd
   if (platform === "darwin") {
@@ -199,7 +199,7 @@ if (existsSync(join(CDXGEN_PLUGINS_DIR, "dosai"))) {
   DOSAI_BIN = join(
     CDXGEN_PLUGINS_DIR,
     "dosai",
-    "dosai-" + platformToUse + "-" + arch + extn,
+    `dosai-${platformToUse}-${arch}${extn}`,
   );
 } else if (process.env.DOSAI_CMD) {
   DOSAI_BIN = process.env.DOSAI_CMD;
@@ -389,7 +389,7 @@ export function getOSPackages(src) {
         // ignore errors
       }
       // Clean up
-      if (tempDir && tempDir.startsWith(tmpdir())) {
+      if (tempDir?.startsWith(tmpdir())) {
         if (DEBUG_MODE) {
           console.log(`Cleaning up ${tempDir}`);
         }
@@ -451,13 +451,13 @@ export function getOSPackages(src) {
           break;
       }
       if (osReleaseData["VERSION_ID"]) {
-        distro_id = distro_id + "-" + osReleaseData["VERSION_ID"];
+        distro_id = `${distro_id}-${osReleaseData["VERSION_ID"]}`;
       }
       const tmpDependencies = {};
       (tmpBom.dependencies || []).forEach((d) => {
         tmpDependencies[d.ref] = d.dependsOn;
       });
-      if (tmpBom && tmpBom.components) {
+      if (tmpBom?.components) {
         for (const comp of tmpBom.components) {
           if (comp.purl) {
             // Retain go components alone from trivy
@@ -497,10 +497,10 @@ export function getOSPackages(src) {
                   purlObj.namespace = group;
                 }
                 purlObj.qualifiers = purlObj.qualifiers || {};
-                if (distro_id && distro_id.length) {
+                if (distro_id?.length) {
                   purlObj.qualifiers["distro"] = distro_id;
                 }
-                if (distro_codename && distro_codename.length) {
+                if (distro_codename?.length) {
                   purlObj.qualifiers["distro_name"] = distro_codename;
                 }
                 // Bug fix for mageia and oracle linux
@@ -509,7 +509,7 @@ export function getOSPackages(src) {
                   purlObj["type"] = purl_type;
                   purlObj["namespace"] = "";
                   comp.group = "";
-                  if (comp.purl && comp.purl.includes(".mga")) {
+                  if (comp.purl?.includes(".mga")) {
                     purlObj["namespace"] = "mageia";
                     comp.group = "mageia";
                     purlObj.qualifiers["distro"] = "mageia";
@@ -529,7 +529,7 @@ export function getOSPackages(src) {
                   allTypes.add(purlObj.type);
                 }
                 // Prefix distro codename for ubuntu
-                if (purlObj.qualifiers && purlObj.qualifiers.distro) {
+                if (purlObj.qualifiers?.distro) {
                   allTypes.add(purlObj.qualifiers.distro);
                   if (OS_DISTRO_ALIAS[purlObj.qualifiers.distro]) {
                     distro_codename =
@@ -537,7 +537,7 @@ export function getOSPackages(src) {
                   } else if (group === "alpine") {
                     const dtmpA = purlObj.qualifiers.distro.split(".");
                     if (dtmpA && dtmpA.length > 2) {
-                      distro_codename = dtmpA[0] + "." + dtmpA[1];
+                      distro_codename = `${dtmpA[0]}.${dtmpA[1]}`;
                     }
                   } else if (group === "photon") {
                     const dtmpA = purlObj.qualifiers.distro.split("-");
@@ -699,7 +699,7 @@ const retrieveDependencies = (tmpDependencies, origBomRef, comp) => {
 export function executeOsQuery(query) {
   if (OSQUERY_BIN) {
     if (!query.endsWith(";")) {
-      query = query + ";";
+      query = `${query};`;
     }
     const args = ["--json", query];
     // On darwin, we need to disable the safety check and run cdxgen with sudo

package/cbomutils.js

@@ -26,10 +26,10 @@ export function collectOSCryptoLibs(options) {
       results,
       false,
     );
-    if (dlist && dlist.length) {
+    if (dlist?.length) {
       osPkgsList = osPkgsList.concat(dlist);
       // Should we downgrade from cryptographic-asset to data for < 1.6 spec
-      if (options && options.specVersion && options.specVersion < 1.6) {
+      if (options?.specVersion && options.specVersion < 1.6) {
         for (const apkg of osPkgsList) {
           if (apkg.type === "cryptographic-asset") {
             apkg.type = "data";

package/display.js

@@ -17,8 +17,7 @@ export const printTable = (bomJson) => {
     return;
   }
   if (
-    bomJson.metadata &&
-    bomJson.metadata.component &&
+    bomJson.metadata?.component &&
     ["operating-system", "platform"].includes(bomJson.metadata.component.type)
   ) {
     return printOSTable(bomJson);
@@ -109,7 +108,7 @@ const locationComparator = (a, b) => {
     const tmpA = a.split("#");
     const tmpB = b.split("#");
     if (tmpA.length === 2 && tmpB.length === 2) {
-      if (tmpA[0] == tmpB[0]) {
+      if (tmpA[0] === tmpB[0]) {
         return tmpA[1] - tmpB[1];
       }
     }
@@ -162,7 +161,7 @@ export const printCallStack = (bomJson) => {
     const frames = Array.from(
       new Set(
         comp.evidence.callstack.frames.map(
-          (c) => `${c.fullFilename}${c.line ? "#" + c.line : ""}`,
+          (c) => `${c.fullFilename}${c.line ? `#${c.line}` : ""}`,
         ),
       ),
     ).sort(locationComparator);
@@ -199,7 +198,7 @@ export const printDependencyTree = (bomJson) => {
   }
   const depMap = {};
   for (const d of dependencies) {
-    if (d.dependsOn && d.dependsOn.length) {
+    if (d.dependsOn?.length) {
       depMap[d.ref] = d.dependsOn.sort();
     }
   }
@@ -261,7 +260,7 @@ const recursePrint = (depMap, subtree, level, shownList, treeGraphics) => {
       level > 0
     ) {
       treeGraphics.push(
-        `${levelPrefix(level, i == listToUse.length - 1)}${refStr}`,
+        `${levelPrefix(level, i === listToUse.length - 1)}${refStr}`,
       );
       shownList.push(refStr.toLowerCase());
       if (l && depMap[refStr]) {
@@ -299,7 +298,7 @@ export const printReachables = (sliceArtefacts) => {
   );
   const data = [["Package URL", "Reachable Flows"]];
   for (const apurl of Object.keys(sortedPurls)) {
-    data.push([apurl, "" + sortedPurls[apurl]]);
+    data.push([apurl, `${sortedPurls[apurl]}`]);
   }
   const config = {
     header: {

package/docker.js

@@ -59,7 +59,7 @@ const registry_auth_keys = {};
  */
 export const getDirs = (dirPath, dirName, hidden = false, recurse = true) => {
   try {
-    return globSync(recurse ? "**/" : "" + dirName, {
+    return globSync(recurse ? "**/" : `${dirName}`, {
       cwd: dirPath,
       absolute: true,
       nocase: true,
@@ -181,7 +181,8 @@ const getDefaultOptions = (forRegistry) => {
               };
               authTokenSet = true;
               break;
-            } else if (configJson.credsStore) {
+            }
+            if (configJson.credsStore) {
               const helperAuthToken = getCredsFromHelper(
                 configJson.credsStore,
                 serverAddress,
@@ -222,7 +223,7 @@ const getDefaultOptions = (forRegistry) => {
     }
   }
   const userInfo = _userInfo();
-  opts.podmanPrefixUrl = isWin ? "" : `http://unix:/run/podman/podman.sock:`;
+  opts.podmanPrefixUrl = isWin ? "" : "http://unix:/run/podman/podman.sock:";
   opts.podmanRootlessPrefixUrl = isWin
     ? ""
     : `http://unix:/run/user/${userInfo.uid}/podman/podman.sock:`;
@@ -288,7 +289,8 @@ const getDefaultOptions = (forRegistry) => {
 export const getConnection = async (options, forRegistry) => {
   if (isContainerd) {
     return undefined;
-  } else if (!dockerConn) {
+  }
+  if (!dockerConn) {
     const defaultOptions = getDefaultOptions(forRegistry);
     const opts = Object.assign(
       {},
@@ -381,7 +383,7 @@ export const getConnection = async (options, forRegistry) => {
   return dockerConn;
 };
 
-export const makeRequest = async (path, method = "GET", forRegistry) => {
+export const makeRequest = async (path, method, forRegistry) => {
   const client = await getConnection({}, forRegistry);
   if (!client) {
     return undefined;
@@ -451,7 +453,7 @@ export const parseImageName = (fullImageName) => {
       tmpA[0].includes(":")
     ) {
       nameObj.registry = tmpA[0];
-      fullImageName = fullImageName.replace(tmpA[0] + "/", "");
+      fullImageName = fullImageName.replace(`${tmpA[0]}/`, "");
     }
   }
 
@@ -460,7 +462,7 @@ export const parseImageName = (fullImageName) => {
     const tmpA = fullImageName.split("@sha256:");
     if (tmpA.length > 1) {
       nameObj.digest = tmpA[tmpA.length - 1];
-      fullImageName = fullImageName.replace("@sha256:" + nameObj.digest, "");
+      fullImageName = fullImageName.replace(`@sha256:${nameObj.digest}`, "");
     }
   }
 
@@ -469,7 +471,7 @@ export const parseImageName = (fullImageName) => {
     const tmpA = fullImageName.split(":");
     if (tmpA.length > 1) {
       nameObj.tag = tmpA[tmpA.length - 1];
-      fullImageName = fullImageName.replace(":" + nameObj.tag, "");
+      fullImageName = fullImageName.replace(`:${nameObj.tag}`, "");
     }
   }
 
@@ -482,7 +484,7 @@ export const parseImageName = (fullImageName) => {
     const tmpA = fullImageName.split("/");
     if (tmpA.length > 1) {
       nameObj.name = tmpA[tmpA.length - 1];
-      nameObj.group = fullImageName.replace("/" + tmpA[tmpA.length - 1], "");
+      nameObj.group = fullImageName.replace(`/${tmpA[tmpA.length - 1]}`, "");
     }
   }
 
@@ -516,7 +518,7 @@ export const getImage = async (fullImageName) => {
       : `${repo}:${tag !== "" ? tag : ":latest"}`;
   // Fetch only the latest tag if none is specified
   if (tag === "" && digest === "") {
-    fullImageName = fullImageName + ":latest";
+    fullImageName = `${fullImageName}:latest`;
   }
   if (isContainerd) {
     console.log(
@@ -530,14 +532,11 @@ export const getImage = async (fullImageName) => {
       encoding: "utf-8",
     });
     if (result.status !== 0 || result.error) {
-      if (
-        result.stderr &&
-        result.stderr.includes("docker daemon is not running")
-      ) {
+      if (result.stderr?.includes("docker daemon is not running")) {
         console.log(
           "Ensure Docker for Desktop is running as an administrator with 'Exposing daemon on TCP without TLS' setting turned on.",
         );
-      } else if (result.stderr && result.stderr.includes("not found")) {
+      } else if (result.stderr?.includes("not found")) {
         console.log(
           "Set the environment variable DOCKER_CMD to use an alternative command such as nerdctl or podman.",
         );
@@ -545,29 +544,26 @@ export const getImage = async (fullImageName) => {
         console.log(result.stderr);
       }
       return localData;
-    } else {
-      result = spawnSync(dockerCmd, ["inspect", fullImageName], {
-        encoding: "utf-8",
-      });
-      if (result.status !== 0 || result.error) {
-        console.log(result.stderr);
-        return localData;
-      } else {
-        try {
-          const stdout = result.stdout;
-          if (stdout) {
-            const inspectData = JSON.parse(Buffer.from(stdout).toString());
-            if (inspectData && Array.isArray(inspectData)) {
-              return inspectData[0];
-            } else {
-              return inspectData;
-            }
-          }
-        } catch (err) {
-          // continue regardless of error
-          console.log(err);
+    }
+    result = spawnSync(dockerCmd, ["inspect", fullImageName], {
+      encoding: "utf-8",
+    });
+    if (result.status !== 0 || result.error) {
+      console.log(result.stderr);
+      return localData;
+    }
+    try {
+      const stdout = result.stdout;
+      if (stdout) {
+        const inspectData = JSON.parse(Buffer.from(stdout).toString());
+        if (inspectData && Array.isArray(inspectData)) {
+          return inspectData[0];
         }
+        return inspectData;
       }
+    } catch (err) {
+      // continue regardless of error
+      console.log(err);
     }
   }
   try {
@@ -792,7 +788,8 @@ export const exportArchive = async (fullImageName) => {
       };
       exportData.pkgPathList = getPkgPathList(exportData, lastWorkingDir);
       return exportData;
-    } else if (existsSync(manifestFile)) {
+    }
+    if (existsSync(manifestFile)) {
       // docker manifest file
       return await extractFromManifest(
         manifestFile,
@@ -800,9 +797,8 @@ export const exportArchive = async (fullImageName) => {
         tempDir,
         allLayersExplodedDir,
       );
-    } else {
-      console.log(`Unable to extract image archive to ${tempDir}`);
     }
+    console.log(`Unable to extract image archive to ${tempDir}`);
   } catch (err) {
     console.log(err);
   }
@@ -842,7 +838,7 @@ export const extractFromManifest = async (
     const layers = manifest[manifest.length - 1]["Layers"] || [];
     if (!layers.length && existsSync(tempDir)) {
       const blobFiles = readdirSync(join(tempDir, "blobs", "sha256"));
-      if (blobFiles && blobFiles.length) {
+      if (blobFiles?.length) {
         for (const blobf of blobFiles) {
           layers.push(join("blobs", "sha256", blobf));
         }
@@ -892,10 +888,9 @@ export const extractFromManifest = async (
             encoding: "utf-8",
           }),
         );
-        lastWorkingDir =
-          lastLayerConfig.config && lastLayerConfig.config.WorkingDir
-            ? join(allLayersExplodedDir, lastLayerConfig.config.WorkingDir)
-            : "";
+        lastWorkingDir = lastLayerConfig.config?.WorkingDir
+          ? join(allLayersExplodedDir, lastLayerConfig.config.WorkingDir)
+          : "";
       } catch (err) {
         console.log(err);
       }
@@ -926,7 +921,7 @@ export const exportImage = async (fullImageName) => {
   const { registry, tag, digest } = parseImageName(fullImageName);
   // Fetch only the latest tag if none is specified
   if (tag === "" && digest === "") {
-    fullImageName = fullImageName + ":latest";
+    fullImageName = `${fullImageName}:latest`;
   }
   const tempDir = mkdtempSync(join(tmpdir(), "docker-images-"));
   const allLayersExplodedDir = join(tempDir, "all-layers");
@@ -951,20 +946,19 @@ export const exportImage = async (fullImageName) => {
         console.log(result.stdout, result.stderr);
       }
       return localData;
-    } else {
-      await extractTar(imageTarFile, tempDir);
-      if (DEBUG_MODE) {
-        console.log(`Cleaning up ${imageTarFile}`);
-      }
-      if (rmSync) {
-        rmSync(imageTarFile, { force: true });
-      }
+    }
+    await extractTar(imageTarFile, tempDir);
+    if (DEBUG_MODE) {
+      console.log(`Cleaning up ${imageTarFile}`);
+    }
+    if (rmSync) {
+      rmSync(imageTarFile, { force: true });
     }
   } else {
     const client = await getConnection({}, registry);
     try {
       if (DEBUG_MODE) {
-        if (registry && registry.trim().length) {
+        if (registry?.trim().length) {
           console.log(
             `About to export image ${fullImageName} from ${registry} to ${tempDir}`,
           );
@@ -986,7 +980,7 @@ export const exportImage = async (fullImageName) => {
         }),
       );
     } catch (err) {
-      if (localData && localData.Id) {
+      if (localData?.Id) {
         console.log(`Retrying with ${localData.Id}`);
         try {
           await stream.pipeline(
@@ -1032,9 +1026,8 @@ export const exportImage = async (fullImageName) => {
       tempDir,
       allLayersExplodedDir,
     );
-  } else {
-    console.log(`Unable to export image to ${tempDir}`);
   }
+  console.log(`Unable to export image to ${tempDir}`);
   return undefined;
 };
 
@@ -1084,10 +1077,10 @@ export const getPkgPathList = (exportData, lastWorkingDir) => {
     knownSysPaths.push(join(allLayersDir, "ProgramData"));
   }
   const pyInstalls = getDirs(allLayersDir, "Python*/", false, false);
-  if (pyInstalls && pyInstalls.length) {
+  if (pyInstalls?.length) {
     for (const pyiPath of pyInstalls) {
       const pyDirs = getOnlyDirs(pyiPath, "site-packages");
-      if (pyDirs && pyDirs.length) {
+      if (pyDirs?.length) {
         pathList = pathList.concat(pyDirs);
       }
     }
@@ -1120,19 +1113,19 @@ export const getPkgPathList = (exportData, lastWorkingDir) => {
   for (const wpath of knownSysPaths) {
     pathList = pathList.concat(wpath);
     const pyDirs = getOnlyDirs(wpath, "site-packages");
-    if (pyDirs && pyDirs.length) {
+    if (pyDirs?.length) {
       pathList = pathList.concat(pyDirs);
     }
     const gemsDirs = getOnlyDirs(wpath, "gems");
-    if (gemsDirs && gemsDirs.length) {
+    if (gemsDirs?.length) {
       pathList = pathList.concat(gemsDirs);
     }
     const cargoDirs = getOnlyDirs(wpath, ".cargo");
-    if (cargoDirs && cargoDirs.length) {
+    if (cargoDirs?.length) {
       pathList = pathList.concat(cargoDirs);
     }
     const composerDirs = getOnlyDirs(wpath, ".composer");
-    if (composerDirs && composerDirs.length) {
+    if (composerDirs?.length) {
       pathList = pathList.concat(composerDirs);
     }
   }
@@ -1156,7 +1149,7 @@ export const getCredsFromHelper = (exeSuffix, serverAddress) => {
   }
   let credHelperExe = `docker-credential-${exeSuffix}`;
   if (isWin) {
-    credHelperExe = credHelperExe + ".exe";
+    credHelperExe = `${credHelperExe}.exe`;
   }
   const result = spawnSync(credHelperExe, ["get"], {
     input: serverAddress,