snyk 1.1205.0 → 1.1206.0

package/dist/cli/245.index.js

@@ -213131,7 +213131,7 @@ const tslib_1 = __webpack_require__(90999);
 const os = __webpack_require__(22037);
 const fs = __webpack_require__(57147);
 const path = __webpack_require__(71017);
-const parse_mvn_1 = __webpack_require__(74134);
+const parse_versions_1 = __webpack_require__(55648);
 const subProcess = __webpack_require__(17872);
 const archive_1 = __webpack_require__(59337);
 const error_format_1 = __webpack_require__(34083);
@@ -213257,14 +213257,8 @@ function inspect(root, targetFile, options, snykHttpClient) {
             const versionResult = yield subProcess.execute(`${mavenCommand} --version`, [], {
                 cwd: mvnWorkingDirectory,
             });
-            let parseResult = {};
-            if (options.mavenAggregateProject) {
-                parseResult = (0, parse_1.parse)(result, options.dev);
-            }
-            else {
-                parseResult = (0, parse_mvn_1.parseTree)(result, options.dev);
-            }
-            const { javaVersion, mavenVersion } = (0, parse_mvn_1.parseVersions)(versionResult);
+            const parseResult = (0, parse_1.parse)(result, options.dev);
+            const { javaVersion, mavenVersion } = (0, parse_versions_1.parseVersions)(versionResult);
             return Object.assign({ plugin: {
                     name: 'bundled:maven',
                     runtime: 'unknown',
@@ -213344,31 +213338,13 @@ exports.parseDigraph = parseDigraph;
 
 /***/ }),
 
-/***/ 74134:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ 55648:
+/***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.parseVersions = exports.parseTree = void 0;
-const parse_digraph_1 = __webpack_require__(58553);
-const dependency_1 = __webpack_require__(20448);
-const newline = /[\r\n]+/g;
-const logLabel = /^\[\w+\]\s*/gm;
-const errorLabel = /^\[ERROR\]/gm;
-// Parse the output from 'mvn dependency:tree -DoutputType=dot'
-function parseTree(text, withDev) {
-    // check for errors in mvn output
-    if (errorLabel.test(text)) {
-        throw new Error('Failed to execute an `mvn` command.');
-    }
-    // clear all labels
-    text = text.replace(logLabel, '');
-    // extract deps
-    const data = getRootProject(text, withDev);
-    return { package: data };
-}
-exports.parseTree = parseTree;
+exports.parseVersions = void 0;
 function parseVersions(text) {
     // AppVeyor (at least) doesn't use \n\r, therefore os.EOL doesn't work
     const data = text.split('\n');
@@ -213377,84 +213353,7 @@ function parseVersions(text) {
     return { javaVersion, mavenVersion };
 }
 exports.parseVersions = parseVersions;
-function getRootProject(text, withDev) {
-    const projects = (0, parse_digraph_1.parseDigraph)(text);
-    if (!projects) {
-        throw new Error('Cannot find dependency information.');
-    }
-    const rootProject = getProject(projects[0], withDev);
-    const defaultRoot = {
-        name: 'no-name',
-        version: '0.0.0',
-        dependencies: {},
-        packageFormatVersion: 'mvn:0.0.1',
-    };
-    const root = Object.assign(Object.assign({}, defaultRoot), rootProject);
-    return root;
-}
-function getProject(projectDump, withDev) {
-    const lines = projectDump.split(newline);
-    const identity = dequote(lines[0]);
-    const deps = {};
-    for (let i = 1; i < lines.length - 1; i++) {
-        const line = lines[i];
-        const nodes = line.trim().split('->');
-        const source = dequote(nodes[0]);
-        const target = dequote(nodes[1]);
-        deps[source] = deps[source] || [];
-        deps[source].push(target);
-    }
-    return assemblePackage(identity, deps, withDev);
-}
-function assemblePackage(source, projectDeps, withDev) {
-    const sourcePackage = createPackage(source);
-    if (sourcePackage.labels &&
-        sourcePackage.labels.scope === 'test' &&
-        !withDev) {
-        // skip a test dependency if it's not asked for
-        return null;
-    }
-    const sourceDeps = projectDeps[source];
-    if (sourceDeps) {
-        sourcePackage.dependencies = {};
-        for (const dep of sourceDeps) {
-            const pkg = assemblePackage(dep, projectDeps, withDev);
-            if (pkg && pkg.name) {
-                sourcePackage.dependencies[pkg.name] = pkg;
-            }
-        }
-    }
-    return sourcePackage;
-}
-function createPackage(pkg) {
-    const range = getConstraint(pkg);
-    if (range) {
-        pkg = pkg.substring(0, pkg.indexOf(' '));
-    }
-    const { groupId, artifactId, version, scope, classifier } = (0, dependency_1.parseDependency)(pkg);
-    const coordinate = `${groupId}:${artifactId}`;
-    const name = classifier ? `${coordinate}:${classifier}` : coordinate;
-    const result = {
-        name,
-        version,
-        dependencies: {},
-    };
-    if (scope) {
-        result.labels = { scope };
-    }
-    return result;
-}
-function dequote(str) {
-    return str.slice(str.indexOf('"') + 1, str.lastIndexOf('"'));
-}
-function getConstraint(str) {
-    const index = str.indexOf('selected from constraint');
-    if (index === -1) {
-        return null;
-    }
-    return str.slice(index + 25, str.lastIndexOf(')'));
-}
-//# sourceMappingURL=parse-mvn.js.map
+//# sourceMappingURL=parse-versions.js.map
 
 /***/ }),