Optimize scrips (#868)

* optimize scripts * changelog * release * remove unused * package * remove deps * hconf * release * cli * release * release * files * cmd * format * format * release * update * scripts * update * hconf * update * release * release * update * update * update * BUFFER * BUFFER * BUFFER
morpheusgraphql · Jun 11, 2024 · 8dd9abb · 8dd9abb
1 parent 84b2f00
commit 8dd9abb
Show file tree

Hide file tree

Showing 146 changed files with 1,096 additions and 1,211 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -49,10 +49,11 @@ jobs:
   format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: mrkkrp/ormolu-action@v7
-        with:
-          pattern: morpheus-graphql*/**/*.hs
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup-hs
+      - name: check
+        shell: bash
+        run: hconf format --check
 
 concurrency:
   group: ${{ github.ref }}

diff --git a/examples/client/src/Client/DefineByIntrospection.hs b/examples/client/src/Client/DefineByIntrospection.hs
@@ -77,16 +77,16 @@ declareLocalTypesInline
 
 usersApi :: ByteString -> IO ByteString
 usersApi _ =
-  pure $
-    "{\"data\":{"
-      <> "\"myUser\":{ "
-      <> "   \"boo3\": \"name\","
-      <> "   \"myUserEmail\": \"some field\","
-      <> "   \"address\":{ \"city\":\"some city\" },"
-      <> "   \"customAdress\":{ \"customCity\":\"some custom city\" }"
-      <> "},"
-      <> " \"user\":{ \"email\":\"some email\" }"
-      <> "}}"
+  pure
+    $ "{\"data\":{"
+    <> "\"myUser\":{ "
+    <> "   \"boo3\": \"name\","
+    <> "   \"myUserEmail\": \"some field\","
+    <> "   \"address\":{ \"city\":\"some city\" },"
+    <> "   \"customAdress\":{ \"customCity\":\"some custom city\" }"
+    <> "},"
+    <> " \"user\":{ \"email\":\"some email\" }"
+    <> "}}"
 
 fetchUsers :: IO (Either (FetchError GetUser) GetUser)
 fetchUsers = fetch usersApi userArgs

diff --git a/examples/code-gen-docs/src/Server/API.hs b/examples/code-gen-docs/src/Server/API.hs
@@ -10,7 +10,7 @@ import Scalars (Markdown (..))
 import Server.Blog
 
 resolvePost ::
-  Monad m =>
+  (Monad m) =>
   ID ->
   m (Post m)
 resolvePost (ID x) =
@@ -21,7 +21,7 @@ resolvePost (ID x) =
       }
 
 resolveUser ::
-  Monad m =>
+  (Monad m) =>
   ID ->
   m (User m)
 resolveUser (ID x) =
@@ -31,15 +31,15 @@ resolveUser (ID x) =
         posts = traverse resolvePost ["id1", "id2"]
       }
 
-resolveQuery :: Monad m => Query m
+resolveQuery :: (Monad m) => Query m
 resolveQuery =
   Query
     { getPosts = traverse resolvePost ["id1", "id2"],
       getUsers = traverse resolveUser ["id1", "id2"]
     }
 
 rootResolver ::
-  Monad m =>
+  (Monad m) =>
   RootResolver m () Query Undefined Undefined
 rootResolver = defaultRootResolver {queryResolver = resolveQuery}
 

diff --git a/examples/code-gen/src/Domains/Posts/Resolver.hs b/examples/code-gen/src/Domains/Posts/Resolver.hs
@@ -10,19 +10,19 @@ import Data.Morpheus.Types
 import Domains.Posts.Posts
 
 resolvePost ::
-  Monad m =>
+  (Monad m) =>
   ID ->
   m (Maybe (Post m))
 resolvePost postId =
-  pure $
-    Just $
-      Post
-        { Domains.Posts.Posts.id = pure postId,
-          title = pure "Post Tittle",
-          authorID = pure "Post Author"
-        }
+  pure
+    $ Just
+    $ Post
+      { Domains.Posts.Posts.id = pure postId,
+        title = pure "Post Tittle",
+        authorID = pure "Post Author"
+      }
 
-resolveQuery :: Monad m => Query m
+resolveQuery :: (Monad m) => Query m
 resolveQuery =
   Query
     { posts =
@@ -36,7 +36,7 @@ resolveQuery =
     }
 
 rootResolver ::
-  Monad m =>
+  (Monad m) =>
   RootResolver m () Query Undefined Undefined
 rootResolver = defaultRootResolver {queryResolver = resolveQuery}
 

diff --git a/examples/code-gen/src/Domains/Users/Resolver.hs b/examples/code-gen/src/Domains/Users/Resolver.hs
@@ -10,18 +10,18 @@ import Data.Morpheus.Types
 import Domains.Users.Users
 
 resolveUser ::
-  Monad m =>
+  (Monad m) =>
   ID ->
   m (Maybe (User m))
 resolveUser postId =
-  pure $
-    Just $
-      User
-        { Domains.Users.Users.id = pure postId,
-          name = pure "User Tittle"
-        }
+  pure
+    $ Just
+    $ User
+      { Domains.Users.Users.id = pure postId,
+        name = pure "User Tittle"
+      }
 
-resolveQuery :: Monad m => Query m
+resolveQuery :: (Monad m) => Query m
 resolveQuery =
   Query
     { users =
@@ -35,7 +35,7 @@ resolveQuery =
     }
 
 rootResolver ::
-  Monad m =>
+  (Monad m) =>
   RootResolver m () Query Undefined Undefined
 rootResolver = defaultRootResolver {queryResolver = resolveQuery}
 

diff --git a/examples/scotty-fraxl/src/Fraxl/API.hs b/examples/scotty-fraxl/src/Fraxl/API.hs
@@ -235,7 +235,7 @@ isSchema = param "schema"
 
 httpEndpoint :: RoutePattern -> ScottyM ()
 httpEndpoint route = do
-  get route $
-    (isSchema *> raw (render app))
-      <|> raw httpPlayground
+  get route
+    $ (isSchema *> raw (render app))
+    <|> raw httpPlayground
   post route (raw . DB.runQuery . runFraxl fetchSource . runApp app =<< body)
diff --git a/examples/scotty-freer-simple/src/API.hs b/examples/scotty-freer-simple/src/API.hs
@@ -42,7 +42,7 @@ importGQLDocument =<< makeRelativeToProject "src/api.gql"
 api :: (Member DR.DeityRepo effs, Typeable effs) => ByteString -> Eff effs ByteString
 api = interpreter rootResolver
 
-rootResolver :: Member DR.DeityRepo effs => RootResolver (Eff effs) () Query Mutation Undefined
+rootResolver :: (Member DR.DeityRepo effs) => RootResolver (Eff effs) () Query Mutation Undefined
 rootResolver =
   defaultRootResolver
     { queryResolver = Query {deity = deityResolver},
@@ -62,5 +62,5 @@ toResponse ::
 toResponse (Right deity) = Right $ toResponse' deity
 toResponse (Left error) = Left $ show error
 
-toResponse' :: Applicative m => T.Deity -> Deity m
+toResponse' :: (Applicative m) => T.Deity -> Deity m
 toResponse' (T.Deity name power) = Deity {name = pure name, power = pure power}
diff --git a/examples/scotty-freer-simple/src/DeityRepo.hs b/examples/scotty-freer-simple/src/DeityRepo.hs
@@ -15,8 +15,8 @@ data DeityRepo r where
   CreateDeity :: Deity -> DeityRepo (Either Error Deity)
 
 -- Interface for use
-getDeityByName :: Member DeityRepo effs => Name -> Eff effs (Either Error Deity)
+getDeityByName :: (Member DeityRepo effs) => Name -> Eff effs (Either Error Deity)
 getDeityByName name = send $ GetDeityByName name
 
-createDeity :: Member DeityRepo effs => Deity -> Eff effs (Either Error Deity)
+createDeity :: (Member DeityRepo effs) => Deity -> Eff effs (Either Error Deity)
 createDeity deity = send $ CreateDeity deity
diff --git a/examples/scotty-freer-simple/src/ExampleDeityRepoHandler.hs b/examples/scotty-freer-simple/src/ExampleDeityRepoHandler.hs
@@ -30,7 +30,7 @@ exampleDeityRepoHandler dbRef =
       writeIORef dbRef $ addOrReplace diety deities
       pure (Right diety)
 
-addOrReplace :: Eq a => a -> [a] -> [a]
+addOrReplace :: (Eq a) => a -> [a] -> [a]
 addOrReplace a as = a : filter (/= a) as
 
 toEither :: b -> Maybe a -> Either b a

diff --git a/examples/scotty-freer-simple/src/Lib.hs b/examples/scotty-freer-simple/src/Lib.hs
@@ -32,8 +32,8 @@ server' showStart readyAction = do
     routes
   where
     settings =
-      setBeforeMainLoop readyAction $
-        setPort
+      setBeforeMainLoop readyAction
+        $ setPort
           8080
           defaultSettings
     showStartMessage = if showStart then 1 else 0

diff --git a/examples/scotty-haxl/src/HaxlAPI/API.hs b/examples/scotty-haxl/src/HaxlAPI/API.hs
@@ -100,7 +100,7 @@ httpEndpoint route = do
   get route $ (isSchema *> raw (render app)) <|> raw httpPlayground
   post route $ raw =<< (liftIO . runHaxlApp (deriveApp rootResolver) =<< body)
 
-runHaxlApp :: MapAPI a b => App e Haxl -> a -> IO b
+runHaxlApp :: (MapAPI a b) => App e Haxl -> a -> IO b
 runHaxlApp haxlApp input = do
   let stateStore = stateSet DeityState stateEmpty
   environment <- initEnv stateStore ()

diff --git a/examples/scotty-haxl/src/HaxlAPI/DataSource.hs b/examples/scotty-haxl/src/HaxlAPI/DataSource.hs
@@ -83,7 +83,7 @@ instance DataSourceName DeityReq where
 instance DataSource u DeityReq where
   fetch _ _ _ = BackgroundFetch myfetch
 
-fetchAll :: Foldable t => t (ResultVar [ID]) -> IO ()
+fetchAll :: (Foldable t) => t (ResultVar [ID]) -> IO ()
 fetchAll allIdVars = do
   allIds <- fetchDeityIds
   mapM_ (`putSuccess` allIds) allIdVars

diff --git a/examples/scotty/src/Server/MonadIO/API.hs b/examples/scotty/src/Server/MonadIO/API.hs
@@ -186,9 +186,9 @@ loginResolver LoginArgs {username, password} = do
             | userId userRow == 1 = tokenUser1
             | userId userRow == 2 = tokenUser2
             | otherwise = tokenUser3
-      pure $
-        Just $
-          Session {token = pure tokenUser, user = userResolver userRow}
+      pure
+        $ Just
+        $ Session {token = pure tokenUser, user = userResolver userRow}
     Nothing -> fail "Invalid user or password"
 
 getUserResolver :: (RESOLVER t) => Arg "id" Int -> Wrapped t Maybe User
@@ -224,8 +224,8 @@ addDogResolver (Arg name) = do
 -------------------------------------------------------------------------------
 userResolver :: (RESOLVER t) => UserRow -> Value t User
 userResolver UserRow {userId = thisUserId, userFullName} =
-  pure $
-    User
+  pure
+    $ User
       { id = idResolver,
         name = nameResolver,
         favoriteDog = favoriteDogResolver,
@@ -271,14 +271,14 @@ api = interpreter rootResolver
 app :: IO ()
 app = do
   db <- newTVarIO dbInit
-  scotty 8080 $
-    post "/api" $
-      do
-        reqBody <- body
-        reqHeaders <- headers
-        let env = Env db $ map (both $ T.pack . LT.unpack) reqHeaders
-        res <-
-          liftIO . runExceptT . flip runReaderT env . runWeb $ api reqBody
-        case res of
-          Left code -> status $ Status code "Error"
-          Right rawResponse -> raw rawResponse
+  scotty 8080
+    $ post "/api"
+    $ do
+      reqBody <- body
+      reqHeaders <- headers
+      let env = Env db $ map (both $ T.pack . LT.unpack) reqHeaders
+      res <-
+        liftIO . runExceptT . flip runReaderT env . runWeb $ api reqBody
+      case res of
+        Left code -> status $ Status code "Error"
+        Right rawResponse -> raw rawResponse
diff --git a/examples/scotty/src/Server/Mythology/API.hs b/examples/scotty/src/Server/Mythology/API.hs
@@ -67,7 +67,7 @@ resolveDeity :: DeityArgs -> ResolverQ e IO Deity
 resolveDeity DeityArgs {name, bornPlace} =
   liftEither $ dbDeity name bornPlace
 
-resolveCharacter :: Applicative m => [Character m]
+resolveCharacter :: (Applicative m) => [Character m]
 resolveCharacter =
   [ CharacterHuman someHuman,
     CharacterDeity someDeity,

diff --git a/examples/scotty/src/Server/Mythology/Character.hs b/examples/scotty/src/Server/Mythology/Character.hs
@@ -45,15 +45,15 @@ data Human m = Human
 
 type PersonGuard m = TypeGuard Person (UnionPerson m)
 
-resolvePersons :: Applicative m => [PersonGuard m]
+resolvePersons :: (Applicative m) => [PersonGuard m]
 resolvePersons = ResolveType <$> [UnionPersonDeity someDeity, UnionPersonHuman someHuman]
 
 data UnionPerson m
   = UnionPersonDeity Deity
   | UnionPersonHuman (Human m)
   deriving (Generic, GQLType)
 
-someHuman :: Applicative m => Human m
+someHuman :: (Applicative m) => Human m
 someHuman = Human {name = pure "Odysseus", bornAt = pure Ithaca}
 
 someDeity :: Deity
@@ -67,11 +67,11 @@ someDeity =
 
 dbDeity :: Text -> Maybe City -> IO (Either String Deity)
 dbDeity _ bornAt =
-  return $
-    Right $
-      Deity
-        { name = "Morpheus",
-          power = Just "Shapeshifting",
-          realm = Dream,
-          bornAt
-        }
+  return
+    $ Right
+    $ Deity
+      { name = "Morpheus",
+        power = Just "Shapeshifting",
+        realm = Dream,
+        bornAt
+      }
diff --git a/examples/scotty/src/Server/NamedResolvers/Authors.hs b/examples/scotty/src/Server/NamedResolvers/Authors.hs
@@ -63,8 +63,8 @@ instance ResolveNamed m (Author (NamedResolverT m)) where
   resolveBatched = traverse getAuthor
     where
       getAuthor uid =
-        pure $
-          Just
+        pure
+          $ Just
             Author
               { authorId = resolve (pure uid),
                 role = resolve (pure uid),
@@ -85,8 +85,8 @@ instance ResolveNamed m (Post (NamedResolverT m)) where
   resolveBatched = traverse getPost
     where
       getPost uid =
-        pure $
-          Just
+        pure
+          $ Just
             Post
               { author = resolve (pure uid)
               }

diff --git a/examples/scotty/src/Server/NamedResolvers/Pages.hs b/examples/scotty/src/Server/NamedResolvers/Pages.hs
@@ -59,7 +59,7 @@ data Query m = Query
       GQLType
     )
 
-instance MonadError GQLError m => ResolveNamed m (Query (NamedResolverT m)) where
+instance (MonadError GQLError m) => ResolveNamed m (Query (NamedResolverT m)) where
   type Dep (Query (NamedResolverT m)) = ()
   resolveBatched _ =
     pure

diff --git a/examples/scotty/src/Server/NamedResolvers/Posts.hs b/examples/scotty/src/Server/NamedResolvers/Posts.hs
@@ -50,12 +50,12 @@ data Post m = Post
 
 getPost :: (Monad m) => ID -> m (Maybe (Post (NamedResolverT m)))
 getPost pid =
-  pure $
-    Just $
-      Post
-        { postID = resolve (pure pid),
-          title = resolve (pure $ "title for \"" <> unpackID pid <> "\"")
-        }
+  pure
+    $ Just
+    $ Post
+      { postID = resolve (pure pid),
+        title = resolve (pure $ "title for \"" <> unpackID pid <> "\"")
+      }
 
 instance ResolveNamed m (Post (NamedResolverT m)) where
   type Dep (Post (NamedResolverT m)) = ID
@@ -71,7 +71,7 @@ data Query m = Query
       GQLType
     )
 
-instance MonadError GQLError m => ResolveNamed m (Query (NamedResolverT m)) where
+instance (MonadError GQLError m) => ResolveNamed m (Query (NamedResolverT m)) where
   type Dep (Query (NamedResolverT m)) = ()
   resolveBatched _ =
     pure