688bc75 · servant · git.iko.soy

git.iko.soy/servant

Revert "Replace <> with interpolate QQ"

This reverts commit 7fb4471b00919dfe0edf876f72793721ba6198ce.

commit688bc7520eda356df76b3b3b8bbc4f55f63f4e0f authorFreezeboy <freezeboy@users.noreply.github.com> dateSat 18 Jul 2015, 12:20 (11 years ago) parenta50d36c

4 files changed+42−52

compare with master

unifiedsplit

servant-jquery/servant-jquery.cabal−1 servant-jquery/src/Servant/JQuery/Angular.hs+12−15 servant-jquery/src/Servant/JQuery/JQuery.hs+12−15 servant-jquery/src/Servant/JQuery/Vanilla.hs+18−21

servant-jquery/servant-jquery.cabal−1

@@ -42,7 +42,6 @@ library

4242 , lens >= 4

4343 , servant == 0.4.*

4444 , text

45− , interpolate

4645 hs-source-dirs: src

4746 default-language: Haskell2010

4847 ghc-options: -Wall

servant-jquery/src/Servant/JQuery/Angular.hs+12−15

@@ -1,11 +1,9 @@

1−{-# LANGUAGE QuasiQuotes #-}

21module Servant.JQuery.Angular where

43import Servant.JQuery.Internal

54import Control.Lens

65import Data.List

76import Data.Monoid

8−import Data.String.Interpolate

108data AngularOptions = AngularOptions

119 { serviceName :: String -- ^ When generating code with wrapInService,

@@ -17,8 +15,8 @@ data AngularOptions = AngularOptions

1715defAngularOptions :: AngularOptions

1816defAngularOptions = AngularOptions

1917 { serviceName = ""

20− , prologue = \svc m -> [i|#{m}service('#{svc}', function($http) {

21− return ({|]

18+ , prologue = \svc m -> m <> "service('" <> svc <> "', function($http) {\n"

19+ <> " return ({"

2220 , epilogue = "});\n});\n"

2321 }

2422

@@ -48,17 +46,16 @@ generateAngularJS ngOpts = generateAngularJSWith ngOpts defCommonGeneratorOption

4846

4947-- js codegen using $http service from Angular

5048generateAngularJSWith :: AngularOptions -> CommonGeneratorOptions -> AjaxReq -> String

51−generateAngularJSWith ngOptions opts req = [i|

52− #{fname}#{fsep} function(#{argsStr})

53− {

54− return $http(

55− { url: #{url}

56− #{dataBody}

57− #{reqheaders}

58− , method: '#{method}'

59− });

60− }

61−|]

49+generateAngularJSWith ngOptions opts req = "\n" <>

50+ fname <> fsep <> " function(" <> argsStr <> ")\n"

51+ <> "{\n"

52+ <> " return $http(\n"

53+ <> " { url: " <> url <> "\n"

54+ <> dataBody

55+ <> reqheaders

56+ <> " , method: '" <> method <> "'\n"

57+ <> " });\n"

58+ <> "}\n"

6259

6360 where argsStr = intercalate ", " args

6461 args = http

servant-jquery/src/Servant/JQuery/JQuery.hs+12−15

@@ -1,11 +1,9 @@

1−{-# LANGUAGE QuasiQuotes #-}

21module Servant.JQuery.JQuery where

43import Servant.JQuery.Internal

54import Control.Lens

65import Data.List

76import Data.Monoid

8−import Data.String.Interpolate

108-- | js codegen using JQuery using default options

119generateJQueryJS :: AjaxReq -> String

@@ -13,19 +11,18 @@ generateJQueryJS = generateJQueryJSWith defCommonGeneratorOptions

1311

1412-- | js codegen using JQuery

1513generateJQueryJSWith :: CommonGeneratorOptions -> AjaxReq -> String

16−generateJQueryJSWith opts req = [i|

17− #{fname} = function(#{argsStr})

18− {

19− $.ajax(

20− { url: #{url}

21− , success: #{onSuccess}

22− #{dataBody}

23− #{reqheaders}

24− , error: #{onError}

25− , type: '#{method}'

26− });

27− }

28−|]

14+generateJQueryJSWith opts req = "\n" <>

15+ fname <> " = function(" <> argsStr <> ")\n"

16+ <> "{\n"

17+ <> " $.ajax(\n"

18+ <> " { url: " <> url <> "\n"

19+ <> " , success: " <> onSuccess <> "\n"

20+ <> dataBody

21+ <> reqheaders

22+ <> " , error: " <> onError <> "\n"

23+ <> " , type: '" <> method <> "'\n"

24+ <> " });\n"

25+ <> "}\n"

2926

3027 where argsStr = intercalate ", " args

3128 args = captures

servant-jquery/src/Servant/JQuery/Vanilla.hs+18−21

@@ -1,11 +1,9 @@

1−{-# LANGUAGE QuasiQuotes #-}

21module Servant.JQuery.Vanilla where

43import Servant.JQuery.Internal

54import Control.Lens

65import Data.List

76import Data.Monoid

8−import Data.String.Interpolate

108-- | js codegen using XmlHttpRequest using default generation options

119generateVanillaJS :: AjaxReq -> String

@@ -13,25 +11,24 @@ generateVanillaJS = generateVanillaJSWith defCommonGeneratorOptions

1311

1412-- | js codegen using XmlHttpRequest

1513generateVanillaJSWith :: CommonGeneratorOptions -> AjaxReq -> String

16−generateVanillaJSWith opts req = [i|

17− #{fname} = function(#{argsStr})

18− {

19− var xhr = new XMLHttpRequest();

20− xhr.open('#{method}', #{url}, true);

21− #{reqheaders}

22− xhr.onreadystatechange = function (e) {

23− if (xhr.readyState == 4) {

24− var value = JSON.parse(xhr.responseText);

25− if (xhr.status == 200 || xhr.status == 201) {

26− #{onSuccess}(value);

27− } else {

28− #{onError}(value);

29− }

30− }

31− }

32− xhr.send(#{dataBody});

33− }

34−|]

14+generateVanillaJSWith opts req = "\n" <>

15+ fname <> " = function(" <> argsStr <> ")\n"

16+ <> "{\n"

17+ <> " var xhr = new XMLHttpRequest();\n"

18+ <> " xhr.open('" <> method <> "', " <> url <> ", true);\n"

19+ <> reqheaders

20+ <> " xhr.onreadystatechange = function (e) {\n"

21+ <> " if (xhr.readyState == 4) {\n"

22+ <> " var value = JSON.parse(xhr.responseText);\n"

23+ <> " if (xhr.status == 200 || xhr.status == 201) {\n"

24+ <> " onSuccess(value);\n"

25+ <> " } else {\n"

26+ <> " onError(value);\n"

27+ <> " }\n"

28+ <> " }\n"

29+ <> " }\n"

30+ <> " xhr.send(" <> dataBody <> ");\n"

31+ <> "}\n"

3532

3633 where argsStr = intercalate ", " args

3734 args = captures