Moved IHP.HSX modules into it's own ihp-hsx package

Author: mpscholten

NixSupport/haskell-packages/ihp-hsx.nix

@@ -0,0 +1,38 @@
+{ mkDerivation
+, classy-prelude
+, string-conversions
+, blaze-html
+, blaze-markup
+, text
+, bytestring
+, lib
+, basic-prelude
+, megaparsec
+, template-haskell
+, haskell-src-meta
+, containers
+}:
+mkDerivation {
+  pname = "ihp-hsx";
+  version = "v0.18.0";
+  src = ./../../ihp-hsx;
+  isLibrary = true;
+  isExecutable = false;
+  libraryHaskellDepends = [
+    classy-prelude
+    string-conversions
+    blaze-html
+    blaze-markup
+    text
+    bytestring
+    basic-prelude
+    megaparsec
+    template-haskell
+    haskell-src-meta
+    containers
+  ];
+  license = lib.licenses.mit;
+  enableLibraryForGhci = true;
+  homepage = "https://ihp.digitallyinduced.com";
+  configureFlags = ["--enable-optimization=2"];
+}

IHP/View/ConvertibleStrings.hs renamed to ihp-hsx/IHP/HSX/ConvertibleStrings.hs

@@ -4,7 +4,7 @@
 {-# LANGUAGE TypeFamilies          #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
-module IHP.View.ConvertibleStrings where
+module IHP.HSX.ConvertibleStrings where
 
 import Prelude
 import Data.String.Conversions (ConvertibleStrings (convertString), cs)

IHP/HSX/Parser.hs renamed to ihp-hsx/IHP/HSX/Parser.hs

@@ -6,8 +6,7 @@ import qualified Text.Blaze.Html5 as Html5
 import qualified Text.Blaze.Internal
 import ClassyPrelude
 import Data.String.Conversions (cs)
-import IHP.View.ConvertibleStrings ()
-import qualified Data.ByteString
+import IHP.HSX.ConvertibleStrings ()
 
 class ToHtml a where
     toHtml :: a -> Html5.Html
@@ -18,13 +17,13 @@ instance ToHtml (Text.Blaze.Internal.MarkupM ()) where
 
 instance ToHtml Text where
     {-# INLINE toHtml #-}
-    toHtml = cs
+    toHtml = Html5.text
 
 instance ToHtml String where
     {-# INLINE toHtml #-}
-    toHtml = cs
+    toHtml = Html5.string
 
-instance ToHtml Data.ByteString.ByteString where
+instance ToHtml ByteString where
     {-# INLINE toHtml #-}
     toHtml value = toHtml (cs value :: Text)
 
@@ -34,4 +33,4 @@ instance {-# OVERLAPPABLE #-} ToHtml a => ToHtml (Maybe a) where
 
 instance {-# OVERLAPPABLE #-} Show a => ToHtml a where
     {-# INLINE toHtml #-}
-    toHtml value = cs (show value)
+    toHtml value = Html5.string (show value)

IHP/HSX/QQ.hs renamed to ihp-hsx/IHP/HSX/QQ.hs

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2020 digitally induced GmbH
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

IHP/HSX/ToHtml.hs renamed to ihp-hsx/IHP/HSX/ToHtml.hs

@@ -0,0 +1,3 @@
+# HSX
+
+This directory contains the ihp-hsx package which provides `[hsx|<h1>Hello World</h1>|]` syntax to IHP projects.

ihp-hsx/LICENSE

@@ -0,0 +1,79 @@
+cabal-version:       2.2
+name:                ihp-hsx
+version:             0.18.0
+synopsis:            JSX-like but for Haskell
+description:         JSX-like templating syntax for Haskell
+license:             NONE
+license-file:        LICENSE
+author:              digitally induced GmbH
+maintainer:          [email protected]
+-- copyright:
+-- category:
+build-type:          Simple
+
+library
+    default-language: Haskell2010
+    build-depends:
+        base
+        , classy-prelude
+        , string-conversions
+        , blaze-html
+        , blaze-markup
+        , text
+        , bytestring
+        , basic-prelude
+        , megaparsec
+        , template-haskell
+        , haskell-src-meta
+        , containers
+    default-extensions:
+        OverloadedStrings
+        , NoImplicitPrelude
+        , ImplicitParams
+        , Rank2Types
+        , NamedFieldPuns
+        , TypeSynonymInstances
+        , FlexibleInstances
+        , DisambiguateRecordFields
+        , DuplicateRecordFields
+        , OverloadedLabels
+        , FlexibleContexts
+        , DataKinds
+        , QuasiQuotes
+        , TypeFamilies
+        , PackageImports
+        , ScopedTypeVariables
+        , RecordWildCards
+        , TypeApplications
+        , DataKinds
+        , InstanceSigs
+        , DeriveGeneric
+        , MultiParamTypeClasses
+        , TypeOperators
+        , DeriveDataTypeable
+        , DefaultSignatures
+        , BangPatterns
+        , FunctionalDependencies
+        , PartialTypeSignatures
+        , BlockArguments
+        , LambdaCase
+        , StandaloneDeriving
+        , TemplateHaskell
+    ghc-options:
+        -fstatic-argument-transformation
+        -funbox-strict-fields
+        -haddock
+        -Wredundant-constraints
+        -Wunused-imports
+        -Wunused-foralls
+        -Wmissing-fields
+        -Winaccessible-code
+        -Wmissed-specialisations
+        -Wall-missed-specialisations
+        -fexpose-all-unfoldings
+    hs-source-dirs: .
+    exposed-modules:
+        IHP.HSX.Parser
+        , IHP.HSX.QQ
+        , IHP.HSX.ToHtml
+        , IHP.HSX.ConvertibleStrings

ihp-hsx/README.md

@@ -0,0 +1,29 @@
+let
+    pkgs = (import ./../NixSupport/make-nixpkgs-from-options.nix) {
+        ihp = ./../.;
+        haskellPackagesDir = ./../NixSupport/haskell-packages;
+    };
+    ghc = pkgs.haskell.packages.ghc8107;
+    haskellDeps = ghc.ghcWithPackages (p: with p; [
+        classy-prelude
+        string-conversions
+        blaze-html
+        blaze-markup
+        text
+        bytestring
+        basic-prelude
+        megaparsec
+        template-haskell
+        haskell-src-meta
+        containers
+
+        # Development Specific Tools
+        hspec
+    ]);
+in
+    pkgs.stdenv.mkDerivation {
+        name = "ihp-hsx";
+        src = ./.;
+        buildInputs = [haskellDeps];
+        shellHook = "eval $(egrep ^export ${haskellDeps}/bin/ghc)";
+    }

ihp-hsx/ihp-hsx.cabal

@@ -63,6 +63,7 @@
 , neat-interpolation
 , unagi-chan
 , with-utf8
+, ihp-hsx
 }:
 mkDerivation {
   pname = "ihp";
@@ -132,6 +133,7 @@ mkDerivation {
     neat-interpolation
     unagi-chan
     with-utf8
+    ihp-hsx
   ];
   license = lib.licenses.mit;
   postInstall = ''