git.iko.soy/servant
on master help sign in
Revert "Replace <> with interpolate QQ"
688bc75Freezeboy
servant-jquery/servant-jquery.cabal−1
compare with master
unifiedsplit
@@ -42,7 +42,6 @@ library
42 , lens >= 4
42 , lens >= 4
43 , servant == 0.4.*
43 , servant == 0.4.*
44 , text
44 , text
45− , interpolate
46 hs-source-dirs: src
45 hs-source-dirs: src
47 default-language: Haskell2010
46 default-language: Haskell2010
48 ghc-options: -Wall
47 ghc-options: -Wall
servant-jquery/src/Servant/JQuery/Angular.hs+12−15
@@ -1,11 +1,9 @@
1−{-# LANGUAGE QuasiQuotes #-}
2module Servant.JQuery.Angular where
1module Servant.JQuery.Angular where
3
2
4import Servant.JQuery.Internal
3import Servant.JQuery.Internal
5import Control.Lens
4import Control.Lens
6import Data.List
5import Data.List
7import Data.Monoid
6import Data.Monoid
8−import Data.String.Interpolate
9
7
10data AngularOptions = AngularOptions
8data AngularOptions = AngularOptions
11 { serviceName :: String -- ^ When generating code with wrapInService,
9 { serviceName :: String -- ^ When generating code with wrapInService,
@@ -17,8 +15,8 @@ data AngularOptions = AngularOptions
17defAngularOptions :: AngularOptions
15defAngularOptions :: AngularOptions
18defAngularOptions = AngularOptions
16defAngularOptions = AngularOptions
19 { serviceName = ""
17 { serviceName = ""
20− , prologue = \svc m -> [i|#{m}service('#{svc}', function($http) {
18+ , prologue = \svc m -> m <> "service('" <> svc <> "', function($http) {\n"
21− return ({|]
19+ <> " return ({"
22 , epilogue = "});\n});\n"
20 , epilogue = "});\n});\n"
23 }
21 }
24
22
@@ -48,17 +46,16 @@ generateAngularJS ngOpts = generateAngularJSWith ngOpts defCommonGeneratorOption
48
46
49-- js codegen using $http service from Angular
47-- js codegen using $http service from Angular
50generateAngularJSWith :: AngularOptions -> CommonGeneratorOptions -> AjaxReq -> String
48generateAngularJSWith :: AngularOptions -> CommonGeneratorOptions -> AjaxReq -> String
51−generateAngularJSWith ngOptions opts req = [i|
49+generateAngularJSWith ngOptions opts req = "\n" <>
52− #{fname}#{fsep} function(#{argsStr})
50+ fname <> fsep <> " function(" <> argsStr <> ")\n"
53− {
51+ <> "{\n"
54− return $http(
52+ <> " return $http(\n"
55− { url: #{url}
53+ <> " { url: " <> url <> "\n"
56− #{dataBody}
54+ <> dataBody
57− #{reqheaders}
55+ <> reqheaders
58− , method: '#{method}'
56+ <> " , method: '" <> method <> "'\n"
59− });
57+ <> " });\n"
60− }
58+ <> "}\n"
61−|]
62
59
63 where argsStr = intercalate ", " args
60 where argsStr = intercalate ", " args
64 args = http
61 args = http
servant-jquery/src/Servant/JQuery/JQuery.hs+12−15
@@ -1,11 +1,9 @@
1−{-# LANGUAGE QuasiQuotes #-}
2module Servant.JQuery.JQuery where
1module Servant.JQuery.JQuery where
3
2
4import Servant.JQuery.Internal
3import Servant.JQuery.Internal
5import Control.Lens
4import Control.Lens
6import Data.List
5import Data.List
7import Data.Monoid
6import Data.Monoid
8−import Data.String.Interpolate
9
7
10-- | js codegen using JQuery using default options
8-- | js codegen using JQuery using default options
11generateJQueryJS :: AjaxReq -> String
9generateJQueryJS :: AjaxReq -> String
@@ -13,19 +11,18 @@ generateJQueryJS = generateJQueryJSWith defCommonGeneratorOptions
13
11
14-- | js codegen using JQuery
12-- | js codegen using JQuery
15generateJQueryJSWith :: CommonGeneratorOptions -> AjaxReq -> String
13generateJQueryJSWith :: CommonGeneratorOptions -> AjaxReq -> String
16−generateJQueryJSWith opts req = [i|
14+generateJQueryJSWith opts req = "\n" <>
17− #{fname} = function(#{argsStr})
15+ fname <> " = function(" <> argsStr <> ")\n"
18− {
16+ <> "{\n"
19− $.ajax(
17+ <> " $.ajax(\n"
20− { url: #{url}
18+ <> " { url: " <> url <> "\n"
21− , success: #{onSuccess}
19+ <> " , success: " <> onSuccess <> "\n"
22− #{dataBody}
20+ <> dataBody
23− #{reqheaders}
21+ <> reqheaders
24− , error: #{onError}
22+ <> " , error: " <> onError <> "\n"
25− , type: '#{method}'
23+ <> " , type: '" <> method <> "'\n"
26− });
24+ <> " });\n"
27− }
25+ <> "}\n"
28−|]
29
26
30 where argsStr = intercalate ", " args
27 where argsStr = intercalate ", " args
31 args = captures
28 args = captures
servant-jquery/src/Servant/JQuery/Vanilla.hs+18−21
@@ -1,11 +1,9 @@
1−{-# LANGUAGE QuasiQuotes #-}
2module Servant.JQuery.Vanilla where
1module Servant.JQuery.Vanilla where
3
2
4import Servant.JQuery.Internal
3import Servant.JQuery.Internal
5import Control.Lens
4import Control.Lens
6import Data.List
5import Data.List
7import Data.Monoid
6import Data.Monoid
8−import Data.String.Interpolate
9
7
10-- | js codegen using XmlHttpRequest using default generation options
8-- | js codegen using XmlHttpRequest using default generation options
11generateVanillaJS :: AjaxReq -> String
9generateVanillaJS :: AjaxReq -> String
@@ -13,25 +11,24 @@ generateVanillaJS = generateVanillaJSWith defCommonGeneratorOptions
13
11
14-- | js codegen using XmlHttpRequest
12-- | js codegen using XmlHttpRequest
15generateVanillaJSWith :: CommonGeneratorOptions -> AjaxReq -> String
13generateVanillaJSWith :: CommonGeneratorOptions -> AjaxReq -> String
16−generateVanillaJSWith opts req = [i|
14+generateVanillaJSWith opts req = "\n" <>
17− #{fname} = function(#{argsStr})
15+ fname <> " = function(" <> argsStr <> ")\n"
18− {
16+ <> "{\n"
19− var xhr = new XMLHttpRequest();
17+ <> " var xhr = new XMLHttpRequest();\n"
20− xhr.open('#{method}', #{url}, true);
18+ <> " xhr.open('" <> method <> "', " <> url <> ", true);\n"
21− #{reqheaders}
19+ <> reqheaders
22− xhr.onreadystatechange = function (e) {
20+ <> " xhr.onreadystatechange = function (e) {\n"
23− if (xhr.readyState == 4) {
21+ <> " if (xhr.readyState == 4) {\n"
24− var value = JSON.parse(xhr.responseText);
22+ <> " var value = JSON.parse(xhr.responseText);\n"
25− if (xhr.status == 200 || xhr.status == 201) {
23+ <> " if (xhr.status == 200 || xhr.status == 201) {\n"
26− #{onSuccess}(value);
24+ <> " onSuccess(value);\n"
27− } else {
25+ <> " } else {\n"
28− #{onError}(value);
26+ <> " onError(value);\n"
29− }
27+ <> " }\n"
30− }
28+ <> " }\n"
31− }
29+ <> " }\n"
32− xhr.send(#{dataBody});
30+ <> " xhr.send(" <> dataBody <> ");\n"
33− }
31+ <> "}\n"
34−|]
35
32
36 where argsStr = intercalate ", " args
33 where argsStr = intercalate ", " args
37 args = captures
34 args = captures