Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ihp-context/ihp-context.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ common shared-properties
, ImplicitParams
, BlockArguments
, LambdaCase
ghc-options: -Werror=incomplete-patterns
ghc-options: -Werror=incomplete-patterns -Werror=unused-imports

library
import: shared-properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module IHP.DataSync.TypeScript.Compiler where

import IHP.Prelude
import IHP.Postgres.Types
import NeatInterpolation

generateTypeScriptTypeDefinitions :: [Statement] -> Text
generateTypeScriptTypeDefinitions schema = [trimming|
Expand Down
2 changes: 0 additions & 2 deletions ihp-datasync-typescript/Test/Spec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ module Main where
import Test.Hspec
import IHP.Prelude
import IHP.DataSync.TypeScript.Compiler
import NeatInterpolation
import IHP.ControllerPrelude

import qualified IHP.Postgres.Parser as Parser
import IHP.Postgres.Types
Expand Down
2 changes: 1 addition & 1 deletion ihp-datasync-typescript/ihp-datasync-typescript.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ common shared-properties
, LambdaCase
, TemplateHaskell
, OverloadedRecordDot
ghc-options: -Werror=incomplete-patterns
ghc-options: -Werror=incomplete-patterns -Werror=unused-imports

library
import: shared-properties
Expand Down
1 change: 0 additions & 1 deletion ihp-datasync/IHP/DataSync/Controller.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import IHP.DataSync.RowLevelSecurity
import qualified IHP.DataSync.ChangeNotifications as ChangeNotifications
import IHP.DataSync.ControllerImpl (runDataSyncController)
import IHP.DataSync.DynamicQueryCompiler (camelCaseRenamer)
import IHP.ModelSupport.Types (ModelContext(..))

instance (
Show (PrimaryKey (GetTableName CurrentUserRecord))
Expand Down
4 changes: 1 addition & 3 deletions ihp-datasync/IHP/DataSync/ControllerImpl.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
module IHP.DataSync.ControllerImpl where

import IHP.ControllerPrelude hiding (OrderByClause, sqlQuery, sqlExec, sqlQueryScalar)
import Network.Wai (Request)
import qualified Control.Exception.Safe as Exception
import qualified IHP.Log as Log
import qualified Data.Aeson as Aeson
Expand All @@ -22,14 +21,13 @@ import IHP.DataSync.Types
import IHP.DataSync.RowLevelSecurity
import IHP.DataSync.DynamicQuery
import IHP.DataSync.DynamicQueryCompiler
import IHP.DataSync.TypedEncoder (ColumnTypeInfo(..), makeCachedColumnTypeLookup, typedAesonValueToSnippet, lookupColumnType)
import IHP.DataSync.TypedEncoder (makeCachedColumnTypeLookup, typedAesonValueToSnippet, lookupColumnType)
import qualified IHP.DataSync.ChangeNotifications as ChangeNotifications
import qualified IHP.PGListener as PGListener
import qualified Data.Set as Set
import GHC.Conc (ThreadId, myThreadId, atomically)
import Control.Concurrent.QSemN
import Control.Concurrent.STM.TVar
import IHP.RequestVault
import qualified Data.List as List

$(deriveFromJSON defaultOptions ''DataSyncMessage)
Expand Down
4 changes: 0 additions & 4 deletions ihp-datasync/IHP/DataSync/DynamicQuery.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Copyright: (c) digitally induced GmbH, 2021
module IHP.DataSync.DynamicQuery where

import IHP.ControllerPrelude hiding (OrderByClause)
import Data.Aeson
import qualified Data.Aeson as Aeson
import qualified IHP.QueryBuilder as QueryBuilder
import qualified Hasql.Decoders as Decoders
Expand All @@ -22,11 +21,8 @@ import qualified Data.Scientific as Scientific
import qualified Data.UUID as UUID
import qualified Data.Vector as Vector
import qualified Data.List as List
import qualified Data.Text as Text
import qualified Data.HashMap.Strict as HashMap
import qualified IHP.QueryBuilder.HasqlHelpers as HasqlHelpers
import IHP.Postgres.Point (Point(..))
import Data.Int (Int64)
import qualified Data.Set as Set

data Field = Field { fieldName :: Text, fieldValue :: Value }
Expand Down
3 changes: 1 addition & 2 deletions ihp-datasync/IHP/DataSync/DynamicQueryCompiler.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ module IHP.DataSync.DynamicQueryCompiler where

import IHP.Prelude
import IHP.DataSync.DynamicQuery
import IHP.DataSync.TypedEncoder (ColumnTypeInfo(..), typedValueParam)
import IHP.DataSync.TypedEncoder (typedValueParam)
import qualified IHP.QueryBuilder as QueryBuilder
import qualified Hasql.DynamicStatements.Snippet as Snippet
import Hasql.DynamicStatements.Snippet (Snippet)
import qualified Data.List as List
import qualified Data.HashMap.Strict as HashMap
import Data.Int (Int32)
import qualified Data.Aeson as Aeson

data Renamer = Renamer
Expand Down
2 changes: 0 additions & 2 deletions ihp-datasync/IHP/DataSync/Pool.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ module IHP.DataSync.Pool
) where

import IHP.Prelude
import qualified Hasql.Pool
import IHP.FrameworkConfig (findOptionOrNothing, addInitializer)
import IHP.FrameworkConfig.Types (RLSAuthenticatedRole(..))
import IHP.ModelSupport.Types (ModelContext(..))
import qualified Control.Monad.Trans.State.Strict as State
import qualified Data.TMap as TMap
import qualified IHP.DataSync.Role as Role
Expand Down
6 changes: 1 addition & 5 deletions ihp-datasync/IHP/DataSync/REST/Controller.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
module IHP.DataSync.REST.Controller where

import IHP.ControllerPrelude hiding (OrderByClause)
import Network.Wai (Request)
import IHP.DataSync.REST.Types
import Data.Aeson
import qualified Data.Vector as Vector
Expand All @@ -13,8 +12,7 @@ import IHP.DataSync.DynamicQuery
import IHP.DataSync.Types
import Network.HTTP.Types (status400)
import IHP.DataSync.DynamicQueryCompiler
import IHP.DataSync.TypedEncoder (ColumnTypeInfo(..), makeCachedColumnTypeLookup, typedAesonValueToSnippet, lookupColumnType)
import qualified Data.HashMap.Strict as HashMap
import IHP.DataSync.TypedEncoder (makeCachedColumnTypeLookup, typedAesonValueToSnippet, lookupColumnType)
import qualified Data.Text as Text
import qualified Data.List as List

Expand All @@ -23,8 +21,6 @@ import qualified Data.Aeson.Encoding.Internal as Aeson
import qualified Data.Aeson.KeyMap as Aeson
import qualified Data.Aeson.Key as Aeson
import qualified Hasql.DynamicStatements.Snippet as Snippet
import Hasql.DynamicStatements.Snippet (Snippet)
import IHP.ModelSupport.Types (ModelContext(..))

instance (
Show (PrimaryKey (GetTableName CurrentUserRecord))
Expand Down
3 changes: 1 addition & 2 deletions ihp-datasync/IHP/DataSync/TypedEncoder.hs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ import qualified Data.Aeson as Aeson
import qualified Data.Aeson.KeyMap as Aeson
import qualified Data.UUID as UUID
import qualified Data.Scientific as Scientific
import Data.Int (Int16, Int32, Int64)
import Data.Time (UTCTime, LocalTime, Day)
import Data.Int (Int16)
import qualified Data.Time.Format.ISO8601 as ISO8601
import qualified Data.Attoparsec.Text as Attoparsec
import qualified Data.Text as Text
Expand Down
3 changes: 1 addition & 2 deletions ihp-datasync/Test/DataSync/ChangeNotifications.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ module Test.DataSync.ChangeNotifications where
import Test.Hspec
import IHP.Prelude
import Data.Aeson
import qualified Data.Aeson.Key as Aeson
import IHP.DataSync.ChangeNotifications (Change(..), ChangeNotification(..))
import IHP.DataSync.ChangeNotifications (Change(..))
import IHP.DataSync.ControllerImpl (changesToValue)
import IHP.DataSync.DynamicQueryCompiler (Renamer(..))
import IHP.DataSync.DynamicQuery (ConditionExpression(..), ConditionOperator(..), FunctionCall(..), conditionColumns)
Expand Down
4 changes: 1 addition & 3 deletions ihp-datasync/Test/DataSync/DataSyncIntegrationSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ import IHP.RequestVault (pgListenerVaultKey, frameworkConfigVaultKey)
import IHP.Controller.Context (newControllerContext, putContext, freeze)
import IHP.LoginSupport.Types (HasNewSessionUrl(..), CurrentUserRecord)
import qualified IHP.ModelSupport as ModelSupport
import IHP.ModelSupport.Types (ModelContext(..), Id'(..), GetTableName, PrimaryKey)
import IHP.ModelSupport.Types (Id'(..), PrimaryKey)
import qualified IHP.PGListener as PGListener
import IHP.FrameworkConfig (buildFrameworkConfig)
import IHP.FrameworkConfig.Types

import qualified Data.Vault.Lazy as Vault
import qualified Data.HashMap.Strict as HashMap
import qualified Data.UUID.V4 as UUID
import qualified Data.UUID as UUID
import qualified Data.Text as Text
Expand All @@ -35,7 +34,6 @@ import Data.Aeson (Value(..), object, (.=))
import qualified Data.Aeson as Aeson
import Control.Concurrent.STM
import Control.Concurrent (threadDelay)
import Data.IORef
import qualified IHP.Log as Log

-- | Define CurrentUserRecord for this test module
Expand Down
1 change: 0 additions & 1 deletion ihp-datasync/Test/DataSync/DynamicQueryCompiler.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import Test.Hspec
import IHP.Prelude
import IHP.DataSync.DynamicQueryCompiler
import IHP.DataSync.DynamicQuery
import IHP.DataSync.TypedEncoder (ColumnTypeInfo(..))
import IHP.QueryBuilder hiding (OrderByClause)
import Hasql.DynamicStatements.Snippet (Snippet)
import qualified Hasql.DynamicStatements.Snippet as Snippet
Expand Down
1 change: 0 additions & 1 deletion ihp-datasync/Test/DataSync/TypedEncoder.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import IHP.DataSync.TypedEncoder
import Hasql.DynamicStatements.Snippet (Snippet)
import qualified Hasql.DynamicStatements.Snippet as Snippet
import qualified Data.Aeson as Aeson
import qualified Data.Aeson.KeyMap as Aeson
import qualified Data.Vector as Vector
import qualified Control.Exception as Exception

Expand Down
2 changes: 2 additions & 0 deletions ihp-datasync/ihp-datasync.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ common shared-properties
-Wall-missed-specialisations
-Wno-ambiguous-fields
-Werror=incomplete-patterns
-Werror=unused-imports
else
ghc-options:
-fstatic-argument-transformation
Expand All @@ -109,6 +110,7 @@ common shared-properties
-Wall-missed-specialisations
-Wno-ambiguous-fields
-Werror=incomplete-patterns
-Werror=unused-imports

library
import: shared-properties
Expand Down
2 changes: 1 addition & 1 deletion ihp-graphql/ihp-graphql.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ common shared-properties
, LambdaCase
, TemplateHaskell
, OverloadedRecordDot
ghc-options: -Werror=incomplete-patterns
ghc-options: -Werror=incomplete-patterns -Werror=unused-imports

library
import: shared-properties
Expand Down
2 changes: 1 addition & 1 deletion ihp-hspec/ihp-hspec.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ library
OverloadedStrings
ImplicitParams
RecordWildCards
ghc-options: -Werror=incomplete-patterns
ghc-options: -Werror=incomplete-patterns -Werror=unused-imports
build-depends: base >= 4.17.0 && < 4.22, ihp, ihp-log, wai, process, text, ihp-ide, vault, uuid, hasql, wai-request-params
hs-source-dirs: .
exposed-modules: IHP.Hspec
2 changes: 1 addition & 1 deletion ihp-ide/IHP/IDE/CodeGen/MailGenerator.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module IHP.IDE.CodeGen.MailGenerator (buildPlan, buildPlan', MailConfig (..)) wh
import IHP.Prelude
import IHP.IDE.CodeGen.Types
import IHP.Postgres.Types
import Text.Countable (singularize, pluralize)
import Text.Countable (pluralize)

data MailConfig = MailConfig
{ controllerName :: Text
Expand Down
1 change: 0 additions & 1 deletion ihp-ide/IHP/IDE/CodeGen/ViewGenerator.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module IHP.IDE.CodeGen.ViewGenerator (buildPlan, buildPlan', ViewConfig (..), po
import IHP.Prelude
import IHP.IDE.CodeGen.Types
import IHP.Postgres.Types
import IHP.NameSupport (columnNameToFieldName, columnNameToFieldLabel)
import Text.Countable (singularize, pluralize)

data ViewConfig = ViewConfig
Expand Down
1 change: 0 additions & 1 deletion ihp-ide/IHP/IDE/Data/Controller.hs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import qualified Data.Aeson as Aeson
import qualified Data.Aeson.KeyMap as Aeson
import qualified Data.Aeson.Key as Aeson
import qualified Data.List as List
import Data.Int (Int64)
import IHP.QueryBuilder.HasqlHelpers (wrapDynamicQuery, quoteIdentifier)

instance Controller DataController where
Expand Down
2 changes: 1 addition & 1 deletion ihp-ide/IHP/IDE/FileWatcher.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import qualified Data.Map as Map
import qualified System.FSNotify as FS
import qualified Data.List as List
import qualified Control.Debounce as Debounce
import System.OsPath (OsPath, encodeUtf, decodeUtf)
import System.OsPath (encodeUtf, decodeUtf)
import qualified System.Process as Process
import qualified System.IO as IO

Expand Down
1 change: 0 additions & 1 deletion ihp-ide/IHP/IDE/LiveReloadNotificationServer.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module IHP.IDE.LiveReloadNotificationServer (app, notifyHaskellChange, notifyAss
import IHP.Prelude
import qualified Network.WebSockets as Websocket
import qualified Control.Concurrent as Concurrent
import IHP.IDE.Types
import qualified Control.Exception as Exception
import qualified Data.UUID.V4 as UUID
import qualified Data.Map as Map
Expand Down
2 changes: 0 additions & 2 deletions ihp-ide/IHP/IDE/Logs/Controller.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ import IHP.ControllerPrelude
import IHP.IDE.ToolServer.Helper.Controller
import IHP.IDE.ToolServer.Types
import IHP.IDE.Logs.View.Logs
import qualified IHP.IDE.Types as DevServer
import qualified Data.ByteString.Char8 as ByteString
import qualified Data.ByteString.Builder as ByteString
import qualified Control.Concurrent.MVar as MVar

instance Controller LogsController where
action AppLogsAction = do
Expand Down
1 change: 0 additions & 1 deletion ihp-ide/IHP/IDE/PortConfig.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import ClassyPrelude
import qualified Network.Socket as Socket
import qualified UnliftIO.Exception as Exception
import Foreign.C.Error (Errno (..), eCONNREFUSED)
import Control.Exception.Safe (IOException(..))
import GHC.IO.Exception (ioe_errno)
import IHP.FrameworkConfig (defaultPort)
import qualified System.Posix.IO as Posix
Expand Down
2 changes: 1 addition & 1 deletion ihp-ide/IHP/IDE/Postgres.hs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import qualified Control.Exception.Safe as Exception
import qualified IHP.Log as Log
import qualified IHP.EnvVar as EnvVar
import Paths_ihp_ide (getDataFileName)
import System.OsPath (OsPath, encodeUtf, decodeUtf)
import System.OsPath (decodeUtf)

withPostgres :: (?context :: Context) => (MVar () -> IORef ByteString.Builder -> IORef ByteString.Builder -> IO a) -> IO a
withPostgres callback = do
Expand Down
3 changes: 0 additions & 3 deletions ihp-ide/IHP/IDE/Prelude.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ module IHP.IDE.Prelude
, module IHP.Controller.Layout
, module IHP.FlashMessages
, module IHP.Modal.Types
, module IHP.Modal.ControllerFunctions
, setModal
, module IHP.ValidationSupport
) where
Expand All @@ -26,12 +25,10 @@ import IHP.Controller.Redirect
import IHP.Controller.Layout
import IHP.FlashMessages
import IHP.Modal.Types
import IHP.Modal.ControllerFunctions hiding (setModal)
import qualified IHP.Modal.ControllerFunctions as Modal
import IHP.ViewSupport (View)
import qualified IHP.ViewSupport as ViewSupport
import IHP.ValidationSupport
import Network.Wai (Request)

-- | Renders a view and stores it as modal HTML in the context for later rendering.
--
Expand Down
2 changes: 0 additions & 2 deletions ihp-ide/IHP/IDE/SchemaDesigner/Controller/Helper.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import qualified Text.Megaparsec as Megaparsec
import qualified IHP.IDE.SchemaDesigner.Compiler as SchemaCompiler
import IHP.IDE.SchemaDesigner.View.Schema.Error
import IHP.IDE.ToolServer.Helper.Controller
import Wai.Request.Params.Middleware (Respond)
import Network.Wai (Request)

instance ParamReader PostgresType where
readParameter byteString = case Megaparsec.runParser Parser.sqlType "" (cs byteString) of
Expand Down
5 changes: 0 additions & 5 deletions ihp-ide/IHP/IDE/ToolServer.hs
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,11 @@ import IHP.IDE.ToolServer.Routes ()
import qualified System.Process as Process
import System.Info
import qualified IHP.EnvVar as EnvVar
import qualified IHP.AutoRefresh.Types as AutoRefresh
import qualified IHP.AutoRefresh as AutoRefresh
import IHP.Controller.Context
import IHP.RequestVault.Helper (lookupRequestVault)
import qualified IHP.IDE.ToolServer.Layout as Layout
import IHP.Controller.Layout
import qualified IHP.IDE.LiveReloadNotificationServer as LiveReloadNotificationServer
import qualified IHP.Version as Version
import qualified IHP.PGListener as PGListener
import IHP.RequestVault.ModelContext (modelContextMiddleware)
import qualified Control.Exception.Safe as Exception

import qualified Network.Wai.Application.Static as Static
Expand Down
5 changes: 1 addition & 4 deletions ihp-ide/IHP/IDE/ToolServer/Helper/Controller.hs
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,16 @@ module IHP.IDE.ToolServer.Helper.Controller
import IHP.Prelude
import IHP.ControllerSupport
import IHP.IDE.ToolServer.Types
import qualified IHP.IDE.PortConfig as PortConfig
import IHP.IDE.Types
import qualified Network.Socket as Socket
import qualified System.Process as Process
import System.Info (os)
import qualified IHP.EnvVar as EnvVar
import IHP.Controller.Context
import System.IO.Unsafe (unsafePerformIO)

import qualified Data.Text as Text
import qualified System.Directory.OsPath as Directory
import qualified Data.Text.IO as IO
import System.OsPath (OsPath, encodeUtf, decodeUtf)
import System.OsPath (encodeUtf, decodeUtf)

-- | Returns the port used by the running app. Usually returns @8000@.
theAppPort :: (?context :: ControllerContext) => IO Socket.PortNumber
Expand Down
2 changes: 0 additions & 2 deletions ihp-ide/IHP/IDE/ToolServer/Types.hs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module IHP.IDE.ToolServer.Types where

import IHP.Prelude
import qualified IHP.IDE.Types as DevServer
import Control.Concurrent.MVar
import qualified Data.ByteString.Builder as ByteString
import Network.Socket (PortNumber)
import qualified Data.Vault.Lazy as Vault
Expand Down
2 changes: 0 additions & 2 deletions ihp-ide/IHP/IDE/Types.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module IHP.IDE.Types where

import ClassyPrelude
import System.Process.Internals
import qualified System.Process as Process
import qualified GHC.IO.Handle as Handle
import qualified Network.WebSockets as Websocket
Expand All @@ -11,7 +10,6 @@ import Data.String.Conversions (cs)
import Data.UUID
import qualified IHP.Log.Types as Log
import qualified IHP.Log as Log
import qualified Data.ByteString.Builder as ByteString
import qualified Control.Concurrent.Chan.Unagi as Queue
import qualified Network.Socket as Socket
import System.OsPath (OsPath, decodeUtf)
Expand Down
Loading