Add HLint to CI and fix templates (#243)

Author: serras

.github/workflows/haskell.yml

@@ -11,3 +11,10 @@ jobs:
         name: 47deg
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
     - run: nix-build
+    - name: 'Set up HLint'
+      uses: rwe/[email protected]
+    - name: 'Run HLint'
+      uses: rwe/[email protected]
+      with:
+        path: '["core/schema/src/", "core/rpc/src/", "core/optics/src/", "core/lens/src/", "adapter/avro/src/", "adapter/protobuf/src/", "adapter/persistent/src/", "adapter/kafka/src/", "grpc/common/src/", "grpc/client/src/", "grpc/server/src/", "graphql/src/", "servant/server/src/", "instrumentation/prometheus/src/", "instrumentation/tracing/src/" ]'
+        fail-on: warning

adapter/kafka/src/Mu/Kafka/Consumer.hs

@@ -1,6 +1,5 @@
 {-# language FlexibleContexts #-}
 {-# language TypeFamilies     #-}
-{-# language TypeOperators    #-}
 {-|
 Description : Kafka consumers as streams of Mu terms
 

adapter/kafka/src/Mu/Kafka/Internal.hs

@@ -2,7 +2,6 @@
 {-# language ScopedTypeVariables #-}
 {-# language TypeApplications    #-}
 {-# language TypeFamilies        #-}
-{-# language TypeOperators       #-}
 module Mu.Kafka.Internal where
 
 import qualified Data.Avro            as A

adapter/kafka/src/Mu/Kafka/Producer.hs

@@ -1,7 +1,6 @@
 {-# language DeriveGeneric    #-}
 {-# language FlexibleContexts #-}
 {-# language TypeFamilies     #-}
-{-# language TypeOperators    #-}
 {-|
 Description : streams of Mu terms as Kafka producers
 

adapter/protobuf/mu-protobuf.cabal

@@ -1,5 +1,5 @@
 name:          mu-protobuf
-version:       0.4.0.0
+version:       0.4.0.1
 synopsis:
   Protocol Buffers serialization and gRPC schema import for Mu microservices
 

core/lens/src/Mu/Schema/Lens.hs

@@ -6,7 +6,6 @@
 {-# language GADTs                  #-}
 {-# language InstanceSigs           #-}
 {-# language LambdaCase             #-}
-{-# language OverloadedLabels       #-}
 {-# language PartialTypeSignatures  #-}
 {-# language PolyKinds              #-}
 {-# language QuantifiedConstraints  #-}
@@ -312,14 +311,14 @@ type family InterpretList sch (fieldTypes :: [FieldType typeName]) :: [Type] whe
 
 fromFieldValue :: FieldValue sch fieldType -> Interpret sch fieldType
 fromFieldValue = \case
-  FNull -> ()
-  (FPrimitive val) -> val
-  (FSchematic term) -> term
+  FNull                     -> ()
+  (FPrimitive val)          -> val
+  (FSchematic term)         -> term
   (FOption maybeFieldValue) -> fromFieldValue <$> maybeFieldValue
-  (FList listFieldValues) -> fromFieldValue <$> listFieldValues
-  (FMap mapFieldValues) -> mapKeysMonotonic fromFieldValue (fromFieldValue <$> mapFieldValues)
-  (FUnion (Z val)) -> Z (Identity (fromFieldValue val))
-  (FUnion (S val)) -> S (fromFieldValue (FUnion val))
+  (FList listFieldValues)   -> fromFieldValue <$> listFieldValues
+  (FMap mapFieldValues)     -> mapKeysMonotonic fromFieldValue (fromFieldValue <$> mapFieldValues)
+  (FUnion (Z val))          -> Z (Identity (fromFieldValue val))
+  (FUnion (S val))          -> S (fromFieldValue (FUnion val))
 
 class UninterpretField sch a where
   type Uninterpret a :: FieldType typeName

default.nix

@@ -1,5 +1,5 @@
 let
-  haskellNix = import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/53ed0a9.tar.gz) {};
+  haskellNix = import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/134b60e.tar.gz) {};
   nixpkgsSrc = haskellNix.sources.nixpkgs-2003;
   nixpkgsArgs = haskellNix.nixpkgsArgs;
 in

graphql/src/Mu/GraphQL/Quasi/LostParser.hs

@@ -13,8 +13,8 @@ import           Text.Parser.Token             (braces, symbol, whiteSpace)
 schemaDefinition :: Parser GQL.SchemaDefinition
 schemaDefinition = symbol "schema" *> braces (
     GQL.SchemaDefinition
-      <$> pure Nothing -- ignore [Directive]
-      <*> many1 rootOperationParser
+          Nothing -- ignore [Directive]
+      <$> many1 rootOperationParser
   )
 
 rootOperationParser :: Parser GQL.RootOperationTypeDefinition

grpc/client/src/Mu/GRpc/Client/Record.hs

@@ -114,10 +114,9 @@ serviceDefToDecl serviceTyName complete fieldsPrefix tNamer (Service _ methods)
                   [pure (DerivClause Nothing [ConT ''Generic])]
        let buildName = mkName ("build" ++ complete)
        s <- SigD buildName <$> [t|GrpcClient -> $(pure (ConT (mkName complete)))|]
-       c <- Clause <$> pure []
-                   <*> (NormalB <$> [e|buildService @($(pure $ ConT serviceTyName))
-                                                    @($(pure $ LitT (StrTyLit fieldsPrefix)))|])
-                   <*> pure []
+       c <- Clause [] <$> (NormalB <$> [e|buildService @ $(conT serviceTyName)
+                                                       @ $(litT (strTyLit fieldsPrefix))|])
+                      <*> pure []
        pure [d, s, FunD buildName [c]]
 
 methodToDecl :: String -> Namer

grpc/common/src/Mu/GRpc/Avro.hs

@@ -7,7 +7,6 @@
 {-# language PolyKinds             #-}
 {-# language ScopedTypeVariables   #-}
 {-# language TypeApplications      #-}
-{-# language TypeOperators         #-}
 {-# language UndecidableInstances  #-}
 {-# options_ghc -fno-warn-orphans -fno-warn-simplifiable-class-constraints  #-}
 {-|

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-16.18
+resolver: lts-16.20
 allow-newer: true
 
 packages:

templates/graphql-server.hsfiles

@@ -16,6 +16,7 @@ extra-source-files: README.md
 executable {{name}}
   hs-source-dirs:   src
   main-is:          Main.hs
+  ghc-options:      -Wall
   default-language: Haskell2010
   build-depends:
       base        >=4.12  && <5
@@ -29,14 +30,19 @@ executable {{name}}
 
 
 {-# START_FILE stack.yaml #-}
-resolver: lts-16.18
+resolver: lts-16.20
 allow-newer: true
 extra-deps:
-- mu-schema-0.3.1.0
-- mu-rpc-0.3.4.0
+- mu-schema-0.3.1.1
+- mu-rpc-0.4.0.0
 - mu-graphql-0.4.0.0
 - git: https://github.com/hasura/graphql-parser-hs.git
   commit: f4a093981ca5626982a17c2bfaad047cc0834a81
+- primitive-extras-0.8
+- primitive-unlifted-0.1.3.0
+- stm-hamt-1.2.0.4
+- stm-containers-1.1.0.4
+- stm-lifted-2.5.0.0
 
 {-# START_FILE Setup.hs #-}
 import Distribution.Simple
@@ -64,16 +70,16 @@ type Query {
 {-# language ScopedTypeVariables   #-}
 {-# language TemplateHaskell       #-}
 {-# language TypeApplications      #-}
+{-# language TypeFamilies          #-}
 {-# language TypeOperators         #-}
+{-# OPTIONS_GHC -fno-warn-partial-type-signatures #-}
 
 module Main where
 
 import           Data.Proxy
-import qualified Data.Text         as T
 
 import           Mu.GraphQL.Quasi
 import           Mu.GraphQL.Server
-import           Mu.Schema
 import           Mu.Server
 
 graphql "ServiceDefinition" "schema.graphql"
@@ -87,5 +93,5 @@ main = do
 
 type ServiceMapping = '[]
 
-server :: MonadServer m => ServerT ServiceMapping ServiceDefinition m _
+server :: MonadServer m => ServerT ServiceMapping i ServiceDefinition m _
 server = resolver ( object @"Query" ( method @"hello" $ error "not implemented" ) )

templates/grpc-server-avro.hsfiles

@@ -17,6 +17,7 @@ executable {{name}}
   hs-source-dirs:   src
   main-is:          Main.hs
   other-modules:    Schema
+  ghc-options:      -Wall
   default-language: Haskell2010
   build-depends:
       base            >=4.12  && <5
@@ -27,15 +28,15 @@ executable {{name}}
     , text
 
 {-# START_FILE stack.yaml #-}
-resolver: lts-16.18
+resolver: lts-16.20
 allow-newer: true
 extra-deps:
 # mu
-- mu-schema-0.3.1.0
+- mu-schema-0.3.1.1
 - mu-rpc-0.4.0.0
 - mu-optics-0.3.0.0
-- mu-avro-0.4.0.0
-- mu-protobuf-0.4.0.0
+- mu-avro-0.4.0.1
+- mu-protobuf-0.4.0.1
 - mu-grpc-server-0.4.0.0
 - mu-grpc-common-0.4.0.0
 - compendium-client-0.2.0.0
@@ -80,8 +81,8 @@ protocol Service {
 
 module Schema where
 
-import Data.Text as T
-import GHC.Generics
+-- import Data.Text as T
+-- import GHC.Generics
 
 import Mu.Quasi.Avro
 import Mu.Schema
@@ -114,5 +115,5 @@ import Schema
 main :: IO ()
 main = runGRpcApp msgAvro 8080 server
 
-server :: MonadServer m => SingleServerT TheService m _
+server :: MonadServer m => SingleServerT i TheService m _
 server = singleService ()

templates/grpc-server-protobuf.hsfiles

@@ -17,6 +17,7 @@ executable {{name}}
   hs-source-dirs:   src
   main-is:          Main.hs
   other-modules:    Schema
+  ghc-options:      -Wall
   default-language: Haskell2010
   build-depends:
       base            >=4.12  && <5
@@ -27,15 +28,15 @@ executable {{name}}
     , text
 
 {-# START_FILE stack.yaml #-}
-resolver: lts-15.8
+resolver: lts-16.20
 allow-newer: true
 extra-deps:
 # mu
-- mu-schema-0.3.1.0
+- mu-schema-0.3.1.1
 - mu-rpc-0.4.0.0
 - mu-optics-0.3.0.0
-- mu-avro-0.4.0.0
-- mu-protobuf-0.4.0.0
+- mu-avro-0.4.0.1
+- mu-protobuf-0.4.0.1
 - mu-grpc-server-0.4.0.0
 - mu-grpc-common-0.4.0.0
 - compendium-client-0.2.0.0
@@ -85,8 +86,8 @@ service Service {
 
 module Schema where
 
-import Data.Text as T
-import GHC.Generics
+-- import Data.Text as T
+-- import GHC.Generics
 
 import Mu.Quasi.GRpc
 import Mu.Schema
@@ -119,5 +120,5 @@ import Schema
 main :: IO ()
 main = runGRpcApp msgProtoBuf 8080 server
 
-server :: MonadServer m => SingleServerT Service m _
+server :: MonadServer m => SingleServerT i Service m _
 server = singleService ()

test-templates.sh

@@ -3,17 +3,20 @@
 mkdir template-check
 cd template-check
 
-stack new muavro https://raw.githubusercontent.com/higherkindness/mu-haskell/master/templates/grpc-server-avro.hsfiles -p "author-email:[email protected]" -p "author-name:Haskell Curry"
+# copy files (cannot use .. in Stack)
+cp ../templates/*.hsfiles .
+
+stack new muavro grpc-server-avro.hsfiles -p "author-email:[email protected]" -p "author-name:Haskell Curry"
 cd muavro
 stack build
 cd ..
 
-stack new muprotobuf https://raw.githubusercontent.com/higherkindness/mu-haskell/master/templates/grpc-server-protobuf.hsfiles -p "author-email:[email protected]" -p "author-name:Haskell Curry"
+stack new muprotobuf grpc-server-protobuf.hsfiles -p "author-email:[email protected]" -p "author-name:Haskell Curry"
 cd muprotobuf
 stack build
 cd ..
 
-stack new mugraphql https://raw.githubusercontent.com/higherkindness/mu-haskell/master/templates/graphql-server.hsfiles -p "author-email:[email protected]" -p "author-name:Haskell Curry"
+stack new mugraphql graphql-server.hsfiles -p "author-email:[email protected]" -p "author-name:Haskell Curry"
 cd mugraphql
 stack build
 cd ..