removed implicit conversions from Directory/File to Path

Author: nikololiahim

src/main/scala/org/polystat/cli/EO.scala

@@ -84,7 +84,7 @@ object EO:
       _ <- cfg.output.dirs.traverse_ { outDir =>
         for
           _ <- IO.println(s"Cleaning $outDir before writing...")
-          _ <- outDir.createDirIfDoesntExist.flatMap(_.clean)
+          _ <- outDir.toPath.createDirIfDoesntExist.flatMap(_.clean)
         yield ()
       }
       _ <- writeToDirs(analyzed)

src/main/scala/org/polystat/cli/Far.scala

@@ -51,12 +51,12 @@ object Far:
   ): IO[OdinAnalysisResult] =
     val codeFileNameNoExt: String = pathToCode.filenameNoExt
     val createPathToXml: IO[JPath] =
-      (pathToTmpDir / "xmir").createDirIfDoesntExist.map(
-        tmp =>
-          pathToCode
-            .mount(to = tmp, relativelyTo = pathToSrcRoot)
-            .replaceExt(newExt = ".xml")
-            .toNioPath
+      (pathToTmpDir / "xmir").createDirIfDoesntExist.map(tmp =>
+        pathToCode
+          .mount(to = tmp, relativelyTo = pathToSrcRoot)
+          .replaceExt(newExt = ".xml")
+          .toPath
+          .toNioPath
       )
 
     for
@@ -65,7 +65,7 @@ object Far:
       _ <- IO.delay(
         new Syntax(
           codeFileNameNoExt,
-          new InputOf(pathToCode.toNioPath),
+          new InputOf(pathToCode.toPath.toNioPath),
           new OutputTo(pathToXml),
         ).parse()
       )

src/main/scala/org/polystat/cli/Java.scala

@@ -96,12 +96,7 @@ object Java:
       // J2EO deletes the tmp directory when there are no files to analyze
       // This causes the subsequent call to EO.analyze to fail, because there is no temp directory.
       // The line below patches this issue by creating the temp directory if it was deleted by J2EO.
-      _ <- Files[IO]
-        .exists(cfg.tempDir)
-        .ifM(
-          ifTrue = IO.unit,
-          ifFalse = Files[IO].createDirectories(dirForEO),
-        )
+      _ <- cfg.tempDir.toPath.createDirIfDoesntExist
       _ <- EO.analyze(
         cfg.copy(input = dirForEO)
       )

src/main/scala/org/polystat/cli/Main.scala

@@ -129,9 +129,9 @@ object Main extends IOApp:
         def analyze(filtered: NonEmptyList[EOAnalyzer]): IO[Unit] =
           for
             tempDir <- tmp match
-              case Some(path) =>
-                IO.println(s"Cleaning ${path.absolute}...") *>
-                  path.createDirIfDoesntExist.flatMap(_.clean)
+              case Some(dir) =>
+                IO.println(s"Cleaning ${dir.toPath.absolute}...") *>
+                  dir.clean
               case None =>
                 Files[IO].createTempDirectory.flatMap(
                   Directory.fromPathFailFast

src/main/scala/org/polystat/cli/util/FileTypes.scala

@@ -10,8 +10,8 @@ object FileTypes:
   ):
     override def toString = underlying.toString
     def toPath: Path = underlying
+    def /(s: String): Path = underlying / s
 
-  given Conversion[Directory, Path] = _.underlying
   object Directory:
 
     def fromPath(path: Path): IO[Option[Directory]] =
@@ -25,7 +25,10 @@ object FileTypes:
     def fromPathFailFast(path: Path): IO[Directory] =
       fromPath(path).flatMap {
         case Some(dir) => IO.pure(dir)
-        case None => IO.raiseError(new Exception(s"$path must be a directory!"))
+        case None =>
+          IO.raiseError(
+            new Exception(s"$path is either not a directory or does not exist!")
+          )
       }
 
     def fromPathUnsafe(path: Path): Directory = Directory(path)
@@ -40,8 +43,8 @@ object FileTypes:
   class File private[FileTypes] (private[FileTypes] val underlying: Path):
     override def toString(): String = underlying.toString
     def toPath = underlying
+    def extName = underlying.extName
 
-  given Conversion[File, Path] = _.underlying
   object File:
     def fromPath(path: Path): IO[Option[File]] =
       Files[IO]
@@ -55,7 +58,11 @@ object FileTypes:
       fromPath(path).flatMap {
         case Some(file) => IO.pure(file)
         case None =>
-          IO.raiseError(new Exception(s"$path must be a regular file!"))
+          IO.raiseError(
+            new Exception(
+              s"$path is either not a regular file or does not exist!"
+            )
+          )
       }
 
     def fromPathUnsafe(path: Path): File = File(path)

src/main/scala/org/polystat/cli/util/InputUtils.scala

@@ -58,39 +58,39 @@ object InputUtils:
     Stream
       .emit(file)
       .filter(_.extName.endsWith(ext))
-      .flatMap(path =>
+      .flatMap(file =>
         Files[IO]
-          .readAll(path)
+          .readAll(file.toPath)
           .through(utf8.decode)
-          .map(code => (path, code))
+          .map(code => (file, code))
       )
 
   def readCodeFromDir(ext: String, dir: Directory): Stream[IO, (File, String)] =
     Files[IO]
-      .walk(dir)
+      .walk(dir.toPath)
       .evalMapFilter(path =>
         File.fromPath(path).map(_.filter(_.extName.endsWith(ext)))
       )
-      .flatMap(path =>
+      .flatMap(file =>
         Files[IO]
-          .readAll(path)
+          .readAll(file.toPath)
           .through(utf8.decode)
-          .map(code => (path, code))
+          .map(code => (file, code))
       )
 
   def readCodeFromStdin: Stream[IO, String] = stdinUtf8[IO](4096).bufferAll
 
-  def readConfigFromFile(path: File): IO[PolystatUsage.Analyze] =
-    HoconConfig(path).config.load
+  def readConfigFromFile(file: File): IO[PolystatUsage.Analyze] =
+    HoconConfig(file.toPath).config.load
 
-  def writeOutputTo(path: Path)(output: String): IO[Unit] =
+  def writeOutputTo(file: File)(output: String): IO[Unit] =
     for
-      _ <- path.parent
+      _ <- file.toPath.parent
         .map(Files[IO].createDirectories)
         .getOrElse(IO.unit)
       _ <- Stream
         .emits(output.getBytes)
-        .through(Files[IO].writeAll(path))
+        .through(Files[IO].writeAll(file.toPath))
         .compile
         .drain
     yield ()

src/main/scala/org/polystat/sarif/SarifOutput.scala

@@ -9,11 +9,12 @@ import io.circe.Encoder
 import io.circe.Json
 import io.circe.syntax.*
 import org.polystat.odin.analysis.EOOdinAnalyzer.OdinAnalysisResult
+import org.polystat.cli.util.FileTypes.*
 
 import OdinAnalysisResult.*
 import Sarif.*
 
-final case class SarifOutput(filePath: Path, errors: List[OdinAnalysisResult]):
+final case class SarifOutput(filePath: File, errors: List[OdinAnalysisResult]):
   private val sarifRun: SarifRun = SarifOutput.sarifRun(filePath, errors)
 
   val sarif: SarifLog = SarifLog(Seq(sarifRun))
@@ -24,15 +25,15 @@ end SarifOutput
 
 object SarifOutput:
 
-  def sarifRun(filePath: Path, errors: List[OdinAnalysisResult]): SarifRun =
+  def sarifRun(filePath: File, errors: List[OdinAnalysisResult]): SarifRun =
     SarifRun(
       tool = SarifTool(SarifDriver()),
       results = errors.mapFilter(SarifOutput.sarifResult),
       invocations = errors.map(SarifOutput.sarifInvocation),
       artifacts = Seq(
         SarifArtifact(location =
           SarifArtifactLocation(uri =
-            filePath.absolute.toNioPath.toUri.toString
+            filePath.toPath.absolute.toNioPath.toUri.toString
           )
         )
       ),