@@ -319,15 +319,21 @@ data ParamOtherSchema = ParamOtherSchema
319319 -- Default value is @False@.
320320 , _paramOtherSchemaAllowEmptyValue :: Maybe Bool
321321
322− -- | Determines the format of the array if @'ParamArray'@ is used.
323− -- Default value is csv.
324− , _paramOtherSchemaCollectionFormat :: Maybe (CollectionFormat Param)
325−
326322 , _paramOtherSchemaParamSchema :: ParamSchema ParamOtherSchema
327323 } deriving (Eq, Show, Generic, Data, Typeable)
328324
325+-- | Items for @'SwaggerArray'@ schemas.
326+--
327+-- @'SwaggerItemsPrimitive'@ should be used only for query params, headers and path pieces.
328+-- The @'CollectionFormat' t@ parameter specifies how elements of an array should be displayed.
329+-- Note that @fmt@ in @'SwaggerItemsPrimitive' fmt schema@ specifies format for elements of type @schema@.
330+-- This is different from the original Swagger's <http://swagger.io/specification/#itemsObject Items Object>.
331+--
332+-- @'SwaggerItemsObject'@ should be used to specify homogenous array @'Schema'@s.
333+--
334+-- @'SwaggerItemsArray'@ should be used to specify tuple @'Schema'@s.
329335data SwaggerItems t where
330− SwaggerItemsPrimitive :: Items -> SwaggerItems t
336+ SwaggerItemsPrimitive :: Maybe (CollectionFormat t) -> ParamSchema t -> SwaggerItems t
331337 SwaggerItemsObject :: Referenced Schema -> SwaggerItems Schema
332338 SwaggerItemsArray :: [Referenced Schema] -> SwaggerItems Schema
333339
@@ -341,9 +347,9 @@ swaggerItemsPrimitiveConstr = mkConstr swaggerItemsDataType "SwaggerItemsPrimiti
341347swaggerItemsDataType :: DataType
342348swaggerItemsDataType = mkDataType "Data.Swagger.SwaggerItems" [swaggerItemsPrimitiveConstr]
343349
344−instance {-# OVERLAPPABLE #-} Typeable t => Data (SwaggerItems t) where
350+instance {-# OVERLAPPABLE #-} Data t => Data (SwaggerItems t) where
345351 gunfold k z c = case constrIndex c of
346− 1 -> k (z SwaggerItemsPrimitive)
352+ 1 -> k (k (z SwaggerItemsPrimitive))
347353 _ -> error $ "Data.Data.gunfold: Constructor " ++ show c ++ " is not of type (SwaggerItems t)."
348354 toConstr _ = swaggerItemsPrimitiveConstr
349355 dataTypeOf _ = swaggerItemsDataType
@@ -508,7 +514,7 @@ deriving instance (Data t, Data (SwaggerType t), Data (SwaggerItems t)) => Data
508514
509515data Xml = Xml
510516 { -- | Replaces the name of the element/attribute used for the described schema property.
511− -- When defined within the @'Items'@ (items), it will affect the name of the individual XML elements within the list.
517+ -- When defined within the @'SwaggerItems'@ (items), it will affect the name of the individual XML elements within the list.
512518 -- When defined alongside type being array (outside the items),
513519 -- it will affect the wrapping element and only if wrapped is true.
514520 -- If wrapped is false, it will be ignored.
@@ -534,14 +540,6 @@ data Xml = Xml
534540 , _xmlWrapped :: Maybe Bool
535541 } deriving (Eq, Show, Generic, Data, Typeable)
536542
537−data Items = Items
538− { -- | Determines the format of the array if type array is used.
539− -- Default value is @'ItemsCollectionCSV'@.
540− _itemsCollectionFormat :: Maybe (CollectionFormat Items)
541−
542− , _itemsParamSchema :: ParamSchema Items
543− } deriving (Eq, Show, Generic, Data, Typeable)
544−
545543-- | A container for the expected responses of an operation.
546544-- The container maps a HTTP response code to the expected response.
547545-- It is not expected from the documentation to necessarily cover all possible HTTP response codes,
@@ -585,10 +583,6 @@ data Header = Header
585583 { -- | A short description of the header.
586584 _headerDescription :: Maybe Text
587585
588− -- | Determines the format of the array if type array is used.
589− -- Default value is @'ItemsCollectionCSV'@.
590− , _headerCollectionFormat :: Maybe (CollectionFormat Items)
591−
592586 , _headerParamSchema :: ParamSchema Header
593587 } deriving (Eq, Show, Generic, Data, Typeable)
594588
@@ -942,13 +936,12 @@ instance ToJSON Schema where
942936instance ToJSON Header where
943937 toJSON = genericToJSONWithSub "paramSchema" (jsonPrefix "header")
944938
945−instance ToJSON Items where
946− toJSON = genericToJSONWithSub "paramSchema" (jsonPrefix "items")
947−
948939instance ToJSON (SwaggerItems t) where
949− toJSON (SwaggerItemsPrimitive x) = toJSON x
950− toJSON (SwaggerItemsObject x) = toJSON x
951− toJSON (SwaggerItemsArray x) = toJSON x
940+ toJSON (SwaggerItemsPrimitive fmt schema) = object
941+ [ "collectionFormat" .= fmt
942+ , "items" .= schema ]
943+ toJSON (SwaggerItemsObject x) = object [ "items" .= x ]
944+ toJSON (SwaggerItemsArray x) = object [ "items" .= x ]
952945
953946instance ToJSON Host where
954947 toJSON (Host host mport) = toJSON $
@@ -1017,7 +1010,7 @@ instance ToJSON (CollectionFormat t) where
10171010 toJSON CollectionMulti = "multi"
10181011
10191012instance ToJSON (ParamSchema t) where
1020− toJSON = genericToJSON (jsonPrefix "paramSchema")
1013+ toJSON = omitEmpties . genericToJSONWithSub "items" (jsonPrefix "paramSchema")
10211014
10221015-- =======================================================================
10231016-- Manual FromJSON instances
@@ -1076,11 +1069,10 @@ instance FromJSON Schema where
10761069instance FromJSON Header where
10771070 parseJSON = genericParseJSONWithSub "paramSchema" (jsonPrefix "header")
10781071
1079−instance FromJSON Items where
1080− parseJSON = genericParseJSONWithSub "paramSchema" (jsonPrefix "items")
1081−
1082−instance {-# OVERLAPPABLE #-} FromJSON (SwaggerItems t) where
1083− parseJSON js = SwaggerItemsPrimitive <$> parseJSON js
1072+instance {-# OVERLAPPABLE #-} (FromJSON (CollectionFormat t), FromJSON (ParamSchema t)) => FromJSON (SwaggerItems t) where
1073+ parseJSON (Object o) = SwaggerItemsPrimitive
1074+ <$> o .:? "collectionFormat"
1075+ <*> (o .: "items" >>= parseJSON)
10841076
10851077instance {-# OVERLAPPING #-} FromJSON (SwaggerItems Schema) where
10861078 parseJSON js@(Object _) = SwaggerItemsObject <$> parseJSON js
@@ -1174,16 +1166,17 @@ instance FromJSON (SwaggerType ParamOtherSchema) where
11741166instance {-# OVERLAPPABLE #-} FromJSON (SwaggerType t) where
11751167 parseJSON = parseOneOf [SwaggerString, SwaggerInteger, SwaggerNumber, SwaggerBoolean, SwaggerArray]
11761168
1169+instance {-# OVERLAPPABLE #-} FromJSON (CollectionFormat t) where
1170+ parseJSON = parseOneOf [CollectionCSV, CollectionSSV, CollectionTSV, CollectionPipes]
1171+
11771172instance FromJSON (CollectionFormat Param) where
11781173 parseJSON = parseOneOf [CollectionCSV, CollectionSSV, CollectionTSV, CollectionPipes, CollectionMulti]
11791174
1180−instance FromJSON (CollectionFormat Items) where
1181− parseJSON = parseOneOf [CollectionCSV, CollectionSSV, CollectionTSV, CollectionPipes]
1182−
11831175-- NOTE: The constraints @FromJSON (SwaggerType t)@ and
11841176-- @FromJSON (SwaggerItems t)@ are necessary here!
11851177-- Without the constraint the general instance will be used
11861178-- that only accepts common types (i.e. NOT object, null or file)
11871179-- and primitive array items.
11881180instance (FromJSON (SwaggerType t), FromJSON (SwaggerItems t)) => FromJSON (ParamSchema t) where
1189− parseJSON = genericParseJSON (jsonPrefix "ParamSchema")
1181+ parseJSON = genericParseJSONWithSub "items" (jsonPrefix "ParamSchema")
1182+