Fix nullarySchema and nullary constructor schema

(fixes haskell-servant/servant-swagger#19)
GetShopTV · Jan 23, 2016 · ab65c4a · ab65c4a
1 parent 59aa9f9
commit ab65c4a
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/Data/Swagger/Internal/Schema.hs b/src/Data/Swagger/Internal/Schema.hs
@@ -416,7 +416,6 @@ paramSchemaToSchema _ = mempty & paramSchema .~ toParamSchema (Proxy :: Proxy a)
 nullarySchema :: Schema
 nullarySchema = mempty
   & type_ .~ SwaggerArray
-  & enum_ ?~ [ toJSON () ]
   & items ?~ SwaggerItemsArray []
 
 gtoNamedSchema :: GToSchema f => SchemaOptions -> proxy f -> NamedSchema
@@ -535,18 +534,22 @@ class GSumToSchema f where
 instance (GSumToSchema f, GSumToSchema g) => GSumToSchema (f :+: g) where
   gsumToSchema opts _ = gsumToSchema opts (Proxy :: Proxy f) <=< gsumToSchema opts (Proxy :: Proxy g)
 
-gsumConToSchema :: forall c f proxy. (GToSchema (C1 c f), Constructor c) =>
-  SchemaOptions -> proxy (C1 c f) -> Schema -> Declare (Definitions Schema) Schema
-gsumConToSchema opts _ schema = do
-  ref <- gdeclareSchemaRef opts (Proxy :: Proxy (C1 c f))
-  return $ schema
-    & type_ .~ SwaggerObject
-    & properties . at tag ?~ ref
-    & maxProperties ?~ 1
-    & minProperties ?~ 1
+gsumConToSchemaWith :: forall c f proxy. (GToSchema (C1 c f), Constructor c) =>
+  Referenced Schema -> SchemaOptions -> proxy (C1 c f) -> Schema -> Schema
+gsumConToSchemaWith ref opts _ schema = schema
+  & type_ .~ SwaggerObject
+  & properties . at tag ?~ ref
+  & maxProperties ?~ 1
+  & minProperties ?~ 1
   where
     tag = T.pack (constructorTagModifier opts (conName (Proxy3 :: Proxy3 c f p)))
 
+gsumConToSchema :: forall c f proxy. (GToSchema (C1 c f), Constructor c) =>
+  SchemaOptions -> proxy (C1 c f) -> Schema -> Declare (Definitions Schema) Schema
+gsumConToSchema opts proxy schema = do
+  ref <- gdeclareSchemaRef opts proxy
+  return $ gsumConToSchemaWith ref opts proxy schema
+
 instance {-# OVERLAPPABLE #-} (Constructor c, GToSchema f) => GSumToSchema (C1 c f) where
   gsumToSchema opts proxy schema = do
     tell (All False)
@@ -558,7 +561,7 @@ instance (Constructor c, Selector s, GToSchema f) => GSumToSchema (C1 c (S1 s f)
     lift $ gsumConToSchema opts proxy schema
 
 instance Constructor c => GSumToSchema (C1 c U1) where
-  gsumToSchema opts proxy = lift . gsumConToSchema opts proxy
+  gsumToSchema opts proxy = pure . gsumConToSchemaWith (Inline nullarySchema) opts proxy
 
 data Proxy2 a b = Proxy2