snyk 1.1041.0 → 1.1043.0

package/dist/cli/263.index.js

@@ -193771,34 +193771,63 @@ function inspect(root, targetFile, options) {
         const isCoursierPresent = yield (0, plugin_search_1.isPluginInstalled)(root, targetFile, constants_1.sbtCoursierPluginName);
         const isSbtDependencyGraphPresent = yield (0, plugin_search_1.isPluginInstalled)(root, targetFile, constants_1.sbtDependencyGraphPluginName);
         const isNewSbtDependencyGraphPresent = yield (0, plugin_search_1.isPluginInstalled)(root, targetFile, constants_1.sbtDependencyGraphPluginNameNew);
-        Object.assign(options, { isCoursierPresent });
-        // in order to apply the pluginInspect, coursier should *not* be present and sbt-dependency-graph should be present
-        // we currently don't support the new notation of the sbt-dependency-graph which is 'addDependencyTreePlugin'
-        if (!isCoursierPresent && isSbtDependencyGraphPresent && !isNewSbtDependencyGraphPresent) {
-            debug('applying plugin inspect');
-            const res = yield pluginInspect(root, targetFile, options);
-            if (res) {
-                res.package.packageFormatVersion = packageFormatVersion;
-                return res;
+        debug(`isCoursierPresent: ${isCoursierPresent}, isSbtDependencyGraphPresent: ${isSbtDependencyGraphPresent},
+  isNewSbtDependencyGraphPresent: ${isNewSbtDependencyGraphPresent}`);
+        // If coursier is present, use it because it gives different results to sbt dependencyTree
+        let result;
+        if (isCoursierPresent) {
+            try {
+                options.useCoursier = true;
+                result = yield legacyInspect(root, targetFile, options);
+                return result;
             }
-            else {
-                debug('coursier present = ' +
-                    isCoursierPresent +
-                    ', sbt-dependency-graph present = ' +
-                    isSbtDependencyGraphPresent);
-                debug('Falling back to legacy inspect');
-                // tslint:disable-next-line:no-console
-                console.warn(buildHintMessage(options));
+            catch (err) {
+                debug('Coursier failed with error: ', err);
             }
         }
-        else {
-            if (isNewSbtDependencyGraphPresent) {
-                // tslint:disable-next-line:no-console
-                console.warn(buildNewSbtDepGraphWarning());
+        // TODO:Legacy path creates a large output that can cause RangeError in bigger projects
+        // We would prefer to use plugin inspect by default but currently it requires sbt-dep-graph plugin
+        if (isSbtDependencyGraphPresent) {
+            try {
+                debug('Applying plugin inspect');
+                result = yield pluginInspect(root, targetFile, options);
             }
-            debug('falling back to legacy inspect');
+            catch (err) {
+                debug('pluginInspect failed with error: ', err);
+            }
+            if (result) {
+                result.package.packageFormatVersion = packageFormatVersion;
+                return result;
+            }
+        }
+        options.useCoursier = false;
+        try {
+            result = yield legacyInspect(root, targetFile, options);
+            return result;
         }
-        const result = yield legacyInspect(root, targetFile, options);
+        catch (err) {
+            const hintMsg = buildHintMessage(options);
+            err.message = err.message + '\n' + hintMsg;
+            throw new Error(err);
+        }
+    });
+}
+exports.inspect = inspect;
+function legacyInspect(root, targetFile, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const targetFilePath = path.dirname(path.resolve(root, targetFile));
+        if (!fs.existsSync(targetFilePath)) {
+            debug(`build.sbt not found at location: ${targetFilePath}. This may result in no dependencies`);
+        }
+        const useCoursier = options.useCoursier;
+        const sbtArgs = buildArgs(options.args, useCoursier);
+        debug(`running command: sbt ${sbtArgs.join(' ')}`);
+        const result = {
+            sbtOutput: yield subProcess.execute('sbt', sbtArgs, {
+                cwd: targetFilePath,
+            }),
+            coursier: useCoursier,
+        };
         const packageName = path.basename(root);
         const packageVersion = '0.0.0';
         const depTree = parser.parse(result.sbtOutput, packageName, packageVersion, result.coursier);
@@ -193812,44 +193841,6 @@ function inspect(root, targetFile, options) {
         };
     });
 }
-exports.inspect = inspect;
-function legacyInspect(root, targetFile, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const targetFilePath = path.dirname(path.resolve(root, targetFile));
-        if (!fs.existsSync(targetFilePath)) {
-            debug(`build.sbt not found at location: ${targetFilePath}. This may result in no dependencies`);
-        }
-        let useCoursier = options.isCoursierPresent;
-        const sbtArgs = buildArgs(options.args, useCoursier);
-        try {
-            return {
-                sbtOutput: yield subProcess.execute('sbt', sbtArgs, {
-                    cwd: targetFilePath,
-                }),
-                coursier: useCoursier,
-            };
-        }
-        catch (error) {
-            if (useCoursier) {
-                // if we've tried coursier already, we'll fallback to dependency-graph
-                // in case we've failed to parse the files correctly #paranoid
-                useCoursier = false;
-                const sbtArgsNoCoursier = buildArgs(options.args, useCoursier);
-                return {
-                    sbtOutput: yield subProcess.execute('sbt', sbtArgsNoCoursier, {
-                        cwd: targetFilePath,
-                    }),
-                    coursier: useCoursier,
-                };
-            }
-            else {
-                // otherwise cascade the reject
-                error.message = error.message + buildHintMessage(options);
-                throw error;
-            }
-        }
-    });
-}
 function injectSbtScript(sbtPluginPath, targetFolderPath) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
@@ -193889,6 +193880,7 @@ function generateSbtPluginPath(sbtVersion) {
         pluginName = 'SnykSbtPlugin-0.1x.scala';
     }
     if (/index.[tj]s$/.test(__filename)) {
+        debug('Applying ', pluginName);
         return path.join(__dirname, `../scala/${pluginName}`);
     }
     else {
@@ -193907,6 +193899,7 @@ function pluginInspect(root, targetFile, options) {
             const packageVersion = '1.0.0';
             injectedScript = yield injectSbtScript(sbtPluginPath, targetFolderPath);
             debug('injectedScript.path: ' + injectedScript.path);
+            debug('args passed to plugin inspect: ', sbtArgs.join(' '));
             const stdout = yield subProcess.execute('sbt', sbtArgs, {
                 cwd: targetFolderPath,
             });
@@ -193963,7 +193956,7 @@ function buildHintMessage(options) {
         csArgs +
         ' executes successfully on this project.\n\n' +
         'For this project we guessed that you are using ' +
-        (options.isCoursierPresent ? 'sbt-coursier' : 'sbt-dependency-graph') +
+        (options.useCoursier ? 'sbt-coursier' : 'sbt-dependency-graph') +
         '.\n\n' +
         'If the problem persists, collect the output of ' +
         dgArgs +
@@ -193989,14 +193982,6 @@ function buildArgs(sbtArgs, isCoursierProject, isOutputGraph) {
     return args;
 }
 exports.buildArgs = buildArgs;
-function buildNewSbtDepGraphWarning() {
-    return ('\n\n' +
-        'We currently do not support the new `addDependencyTreePlugin` annotation for the `sbt-dependency-graph` plugin\n' +
-        'Instead, please add the following line to the plugins file: \n' +
-        'addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")\n' +
-        'Further instructions can be found in ' +
-        'https://tinyurl.com/2p9xa3p2\n\n');
-}
 //# sourceMappingURL=index.js.map
 
 /***/ }),