snyk 1.1248.0 → 1.1249.0

package/dist/cli/245.index.js

@@ -205596,11 +205596,11 @@ function leftPad(s, n) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.findChildren = exports.buildGraph = void 0;
 const dep_graph_1 = __webpack_require__(23423);
-async function buildGraph(snykGraph, projectName, projectVersion, coordinateMap) {
+async function buildGraph(snykGraph, rootPkgName, projectVersion, coordinateMap) {
     const pkgManager = { name: 'gradle' };
     const isEmptyGraph = !snykGraph || Object.keys(snykGraph).length === 0;
     const depGraphBuilder = new dep_graph_1.DepGraphBuilder(pkgManager, {
-        name: projectName,
+        name: rootPkgName,
         version: projectVersion || '0.0.0',
     });
     if (isEmptyGraph) {
@@ -205678,12 +205678,12 @@ const subProcess = __webpack_require__(84335);
 const tmp = __webpack_require__(84688);
 const pMap = __webpack_require__(86301);
 const chalk = __webpack_require__(35337);
-const debugModule = __webpack_require__(15158);
 const cli_interface_1 = __webpack_require__(43548);
 const errors_1 = __webpack_require__(45339);
 const gradle_attributes_pretty_1 = __webpack_require__(89173);
 const graph_1 = __webpack_require__(23012);
 const search_1 = __webpack_require__(45479);
+const debugModule = __webpack_require__(15158);
 // To enable debugging output, use `snyk -d`
 let logger = null;
 function debugLog(s) {
@@ -205988,7 +205988,7 @@ async function getAllDeps(root, targetFile, options, snykHttpClient) {
                 concurrency: 100,
             });
         }
-        return await processProjectsInExtractedJSON(root, extractedJSON, coordinateMap);
+        return await processProjectsInExtractedJSON(extractedJSON, coordinateMap);
     }
     catch (err) {
         const error = err;
@@ -206058,23 +206058,19 @@ ${chalk.red.bold(mainErrorMessage)}`;
         throw error;
     }
 }
-async function processProjectsInExtractedJSON(root, extractedJSON, coordinateMap) {
+async function processProjectsInExtractedJSON(extractedJSON, coordinateMap) {
     for (const projectId in extractedJSON.projects) {
         const { defaultProject, defaultProjectKey } = extractedJSON;
         const { snykGraph, projectVersion } = extractedJSON.projects[projectId];
         if (!snykGraph) {
             continue;
         }
-        const invalidValues = [null, undefined, ''];
-        const isValidRootDir = invalidValues.indexOf(root) === -1;
         const isSubProject = projectId !== defaultProjectKey;
-        let projectName = isValidRootDir ? path.basename(root) : defaultProject;
+        let rootPkgName = defaultProject;
         if (isSubProject) {
-            projectName = isValidRootDir
-                ? `${path.basename(root)}/${projectId}`
-                : `${defaultProject}/${projectId}`;
+            rootPkgName = `${defaultProject}/${projectId}`;
         }
-        extractedJSON.projects[projectId].depGraph = await (0, graph_1.buildGraph)(snykGraph, projectName, projectVersion, coordinateMap);
+        extractedJSON.projects[projectId].depGraph = await (0, graph_1.buildGraph)(snykGraph, rootPkgName, projectVersion, coordinateMap);
         // this property usage ends here
         delete extractedJSON.projects[projectId].snykGraph;
     }