Merge pull request #28 from legrostdg/purescript-0.11

Purescript 0.11
eskimor · May 3, 2017 · 2029173 · 2029173
2 parents 0ee0700 + cf4bafd
commit 2029173
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/Servant/PureScript/CodeGen.hs b/src/Servant/PureScript/CodeGen.hs
@@ -88,7 +88,7 @@ genGetReaderParams = stack . map (genGetReaderParam . psVar . _pName)
 
 
 genSignature :: Text -> [PSType] -> Maybe PSType -> Doc
-genSignature = genSignatureBuilder $ "forall eff m." <+/> "(MonadAsk (SPSettings_ SPParams_) m, MonadError AjaxError m, MonadAff ( ajax :: AJAX | eff) m)" <+/> "=>"
+genSignature = genSignatureBuilder $ "forall eff m." <+/> "MonadAsk (SPSettings_ SPParams_) m => MonadError AjaxError m => MonadAff ( ajax :: AJAX | eff) m" <+/> "=>"
 
 genSignatureBuilder :: Doc -> Text -> [PSType] -> Maybe PSType -> Doc
 genSignatureBuilder constraint fnName params mRet = fName <+> "::" <+> align (constraint <+/> parameterString)
@@ -121,7 +121,7 @@ genFnBody rParams req = "do"
         </> ", headers =" <+> "defaultRequest.headers <> reqHeaders"
         </> case req ^. reqBody of
               Nothing -> "}"
-              Just _  -> ", content =" <+> "toNullable <<< Just <<< printJson <<< encodeJson $ reqBody" </> "}"
+              Just _  -> ", content =" <+> "toNullable <<< Just <<< stringify <<< encodeJson $ reqBody" </> "}"
       )
       </> "affResp <- affjax affReq"
       </> "getResult affReq decodeJson affResp" <> line

diff --git a/src/Servant/PureScript/Internal.hs b/src/Servant/PureScript/Internal.hs
@@ -96,17 +96,16 @@ defaultSettings = Settings {
   , _standardImports = importsFromList
         [ ImportLine "Control.Monad.Reader.Class" (Set.fromList [ "class MonadAsk", "ask" ])
         , ImportLine "Control.Monad.Error.Class" (Set.fromList [ "class MonadError" ])
-        , ImportLine "Control.Monad.Aff.Class" (Set.fromList [ "class MonadAff", "liftAff" ])
+        , ImportLine "Control.Monad.Aff.Class" (Set.fromList [ "class MonadAff" ])
         , ImportLine "Network.HTTP.Affjax" (Set.fromList [ "AJAX" ])
-        , ImportLine "Global" (Set.fromList [ "encodeURIComponent" ]) -- from package globals
-        , ImportLine "Data.Nullable" (Set.fromList [ "Nullable()", "toNullable" ])
-        , ImportLine "Servant.PureScript.Affjax" (Set.fromList [ "defaultRequest", "affjax", "AjaxError(..)" ])
+        , ImportLine "Data.Nullable" (Set.fromList [ "toNullable" ])
+        , ImportLine "Servant.PureScript.Affjax" (Set.fromList [ "AjaxError", "defaultRequest", "affjax" ])
         , ImportLine "Servant.PureScript.Settings" (Set.fromList [ "SPSettings_(..)", "gDefaultToURLPiece" ])
         , ImportLine "Servant.PureScript.Util" (Set.fromList [ "encodeListQuery", "encodeURLPiece", "encodeQueryItem", "getResult", "encodeHeader" ])
         , ImportLine "Prim" (Set.fromList [ "String" ]) -- For baseURL!
         , ImportLine "Data.Argonaut.Generic.Aeson" (Set.fromList [ "encodeJson", "decodeJson" ]) -- Should not be necessary - compiler bug!
         , ImportLine "Data.Maybe" (Set.fromList [ "Maybe(..)"])
-        , ImportLine "Data.Argonaut.Printer" (Set.fromList [ "printJson" ])
+        , ImportLine "Data.Argonaut.Core" (Set.fromList [ "stringify" ])
         ]
   , _generateSubscriberAPI = False
   }

diff --git a/src/Servant/PureScript/MakeRequests.hs b/src/Servant/PureScript/MakeRequests.hs
@@ -108,7 +108,7 @@ genFnBody rParams req = "do"
                                </> ", httpQuery:" <+> "reqQuery"
                                </> ", httpBody:" <+> case req ^. reqBody of
                                        Nothing -> "\"\""
-                                       Just _ -> "printJson <<< encodeJson $ reqBody"
+                                       Just _ -> "stringify <<< encodeJson $ reqBody"
                                </> "}")
       </> "pure spReq"
     ) <> "\n"

diff --git a/stack-8.0.yaml b/stack-8.0.yaml
@@ -1,4 +1,4 @@
-resolver: lts-8.5
+resolver: lts-8.12
 packages:
   - '.'
   - './examples/central-counter'