Get rid of Protolude dependency

Author: ollef

examples/UserAPI.hs

@@ -1,18 +1,18 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TypeOperators #-}
+{-# language DataKinds #-}
+{-# language DeriveAnyClass #-}
+{-# language DeriveGeneric #-}
+{-# language MultiParamTypeClasses #-}
+{-# language OverloadedStrings #-}
+{-# language TypeApplications #-}
+{-# language TypeOperators #-}
 module UserAPI where
 
-import Protolude
-
 import qualified Data.Aeson as Aeson
+import Data.Foldable
 import qualified Data.HashMap.Lazy as HashMap
+import Data.Text (Text)
 import qualified Generics.SOP as SOP
+import GHC.Generics
 import Servant.API
 
 import qualified Language.Elm.Pretty as Pretty

package.yaml

@@ -27,7 +27,6 @@ dependencies:
 - elm-syntax >= 0.3.0 && < 0.3.1
 - haskell-to-elm >= 0.3.0 && < 0.3.1
 - http-types >= 0.12.0
-- protolude >= 0.2.3
 - servant >= 0.16.0
 - servant-multipart >= 0.11.0
 - text >= 1.2.0

servant-to-elm.cabal

@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 06cbc1099ac24f0854793a96e85589086f7cb8409a277a16015d1c10e79f321c
+-- hash: 94c98baaa8085cbb210f614d42a13aa56afa0429cec5fe3b3416607ac8cc971c
 
 name:           servant-to-elm
 version:        0.4.0.0
@@ -48,7 +48,6 @@ library
     , elm-syntax >=0.3.0 && <0.3.1
     , haskell-to-elm >=0.3.0 && <0.3.1
     , http-types >=0.12.0
-    , protolude >=0.2.3
     , servant >=0.16.0
     , servant-multipart >=0.11.0
     , text >=1.2.0
@@ -69,7 +68,6 @@ executable user-example
     , generics-sop
     , haskell-to-elm >=0.3.0 && <0.3.1
     , http-types >=0.12.0
-    , protolude >=0.2.3
     , servant
     , servant-multipart >=0.11.0
     , servant-to-elm
@@ -94,7 +92,6 @@ test-suite servant-to-elm-test
     , elm-syntax >=0.3.0 && <0.3.1
     , haskell-to-elm >=0.3.0 && <0.3.1
     , http-types >=0.12.0
-    , protolude >=0.2.3
     , servant >=0.16.0
     , servant-multipart >=0.11.0
     , servant-to-elm

src/Servant/To/Elm.hs

@@ -1,32 +1,35 @@
-{-# LANGUAGE AllowAmbiguousTypes #-}
-{-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE PolyKinds #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE UndecidableInstances #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# language AllowAmbiguousTypes #-}
+{-# language BangPatterns #-}
+{-# language DataKinds #-}
+{-# language DuplicateRecordFields #-}
+{-# language FlexibleContexts #-}
+{-# language FlexibleInstances #-}
+{-# language GADTs #-}
+{-# language MultiParamTypeClasses #-}
+{-# language OverloadedStrings #-}
+{-# language PolyKinds #-}
+{-# language ScopedTypeVariables #-}
+{-# language TypeApplications #-}
+{-# language TypeOperators #-}
+{-# language UndecidableInstances #-}
+{-# options_ghc -fno-warn-orphans #-}
 module Servant.To.Elm where
 
-import Protolude hiding (Type, functionName, moduleName)
-
 import qualified Bound
 import qualified Data.Aeson as Aeson
 import qualified Data.Char as Char
+import Data.Proxy
+import Data.String
+import Data.Text (Text)
 import qualified Data.Text as Text
+import qualified Data.Text.Encoding as Text
+import Data.Void
+import GHC.TypeLits
 import qualified Network.HTTP.Types as HTTP
 import Servant.API ((:<|>), (:>))
 import qualified Servant.API as Servant
-import qualified Servant.Multipart as Servant
 import qualified Servant.API.Modifiers as Servant
+import qualified Servant.Multipart as Servant
 
 import Language.Elm.Definition (Definition)
 import qualified Language.Elm.Definition as Definition
@@ -49,7 +52,7 @@ elmEndpointDefinition urlBase moduleName endpoint =
     (Name.Qualified moduleName functionName)
     0
     (Bound.toScope $ vacuous $ elmTypeSig)
-    (panic "expression not closed" <$> lambdaArgs argNames elmLambdaBody)
+    (error "expression not closed" <$> lambdaArgs argNames elmLambdaBody)
   where
     functionName =
       case _functionName endpoint of
@@ -162,7 +165,7 @@ elmEndpointDefinition urlBase moduleName endpoint =
       Expression.App
         "Http.request"
         (Expression.Record
-          [ ("method", Expression.String $ toS $ _method endpoint)
+          [ ("method", Expression.String $ Text.decodeUtf8 $ _method endpoint)
           , ("headers", elmHeaders)
           , ("url", elmUrl)
           , ("body", elmBody)
@@ -325,7 +328,7 @@ elmEndpointDefinition urlBase moduleName endpoint =
               , Bound.toScope $
                 case _returnType endpoint of
                   Nothing ->
-                    panic "elmRequest: No return type" -- TODO?
+                    error "elmRequest: No return type" -- TODO?
 
                   Just (Left Servant.NoContent) ->
                     Expression.if_ (Expression.apps ("Basics.==") [pure $ Bound.B 1, Expression.String ""])
@@ -367,15 +370,15 @@ elmEndpointDefinition urlBase moduleName endpoint =
 
     headerArgName :: Int -> Text
     headerArgName i =
-      "header" <> show i
+      "header" <> fromString (show i)
 
     capturedArgName :: Int -> Text
     capturedArgName i =
-      "capture" <> show i
+      "capture" <> fromString (show i)
 
     paramArgName :: Int -> Text
     paramArgName i =
-      "param" <> show i
+      "param" <> fromString (show i)
 
 -------------------------------------------------------------------------------
 -- * Endpoints
@@ -460,7 +463,7 @@ instance (KnownSymbol symbol, HasElmEncoder Text a, HasElmEndpoints api)
         }
       where
         str =
-          toS $ symbolVal $ Proxy @symbol
+          fromString $ symbolVal $ Proxy @symbol
 
 instance (KnownSymbol symbol, HasElmEncoder Text a, HasElmEndpoints api)
   => HasElmEndpoints (Servant.CaptureAll symbol a :> api) where
@@ -473,15 +476,15 @@ instance (KnownSymbol symbol, HasElmEncoder Text a, HasElmEndpoints api)
         }
       where
         str =
-          toS $ symbolVal $ Proxy @symbol
+          fromString $ symbolVal $ Proxy @symbol
 
 instance (Servant.ReflectMethod method, HasElmDecoder Aeson.Value a, list ~ '[Servant.JSON])
   => HasElmEndpoints (Servant.Verb method 200 list a) where
     elmEndpoints' prefix =
       [ prefix
         { _method = method
         , _returnType = Just $ Right $ makeDecoder @Aeson.Value @a
-        , _functionName = Text.toLower (toS method) : _functionName prefix
+        , _functionName = Text.toLower (Text.decodeUtf8 method) : _functionName prefix
         }
       ]
       where
@@ -493,7 +496,7 @@ instance Servant.ReflectMethod method => HasElmEndpoints (Servant.Verb method 20
       [ prefix
         { _method = method
         , _returnType = Just $ Left Servant.NoContent
-        , _functionName = Text.toLower (toS method) : _functionName prefix
+        , _functionName = Text.toLower (Text.decodeUtf8 method) : _functionName prefix
         }
       ]
       where
@@ -509,7 +512,7 @@ instance
     elmEndpoints' prefix =
       elmEndpoints' @api prefix
         { _headers = _headers prefix <>
-          [ ( toS $ symbolVal $ Proxy @symbol
+          [ ( fromString $ symbolVal $ Proxy @symbol
             , makeEncoder @(Servant.RequiredArgument mods Text) @(Servant.RequiredArgument mods a)
             , case Servant.sbool @(Servant.FoldRequired mods) of
                 Servant.STrue ->
@@ -532,7 +535,7 @@ instance
         { _url = (_url prefix)
           { _queryString =
             _queryString (_url prefix) <>
-            [ ( toS $ symbolVal $ Proxy @symbol
+            [ ( fromString $ symbolVal $ Proxy @symbol
               , case Servant.sbool @(Servant.FoldRequired mods) of
                   Servant.STrue ->
                     Required
@@ -552,7 +555,7 @@ instance (KnownSymbol symbol, HasElmEncoder Text a, HasElmEndpoints api)
         { _url = (_url prefix)
           { _queryString =
             _queryString (_url prefix) <>
-            [ ( toS $ symbolVal $ Proxy @symbol
+            [ ( fromString $ symbolVal $ Proxy @symbol
               , List
               , makeEncoder @Text @a
               )
@@ -567,7 +570,7 @@ instance (KnownSymbol symbol, HasElmEndpoints api)
         { _url = (_url prefix)
           { _queryString =
             _queryString (_url prefix) <>
-            [ ( toS $ symbolVal $ Proxy @symbol
+            [ ( fromString $ symbolVal $ Proxy @symbol
               , Flag
               , Encoder "Basics.identity" "Basics.Bool"
               )
@@ -599,7 +602,7 @@ instance (KnownSymbol path, HasElmEndpoints api) => HasElmEndpoints (path :> api
       }
     where
       path =
-        toS $ symbolVal $ Proxy @path
+        fromString $ symbolVal $ Proxy @path
 
 instance HasElmEndpoints api => HasElmEndpoints (Servant.RemoteHost :> api) where
   elmEndpoints' = elmEndpoints' @api