snyk 1.974.0 → 1.977.0

package/dist/cli/184.index.js

@@ -210187,9 +210187,9 @@ function inspect(root, targetFile, options) {
         if (!options) {
             options = { dev: false };
         }
-        const isCoursierPresent = yield plugin_search_1.isPluginInstalled(root, targetFile, constants_1.sbtCoursierPluginName);
-        const isSbtDependencyGraphPresent = yield plugin_search_1.isPluginInstalled(root, targetFile, constants_1.sbtDependencyGraphPluginName);
-        const isNewSbtDependencyGraphPresent = yield plugin_search_1.isPluginInstalled(root, targetFile, constants_1.sbtDependencyGraphPluginNameNew);
+        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'
@@ -210320,7 +210320,7 @@ function pluginInspect(root, targetFile, options) {
         try {
             const targetFolderPath = path.dirname(path.resolve(root, targetFile));
             const sbtArgs = buildArgs(options.args, false, true);
-            const sbtVersion = yield version_1.getSbtVersion(root, targetFile);
+            const sbtVersion = yield (0, version_1.getSbtVersion)(root, targetFile);
             const sbtPluginPath = generateSbtPluginPath(sbtVersion);
             const packageName = path.basename(root);
             const packageVersion = '1.0.0';
@@ -210687,7 +210687,7 @@ function searchProjectFiles(root, targetFile, plugin) {
 function searchGlobalFiles(root, targetFile, plugin) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const homedir = os.homedir();
-        const sbtVersion = yield version_1.getSbtVersion(root, targetFile);
+        const sbtVersion = yield (0, version_1.getSbtVersion)(root, targetFile);
         // https://www.scala-sbt.org/1.x/docs/Using-Plugins.html#Global+plugins
         const pluginsPath = semver.lt(sbtVersion, '1.0.0') ?
             path.join(homedir, '.sbt', '0.13', 'plugins') :
@@ -210714,7 +210714,10 @@ function sbtFiles(basePath) {
     return [];
 }
 function searchWithFs(filename, word) {
-    const buffer = fs.readFileSync(filename);
+    let buffer = fs.readFileSync(filename, { encoding: 'utf8' });
+    // remove single-line and multi-line comments
+    const singleLineCommentPattern = /\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm;
+    buffer = buffer.replace(singleLineCommentPattern, '');
     return buffer.indexOf(word) > -1;
 }
 //# sourceMappingURL=plugin-search.js.map
@@ -210736,7 +210739,7 @@ const debugLogging = debugModule('snyk-sbt-plugin');
 // Disabled by default, to set run the CLI as `PROC_TIMEOUT=100000 snyk ...`
 const TIMEOUT = process.env.PROC_TIMEOUT || '0';
 const PROC_TIMEOUT = parseInt(TIMEOUT, 10);
-exports.execute = (command, args, options) => {
+const execute = (command, args, options) => {
     const spawnOptions = { shell: true };
     if (options && options.cwd) {
         spawnOptions.cwd = options.cwd;
@@ -210784,6 +210787,7 @@ exports.execute = (command, args, options) => {
         });
     });
 };
+exports.execute = execute;
 function kill(id, out) {
     return () => {
         out.stderr = out.stderr + 'Process timed out. To set longer timeout run with `PROC_TIMEOUT=value_in_ms`\n';