fix dependency notice for json-helpers

"The following purescript packages are needed by the generated code:"
eskimor · Oct 16, 2023 · 1bc3046 · 1bc3046
1 parent 5480bff
commit 1bc3046
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/src/Language/PureScript/Bridge/SumType.hs b/src/Language/PureScript/Bridge/SumType.hs
@@ -317,20 +317,30 @@ constructorToTypes (DataConstructor _ (Record rs)) = _recValue <$> NE.toList rs
 instanceToTypes :: Instance lang -> [TypeInfo lang]
 instanceToTypes Generic = pure . constraintToType $ TypeInfo "purescript-prelude" "Data.Generic.Rep" "Generic" []
 instanceToTypes GenericShow = pure . constraintToType $ TypeInfo "purescript-prelude" "Prelude" "Show" []
-instanceToTypes EncodeJson =
-    pure . constraintToType $ TypeInfo "purescript-argonaut-codecs" "Data.Argonaut.Encode" "EncodeJson" []
-instanceToTypes DecodeJson =
-    pure . constraintToType $ TypeInfo "purescript-argonaut-codecs" "Data.Argonaut.Decode" "DecodeJson" []
+instanceToTypes EncodeJson = fmap constraintToType
+    [ TypeInfo "purescript-argonaut-codecs" "Data.Argonaut.Encode" "EncodeJson" []
+    -- , TypeInfo "purescript-argonaut-aeson-generic" "Data.Argonaut.Aeson.Encode.Generic" "genericEncodeAeson" []
+    ]
+instanceToTypes DecodeJson = fmap constraintToType
+    [ TypeInfo "purescript-argonaut-codecs" "Data.Argonaut.Decode" "DecodeJson" []
+    -- , TypeInfo "purescript-argonaut-aeson-generic" "Data.Argonaut.Aeson.Decode.Generic" "genericDecodeAeson" []
+    ]
 {-|
   For unpublished Purescript library `purescript-bridge-json-helpers`:
   https://github.com/input-output-hk/purescript-bridge-json-helpers
   and `purescript-argonaut-codecs`
   https://pursuit.purescript.org/packages/purescript-argonaut-codecs
 -}
-instanceToTypes EncodeJsonHelper =
-    pure . constraintToType $ TypeInfo "purescript-argonaut-codecs" "Data.Argonaut.Encode" "EncodeJson" []
-instanceToTypes DecodeJsonHelper =
-    pure . constraintToType $ TypeInfo "purescript-argonaut-codecs" "Data.Argonaut.Decode" "DecodeJson" []
+instanceToTypes EncodeJsonHelper = fmap constraintToType
+    [ -- TypeInfo "purescript-argonaut-codecs" "Data.Argonaut.Encode" "EncodeJson" []
+    -- ,
+      TypeInfo "json-helpers" "Data.Argonaut.Encode.Class" "EncodeJson" []
+    ]
+instanceToTypes DecodeJsonHelper = fmap constraintToType
+    [--  TypeInfo "purescript-argonaut-codecs" "Data.Argonaut.Decode" "DecodeJson" []
+    -- ,
+      TypeInfo "json-helpers" "Data.Argonaut.Decode.Class" "DecodeJson" []
+    ]
 instanceToTypes (ForeignObject _ _) = fmap constraintToType
     [ TypeInfo "purescript-foreign" "Foreign" "Foreign" []
     , TypeInfo "purescript-foreign-object" "Foreign.Object" "Object" []
@@ -372,6 +382,8 @@ baselineImports = importsFromList
 instanceToImportLines :: PSInstance -> ImportLines
 instanceToImportLines GenericShow =
     importsFromList [ImportLine "Data.Show.Generic" Nothing $ Set.singleton "genericShow"]
+-- | This relies on `argonaut-aeson-generic`
+-- <https://github.com/coot/purescript-argonaut-aeson-generic>
 instanceToImportLines EncodeJson =
     importsFromList
         [ ImportLine "Data.Argonaut.Aeson.Encode.Generic" Nothing
@@ -383,6 +395,8 @@ instanceToImportLines EncodeJson =
           $ Set.fromList ["class EncodeJson", "encodeJson"]
         , ImportLine "Control.Lazy" Nothing $ Set.fromList ["defer"]
         ]
+-- | This relies on `argonaut-aeson-generic`
+-- <https://github.com/coot/purescript-argonaut-aeson-generic>
 instanceToImportLines DecodeJson =
     importsFromList
         [ ImportLine "Data.Argonaut.Aeson.Decode.Generic" Nothing
@@ -396,9 +410,9 @@ instanceToImportLines DecodeJson =
         ]
 {-|
   This relies on unpublished Purescript library `purescript-bridge-json-helpers`:
-  https://github.com/input-output-hk/purescript-bridge-json-helpers
+  <https://github.com/input-output-hk/purescript-bridge-json-helpers>
   and `purescript-argonaut-codecs`
-  https://pursuit.purescript.org/packages/purescript-argonaut-codecs
+  <https://pursuit.purescript.org/packages/purescript-argonaut-codecs>
 -}
 instanceToImportLines EncodeJsonHelper =
     importsFromList
@@ -413,9 +427,9 @@ instanceToImportLines EncodeJsonHelper =
         <> instanceToImportLines EncodeJson
 {-|
   This relies on unpublished Purescript library `purescript-bridge-json-helpers`:
-  https://github.com/input-output-hk/purescript-bridge-json-helpers
+  <https://github.com/input-output-hk/purescript-bridge-json-helpers>
   and `purescript-argonaut-codecs`
-  https://pursuit.purescript.org/packages/purescript-argonaut-codecs
+  <https://pursuit.purescript.org/packages/purescript-argonaut-codecs>
 -}
 instanceToImportLines DecodeJsonHelper =
     importsFromList

diff --git a/test/RoundTripJsonHelpers/app/src/RoundTripJsonHelpers/Types.purs b/test/RoundTripJsonHelpers/app/src/RoundTripJsonHelpers/Types.purs
@@ -8,12 +8,10 @@ import Data.Argonaut (encodeJson, jsonNull)
 import Data.Argonaut.Aeson.Decode.Generic (genericDecodeAeson)
 import Data.Argonaut.Aeson.Encode.Generic (genericEncodeAeson)
 import Data.Argonaut.Aeson.Options (defaultOptions) as Argonaut
-import Data.Argonaut.Decode (class DecodeJson)
 import Data.Argonaut.Decode.Aeson ((</$\>), (</*\>), (</\>))
 import Data.Argonaut.Decode.Aeson as D
 import Data.Argonaut.Decode.Class (class DecodeJson, class DecodeJsonField, decodeJson)
 import Data.Argonaut.Decode.Class as Argonaut
-import Data.Argonaut.Encode (class EncodeJson)
 import Data.Argonaut.Encode.Aeson ((>$<), (>/\<))
 import Data.Argonaut.Encode.Aeson as E
 import Data.Argonaut.Encode.Class (class EncodeJson, encodeJson)