Fix for pnpm with sub-projects (#161)

pnpm sub-projects may be not a pnpm project themself. Hence, we have to check for a pnpm-lock.yaml file there again.

This is for: ShiftLeftSecurity/product#10353

src/main/scala/io/shiftleft/js2cpg/preprocessing/BabelTranspiler.scala

@@ -58,7 +58,7 @@ class BabelTranspiler(
     true
   }
 
-  override def validEnvironment(): Boolean = valid()
+  override def validEnvironment(): Boolean = valid(inDir.map(dir => projectPath.resolve(dir)).getOrElse(projectPath))
 
   override protected def logExecution(): Unit =
     logger.info(s"Babel - transpiling source files in '${File(projectPath).name}'")

src/main/scala/io/shiftleft/js2cpg/preprocessing/NuxtTranspiler.scala

@@ -65,7 +65,7 @@ class NuxtTranspiler(override val config: Config, override val projectPath: Path
     false
   }
 
-  override def validEnvironment(): Boolean = valid()
+  override def validEnvironment(): Boolean = valid(projectPath)
 
   override protected def logExecution(): Unit =
     logger.info(s"Nuxt.js - transpiling source files in '${File(projectPath).name}'")

src/main/scala/io/shiftleft/js2cpg/preprocessing/PugTranspiler.scala

@@ -19,7 +19,7 @@ class PugTranspiler(override val config: Config, override val projectPath: Path)
   override def shouldRun(): Boolean = config.templateTranspiling && hasPugFiles
 
   private def installPugPlugins(): Boolean = {
-    val command = if (pnpmAvailable()) {
+    val command = if (pnpmAvailable(projectPath)) {
       s"${TranspilingEnvironment.PNPM_ADD} pug-cli && ${TranspilingEnvironment.PNPM_INSTALL}"
     } else if (yarnAvailable()) {
       s"${TranspilingEnvironment.YARN_ADD} pug-cli && ${TranspilingEnvironment.YARN_INSTALL}"
@@ -54,7 +54,7 @@ class PugTranspiler(override val config: Config, override val projectPath: Path)
     true
   }
 
-  override def validEnvironment(): Boolean = valid()
+  override def validEnvironment(): Boolean = valid(projectPath)
 
   override protected def logExecution(): Unit =
     logger.info(s"PUG - transpiling source files in '${File(projectPath).name}'")

src/main/scala/io/shiftleft/js2cpg/preprocessing/Transpiler.scala

@@ -1,10 +1,6 @@
 package io.shiftleft.js2cpg.preprocessing
 
-import better.files.File
 import io.shiftleft.js2cpg.core.Config
-import io.shiftleft.js2cpg.io.FileDefaults.VUE_SUFFIX
-import io.shiftleft.js2cpg.io.FileUtils
-import io.shiftleft.js2cpg.parser.PackageJsonParser
 
 import java.nio.file.Path
 

src/main/scala/io/shiftleft/js2cpg/preprocessing/TranspilerGroup.scala

@@ -27,7 +27,7 @@ case class TranspilerGroup(override val config: Config, override val projectPath
       "@babel/plugin-transform-property-mutators"
 
   private def installPlugins(): Boolean = {
-    val command = if (pnpmAvailable()) {
+    val command = if (pnpmAvailable(projectPath)) {
       s"${TranspilingEnvironment.PNPM_ADD} $BABEL_PLUGINS && ${TranspilingEnvironment.PNPM_INSTALL}"
     } else if (yarnAvailable()) {
       s"${TranspilingEnvironment.YARN_ADD} $BABEL_PLUGINS && ${TranspilingEnvironment.YARN_INSTALL}"

src/main/scala/io/shiftleft/js2cpg/preprocessing/TranspilingEnvironment.scala

@@ -4,6 +4,7 @@ import better.files.File
 import io.shiftleft.js2cpg.io.ExternalCommand
 import org.slf4j.LoggerFactory
 
+import java.nio.file.Path
 import scala.util.{Failure, Success}
 
 object TranspilingEnvironment {
@@ -97,17 +98,17 @@ trait TranspilingEnvironment {
     }
   }
 
-  protected def valid(): Boolean = isValid match {
+  protected def valid(dir: Path): Boolean = isValid match {
     case Some(value) =>
       value
     case None =>
-      isValid = Some((pnpmAvailable() || yarnAvailable() || npmAvailable()) && setNpmPython())
+      isValid = Some((pnpmAvailable(dir) || yarnAvailable() || npmAvailable()) && setNpmPython())
       isValid.get
   }
 
-  protected def pnpmAvailable(): Boolean = isPnpmAvailable match {
+  protected def pnpmAvailable(dir: Path): Boolean = isPnpmAvailable match {
     case Some(value) =>
-      value
+      value && (File(dir) / "pnpm-lock.yaml").exists
     case None =>
       isPnpmAvailable = Some((File(projectPath) / "pnpm-lock.yaml").exists && checkForPnpm())
       isPnpmAvailable.get

src/main/scala/io/shiftleft/js2cpg/preprocessing/TypescriptTranspiler.scala

@@ -87,7 +87,7 @@ class TypescriptTranspiler(override val config: Config, override val projectPath
   }
 
   private def installTsPlugins(): Boolean = {
-    val command = if (pnpmAvailable()) {
+    val command = if (pnpmAvailable(projectPath)) {
       s"${TranspilingEnvironment.PNPM_ADD} typescript"
     } else if (yarnAvailable()) {
       s"${TranspilingEnvironment.YARN_ADD} typescript"
@@ -166,7 +166,7 @@ class TypescriptTranspiler(override val config: Config, override val projectPath
     true
   }
 
-  override def validEnvironment(): Boolean = valid()
+  override def validEnvironment(): Boolean = valid(projectPath)
 
   override protected def logExecution(): Unit =
     logger.info(s"TypeScript - transpiling source files in '${File(projectPath).name}'")

src/main/scala/io/shiftleft/js2cpg/preprocessing/VueTranspiler.scala

@@ -45,7 +45,7 @@ class VueTranspiler(override val config: Config, override val projectPath: Path)
   }
 
   private def installVuePlugins(): Boolean = {
-    val command = if (pnpmAvailable()) {
+    val command = if (pnpmAvailable(projectPath)) {
       s"${TranspilingEnvironment.PNPM_ADD} @vue/cli-service-global && ${TranspilingEnvironment.PNPM_INSTALL}"
     } else if (yarnAvailable()) {
       s"${TranspilingEnvironment.YARN_ADD} @vue/cli-service-global && ${TranspilingEnvironment.YARN_INSTALL}"
@@ -90,7 +90,7 @@ class VueTranspiler(override val config: Config, override val projectPath: Path)
     true
   }
 
-  override def validEnvironment(): Boolean = valid()
+  override def validEnvironment(): Boolean = valid(projectPath)
 
   override protected def logExecution(): Unit =
     logger.info(s"Vue.js - transpiling source files in '${File(projectPath).name}'")