fix: make imports for other modules than main in packages work correctly

madlib-lang · May 5, 2024 · ac83e20 · ac83e20
1 parent 7cac266
commit ac83e20
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/compiler/main/Utils/Path.hs b/compiler/main/Utils/Path.hs
@@ -9,7 +9,7 @@ import           System.FilePath                ( dropFileName
                                                 , joinPath
                                                 , splitFileName
                                                 , normalise
-                                                , takeExtension, pathSeparator, hasExtension
+                                                , takeExtension, pathSeparator, hasExtension, addExtension
                                                 )
 import qualified MadlibDotJson.MadlibDotJson   as MadlibDotJson
 import           Data.List                      ( isInfixOf
@@ -175,9 +175,9 @@ findMadlibPackageMainPath pathUtils file pkgName = do
     Right json' -> do
       mainPath <- normalisePath pathUtils <$> canonicalizePath pathUtils (joinPath [folder, MadlibDotJson.main json'])
       if '/' `elem` pkgName then do
-        let afterPkg = dropWhile (/= '/') pkgName
+        let afterPkg = tail $ dropTrailingPathSeparator $ dropWhile (/= '/') pkgName
             basePath = takeDirectory mainPath
-            fullPath = joinPath [basePath, afterPkg, ".mad"]
+            fullPath = joinPath [basePath, addExtension afterPkg ".mad"]
         return $ Just fullPath
       else
         return $ Just mainPath