@soos-io/soos-sbom 1.0.17 → 1.1.0-pre.2

package/bin/index.js

@@ -20,31 +20,21 @@ class SOOSSBOMAnalysis {
     }
     static parseArgs() {
         const analysisArgumentParser = AnalysisArgumentParser_1.default.create(api_client_1.IntegrationName.SoosSbom, api_client_1.IntegrationType.Script, api_client_1.ScanType.SBOM, package_json_1.version);
-        analysisArgumentParser.addBaseScanArguments();
-        analysisArgumentParser.argumentParser.add_argument("--directoriesToExclude", {
-            help: "Listing of directories or patterns to exclude from the search for SBOM files. eg: **bin/start/**, **/start/**",
-            type: (value) => {
+        analysisArgumentParser.addArgument("directoriesToExclude", "Listing of directories or patterns to exclude from the search for SBOM files. eg: **bin/start/**, **/start/**", {
+            argParser: (value) => {
                 return (0, utilities_2.removeDuplicates)(value.split(",").map((pattern) => pattern.trim()));
             },
-            default: constants_1.SOOS_SBOM_CONSTANTS.DefaultDirectoriesToExclude,
-            required: false,
+            defaultValue: constants_1.SOOS_SBOM_CONSTANTS.DefaultDirectoriesToExclude,
         });
-        analysisArgumentParser.argumentParser.add_argument("--filesToExclude", {
-            help: "Listing of files or patterns patterns to exclude from the search for SBOM files. eg: **/int**.cdx.json/, **/internal.cdx.json",
-            type: (value) => {
-                return value.split(",").map((pattern) => pattern.trim());
+        analysisArgumentParser.addArgument("filesToExclude", "Listing of files or patterns patterns to exclude from the search for SBOM files. eg: **/int**.cdx.json/, **/internal.cdx.json", {
+            argParser: (value) => {
+                return (0, utilities_2.removeDuplicates)(value.split(",").map((pattern) => pattern.trim()));
             },
-            required: false,
-        });
-        analysisArgumentParser.argumentParser.add_argument("sbomPath", {
-            help: "The SBOM file or folder to scan. When a folder is specified all SBOMs found in the folder and sub-folders will be scanned.",
         });
-        analysisArgumentParser.argumentParser.add_argument("--outputDirectory", {
-            help: "Absolute path where SOOS will write exported reports and SBOMs. eg Correct: /out/sbom/ | Incorrect: ./out/sbom/",
-            default: process.cwd(),
-            required: false,
+        analysisArgumentParser.addArgument("sbomPath", "The SBOM file or folder to scan. When a folder is specified all SBOMs found in the folder and sub-folders will be scanned.", { useNoOptionKey: true });
+        analysisArgumentParser.addArgument("outputDirectory", "Absolute path where SOOS will write exported reports and SBOMs. eg Correct: /out/sbom/ | Incorrect: ./out/sbom/", {
+            defaultValue: process.cwd(),
         });
-        api_client_1.soosLogger.info("Parsing arguments");
         return analysisArgumentParser.parseArguments();
     }
     async runAnalysis() {
@@ -128,8 +118,8 @@ class SOOSSBOMAnalysis {
                 scanType,
             });
             if ((0, utilities_1.isScanDone)(scanStatus) &&
-                this.args.exportFormat !== undefined &&
-                this.args.exportFileType !== undefined) {
+                this.args.exportFormat !== api_client_1.AttributionFormatEnum.Unknown &&
+                this.args.exportFileType !== api_client_1.AttributionFileTypeEnum.Unknown) {
                 await soosAnalysisService.generateFormattedOutput({
                     clientId: this.args.clientId,
                     projectHash: result.projectHash,
@@ -191,12 +181,10 @@ class SOOSSBOMAnalysis {
         return [this.args.sbomPath];
     }
     static async createAndRun() {
-        api_client_1.soosLogger.info("Starting SOOS SBOM Analysis");
-        api_client_1.soosLogger.logLineSeparator();
         try {
             const args = this.parseArgs();
             api_client_1.soosLogger.setMinLogLevel(args.logLevel);
-            api_client_1.soosLogger.info("Configuration read");
+            api_client_1.soosLogger.info("Starting SOOS SBOM Analysis");
             api_client_1.soosLogger.debug(JSON.stringify((0, utilities_1.obfuscateProperties)(args, ["apiKey"]), null, 2));
             api_client_1.soosLogger.logLineSeparator();
             const soosSBOMAnalysis = new SOOSSBOMAnalysis(args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soos-io/soos-sbom",
-  "version": "1.0.17",
+  "version": "1.1.0-pre.2",
   "description": "Upload your Software Bill of Materials (SBOM) to SOOS for vulnerability analysis, license matching and more. Register for a free trial today at https://app.soos.io/register",
   "main": "bin/index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "setup:update": "npx npm-check -u",
     "setup:clean": "npx rimraf node_modules && npx rimraf package-lock.json",
     "build": "tsc",
-    "build:clean": "npx rimraf build",
+    "build:clean": "npx rimraf bin",
     "format": "prettier ./src --check",
     "format:fix": "prettier ./src --write",
     "lint": "eslint --max-warnings 0",
@@ -42,21 +42,19 @@
   },
   "homepage": "https://github.com/soos-io/soos-sbom#readme",
   "dependencies": {
-    "@soos-io/api-client": "1.2.4",
-    "argparse": "^2.0.1",
+    "@soos-io/api-client": "1.3.1",
     "glob": "^11.0.1",
     "tslib": "^2.6.3"
   },
   "devDependencies": {
     "@eslint/js": "^9.21.0",
-    "@types/argparse": "^2.0.16",
     "@types/node": "^20.17.19",
     "eslint": "^9.21.0",
     "globals": "^16.0.0",
-    "knip": "^5.44.1",
+    "knip": "^5.46.0",
     "prettier": "^3.5.1",
     "typescript": "^5.7.3",
-    "typescript-eslint": "^8.24.1"
+    "typescript-eslint": "^8.27.0"
   },
   "bin": {
     "soos-sbom": "bin/index.js"