Rename IHP.HtmlSupport Modules To IHP.HSX

Guide/hsx.markdown

@@ -23,7 +23,7 @@ in
 
 **If the variable is another HSX expression, a blaze HTML element, a text or string**: it is just included as you would expect.
 
-**If the variable is any other custom Haskell data structure**: it will first be converted to a string representation by calling `show` on it. You can add a custom `ToHtml` (import it from `IHP.HtmlSupport.ToHtml`) instance, to customize rendering a data structure.
+**If the variable is any other custom Haskell data structure**: it will first be converted to a string representation by calling `show` on it. You can add a custom `ToHtml` (import it from `IHP.HSX.ToHtml`) instance, to customize rendering a data structure.
 
 You can also write more complex code like:
 
@@ -266,4 +266,4 @@ action CreateUserAction = do
         |> createRecord
 ```
 
-Now when the country input field is empty when creating the user, the `country` field will be set to `Nothing` instead of `Just ""`.
+Now when the country input field is empty when creating the user, the `country` field will be set to `Nothing` instead of `Just ""`.

IHP/AutoRefresh/View.hs

@@ -3,7 +3,7 @@ module IHP.AutoRefresh.View where
 import IHP.Prelude
 import IHP.ViewSupport
 import IHP.AutoRefresh.Types
-import IHP.HtmlSupport.QQ (hsx)
+import IHP.HSX.QQ (hsx)
 import qualified Text.Blaze.Html5 as Html5
 import IHP.Controller.Context
 

IHP/ErrorController.hs

@@ -31,7 +31,7 @@ import qualified Database.PostgreSQL.Simple.FromField as PG
 import qualified Data.ByteString.Char8 as ByteString
 import qualified Data.ByteString.Lazy as LBS
 
-import IHP.HtmlSupport.QQ (hsx)
+import IHP.HSX.QQ (hsx)
 import Database.PostgreSQL.Simple.FromField (ResultError (..))
 import qualified IHP.ModelSupport as ModelSupport
 import IHP.FrameworkConfig
@@ -442,4 +442,4 @@ renderError errorTitle view = H.docTypeHtml ! A.lang "en" $ [hsx|
                     <a href="https://gitter.im/digitallyinduced/ihp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge" target="_blank">Gitter</a>
                     <a href="https://www.reddit.com/r/IHPFramework/" target="_blank">Reddit</a>
                 </div>
-            |]
+            |]

IHP/Fetch.hs

@@ -35,7 +35,7 @@ import qualified Database.PostgreSQL.Simple.Types as PG
 import GHC.OverloadedLabels
 import IHP.ModelSupport
 import qualified Data.ByteString.Builder as Builder
-import IHP.HtmlSupport.ToHtml
+import IHP.HSX.ToHtml
 import qualified Data.ByteString.Char8 as ByteString
 import qualified Data.ByteString.Lazy as LByteString
 import qualified Control.DeepSeq as DeepSeq

IHP/HtmlSupport/Parser.hs → IHP/HSX/Parser.hs

@@ -1,4 +1,4 @@
-module IHP.HtmlSupport.Parser
+module IHP.HSX.Parser
 ( parseHsx
 , Node (..)
 , Attribute (..)
@@ -39,13 +39,13 @@ data Node = Node !Text ![Attribute] ![Node] !Bool
 -- | Parses a HSX text and returns a 'Node'
 --
 -- __Example:__
--- 
+--
 -- > let filePath = "my-template"
 -- > let line = 0
 -- > let col = 0
 -- > let position = Megaparsec.SourcePos filePath (Megaparsec.mkPos line) (Megaparsec.mkPos col)
 -- > let hsxText = "<strong>Hello</strong>"
--- > 
+-- >
 -- > let (Right node) = parseHsx position hsxText
 parseHsx :: SourcePos -> Text -> Either (ParseErrorBundle Text Void) Node
 parseHsx position code = runParser (setPosition position *> parser) "" code
@@ -124,7 +124,7 @@ hsxNodeAttributes :: Parser a -> Parser [Attribute]
 hsxNodeAttributes end = staticAttributes
     where
         staticAttributes = do
-            attributes <- manyTill (hsxNodeAttribute <|> hsxSplicedAttributes) end 
+            attributes <- manyTill (hsxNodeAttribute <|> hsxSplicedAttributes) end
             let staticAttributes = List.filter isStaticAttribute attributes
             let keys = List.map (\(StaticAttribute name _) -> name) staticAttributes
             let uniqueKeys = List.nub keys
@@ -391,7 +391,7 @@ leafs = Set.fromList
 
 stripTextNodeWhitespaces nodes = stripLastTextNodeWhitespaces (stripFirstTextNodeWhitespaces nodes)
 
-stripLastTextNodeWhitespaces nodes = 
+stripLastTextNodeWhitespaces nodes =
     let strippedLastElement = if List.length nodes > 0
             then case List.last nodes of
                 TextNode text -> Just $ TextNode (Text.stripEnd text)
@@ -401,7 +401,7 @@ stripLastTextNodeWhitespaces nodes =
         Just last -> (fst $ List.splitAt ((List.length nodes) - 1) nodes) <> [last]
         Nothing -> nodes
 
-stripFirstTextNodeWhitespaces nodes = 
+stripFirstTextNodeWhitespaces nodes =
     let strippedFirstElement = if List.length nodes > 0
             then case List.head nodes of
                 TextNode text -> Just $ TextNode (Text.stripStart text)
@@ -415,7 +415,7 @@ stripFirstTextNodeWhitespaces nodes =
 collapseSpace :: Text -> Text
 collapseSpace text = cs $ filterDuplicateSpaces (cs text)
     where
-        filterDuplicateSpaces :: String -> String 
+        filterDuplicateSpaces :: String -> String
         filterDuplicateSpaces string = filterDuplicateSpaces' string False
 
         filterDuplicateSpaces' :: String -> Bool -> String

IHP/HtmlSupport/QQ.hs → IHP/HSX/QQ.hs

@@ -1,9 +1,9 @@
 {-# LANGUAGE TemplateHaskell, UndecidableInstances, BangPatterns #-}
 
-module IHP.HtmlSupport.QQ (hsx) where
+module IHP.HSX.QQ (hsx) where
 
 import           ClassyPrelude
-import           IHP.HtmlSupport.Parser
+import           IHP.HSX.Parser
 import qualified "template-haskell" Language.Haskell.TH           as TH
 import qualified "template-haskell" Language.Haskell.TH.Syntax           as TH
 import           Language.Haskell.TH.Quote
@@ -13,7 +13,7 @@ import           Text.Blaze.Html5.Attributes as A
 import Text.Blaze.Html (Html)
 import Text.Blaze.Internal (attribute, MarkupM (Parent, Leaf), StaticString (..))
 import Data.String.Conversions
-import IHP.HtmlSupport.ToHtml
+import IHP.HSX.ToHtml
 import Control.Monad.Fail
 import qualified Text.Megaparsec as Megaparsec
 import qualified Text.Blaze.Html.Renderer.String as BlazeString
@@ -49,7 +49,7 @@ compileToHaskell (Node name attributes children isLeaf) =
         stringAttributes = TH.listE $ map toStringAttribute attributes
         openTag :: Text
         openTag = "<" <> tag
-        tag :: Text 
+        tag :: Text
         tag = cs name
     in
         if isLeaf

IHP/HtmlSupport/ToHtml.hs → IHP/HSX/ToHtml.hs

@@ -1,7 +1,8 @@
 {-# LANGUAGE  UndecidableInstances #-}
 
-module IHP.HtmlSupport.ToHtml where
-import qualified Text.Blaze.Html5              as Html5
+module IHP.HSX.ToHtml where
+
+import qualified Text.Blaze.Html5 as Html5
 import qualified Text.Blaze.Internal
 import ClassyPrelude
 import Data.String.Conversions (cs)
@@ -35,4 +36,3 @@ instance {-# OVERLAPPABLE #-} Show a => ToHtml (Maybe a) where
 instance {-# OVERLAPPABLE #-} Show a => ToHtml a where
     {-# INLINE toHtml #-}
     toHtml value = cs (show value)
-

IHP/Modal/ViewFunctions.hs

@@ -7,7 +7,7 @@ module IHP.Modal.ViewFunctions (modal, renderModal) where
 
 import IHP.Prelude
 import IHP.Controller.Context
-import IHP.HtmlSupport.QQ (hsx)
+import IHP.HSX.QQ (hsx)
 import IHP.Modal.Types
 import Text.Blaze.Html5 (Html, preEscapedText)
 
@@ -52,7 +52,7 @@ renderModalHeader title closeUrl = [hsx|
 |]
 
 modal :: (?context :: ControllerContext) => Html
-modal = 
+modal =
     case maybeFromFrozenContext of
         Just (ModalContainer html) -> html
-        Nothing -> mempty
+        Nothing -> mempty

IHP/QueryBuilder.hs

@@ -49,7 +49,7 @@ import qualified Database.PostgreSQL.Simple.Types as PG
 import GHC.OverloadedLabels
 import IHP.ModelSupport
 import qualified Data.ByteString.Builder as Builder
-import IHP.HtmlSupport.ToHtml
+import IHP.HSX.ToHtml
 import qualified Data.ByteString.Char8 as ByteString
 import qualified Data.ByteString.Lazy as LByteString
 import qualified Control.DeepSeq as DeepSeq

IHP/View/CSSFramework.hs

@@ -8,8 +8,8 @@ module IHP.View.CSSFramework where
 import IHP.Prelude
 import IHP.FlashMessages.Types
 import qualified Text.Blaze.Html5 as Blaze
-import IHP.HtmlSupport.QQ (hsx)
-import IHP.HtmlSupport.ToHtml
+import IHP.HSX.QQ (hsx)
+import IHP.HSX.ToHtml
 import IHP.View.Types
 import IHP.View.Classes
 
@@ -40,7 +40,7 @@ instance Default CSSFramework where
             }
         where
             styledFlashMessages cssFramework flashMessages = forEach flashMessages (styledFlashMessage cssFramework cssFramework)
-            
+
             styledFormField :: CSSFramework -> FormField -> Blaze.Html
             styledFormField cssFramework formField =
                     case get #fieldType formField of

IHP/View/Form.hs

@@ -17,14 +17,14 @@ import           IHP.View.ConvertibleStrings ()
 import           IHP.ViewErrorMessages
 import           IHP.ViewSupport
 import qualified Text.Blaze.Html5                   as Html5
-import IHP.HtmlSupport.ToHtml
+import IHP.HSX.ToHtml
 import IHP.NameSupport
 import GHC.Types
 import IHP.RouterSupport hiding (get)
 import IHP.ModelSupport (getModelName, inputValue, isNew, GetModelName, Id', NormalizeModel, MetaBag, InputValue)
-import IHP.HtmlSupport.QQ (hsx)
+import IHP.HSX.QQ (hsx)
 import IHP.View.Types
-import IHP.View.Classes 
+import IHP.View.Classes
 import qualified Network.Wai as Wai
 import IHP.Controller.Context
 
@@ -46,12 +46,12 @@ import IHP.Controller.Context
 -- >         <label for="post_title">Title</label>
 -- >         <input type="text" name="title" id="post_title" class="form-control" />
 -- >     </div>
--- > 
+-- >
 -- >     <div class="form-group" id="form-group-post_body">
 -- >         <label for="post_body">Body</label>
 -- >         <textarea name="body" id="post_body" class="form-control"></textarea>
 -- >     </div>
--- > 
+-- >
 -- >     <button class="btn btn-primary">Create Post</button>
 -- > </form>
 --
@@ -115,7 +115,7 @@ formFor record formBody = formForWithOptions @record @id @application record (\c
 -- >     {textareaField #body}
 -- >     {submitButton}
 -- > |]
--- > 
+-- >
 -- > formOptions :: FormContext Post -> FormContext Post
 -- > formOptions formContext = formContext
 -- >     |> set #formId "post-form"
@@ -153,7 +153,7 @@ formForWithOptions record applyOptions formBody = buildForm (applyOptions (creat
 -- >     {textareaField #body}
 -- >     {submitButton}
 -- > |]
--- > 
+-- >
 -- > formOptions :: FormContext Post -> FormContext Post
 -- > formOptions formContext = formContext
 -- >     |> set #disableJavascriptSubmission True
@@ -174,23 +174,23 @@ formForWithoutJavascript record formBody = formForWithOptions @record @id @appli
 -- | Allows a custom form action (form submission url) to be set
 --
 -- The URL where the form is going to be submitted to is specified in HTML using the form's @action@ attribute. When using 'formFor' the @action@ attribute is automatically set to the expected path.
--- 
+--
 -- E.g. given the below 'formFor' code, the @action@ is set to @/CreatePost@ or @/UpdatePost@:
--- 
+--
 -- > renderForm :: Post -> Html
 -- > renderForm post = formFor post [hsx|
 -- >     {textField #title}
 -- >     {textareaField #body}
 -- >     {submitButton}
 -- > |]
--- 
+--
 -- To override the auto-generated @action@ attribute use the 'formFor\'' function:
--- 
+--
 -- > renderForm :: Post -> Html
 -- > renderForm post = formFor' post "/my-custom-endpoint" [hsx||]
--- 
+--
 -- If you pass an action to that, you need to wrap it with 'pathTo':
--- 
+--
 -- > renderForm :: Post -> Html
 -- > renderForm post = formFor' post (pathTo CreateDraftAction) [hsx||]
 --
@@ -328,7 +328,7 @@ submitButton =
 --
 -- > <div class="form-group" id="form-group-post_title">
 -- >     <label for="post_title">Title</label>
--- > 
+-- >
 -- >     <input type="text" name="title" id="post_title" class="form-control" />
 -- >     <small class="form-text text-muted">Max. 140 characters</small>
 -- > </div>
@@ -376,7 +376,7 @@ submitButton =
 --
 -- > <div class="form-group" id="form-group-post_title">
 -- >     <label for="post_title">Title</label>
--- > 
+-- >
 -- >     <input
 -- >         type="text"
 -- >         name="title"
@@ -397,7 +397,7 @@ submitButton =
 --
 -- > <div class="form-group" id="form-group-post_title">
 -- >     <label for="post_title">Title</label>
--- > 
+-- >
 -- >     <input
 -- >         type="text"
 -- >         name="title"
@@ -417,7 +417,7 @@ submitButton =
 --
 -- > <div class="form-group" id="form-group-post_title">
 -- >     <label for="post_title">Title</label>
--- > 
+-- >
 -- >     <input
 -- >         type="text"
 -- >         name="title"
@@ -781,4 +781,4 @@ instance (
         in
             init path
                 |> (\path -> [""] <> (fromMaybe [] path) <> [action])
-                |> intercalate "/"
+                |> intercalate "/"

IHP/ViewPrelude.hs

@@ -41,8 +41,8 @@ import           IHP.ViewSupport
 import Text.Blaze (preEscapedText, stringValue, text, (!))
 import Text.Blaze.Html5 (preEscapedToHtml)
 import IHP.View.Form
-import IHP.HtmlSupport.QQ (hsx)
-import IHP.HtmlSupport.ToHtml
+import IHP.HSX.QQ (hsx)
+import IHP.HSX.ToHtml
 import IHP.View.TimeAgo
 import IHP.ValidationSupport
 import IHP.Controller.RequestContext
@@ -65,4 +65,4 @@ import IHP.Job.Types
 import IHP.LoginSupport.Helper.View
 import IHP.PageTitle.ViewFunctions
 
-import IHP.Assets.ViewFunctions
+import IHP.Assets.ViewFunctions