@cyclonedx/cdxgen 11.7.0 → 11.8.0

package/README.md

@@ -521,7 +521,7 @@ Before raising a PR, please run the following commands.
 
 ```shell
 corepack enable pnpm
-pnpm install --config.strict-dep-builds=true
+pnpm install:frozen
 # Generate types using jsdoc syntax
 pnpm run gen-types
 # Run biomejs formatter and linter with auto fix

package/bin/cdxgen.js

@@ -28,21 +28,18 @@ import {
   ATOM_DB,
   commandsExecuted,
   DEBUG_MODE,
-  dirNameStr,
-  getRuntimeInformation,
   getTmpDir,
   isMac,
   isSecureMode,
   isWin,
   remoteHostsAccessed,
+  retrieveCdxgenVersion,
   safeExistsSync,
 } from "../lib/helpers/utils.js";
 import { validateBom } from "../lib/helpers/validator.js";
 import { postProcess } from "../lib/stages/postgen/postgen.js";
 import { prepareEnv } from "../lib/stages/pregen/pregen.js";
 
-const dirName = dirNameStr;
-
 // Support for config files
 const configPaths = [
   ".cdxgenrc",
@@ -384,7 +381,7 @@ const args = _yargs
   .epilogue("for documentation, visit https://cyclonedx.github.io/cdxgen")
   .config(config)
   .scriptName("cdxgen")
-  .version(version())
+  .version(retrieveCdxgenVersion())
   .alias("v", "version")
   .help(false)
   .option("help", {
@@ -399,23 +396,11 @@ if (process.env?.CDXGEN_NODE_OPTIONS) {
 }
 
 if (args.help) {
-  console.log(`${version()}\n`);
+  console.log(`${retrieveCdxgenVersion()}\n`);
   _yargs.showHelp();
   process.exit(0);
 }
 
-function version() {
-  const packageJsonAsString = fs.readFileSync(
-    join(dirName, "package.json"),
-    "utf-8",
-  );
-  const packageJson = JSON.parse(packageJsonAsString);
-
-  const runtimeInfo = getRuntimeInformation();
-
-  return `\x1b[1mCycloneDX Generator ${packageJson.version}\x1b[0m\nRuntime: ${runtimeInfo.runtime}, Version: ${runtimeInfo.version}`;
-}
-
 if (process.env.GLOBAL_AGENT_HTTP_PROXY || process.env.HTTP_PROXY) {
   // Support standard HTTP_PROXY variable if the user doesn't override the namespace
   if (!process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE) {

package/bin/verify.js

@@ -8,12 +8,14 @@ import jws from "jws";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
-import { dirNameStr } from "../lib/helpers/utils.js";
+import { dirNameStr, retrieveCdxgenVersion } from "../lib/helpers/utils.js";
 import { getBomWithOras } from "../lib/managers/oci.js";
 
 const dirName = dirNameStr;
 
-const args = yargs(hideBin(process.argv))
+const _yargs = yargs(hideBin(process.argv));
+
+const args = _yargs
   .option("input", {
     alias: "i",
     default: "bom.json",
@@ -29,11 +31,21 @@ const args = yargs(hideBin(process.argv))
   .completion("completion", "Generate bash/zsh completion")
   .epilogue("for documentation, visit https://cyclonedx.github.io/cdxgen")
   .scriptName("cdx-verify")
-  .version()
-  .help("h")
-  .alias("h", "help")
+  .version(retrieveCdxgenVersion())
+  .help(false)
+  .option("help", {
+    alias: "h",
+    type: "boolean",
+    description: "Show help",
+  })
   .wrap(Math.min(120, yargs().terminalWidth())).argv;
 
+if (args.help) {
+  console.log(`${retrieveCdxgenVersion()}\n`);
+  _yargs.showHelp();
+  process.exit(0);
+}
+
 if (args.version) {
   const packageJsonAsString = fs.readFileSync(
     join(dirName, "..", "package.json"),