scanoss 0.10.5 → 0.11.1

package/build/module/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.d.ts

@@ -0,0 +1,3 @@
+import { ILocalDependency } from '../../DependencyTypes';
+declare const pyProjectToml: (fileContent: string, filePath: string) => Promise<ILocalDependency>;
+export default pyProjectToml;

package/build/module/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.js

@@ -0,0 +1,42 @@
+const rProjectTableContent = new RegExp(/\[project\]\s*\n(.*(?:\n(?!^\s*\[).*)*)/g);
+const rDependenciesSection = new RegExp(/dependencies\s*=\s*\[((?:[^\]]|\](?!\n))+)\]/);
+const purlPrefix = "pkg:pypi/";
+const pyProjectToml = async (fileContent, filePath) => {
+    const result = { file: filePath, purls: [] };
+    const projectTableMatch = fileContent.match(rProjectTableContent);
+    if (!projectTableMatch)
+        return result;
+    const depKeyValueMatch = projectTableMatch[0].match(rDependenciesSection);
+    if (!depKeyValueMatch)
+        return result;
+    const depValue = depKeyValueMatch[1].toString();
+    /* At this point, depKeyValue contains the values for dependencies. Example:
+    *
+    *     "requests",
+    *     # this should be ignored
+    *     'importlib-metadata; python_version<"3.8"',  #This line as well
+    */
+    /* The following code will place each dependency in an array (ignoring comments #) */
+    const deps = depValue
+        .replace(",", "\n") //Convert inline dependencies to new line dependencies
+        .split(/\n/) //Generate an array by splitting new lines. Each line contains an independent dependency
+        .map(d => d.replace(/(,|"|'|\s|(#.*))/g, "")) // Remove extra spaces, quotes, comments and commas
+        .filter(d => d.length !== 0); //Filters those lines that are empty
+    deps.forEach(d => {
+        d = d.replace(/\;.*/g, ""); //Removes environment markers https://packaging.python.org/en/latest/specifications/dependency-specifiers/#environment-markers
+        d = d.replace(/\[.*\]/, ""); //Removes extras https://packaging.python.org/en/latest/specifications/dependency-specifiers/#extras
+        const requirementMatch = d.match(/(?:<|<=|!=|==|>=|>|~=|===).*/);
+        const requirement = requirementMatch ? requirementMatch[0] : null;
+        let purl = d;
+        if (requirement)
+            purl = d.replace(requirement, "").trim();
+        purl = purlPrefix + purl;
+        result.purls.push({
+            purl,
+            ...(requirement !== null && { requirement })
+        });
+    });
+    return result;
+};
+export default pyProjectToml;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHlQcm9qZWN0VG9tbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvRGVwZW5kZW5jaWVzL0xvY2FsRGVwZW5kZW5jeS9wYXJzZXJzL3B5dGhvbi9QeVByb2plY3RUb21sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE1BQU0sb0JBQW9CLEdBQUcsSUFBSSxNQUFNLENBQUMsMENBQTBDLENBQUMsQ0FBQztBQUNwRixNQUFNLG9CQUFvQixHQUFHLElBQUksTUFBTSxDQUFFLDhDQUE4QyxDQUFDLENBQUM7QUFFekYsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDO0FBRS9CLE1BQU0sYUFBYSxHQUFHLEtBQUssRUFBRSxXQUFtQixFQUFDLFFBQWdCLEVBQTZCLEVBQUU7SUFDOUYsTUFBTSxNQUFNLEdBQXFCLEVBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFDLENBQUM7SUFFN0QsTUFBTSxpQkFBaUIsR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFDbEUsSUFBSSxDQUFDLGlCQUFpQjtRQUFFLE9BQU8sTUFBTSxDQUFDO0lBRXRDLE1BQU0sZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFDMUUsSUFBSSxDQUFDLGdCQUFnQjtRQUFFLE9BQU8sTUFBTSxDQUFDO0lBRXJDLE1BQU0sUUFBUSxHQUFHLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBRWhEOzs7OztNQUtFO0lBRUYscUZBQXFGO0lBRXJGLE1BQU0sSUFBSSxHQUFJLFFBQVE7U0FDbkIsT0FBTyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsQ0FBQyxzREFBc0Q7U0FDekUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFJLHdGQUF3RjtTQUN2RyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLG1CQUFtQixFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsbURBQW1EO1NBQ2hHLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFFLENBQUEsQ0FBRSxvQ0FBb0M7SUFHckUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRTtRQUNmLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQSxDQUFFLDhIQUE4SDtRQUMxSixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLENBQUEsQ0FBQyxvR0FBb0c7UUFFaEksTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLDhCQUE4QixDQUFDLENBQUM7UUFDakUsTUFBTSxXQUFXLEdBQUcsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUE7UUFFakUsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDO1FBQ2IsSUFBSSxXQUFXO1lBQUUsSUFBSSxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO1FBRTFELElBQUksR0FBRyxVQUFVLEdBQUcsSUFBSSxDQUFDO1FBRXpCLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDO1lBQ2hCLElBQUk7WUFDSixHQUFHLENBQUMsV0FBVyxLQUFLLElBQUksSUFBSSxFQUFFLFdBQVcsRUFBRSxDQUFDO1NBQzdDLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0lBQ0YsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyxDQUFDO0FBRUYsZUFBZSxhQUFhLENBQUMifQ==

package/build/module/tsconfig.module.tsbuildinfo

@@ -1092,7 +1092,7 @@
         "affectsGlobalScope": false
       },
       "../../src/sdk/Dependencies/LocalDependency/parsers/npmParser.ts": {
-        "version": "373fe307703f18152a11b3a4cbdd6e0c9b5e8e180951a405ff372858a79f0a64",
+        "version": "be0319b96ae93f9db7702bb5b5520f5dc72bd958fbc2b87ff7107857614c01a9",
         "signature": "42f317f68c7debfec90d4435f03d13069d06e1150e89d09041951cc4da9c49b2",
         "affectsGlobalScope": false
       },
@@ -1121,9 +1121,14 @@
         "signature": "5be0bf1b37a315973ea4791db74c473fccfc81e3b76bfea738c2dba011d6868b",
         "affectsGlobalScope": false
       },
+      "../../src/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.ts": {
+        "version": "250b1ffd37c178b0df2097c0e0e4aee37dc911fcf7e611574bd9090a46773d03",
+        "signature": "99407a9b356d85ce95fc02030482aaba1f04075fe0bd154a86b497ab413c8d11",
+        "affectsGlobalScope": false
+      },
       "../../src/sdk/Dependencies/LocalDependency/LocalDependency.ts": {
-        "version": "b5f82d0b72530267f4e71c8d3c88ba35ae840e0403ac1d528920a2e0cd3e98fd",
-        "signature": "d3f8a607f0f520db909894aa064f3fa88d39d41736677fe393fbd28e9f10ff8c",
+        "version": "60d65378448c9fb553e9222741b73ff13a14009f98f2780a1950bb61cce34b98",
+        "signature": "77f44c5d6e6e36b972650e8c556a3863b8417f944d518ac9e31a61503e500d3c",
         "affectsGlobalScope": false
       },
       "../../node_modules/isbinaryfile/lib/index.d.ts": {
@@ -1272,8 +1277,8 @@
         "affectsGlobalScope": false
       },
       "../../node_modules/commander/typings/index.d.ts": {
-        "version": "051ae0b0bda811703875e6f2e466b9344cfe320b39087676327dc0c109f26d32",
-        "signature": "051ae0b0bda811703875e6f2e466b9344cfe320b39087676327dc0c109f26d32",
+        "version": "17d716b12c230355d207d8b464a3359e13041c0cbb94c243981618e279f57670",
+        "signature": "17d716b12c230355d207d8b464a3359e13041c0cbb94c243981618e279f57670",
         "affectsGlobalScope": false
       },
       "../../src/sdk/Filtering/DefaultFilterForDependencies.ts": {
@@ -1296,11 +1301,6 @@
         "signature": "9a00c2707323b806220877e6528108811ed92e580922d77a8ba1959b85fbb474",
         "affectsGlobalScope": false
       },
-      "../../src/cli/commands/wfp.ts": {
-        "version": "fef1a2ff5e663791d133f13a140e8ba3792dc38ffcb14de0e349e532efe9fe35",
-        "signature": "2f1d9f3ac804ba0f5ef9dfb34eebc0ba9f00e5cd98092ae23f3d50fc49de8298",
-        "affectsGlobalScope": false
-      },
       "../../src/sdk/Filtering/DefaultFilterForScanning.ts": {
         "version": "ae3781cbda782d3df2233dbeef699b57a83699b0d26f97428eda0131dbe84d27",
         "signature": "71cf507f6a0fa25a562580e98861acf1c8881b649bdecc50e9e10bbac57eb149",
@@ -1321,11 +1321,31 @@
         "signature": "f2270f14186fb9298c65d83f391db3cefc5e9c40bfae8007515176acc583e131",
         "affectsGlobalScope": false
       },
+      "../../src/cli/commands/wfp.ts": {
+        "version": "fef1a2ff5e663791d133f13a140e8ba3792dc38ffcb14de0e349e532efe9fe35",
+        "signature": "2f1d9f3ac804ba0f5ef9dfb34eebc0ba9f00e5cd98092ae23f3d50fc49de8298",
+        "affectsGlobalScope": false
+      },
       "../../src/cli/bin/cli-bin.ts": {
-        "version": "3e072bf981511d42ef2ceb8838a0f581866a765afa4361f1fbd6634c06943ae5",
+        "version": "bd298bd7315359eae4141d98632734131eaac891587c80581e0024517b9f9e2a",
         "signature": "43e818adf60173644896298637f47b01d5819b17eda46eaa32d0c7d64724d012",
         "affectsGlobalScope": false
       },
+      "../../node_modules/@types/chai/index.d.ts": {
+        "version": "b9734142a4b241cfb505be4a2eb0261d211647df7c73043f817f4fdd8d96c846",
+        "signature": "b9734142a4b241cfb505be4a2eb0261d211647df7c73043f817f4fdd8d96c846",
+        "affectsGlobalScope": true
+      },
+      "../../src/sdk/Dependencies/LocalDependency/LocalDependency.spec.ts": {
+        "version": "a23dfba03c907d083fbe30166c0505ef8704692885fb8202b6e251c06e43b35a",
+        "signature": "8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881",
+        "affectsGlobalScope": false
+      },
+      "../../src/sdk/Dependencies/LocalDependency/parsers/parser.spec.ts": {
+        "version": "d46b1756e93abe52b1cb49f9086d6b803b9b155ae2f63e856c21ba2409ec1d5c",
+        "signature": "8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881",
+        "affectsGlobalScope": false
+      },
       "../../src/sdk/Services/Grpc/scanoss/api/common/v2/scanoss-common_grpc_pb.d.ts": {
         "version": "4cec53a1c91d29642f026cf0a4b15c1127f399b0886b3f0556867f7d88c5bd68",
         "signature": "4cec53a1c91d29642f026cf0a4b15c1127f399b0886b3f0556867f7d88c5bd68",
@@ -1873,6 +1893,9 @@
         "../../node_modules/@types/node/util.d.ts",
         "../../node_modules/protobufjs/index.d.ts"
       ],
+      "../../node_modules/@types/chai/index.d.ts": [
+        "../../node_modules/@types/node/util.d.ts"
+      ],
       "../../node_modules/@types/long/index.d.ts": [
         "../../node_modules/@types/node/util.d.ts"
       ],
@@ -2611,6 +2634,11 @@
       "../../src/sdk/Dependencies/LocalDependency/DependencyTypes.ts": [
         "../../node_modules/@types/node/util.d.ts"
       ],
+      "../../src/sdk/Dependencies/LocalDependency/LocalDependency.spec.ts": [
+        "../../node_modules/@types/chai/index.d.ts",
+        "../../node_modules/@types/node/util.d.ts",
+        "../../src/sdk/Dependencies/LocalDependency/LocalDependency.ts"
+      ],
       "../../src/sdk/Dependencies/LocalDependency/LocalDependency.ts": [
         "../../node_modules/@types/node/fs.d.ts",
         "../../node_modules/@types/node/path.d.ts",
@@ -2622,6 +2650,7 @@
         "../../src/sdk/Dependencies/LocalDependency/parsers/npmParser.ts",
         "../../src/sdk/Dependencies/LocalDependency/parsers/nugetParser.ts",
         "../../src/sdk/Dependencies/LocalDependency/parsers/pyParser.ts",
+        "../../src/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.ts",
         "../../src/sdk/Dependencies/LocalDependency/parsers/rubyParser.ts"
       ],
       "../../src/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.ts": [
@@ -2654,6 +2683,17 @@
         "../../node_modules/xml-js/types/index.d.ts",
         "../../src/sdk/Dependencies/LocalDependency/DependencyTypes.ts"
       ],
+      "../../src/sdk/Dependencies/LocalDependency/parsers/parser.spec.ts": [
+        "../../node_modules/@types/chai/index.d.ts",
+        "../../node_modules/@types/node/util.d.ts",
+        "../../src/sdk/Dependencies/LocalDependency/DependencyTypes.ts",
+        "../../src/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.ts",
+        "../../src/sdk/Dependencies/LocalDependency/parsers/golangParser.ts",
+        "../../src/sdk/Dependencies/LocalDependency/parsers/mavenParser.ts",
+        "../../src/sdk/Dependencies/LocalDependency/parsers/npmParser.ts",
+        "../../src/sdk/Dependencies/LocalDependency/parsers/nugetParser.ts",
+        "../../src/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.ts"
+      ],
       "../../src/sdk/Dependencies/LocalDependency/parsers/pyParser.ts": [
         "../../node_modules/@types/node/path.d.ts",
         "../../node_modules/@types/node/util.d.ts",
@@ -2661,6 +2701,10 @@
         "../../src/sdk/Dependencies/LocalDependency/DependencyTypes.ts",
         "../../src/sdk/Dependencies/LocalDependency/parsers/utils.ts"
       ],
+      "../../src/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.ts": [
+        "../../node_modules/@types/node/util.d.ts",
+        "../../src/sdk/Dependencies/LocalDependency/DependencyTypes.ts"
+      ],
       "../../src/sdk/Dependencies/LocalDependency/parsers/rubyParser.ts": [
         "../../node_modules/@types/node/path.d.ts",
         "../../node_modules/@types/node/util.d.ts",
@@ -3461,6 +3505,9 @@
         "../../node_modules/@types/node/util.d.ts",
         "../../node_modules/protobufjs/index.d.ts"
       ],
+      "../../node_modules/@types/chai/index.d.ts": [
+        "../../node_modules/@types/node/util.d.ts"
+      ],
       "../../node_modules/@types/long/index.d.ts": [
         "../../node_modules/@types/node/util.d.ts"
       ],
@@ -4124,6 +4171,9 @@
       "../../src/sdk/Dependencies/LocalDependency/parsers/pyParser.ts": [
         "../../src/sdk/Dependencies/LocalDependency/DependencyTypes.ts"
       ],
+      "../../src/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.ts": [
+        "../../src/sdk/Dependencies/LocalDependency/DependencyTypes.ts"
+      ],
       "../../src/sdk/Dependencies/LocalDependency/parsers/rubyParser.ts": [
         "../../src/sdk/Dependencies/LocalDependency/DependencyTypes.ts"
       ],
@@ -4372,6 +4422,7 @@
       "../../node_modules/@grpc/grpc-js/build/src/uri-parser.d.ts",
       "../../node_modules/@grpc/proto-loader/build/src/index.d.ts",
       "../../node_modules/@grpc/proto-loader/build/src/util.d.ts",
+      "../../node_modules/@types/chai/index.d.ts",
       "../../node_modules/@types/long/index.d.ts",
       "../../node_modules/@types/mocha/index.d.ts",
       "../../node_modules/@types/node-fetch/externals.d.ts",
@@ -4508,13 +4559,16 @@
       "../../src/sdk/Dependencies/DependencyScannerCfg.ts",
       "../../src/sdk/Dependencies/DependencyTypes.ts",
       "../../src/sdk/Dependencies/LocalDependency/DependencyTypes.ts",
+      "../../src/sdk/Dependencies/LocalDependency/LocalDependency.spec.ts",
       "../../src/sdk/Dependencies/LocalDependency/LocalDependency.ts",
       "../../src/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.ts",
       "../../src/sdk/Dependencies/LocalDependency/parsers/golangParser.ts",
       "../../src/sdk/Dependencies/LocalDependency/parsers/mavenParser.ts",
       "../../src/sdk/Dependencies/LocalDependency/parsers/npmParser.ts",
       "../../src/sdk/Dependencies/LocalDependency/parsers/nugetParser.ts",
+      "../../src/sdk/Dependencies/LocalDependency/parsers/parser.spec.ts",
       "../../src/sdk/Dependencies/LocalDependency/parsers/pyParser.ts",
+      "../../src/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.ts",
       "../../src/sdk/Dependencies/LocalDependency/parsers/rubyParser.ts",
       "../../src/sdk/Dependencies/LocalDependency/parsers/utils.ts",
       "../../src/sdk/Errors.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scanoss",
-  "version": "0.10.5",
+  "version": "0.11.1",
   "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",
@@ -15,7 +15,7 @@
     "build": "run-p build:*",
     "build:main": "tsc -p tsconfig.json",
     "build:module": "tsc -p tsconfig.module.json",
-    "test": "nyc mocha -r ts-node/register 'tests/**/*.ts'",
+    "test": "nyc mocha -r ts-node/register 'tests/**/*.ts' 'src/**/*.spec.ts'",
     "install-dev": "npm run build && npm run test && npm install -g ."
   },
   "engines": {
@@ -26,7 +26,7 @@
     "abort-controller": "^3.0.0",
     "adm-zip": "^0.5.9",
     "cli-progress": "^3.9.1",
-    "commander": "^8.3.0",
+    "commander": "^11.1.0",
     "eventemitter3": "^4.0.7",
     "form-data": "^4.0.0",
     "get-uri": "^4.0.0",
@@ -49,6 +49,7 @@
   },
   "devDependencies": {
     "@ava/typescript": "^1.1.1",
+    "@fig/complete-commander": "^3.0.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@types/chai": "^4.3.1",
     "@types/mocha": "^9.1.1",
@@ -57,8 +58,7 @@
     "@types/node-gzip": "^1.1.0",
     "@types/tar": "^6.1.3",
     "@types/uuid": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.0.1",
-    "@typescript-eslint/parser": "^4.0.1",
+    "@typescript-eslint/parser": "^6.18.0",
     "chai": "^4.3.6",
     "codecov": "^3.5.0",
     "deep-equal-in-any-order": "^2.0.1",
@@ -67,7 +67,7 @@
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-functional": "^3.0.2",
     "eslint-plugin-import": "^2.22.0",
-    "mocha": "^10.0.0",
+    "mocha": "^10.2.0",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "prettier": "^2.8.8",
@@ -89,9 +89,6 @@
       "path": "cz-conventional-changelog"
     }
   },
-  "prettier": {
-    "singleQuote": true
-  },
   "nyc": {
     "extends": "@istanbuljs/nyc-config-typescript",
     "exclude": [