use AnyDir and AnyFile from pathy

Author: safareli

src/SqlSquared/Path.purs

@@ -1,12 +1,11 @@
 module SqlSquared.Path
-  ( AnyFilePath
-  , AnyDirPath
-  , parseAnyFilePath
+  ( parseAnyFilePath
   , printAnyFilePath
   , parseAnyDirPath
   , printAnyDirPath
   , genAnyFilePath
   , genAnyDirPath
+  , module PathyTypeReexprts
   ) where
 
 import Prelude
@@ -15,46 +14,45 @@ import Control.Monad.Gen as Gen
 import Control.Monad.Rec.Class (class MonadRec)
 import Data.Either as E
 import Data.NonEmpty ((:|))
-import Pathy (posixParser, posixPrinter)
 import Pathy as Pt
+import Pathy (AnyDir, AnyFile) as PathyTypeReexprts
+import Pathy (AnyDir, AnyFile)
 import Pathy.Gen as PtGen
 import SqlSquared.Utils ((∘))
 
-type AnyDirPath = E.Either Pt.AbsDir Pt.RelDir
-type AnyFilePath = E.Either Pt.AbsFile Pt.RelFile
 
-printAnyDirPath :: AnyDirPath -> String
+printAnyDirPath :: AnyDir -> String
 printAnyDirPath = E.either
-  (Pt.sandboxAny >>> Pt.unsafePrintPath posixPrinter)
-  (Pt.sandboxAny >>> Pt.unsafePrintPath posixPrinter)
+  (Pt.sandboxAny >>> Pt.unsafePrintPath Pt.posixPrinter)
+  (Pt.sandboxAny >>> Pt.unsafePrintPath Pt.posixPrinter)
 
-parseAnyDirPath :: forall m. Applicative m => (forall a. String -> m a) -> String -> m AnyDirPath
-parseAnyDirPath fail = Pt.parsePath posixParser
+parseAnyDirPath :: forall m. Applicative m => (forall a. String -> m a) -> String -> m AnyDir
+parseAnyDirPath fail = Pt.parsePath Pt.posixParser
   (pure ∘ E.Right)
   (pure ∘ E.Left)
   (const $ fail "Expected a directory path")
   (const $ fail "Expected a directory path")
   (fail "Expected valid path")
 
-printAnyFilePath :: AnyFilePath -> String
+printAnyFilePath :: AnyFile -> String
 printAnyFilePath = E.either
-  (Pt.sandboxAny >>> Pt.unsafePrintPath posixPrinter)
-  (Pt.sandboxAny >>> Pt.unsafePrintPath posixPrinter)
+  (Pt.sandboxAny >>> Pt.unsafePrintPath Pt.posixPrinter)
+  (Pt.sandboxAny >>> Pt.unsafePrintPath Pt.posixPrinter)
 
-parseAnyFilePath :: forall m. Applicative m => (forall a. String -> m a) -> String -> m AnyFilePath
-parseAnyFilePath fail = Pt.parsePath posixParser
+parseAnyFilePath :: forall m. Applicative m => (forall a. String -> m a) -> String -> m AnyFile
+parseAnyFilePath fail = Pt.parsePath Pt.posixParser
   (const $ fail "Expected a file path")
   (const $ fail "Expected a file path")
   (pure ∘ E.Right)
   (pure ∘ E.Left)
   (fail "Expected valid path")
 
-genAnyFilePath :: forall m. Gen.MonadGen m => MonadRec m => m AnyFilePath
+genAnyFilePath :: forall m. Gen.MonadGen m => MonadRec m => m AnyFile
 genAnyFilePath = Gen.oneOf
   $ (E.Left <$> PtGen.genAbsFilePath)
   :| [E.Right <$> PtGen.genRelFilePath]
 
-genAnyDirPath :: forall m. Gen.MonadGen m => MonadRec m => m AnyDirPath
+genAnyDirPath :: forall m. Gen.MonadGen m => MonadRec m => m AnyDir
 genAnyDirPath = Gen.oneOf
   $ (E.Left <$> PtGen.genAbsDirPath)
   :| [E.Right <$> PtGen.genRelDirPath]

src/SqlSquared/Signature.purs

@@ -140,7 +140,7 @@ data SqlF literal a
   | Parens a
 
 data SqlDeclF a
-  = Import Pt.AnyDirPath
+  = Import Pt.AnyDir
   | FunctionDecl (FunctionDeclR a)
 
 newtype SqlModuleF a =

src/SqlSquared/Signature/Relation.purs

@@ -36,7 +36,7 @@ type VariRelR =
   }
 
 type TableRelR =
-  { path ∷ Pt.AnyFilePath
+  { path ∷ Pt.AnyFile
   , alias ∷ Maybe String
   }