Fixed lookup paths during source map construction (#306)

ShiftLeftSecurity · Oct 13, 2023 · f0ed1d5 · f0ed1d5
1 parent d5ab9a9
commit f0ed1d5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/main/scala/io/shiftleft/js2cpg/parser/JsSource.scala b/src/main/scala/io/shiftleft/js2cpg/parser/JsSource.scala
@@ -99,7 +99,7 @@ class JsSource(val srcDir: File, val projectDir: Path, val source: Source) {
       val cleanedPath = FileUtils.cleanPath(sourceFileName)
       // having "/" here is fine as JS source maps always have platform independent path separators
       val lookupPath = if (cleanedPath.contains("/" + srcDir.name + "/")) {
-        cleanedPath.substring(cleanedPath.lastIndexOf("/" + srcDir.name + "/") + srcDir.name.length + 2)
+        cleanedPath.substring(cleanedPath.indexOf("/" + srcDir.name + "/") + srcDir.name.length + 2)
       } else {
         cleanedPath
       }

diff --git a/src/test/resources/typescriptsub/subc/typescriptsub/c.ts b/src/test/resources/typescriptsub/subc/typescriptsub/c.ts
@@ -0,0 +1 @@
+console.log("subc - c!");
diff --git a/src/test/scala/io/shiftleft/js2cpg/preprocessing/TranspilationRunnerTest.scala b/src/test/scala/io/shiftleft/js2cpg/preprocessing/TranspilationRunnerTest.scala
@@ -164,6 +164,7 @@ class TranspilationRunnerTest extends AnyWordSpec with Matchers {
           s"subb${java.io.File.separator}nested${java.io.File.separator}a.ts",
           s"subb${java.io.File.separator}nested${java.io.File.separator}b.ts",
           s"subb${java.io.File.separator}nested${java.io.File.separator}other.js",
+          s"subc${java.io.File.separator}typescriptsub${java.io.File.separator}c.ts",
           s"subb${java.io.File.separator}a.ts",
           s"subb${java.io.File.separator}b.ts"
         )