scanoss 0.2.14 → 0.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scanoss",
-  "version": "0.2.14",
+  "version": "0.2.18",
   "description": "The SCANOSS JS package provides a simple, easy to consume module for interacting with SCANOSS APIs/Engine.",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",

package/src/bin/cli-bin.ts

@@ -15,7 +15,7 @@ function CLIErrorHandler(e: Error) {
 
 async function main() {
   program
-    .version("0.2.14")
+    .version("0.2.17")
     .description('The SCANOSS JS package provides a simple, easy to consume module for interacting with SCANOSS APIs/Engine.')
 
   program

package/src/lib/dependencies/Dependency.ts

@@ -4,6 +4,7 @@ import fs from "fs";
 import { IDependencyResponse, IFile, IDependency } from "./DependencyTypes";
 import { FileListDependency } from "./parsers/types";
 import { generateDependenciesPurls } from "./PurlGenerator";
+import { PackageURL } from "packageurl-js";
 
 export class Dependency {
 
@@ -31,16 +32,15 @@ export class Dependency {
   private adapterToDependencyResponse (dependencies: FileListDependency): IDependencyResponse {
     const results = <IDependencyResponse>{files: []};
 
-
-
-
     for (const dependency of dependencies.files){
       let depArr: Array<IDependency> = [];
       for (const purl of dependency.purls) {
+        const pkg = PackageURL.fromString(purl.purl);
+
         depArr.push({
           component: null,
           purl: purl.purl,
-          version: null,
+          version: pkg.version,
           licenses: [{name: null}]
         });
       }

package/src/lib/dependencies/parsers/mavenParser.ts

@@ -11,7 +11,7 @@ const PURL_TYPE = 'maven';
 // and https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html
 const MANIFEST_FILE = 'pom.xml';
 export function pomParser(fileContent: string, filePath: string): FileDependency {
-    
+
     // If the file is not a python manifest file, return an empty results
     const results: FileDependency = {file: filePath, purls: []};
     if(path.basename(filePath) != MANIFEST_FILE)
@@ -19,30 +19,40 @@ export function pomParser(fileContent: string, filePath: string): FileDependency
 
     const dependencies = fileContent.match(/<dependency>((?:.|\n)*?)<\/dependency>/gm);
     if(dependencies) {
-        // TODO: classifier are not supported yet
-        dependencies.forEach(dependency => {
-            // Extract groupId. It's the purl namespace
-            const groupId = dependency.match(/<groupId>([^<]*)<\/groupId>/);
-            const namespace = groupId ? groupId[1] : '';
-
-            // Extract artifact id. It's the purl name
-            const artifactId = dependency.match(/<artifactId>([^<]*)<\/artifactId>/);
-            const name = artifactId ? artifactId[1] : '';
-
-            const versionReg = dependency.match(/<version>([^<]*)<\/version>/);
-            const version = versionReg ? versionReg[1] : '';
-
-            
-            let purlQualifiers;
-            const type = dependency.match(/<type>([^<]*)<\/type>/);
-            if(type) {
-                purlQualifiers = {};
-                purlQualifiers['type'] = type[1]
-            }
-            
-            const purlString = new PackageURL(PURL_TYPE, namespace, name, version, purlQualifiers, undefined).toString();
-            results.purls.push({purl: purlString});
-        });
+
+      // TODO: classifier are not supported yet
+      dependencies.forEach(dependency => {
+        // Extract groupId. It's the purl namespace
+        const groupId = dependency.match(/<groupId>([^<]*)<\/groupId>/);
+        const namespace = groupId ? groupId[1] : '';
+
+        // Extract artifact id. It's the purl name
+        const artifactId = dependency.match(/<artifactId>([^<]*)<\/artifactId>/);
+        const name = artifactId ? artifactId[1] : '';
+
+        const versionReg = dependency.match(/<version>([^<]*)<\/version>/);
+        let version = versionReg ? versionReg[1] : '';
+
+        const ver = version.match(/\${(.*?)}/);
+        if(ver && ver.length >= 1)  {
+          if(ver[1] === 'project.version') { // TODO: Add support for project.version
+            version = undefined;
+          } else {
+            const res = fileContent.match(new RegExp(`<${ver[1]}>([^<]*)<\/${ver[1]}>`));
+            version = res.length >= 1 ? res[1] : '';
+          }
+        }
+
+        let purlQualifiers;
+        const type = dependency.match(/<type>([^<]*)<\/type>/);
+        if(type) {
+            purlQualifiers = {};
+            purlQualifiers['type'] = type[1]
+        }
+
+        const purlString = new PackageURL(PURL_TYPE, namespace, name, version, purlQualifiers, undefined).toString();
+        results.purls.push({purl: purlString});
+      });
     }
     return results;
-}
+}

package/src/lib/scanner/Scanner.ts

@@ -272,8 +272,8 @@ export class Scanner extends EventEmitter {
     this.init();
     this.createOutputFiles();
     this.scannerInput = scannerInput;
-    // If some jobs have no files to scan, we return
-    if (this.scannerInput.some((input) => !input.fileList.length)){
+
+    if (!this.isValidInput(scannerInput)) {
       this.finishScan();
       return this.finishPromise;
     }
@@ -283,6 +283,29 @@ export class Scanner extends EventEmitter {
   }
 
 
+  private isValidInput(scannerInput: Array<ScannerInput>): boolean {
+    if (!scannerInput) {
+      this.reportLog('[ SCANNER ]: No input provided', 'warning');
+      return false;
+    }
+
+    if (!Array.isArray(scannerInput)) {
+      this.reportLog('[ SCANNER ]: Input must be an array','warning');
+      return false;
+    }
+
+    if (!scannerInput.length) {
+      this.reportLog('[ SCANNER ]: Input array is empty', 'warning');
+      return false;
+    }
+
+    if (scannerInput.some((input) => !input.fileList.length)) {
+      this.reportLog('[ SCANNER ]: Input array contains an element with no file list','warning');
+      return false;
+    }
+
+    return true;
+  }
 
 
   getScannerId() {