git.iko.soy/typeable/servant
on master help sign in
canonicalize API type before generating jquery functions, flattening everything on the way
0644c8dAlp Mestanogullari
src/Servant/JQuery.hs+2−2
compare with master
unifiedsplit
@@ -26,8 +26,8 @@ import Data.Proxy
26import Servant.API
26import Servant.API
27import Servant.JQuery.Internal
27import Servant.JQuery.Internal
28
28
29−jquery :: HasJQ layout => Proxy layout -> JQ layout
29+jquery :: HasJQ (Canonicalize layout) => Proxy layout -> JQ layout
30−jquery p = jqueryFor p defReq
30+jquery p = jqueryFor (canonicalize p) defReq
31
31
32-- js codegen
32-- js codegen
33generateJS :: AjaxReq -> String
33generateJS :: AjaxReq -> String
src/Servant/JQuery/Internal.hs+17−15
@@ -191,12 +191,14 @@ type family Elem (a :: *) (ls::[*]) :: Constraint where
191 Elem a (b ': list) = Elem a list
191 Elem a (b ': list) = Elem a list
192
192
193class HasJQ (layout :: *) where
193class HasJQ (layout :: *) where
194− type JQ layout :: *
194+ type JQ' layout :: *
195− jqueryFor :: Proxy layout -> AjaxReq -> JQ layout
195+ jqueryFor :: Proxy layout -> AjaxReq -> JQ' layout
196+
197+type JQ layout = JQ' (Canonicalize layout)
196
198
197instance (HasJQ a, HasJQ b)
199instance (HasJQ a, HasJQ b)
198 => HasJQ (a :<|> b) where
200 => HasJQ (a :<|> b) where
199− type JQ (a :<|> b) = JQ a :<|> JQ b
201+ type JQ' (a :<|> b) = JQ' a :<|> JQ' b
200
202
201 jqueryFor Proxy req =
203 jqueryFor Proxy req =
202 jqueryFor (Proxy :: Proxy a) req
204 jqueryFor (Proxy :: Proxy a) req
@@ -204,7 +206,7 @@ instance (HasJQ a, HasJQ b)
204
206
205instance (KnownSymbol sym, HasJQ sublayout)
207instance (KnownSymbol sym, HasJQ sublayout)
206 => HasJQ (Capture sym a :> sublayout) where
208 => HasJQ (Capture sym a :> sublayout) where
207− type JQ (Capture sym a :> sublayout) = JQ sublayout
209+ type JQ' (Capture sym a :> sublayout) = JQ' sublayout
208
210
209 jqueryFor Proxy req =
211 jqueryFor Proxy req =
210 jqueryFor (Proxy :: Proxy sublayout) $
212 jqueryFor (Proxy :: Proxy sublayout) $
@@ -213,14 +215,14 @@ instance (KnownSymbol sym, HasJQ sublayout)
213 where str = symbolVal (Proxy :: Proxy sym)
215 where str = symbolVal (Proxy :: Proxy sym)
214
216
215instance HasJQ Delete where
217instance HasJQ Delete where
216− type JQ Delete = AjaxReq
218+ type JQ' Delete = AjaxReq
217
219
218 jqueryFor Proxy req =
220 jqueryFor Proxy req =
219 req & funcName %~ ("delete" <>)
221 req & funcName %~ ("delete" <>)
220 & reqMethod .~ "DELETE"
222 & reqMethod .~ "DELETE"
221
223
222instance Elem JSON list => HasJQ (Get list a) where
224instance Elem JSON list => HasJQ (Get list a) where
223− type JQ (Get list a) = AjaxReq
225+ type JQ' (Get list a) = AjaxReq
224
226
225 jqueryFor Proxy req =
227 jqueryFor Proxy req =
226 req & funcName %~ ("get" <>)
228 req & funcName %~ ("get" <>)
@@ -228,7 +230,7 @@ instance Elem JSON list => HasJQ (Get list a) where
228
230
229instance (KnownSymbol sym, HasJQ sublayout)
231instance (KnownSymbol sym, HasJQ sublayout)
230 => HasJQ (Header sym a :> sublayout) where
232 => HasJQ (Header sym a :> sublayout) where
231− type JQ (Header sym a :> sublayout) = JQ sublayout
233+ type JQ' (Header sym a :> sublayout) = JQ' sublayout
232
234
233 jqueryFor Proxy req =
235 jqueryFor Proxy req =
234 jqueryFor subP (req & reqHeaders <>~ [HeaderArg hname])
236 jqueryFor subP (req & reqHeaders <>~ [HeaderArg hname])
@@ -237,14 +239,14 @@ instance (KnownSymbol sym, HasJQ sublayout)
237 subP = Proxy :: Proxy sublayout
239 subP = Proxy :: Proxy sublayout
238
240
239instance Elem JSON list => HasJQ (Post list a) where
241instance Elem JSON list => HasJQ (Post list a) where
240− type JQ (Post list a) = AjaxReq
242+ type JQ' (Post list a) = AjaxReq
241
243
242 jqueryFor Proxy req =
244 jqueryFor Proxy req =
243 req & funcName %~ ("post" <>)
245 req & funcName %~ ("post" <>)
244 & reqMethod .~ "POST"
246 & reqMethod .~ "POST"
245
247
246instance Elem JSON list => HasJQ (Put list a) where
248instance Elem JSON list => HasJQ (Put list a) where
247− type JQ (Put list a) = AjaxReq
249+ type JQ' (Put list a) = AjaxReq
248
250
249 jqueryFor Proxy req =
251 jqueryFor Proxy req =
250 req & funcName %~ ("put" <>)
252 req & funcName %~ ("put" <>)
@@ -252,7 +254,7 @@ instance Elem JSON list => HasJQ (Put list a) where
252
254
253instance (KnownSymbol sym, HasJQ sublayout)
255instance (KnownSymbol sym, HasJQ sublayout)
254 => HasJQ (QueryParam sym a :> sublayout) where
256 => HasJQ (QueryParam sym a :> sublayout) where
255− type JQ (QueryParam sym a :> sublayout) = JQ sublayout
257+ type JQ' (QueryParam sym a :> sublayout) = JQ' sublayout
256
258
257 jqueryFor Proxy req =
259 jqueryFor Proxy req =
258 jqueryFor (Proxy :: Proxy sublayout) $
260 jqueryFor (Proxy :: Proxy sublayout) $
@@ -262,7 +264,7 @@ instance (KnownSymbol sym, HasJQ sublayout)
262
264
263instance (KnownSymbol sym, HasJQ sublayout)
265instance (KnownSymbol sym, HasJQ sublayout)
264 => HasJQ (QueryParams sym a :> sublayout) where
266 => HasJQ (QueryParams sym a :> sublayout) where
265− type JQ (QueryParams sym a :> sublayout) = JQ sublayout
267+ type JQ' (QueryParams sym a :> sublayout) = JQ' sublayout
266
268
267 jqueryFor Proxy req =
269 jqueryFor Proxy req =
268 jqueryFor (Proxy :: Proxy sublayout) $
270 jqueryFor (Proxy :: Proxy sublayout) $
@@ -272,7 +274,7 @@ instance (KnownSymbol sym, HasJQ sublayout)
272
274
273instance (KnownSymbol sym, HasJQ sublayout)
275instance (KnownSymbol sym, HasJQ sublayout)
274 => HasJQ (QueryFlag sym :> sublayout) where
276 => HasJQ (QueryFlag sym :> sublayout) where
275− type JQ (QueryFlag sym :> sublayout) = JQ sublayout
277+ type JQ' (QueryFlag sym :> sublayout) = JQ' sublayout
276
278
277 jqueryFor Proxy req =
279 jqueryFor Proxy req =
278 jqueryFor (Proxy :: Proxy sublayout) $
280 jqueryFor (Proxy :: Proxy sublayout) $
@@ -312,14 +314,14 @@ instance (KnownSymbol sym, HasJQ sublayout)
312 where str = symbolVal (Proxy :: Proxy sym)
314 where str = symbolVal (Proxy :: Proxy sym)
313
315
314instance HasJQ Raw where
316instance HasJQ Raw where
315− type JQ Raw = Method -> AjaxReq
317+ type JQ' Raw = Method -> AjaxReq
316
318
317 jqueryFor Proxy req method =
319 jqueryFor Proxy req method =
318 req & funcName %~ ((toLower <$> method) <>)
320 req & funcName %~ ((toLower <$> method) <>)
319 & reqMethod .~ method
321 & reqMethod .~ method
320
322
321instance (Elem JSON list, HasJQ sublayout) => HasJQ (ReqBody list a :> sublayout) where
323instance (Elem JSON list, HasJQ sublayout) => HasJQ (ReqBody list a :> sublayout) where
322− type JQ (ReqBody list a :> sublayout) = JQ sublayout
324+ type JQ' (ReqBody list a :> sublayout) = JQ' sublayout
323
325
324 jqueryFor Proxy req =
326 jqueryFor Proxy req =
325 jqueryFor (Proxy :: Proxy sublayout) $
327 jqueryFor (Proxy :: Proxy sublayout) $
@@ -327,7 +329,7 @@ instance (Elem JSON list, HasJQ sublayout) => HasJQ (ReqBody list a :> sublayout
327
329
328instance (KnownSymbol path, HasJQ sublayout)
330instance (KnownSymbol path, HasJQ sublayout)
329 => HasJQ (path :> sublayout) where
331 => HasJQ (path :> sublayout) where
330− type JQ (path :> sublayout) = JQ sublayout
332+ type JQ' (path :> sublayout) = JQ' sublayout
331
333
332 jqueryFor Proxy req =
334 jqueryFor Proxy req =
333 jqueryFor (Proxy :: Proxy sublayout) $
335 jqueryFor (Proxy :: Proxy sublayout) $
test/Servant/JQuerySpec/CustomHeaders.hs+3−3
@@ -22,7 +22,7 @@ data Authorization (sym :: Symbol) a
22
22
23instance (KnownSymbol sym, HasJQ sublayout)
23instance (KnownSymbol sym, HasJQ sublayout)
24 => HasJQ (Authorization sym a :> sublayout) where
24 => HasJQ (Authorization sym a :> sublayout) where
25− type JQ (Authorization sym a :> sublayout) = JQ sublayout
25+ type JQ' (Authorization sym a :> sublayout) = JQ' sublayout
26
26
27 jqueryFor Proxy req = jqueryFor (Proxy :: Proxy sublayout) $
27 jqueryFor Proxy req = jqueryFor (Proxy :: Proxy sublayout) $
28 req & reqHeaders <>~ [ ReplaceHeaderArg "Authorization" $
28 req & reqHeaders <>~ [ ReplaceHeaderArg "Authorization" $
@@ -35,7 +35,7 @@ data MyLovelyHorse a
35
35
36instance (HasJQ sublayout)
36instance (HasJQ sublayout)
37 => HasJQ (MyLovelyHorse a :> sublayout) where
37 => HasJQ (MyLovelyHorse a :> sublayout) where
38− type JQ (MyLovelyHorse a :> sublayout) = JQ sublayout
38+ type JQ' (MyLovelyHorse a :> sublayout) = JQ' sublayout
39
39
40 jqueryFor Proxy req = jqueryFor (Proxy :: Proxy sublayout) $
40 jqueryFor Proxy req = jqueryFor (Proxy :: Proxy sublayout) $
41 req & reqHeaders <>~ [ ReplaceHeaderArg "X-MyLovelyHorse" tpl ]
41 req & reqHeaders <>~ [ ReplaceHeaderArg "X-MyLovelyHorse" tpl ]
@@ -47,7 +47,7 @@ data WhatsForDinner a
47
47
48instance (HasJQ sublayout)
48instance (HasJQ sublayout)
49 => HasJQ (WhatsForDinner a :> sublayout) where
49 => HasJQ (WhatsForDinner a :> sublayout) where
50− type JQ (WhatsForDinner a :> sublayout) = JQ sublayout
50+ type JQ' (WhatsForDinner a :> sublayout) = JQ' sublayout
51
51
52 jqueryFor Proxy req = jqueryFor (Proxy :: Proxy sublayout) $
52 jqueryFor Proxy req = jqueryFor (Proxy :: Proxy sublayout) $
53 req & reqHeaders <>~ [ ReplaceHeaderArg "X-WhatsForDinner" tpl ]
53 req & reqHeaders <>~ [ ReplaceHeaderArg "X-WhatsForDinner" tpl ]