More stuff

lib/GHCup/Types/JSON.hs

@@ -6,7 +6,8 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE TemplateHaskell       #-}
 {-# LANGUAGE TypeFamilies          #-}
-{-# LANGUAGE FlexibleInstances          #-}
+{-# LANGUAGE FlexibleInstances     #-}
+{-# LANGUAGE QuasiQuotes           #-}
 
 module GHCup.Types.JSON where
 
@@ -20,7 +21,11 @@ import           Data.Text.Encoding             ( decodeUtf8
                                                 )
 import           Data.Aeson.Types
 import           Data.Text.Encoding            as E
+import           HPath
 import           URI.ByteString
+import           Data.Word8
+import qualified Data.ByteString               as BS
+import           Data.String.QQ
 
 
 
@@ -33,6 +38,9 @@ deriveJSON defaultOptions ''SemVer
 deriveJSON defaultOptions ''Tool
 deriveJSON defaultOptions ''VSep
 deriveJSON defaultOptions ''VUnit
+deriveJSON defaultOptions ''VersionInfo
+deriveJSON defaultOptions ''Tag
+deriveJSON defaultOptions ''DownloadInfo
 
 
 instance ToJSON URI where
@@ -127,3 +135,17 @@ instance ToJSONKey Tool where
 
 instance FromJSONKey Tool where
   fromJSONKey = genericFromJSONKey defaultJSONKeyOptions
+
+instance ToJSON (Path Rel) where
+  toJSON p = case and . fmap isAscii . BS.unpack $ fp of
+    True  -> toJSON . E.decodeUtf8 $ fp
+    False -> String [s|/not/a/valid/path|]
+    where fp = toFilePath p
+
+instance FromJSON (Path Rel) where
+  parseJSON = withText "HPath Rel" $ \t -> do
+    let d = encodeUtf8 t
+    case parseRel d of
+      Right x -> pure x
+      Left  e -> fail $ "Failure in HPath Rel (FromJSON)" <> show e
+