fix: fix typescript import issue

archguard · Mar 21, 2022 · c4574dc · c4574dc
1 parent 13b8ed0
commit c4574dc
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/...urcecode/src/main/kotlin/com/thoughtworks/archguard/scanner/sourcecode/ClassRepository.kt b/...urcecode/src/main/kotlin/com/thoughtworks/archguard/scanner/sourcecode/ClassRepository.kt
@@ -1,12 +1,10 @@
 package com.thoughtworks.archguard.scanner.sourcecode
 
-import chapi.app.frontend.path.ecmaImportConvert
 import chapi.app.frontend.path.importConvert
 import chapi.domain.core.*
 import infrastructure.SourceBatch
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import java.io.File
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -153,18 +151,27 @@ class ClassRepository(systemId: String, language: String, workspace: String) {
         for (clz in imports) {
             var importSource = clz.Source
             if (isJs()) {
-                importSource = importConvert(filePath, importSource)
-                if(importSource.startsWith("src/")) {
-                    importSource = importSource.replaceFirst("src/", "@/")
-                }
-                importSource = importSource.replace("/", ".")
+                importSource = convertTypeScriptImport(importSource, filePath)
             }
 
             val clzDependenceId = saveOrGetDependentClass(importSource, DEFAULT_MODULE_NAME)
             doSaveClassDependence(clzId, clzDependenceId, "${packageName}.${clzName}", importSource)
         }
     }
 
+    private fun convertTypeScriptImport(importSource: String, filePath: String): String {
+        var imp = importSource
+        if (!imp.startsWith("@")) {
+            imp = importConvert(filePath, imp)
+            if (imp.startsWith("src/")) {
+                imp = imp.replaceFirst("src/", "@/")
+            }
+        }
+
+        imp = imp.replace("/", ".")
+        return imp
+    }
+
     private fun isJs() = language == "typescript" || language == "javascript"
 
     private fun saveOrGetDependentClass(name: String, moduleName: String = DEFAULT_MODULE_NAME): String? {