@@ -148,8 +148,8 @@ class ToSchema a where
148148 declareNamedSchema = genericDeclareNamedSchema defaultSchemaOptions
149149
150150-- | Convert a type into a schema and declare all used schema definitions.
151−declareSchema :: forall a proxy. ToSchema a => proxy a -> Declare (Definitions Schema) Schema
152−declareSchema _ = fmap _namedSchemaSchema $ declareNamedSchema (Proxy :: Proxy a)
151+declareSchema :: ToSchema a => Proxy a -> Declare (Definitions Schema) Schema
152+declareSchema = fmap _namedSchemaSchema . declareNamedSchema
153153
154154-- | Convert a type into an optionally named schema.
155155--
@@ -162,8 +162,8 @@ declareSchema _ = fmap _namedSchemaSchema $ declareNamedSchema (Proxy :: Proxy a
162162-- Just "Day"
163163-- >>> encode (toNamedSchema (Proxy :: Proxy Day) ^. schema)
164164-- "{\"example\":\"2016-07-22\",\"format\":\"date\",\"type\":\"string\"}"
165−toNamedSchema :: forall a proxy. ToSchema a => proxy a -> NamedSchema
166−toNamedSchema _ = undeclare $ declareNamedSchema (Proxy :: Proxy a)
165+toNamedSchema :: ToSchema a => Proxy a -> NamedSchema
166+toNamedSchema = undeclare . declareNamedSchema
167167
168168-- | Get type's schema name according to its @'ToSchema'@ instance.
169169--
@@ -172,7 +172,7 @@ toNamedSchema _ = undeclare $ declareNamedSchema (Proxy :: Proxy a)
172172--
173173-- >>> schemaName (Proxy :: Proxy UTCTime)
174174-- Just "UTCTime"
175−schemaName :: ToSchema a => proxy a -> Maybe T.Text
175+schemaName :: ToSchema a => Proxy a -> Maybe T.Text
176176schemaName = _namedSchemaName . toNamedSchema
177177
178178-- | Convert a type into a schema.
@@ -182,7 +182,7 @@ schemaName = _namedSchemaName . toNamedSchema
182182--
183183-- >>> encode $ toSchema (Proxy :: Proxy [Day])
184184-- "{\"items\":{\"$ref\":\"#/definitions/Day\"},\"type\":\"array\"}"
185−toSchema :: ToSchema a => proxy a -> Schema
185+toSchema :: ToSchema a => Proxy a -> Schema
186186toSchema = _namedSchemaSchema . toNamedSchema
187187
188188-- | Convert a type into a referenced schema if possible.
@@ -193,7 +193,7 @@ toSchema = _namedSchemaSchema . toNamedSchema
193193--
194194-- >>> encode $ toSchemaRef (Proxy :: Proxy Day)
195195-- "{\"$ref\":\"#/definitions/Day\"}"
196−toSchemaRef :: ToSchema a => proxy a -> Referenced Schema
196+toSchemaRef :: ToSchema a => Proxy a -> Referenced Schema
197197toSchemaRef = undeclare . declareSchemaRef
198198
199199-- | Convert a type into a referenced schema if possible
@@ -203,7 +203,7 @@ toSchemaRef = undeclare . declareSchemaRef
203203-- Schema definitions are typically declared for every referenced schema.
204204-- If @'declareSchemaRef'@ returns a reference, a corresponding schema
205205-- will be declared (regardless of whether it is recusive or not).
206−declareSchemaRef :: forall a proxy. ToSchema a => proxy a -> Declare (Definitions Schema) (Referenced Schema)
206+declareSchemaRef :: ToSchema a => Proxy a -> Declare (Definitions Schema) (Referenced Schema)
207207declareSchemaRef proxy = do
208208 case toNamedSchema proxy of
209209 NamedSchema (Just name) schema -> do
@@ -218,7 +218,7 @@ declareSchemaRef proxy = do
218218 known <- looks (InsOrdHashMap.member name)
219219 when (not known) $ do
220220 declare [(name, schema)]
221− void $ declareNamedSchema (Proxy :: Proxy a)
221+ void $ declareNamedSchema proxy
222222 return $ Ref (Reference name)
223223 _ -> Inline <$> declareSchema proxy
224224
@@ -265,7 +265,7 @@ inlineAllSchemas = inlineSchemasWhen (const True)
265265--
266266-- __WARNING:__ @'toInlinedSchema'@ will produce infinite schema
267267-- when inlining recursive schemas.
268−toInlinedSchema :: ToSchema a => proxy a -> Schema
268+toInlinedSchema :: ToSchema a => Proxy a -> Schema
269269toInlinedSchema proxy = inlineAllSchemas defs schema
270270 where
271271 (defs, schema) = runDeclare (declareSchema proxy) mempty
@@ -410,7 +410,7 @@ sketchStrictSchema = go . toJSON
410410 names = HashMap.keys o
411411
412412class GToSchema (f :: * -> *) where
413− gdeclareNamedSchema :: SchemaOptions -> proxy f -> Schema -> Declare (Definitions Schema) NamedSchema
413+ gdeclareNamedSchema :: SchemaOptions -> Proxy f -> Schema -> Declare (Definitions Schema) NamedSchema
414414
415415instance OVERLAPPABLE_ ToSchema a => ToSchema [a] where
416416 declareNamedSchema _ = do
@@ -593,26 +593,26 @@ instance ToSchema a => ToSchema (Identity a) where declareNamedSchema _ = declar
593593--
594594-- >>> encode $ toSchemaBoundedIntegral (Proxy :: Proxy Int16)
595595-- "{\"maximum\":32767,\"minimum\":-32768,\"type\":\"integer\"}"
596−toSchemaBoundedIntegral :: forall a proxy. (Bounded a, Integral a) => proxy a -> Schema
596+toSchemaBoundedIntegral :: forall a. (Bounded a, Integral a) => Proxy a -> Schema
597597toSchemaBoundedIntegral _ = mempty
598598 & type_ .~ SwaggerInteger
599599 & minimum_ ?~ fromInteger (toInteger (minBound :: a))
600600 & maximum_ ?~ fromInteger (toInteger (maxBound :: a))
601601
602602-- | Default generic named schema for @'Bounded'@, @'Integral'@ types.
603−genericToNamedSchemaBoundedIntegral :: forall a d f proxy.
603+genericToNamedSchemaBoundedIntegral :: forall a d f.
604604 ( Bounded a, Integral a
605605 , Generic a, Rep a ~ D1 d f, Datatype d)
606− => SchemaOptions -> proxy a -> NamedSchema
606+ => SchemaOptions -> Proxy a -> NamedSchema
607607genericToNamedSchemaBoundedIntegral opts proxy
608608 = genericNameSchema opts proxy (toSchemaBoundedIntegral proxy)
609609
610610-- | Declare a named schema for a @newtype@ wrapper.
611−genericDeclareNamedSchemaNewtype :: forall proxy a d c s i inner.
611+genericDeclareNamedSchemaNewtype :: forall a d c s i inner.
612612 (Generic a, Datatype d, Rep a ~ D1 d (C1 c (S1 s (K1 i inner))))
613613 => SchemaOptions -- ^ How to derive the name.
614614 -> (Proxy inner -> Declare (Definitions Schema) Schema) -- ^ How to create a schema for the wrapped type.
615− -> proxy a
615+ -> Proxy a
616616 -> Declare (Definitions Schema) NamedSchema
617617genericDeclareNamedSchemaNewtype opts f proxy = genericNameSchema opts proxy <$> f (Proxy :: Proxy inner)
618618
@@ -629,9 +629,9 @@ genericDeclareNamedSchemaNewtype opts f proxy = genericNameSchema opts proxy <$>
629629--
630630-- Note: this is only useful when @key@ is encoded with 'ToJSONKeyText'.
631631-- If it is encoded with 'ToJSONKeyValue' then a regular schema for @[(key, value)]@ is used.
632−declareSchemaBoundedEnumKeyMapping :: forall map key value proxy.
632+declareSchemaBoundedEnumKeyMapping :: forall map key value.
633633 (Bounded key, Enum key, ToJSONKey key, ToSchema key, ToSchema value)
634− => proxy (map key value) -> Declare (Definitions Schema) Schema
634+ => Proxy (map key value) -> Declare (Definitions Schema) Schema
635635declareSchemaBoundedEnumKeyMapping _ = case toJSONKey :: ToJSONKeyFunction key of
636636 ToJSONKeyText keyToText _ -> objectSchema keyToText
637637 ToJSONKeyValue _ _ -> declareSchema (Proxy :: Proxy [(key, value)])
@@ -657,46 +657,46 @@ declareSchemaBoundedEnumKeyMapping _ = case toJSONKey :: ToJSONKeyFunction key o
657657--
658658-- Note: this is only useful when @key@ is encoded with 'ToJSONKeyText'.
659659-- If it is encoded with 'ToJSONKeyValue' then a regular schema for @[(key, value)]@ is used.
660−toSchemaBoundedEnumKeyMapping :: forall map key value proxy.
660+toSchemaBoundedEnumKeyMapping :: forall map key value.
661661 (Bounded key, Enum key, ToJSONKey key, ToSchema key, ToSchema value)
662− => proxy (map key value) -> Schema
662+ => Proxy (map key value) -> Schema
663663toSchemaBoundedEnumKeyMapping = flip evalDeclare mempty . declareSchemaBoundedEnumKeyMapping
664664
665665-- | A configurable generic @'Schema'@ creator.
666666genericDeclareSchema :: (Generic a, GToSchema (Rep a), TypeHasSimpleShape a "genericDeclareSchemaUnrestricted") =>
667− SchemaOptions -> proxy a -> Declare (Definitions Schema) Schema
667+ SchemaOptions -> Proxy a -> Declare (Definitions Schema) Schema
668668genericDeclareSchema = genericDeclareSchemaUnrestricted
669669
670670-- | A configurable generic @'NamedSchema'@ creator.
671671-- This function applied to @'defaultSchemaOptions'@
672672-- is used as the default for @'declareNamedSchema'@
673673-- when the type is an instance of @'Generic'@.
674−genericDeclareNamedSchema :: forall a proxy. (Generic a, GToSchema (Rep a), TypeHasSimpleShape a "genericDeclareNamedSchemaUnrestricted") =>
675− SchemaOptions -> proxy a -> Declare (Definitions Schema) NamedSchema
674+genericDeclareNamedSchema :: (Generic a, GToSchema (Rep a), TypeHasSimpleShape a "genericDeclareNamedSchemaUnrestricted") =>
675+ SchemaOptions -> Proxy a -> Declare (Definitions Schema) NamedSchema
676676genericDeclareNamedSchema = genericDeclareNamedSchemaUnrestricted
677677
678678-- | A configurable generic @'Schema'@ creator.
679679--
680680-- Unlike 'genericDeclareSchema' also works for mixed sum types.
681681-- Use with care since some Swagger tools do not support well schemas for mixed sum types.
682−genericDeclareSchemaUnrestricted :: (Generic a, GToSchema (Rep a)) => SchemaOptions -> proxy a -> Declare (Definitions Schema) Schema
682+genericDeclareSchemaUnrestricted :: (Generic a, GToSchema (Rep a)) => SchemaOptions -> Proxy a -> Declare (Definitions Schema) Schema
683683genericDeclareSchemaUnrestricted opts proxy = _namedSchemaSchema <$> genericDeclareNamedSchemaUnrestricted opts proxy
684684
685685-- | A configurable generic @'NamedSchema'@ creator.
686686--
687687-- Unlike 'genericDeclareNamedSchema' also works for mixed sum types.
688688-- Use with care since some Swagger tools do not support well schemas for mixed sum types.
689−genericDeclareNamedSchemaUnrestricted :: forall a proxy. (Generic a, GToSchema (Rep a)) =>
690− SchemaOptions -> proxy a -> Declare (Definitions Schema) NamedSchema
689+genericDeclareNamedSchemaUnrestricted :: forall a. (Generic a, GToSchema (Rep a)) =>
690+ SchemaOptions -> Proxy a -> Declare (Definitions Schema) NamedSchema
691691genericDeclareNamedSchemaUnrestricted opts _ = gdeclareNamedSchema opts (Proxy :: Proxy (Rep a)) mempty
692692
693693-- | Derive a 'Generic'-based name for a datatype and assign it to a given 'Schema'.
694−genericNameSchema :: forall a d f proxy.
694+genericNameSchema :: forall a d f.
695695 (Generic a, Rep a ~ D1 d f, Datatype d)
696− => SchemaOptions -> proxy a -> Schema -> NamedSchema
696+ => SchemaOptions -> Proxy a -> Schema -> NamedSchema
697697genericNameSchema opts _ = NamedSchema (gdatatypeSchemaName opts (Proxy :: Proxy d))
698698
699−gdatatypeSchemaName :: forall proxy d. Datatype d => SchemaOptions -> proxy d -> Maybe T.Text
699+gdatatypeSchemaName :: forall d. Datatype d => SchemaOptions -> Proxy d -> Maybe T.Text
700700gdatatypeSchemaName opts _ = case orig of
701701 (c:_) | isAlpha c && isUpper c -> Just (T.pack name)
702702 _ -> Nothing
@@ -705,24 +705,23 @@ gdatatypeSchemaName opts _ = case orig of
705705 name = datatypeNameModifier opts orig
706706
707707-- | Lift a plain @'ParamSchema'@ into a model @'NamedSchema'@.
708−paramSchemaToNamedSchema :: forall a d f proxy.
709− (ToParamSchema a, Generic a, Rep a ~ D1 d f, Datatype d)
710− => SchemaOptions -> proxy a -> NamedSchema
708+paramSchemaToNamedSchema :: (ToParamSchema a, Generic a, Rep a ~ D1 d f, Datatype d) =>
709+ SchemaOptions -> Proxy a -> NamedSchema
711710paramSchemaToNamedSchema opts proxy = genericNameSchema opts proxy (paramSchemaToSchema proxy)
712711
713712-- | Lift a plain @'ParamSchema'@ into a model @'Schema'@.
714−paramSchemaToSchema :: forall a proxy. ToParamSchema a => proxy a -> Schema
715−paramSchemaToSchema _ = mempty & paramSchema .~ toParamSchema (Proxy :: Proxy a)
713+paramSchemaToSchema :: ToParamSchema a => Proxy a -> Schema
714+paramSchemaToSchema proxy = mempty & paramSchema .~ toParamSchema proxy
716715
717716nullarySchema :: Schema
718717nullarySchema = mempty
719718 & type_ .~ SwaggerArray
720719 & items ?~ SwaggerItemsArray []
721720
722−gtoNamedSchema :: GToSchema f => SchemaOptions -> proxy f -> NamedSchema
721+gtoNamedSchema :: GToSchema f => SchemaOptions -> Proxy f -> NamedSchema
723722gtoNamedSchema opts proxy = undeclare $ gdeclareNamedSchema opts proxy mempty
724723
725−gdeclareSchema :: GToSchema f => SchemaOptions -> proxy f -> Declare (Definitions Schema) Schema
724+gdeclareSchema :: GToSchema f => SchemaOptions -> Proxy f -> Declare (Definitions Schema) Schema
726725gdeclareSchema opts proxy = _namedSchemaSchema <$> gdeclareNamedSchema opts proxy mempty
727726
728727instance (GToSchema f, GToSchema g) => GToSchema (f :*: g) where
@@ -756,7 +755,7 @@ instance (Selector s, GToSchema f, GToSchema (S1 s f)) => GToSchema (C1 c (S1 s
756755 recordSchema = gdeclareNamedSchema opts (Proxy :: Proxy (S1 s f)) s
757756 fieldSchema = gdeclareNamedSchema opts (Proxy :: Proxy f) s
758757
759−gdeclareSchemaRef :: GToSchema a => SchemaOptions -> proxy a -> Declare (Definitions Schema) (Referenced Schema)
758+gdeclareSchemaRef :: GToSchema a => SchemaOptions -> Proxy a -> Declare (Definitions Schema) (Referenced Schema)
760759gdeclareSchemaRef opts proxy = do
761760 case gtoNamedSchema opts proxy of
762761 NamedSchema (Just name) schema -> do
@@ -820,7 +819,7 @@ instance ( GSumToSchema f
820819 where
821820 gdeclareNamedSchema = gdeclareNamedSumSchema
822821
823−gdeclareNamedSumSchema :: GSumToSchema f => SchemaOptions -> proxy f -> Schema -> Declare (Definitions Schema) NamedSchema
822+gdeclareNamedSumSchema :: GSumToSchema f => SchemaOptions -> Proxy f -> Schema -> Declare (Definitions Schema) NamedSchema
824823gdeclareNamedSumSchema opts proxy s
825824 | allNullaryToStringTag opts && allNullary = pure $ unnamed (toStringTag sumSchema)
826825 | otherwise = (unnamed . fst) <$> runWriterT declareSumSchema
@@ -835,13 +834,13 @@ gdeclareNamedSumSchema opts proxy s
835834type AllNullary = All
836835
837836class GSumToSchema (f :: * -> *) where
838− gsumToSchema :: SchemaOptions -> proxy f -> Schema -> WriterT AllNullary (Declare (Definitions Schema)) Schema
837+ gsumToSchema :: SchemaOptions -> Proxy f -> Schema -> WriterT AllNullary (Declare (Definitions Schema)) Schema
839838
840839instance (GSumToSchema f, GSumToSchema g) => GSumToSchema (f :+: g) where
841840 gsumToSchema opts _ = gsumToSchema opts (Proxy :: Proxy f) >=> gsumToSchema opts (Proxy :: Proxy g)
842841
843−gsumConToSchemaWith :: forall c f proxy. (GToSchema (C1 c f), Constructor c) =>
844− Referenced Schema -> SchemaOptions -> proxy (C1 c f) -> Schema -> Schema
842+gsumConToSchemaWith :: forall c f. (GToSchema (C1 c f), Constructor c) =>
843+ Referenced Schema -> SchemaOptions -> Proxy (C1 c f) -> Schema -> Schema
845844gsumConToSchemaWith ref opts _ schema = schema
846845 & type_ .~ SwaggerObject
847846 & properties . at tag ?~ ref
@@ -850,8 +849,8 @@ gsumConToSchemaWith ref opts _ schema = schema
850849 where
851850 tag = T.pack (constructorTagModifier opts (conName (Proxy3 :: Proxy3 c f p)))
852851
853−gsumConToSchema :: forall c f proxy. (GToSchema (C1 c f), Constructor c) =>
854− SchemaOptions -> proxy (C1 c f) -> Schema -> Declare (Definitions Schema) Schema
852+gsumConToSchema :: (GToSchema (C1 c f), Constructor c) =>
853+ SchemaOptions -> Proxy (C1 c f) -> Schema -> Declare (Definitions Schema) Schema
855854gsumConToSchema opts proxy schema = do
856855 ref <- gdeclareSchemaRef opts proxy
857856 return $ gsumConToSchemaWith ref opts proxy schema