From c07fe27ac6734b66536da59cfc323e34d6d56fbf Mon Sep 17 00:00:00 2001 From: Nebula Lavelle Date: Thu, 15 Jan 2026 13:55:31 -0500 Subject: [PATCH] Updates `json-fleece` to latest version --- src/Orb/Handler/Handler.hs | 4 +- src/Orb/OpenApi.hs | 107 ++++++++---------- src/Orb/Response/Response.hs | 2 +- src/Orb/Response/Schemas.hs | 16 +-- src/Orb/Response/StatusCodes.hs | 86 +++++++------- stack-ghc-9.10.yaml | 2 +- stack-ghc-9.10.yaml.lock | 24 ++-- stack-ghc-9.6.yaml | 2 +- stack-ghc-9.6.yaml.lock | 24 ++-- stack-ghc-9.8.yaml | 2 +- stack-ghc-9.8.yaml.lock | 24 ++-- stack.yaml.lock | 24 ++-- test/Fixtures/NullableRef.hs | 2 +- test/Fixtures/NullableRefCollectComponents.hs | 4 +- test/Fixtures/SimplePost.hs | 2 +- test/Fixtures/TaggedUnion.hs | 6 +- test/Fixtures/Union.hs | 4 +- 17 files changed, 164 insertions(+), 171 deletions(-) diff --git a/src/Orb/Handler/Handler.hs b/src/Orb/Handler/Handler.hs index ef997d4..89f9e42 100644 --- a/src/Orb/Handler/Handler.hs +++ b/src/Orb/Handler/Handler.hs @@ -106,7 +106,7 @@ data NoRequestBody data RequestBody body tags where SchemaRequestBody :: Response.Has422Response tags => - (forall schema. FC.Fleece schema => schema body) -> + (forall t. FC.Fleece t => FC.Schema t body) -> RequestBody body tags RawRequestBody :: Response.HasResponseCodeWithType tags "422" err => @@ -320,7 +320,7 @@ parseBodyRequestSchema :: , HasRequest.HasRequest m , MIO.MonadIO m ) => - (forall schema. FC.Fleece schema => schema request) -> + (forall t. FC.Fleece t => FC.Schema t request) -> m (Either (S.TaggedUnion tags) request) parseBodyRequestSchema schema = do req <- HasRequest.request diff --git a/src/Orb/OpenApi.hs b/src/Orb/OpenApi.hs index 76f8f91..30d7a9d 100644 --- a/src/Orb/OpenApi.hs +++ b/src/Orb/OpenApi.hs @@ -4,7 +4,6 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeOperators #-} module Orb.OpenApi ( mkOpenApi @@ -559,7 +558,7 @@ mkRequestBody :: Either OpenApiError (Maybe (OpenApi.Referenced OpenApi.RequestBody, Map.Map T.Text SchemaInfo)) mkRequestBody handler = case Handler.requestBody handler of - Handler.SchemaRequestBody (FleeceOpenApi mkErrOrSchemaInfo) -> do + Handler.SchemaRequestBody (FC.Schema _ (FleeceOpenApi mkErrOrSchemaInfo)) -> do schemaInfo <- mkErrOrSchemaInfo [] let @@ -687,7 +686,7 @@ mkResponses handler = mbSchemaInfo <- case responseSchema of Response.NoSchemaResponseBody _mbContentType -> pure Nothing - Response.SchemaResponseBody (FleeceOpenApi mkInfo) -> fmap Just (mkInfo []) + Response.SchemaResponseBody (FC.Schema _ (FleeceOpenApi mkInfo)) -> fmap Just (mkInfo []) Response.EmptyResponseBody -> pure Nothing let mkResponseContent schemaRef = @@ -833,7 +832,7 @@ data SchemaWithComponents = SchemaWithComponents Fleece schema. If an error occurs during construction (e.g. conflicting definitions of the same component), an error will be returned. -} -schemaWithComponents :: FleeceOpenApi a -> Either OpenApiError SchemaWithComponents +schemaWithComponents :: FC.Schema FleeceOpenApi a -> Either OpenApiError SchemaWithComponents schemaWithComponents = fmap ( \schemaInfo -> @@ -847,6 +846,7 @@ schemaWithComponents = ) . ($ []) . unFleeceOpenApi + . FC.schemaInterpreter data PathEntry = PathSchema FC.Name @@ -996,13 +996,13 @@ mkSchemaRef schema = OpenApi.Inline . openApiSchema $ schema mkPrimitiveSchema :: - String -> + FC.Name -> OpenApi.OpenApiType -> Path -> SchemaInfo mkPrimitiveSchema name openApiType path = SchemaInfo - { fleeceName = FC.unqualifiedName name + { fleeceName = name , schemaPath = path , schemaIsPrimitive = True , openApiKey = Nothing @@ -1036,39 +1036,22 @@ instance FC.Fleece FleeceOpenApi where data TaggedUnionMembers FleeceOpenApi _allTags _handledTags = TaggedUnionMembers (Path -> FieldInfo -> String -> Either OpenApiError [(T.Text, SchemaInfo)]) - schemaName (FleeceOpenApi mkErrOrSchemaInfo) = - -- We might not be able to make a name here because 'mkErrOrSchemaInfo' might - -- return an error. 'schemaName' cannot return an error, however, so we are - -- forced to reflect the error in the name of the schema. This is not ideal, - -- but the error raised by the schema will almost certainly be raised elsewhere - -- as part of the OpenApi spec generation, so it will get reported as an error - -- elsewhere in addition to in the name of this schema. - case mkErrOrSchemaInfo [] of - Left err -> - let - shortErr = - takeWhile (/= '\n') (renderOpenApiError err) - in - FC.unqualifiedName ("Unable to get schema name:" <> shortErr) - Right schemaInfo -> fleeceName schemaInfo - - format formatString (FleeceOpenApi mkErrOrSchemaInfo) = - FleeceOpenApi $ \path -> - fmap (setSchemaInfoFormat (T.pack formatString)) (mkErrOrSchemaInfo path) + interpretFormat formatString (FC.Schema _name (FleeceOpenApi mkErrOrSchemaInfo)) = + FleeceOpenApi $ fmap (setSchemaInfoFormat (T.pack formatString)) . mkErrOrSchemaInfo - number = - FleeceOpenApi $ Right . mkPrimitiveSchema "number" OpenApi.OpenApiNumber + interpretNumber name = + FleeceOpenApi $ Right . mkPrimitiveSchema name OpenApi.OpenApiNumber - text = - FleeceOpenApi $ Right . mkPrimitiveSchema "text" OpenApi.OpenApiString + interpretText name = + FleeceOpenApi $ Right . mkPrimitiveSchema name OpenApi.OpenApiString - boolean = - FleeceOpenApi $ Right . mkPrimitiveSchema "boolean" OpenApi.OpenApiBoolean + interpretBoolean name = + FleeceOpenApi $ Right . mkPrimitiveSchema name OpenApi.OpenApiBoolean - null = - FleeceOpenApi $ Right . mkPrimitiveSchema "null" OpenApi.OpenApiNull + interpretNull name = + FleeceOpenApi $ Right . mkPrimitiveSchema name OpenApi.OpenApiNull - array (FleeceOpenApi mkErrOrItemSchemaInfo) = + interpretArray arrayName (FC.Schema _itemName (FleeceOpenApi mkErrOrItemSchemaInfo)) = FleeceOpenApi $ \path -> do itemSchemaInfo <- mkErrOrItemSchemaInfo path components <- collectComponents [itemSchemaInfo] @@ -1079,7 +1062,7 @@ instance FC.Fleece FleeceOpenApi where pure $ SchemaInfo - { fleeceName = FC.annotateName (fleeceName itemSchemaInfo) "array" + { fleeceName = arrayName , schemaPath = path , schemaIsPrimitive = False , openApiKey = Nothing @@ -1092,7 +1075,7 @@ instance FC.Fleece FleeceOpenApi where , schemaComponents = components } - nullable (FleeceOpenApi mkErrOrSchemaInfo) = + interpretNullable _nullableName (FC.Schema _name (FleeceOpenApi mkErrOrSchemaInfo)) = FleeceOpenApi $ \path -> do schemaInfo <- mkErrOrSchemaInfo path let @@ -1117,7 +1100,7 @@ instance FC.Fleece FleeceOpenApi where , schemaComponents = schemaComponents schemaInfo } - required name _accessor (FleeceOpenApi mkErrOrSchemaInfo) = + required name _accessor (FC.Schema _schemaName (FleeceOpenApi mkErrOrSchemaInfo)) = Field $ \path -> do schemaInfo <- mkErrOrSchemaInfo (addFieldToPath name path) pure $ @@ -1127,7 +1110,7 @@ instance FC.Fleece FleeceOpenApi where , fieldSchemaInfo = schemaInfo } - optional name _accessor (FleeceOpenApi mkErrOrSchemaInfo) = + optional name _accessor (FC.Schema _schemaName (FleeceOpenApi mkErrOrSchemaInfo)) = Field $ \path -> do schemaInfo <- mkErrOrSchemaInfo (addFieldToPath name path) pure $ @@ -1143,7 +1126,7 @@ instance FC.Fleece FleeceOpenApi where additionalFields _accessor _schema = AdditionalFields - objectNamed name (Object mkErrOrFieldsInReverse) = + interpretObjectNamed name (Object mkErrOrFieldsInReverse) = FleeceOpenApi $ \path -> mkObjectForFields path name =<< mkErrOrFieldsInReverse (addSchemaToPath name path) @@ -1157,7 +1140,7 @@ instance FC.Fleece FleeceOpenApi where Object . const . Left . InternalError $ "Fleece additional fields not currently support for OpenAPI" - validateNamed name _uncheck _check (FleeceOpenApi mkErrOrSchemaInfo) = do + interpretValidateNamed name _uncheck _check (FC.Schema _unvalidatedName (FleeceOpenApi mkErrOrSchemaInfo)) = do FleeceOpenApi $ \path -> do schemaInfo <- mkErrOrSchemaInfo (addSchemaToPath name path) @@ -1178,10 +1161,10 @@ instance FC.Fleece FleeceOpenApi where , openApiKey = Just . fleeceNameToOpenApiKey $ name } - validateAnonymous _uncheck _check (FleeceOpenApi errOrSchemaInfo) = do + interpretValidateAnonymous _uncheck _check (FC.Schema _name (FleeceOpenApi errOrSchemaInfo)) = do FleeceOpenApi errOrSchemaInfo - boundedEnumNamed name toText = + interpretBoundedEnumNamed name toText = let enumValues = fmap @@ -1204,7 +1187,7 @@ instance FC.Fleece FleeceOpenApi where , schemaComponents = Map.empty } - unionNamed name (UnionMembers mkErrOrMembers) = + interpretUnionNamed name (UnionMembers mkErrOrMembers) = FleeceOpenApi $ \path -> do let key = Just $ fleeceNameToOpenApiKey name @@ -1230,7 +1213,7 @@ instance FC.Fleece FleeceOpenApi where , schemaComponents = components } - unionMemberWithIndex _idx (FleeceOpenApi mkErrOrSchemaInfo) = + unionMemberWithIndex _idx (FC.Schema _name (FleeceOpenApi mkErrOrSchemaInfo)) = UnionMembers $ \path -> do schemaInfo <- mkErrOrSchemaInfo path pure [schemaInfo] @@ -1240,7 +1223,7 @@ instance FC.Fleece FleeceOpenApi where -- polymorphism UnionMembers $ \path -> liftA2 (++) (left path) (right path) - taggedUnionNamed name tagPropertyString (TaggedUnionMembers mkMembers) = + interpretTaggedUnionNamed name tagPropertyString (TaggedUnionMembers mkMembers) = FleeceOpenApi $ \path -> do let tagProperty = @@ -1250,7 +1233,7 @@ instance FC.Fleece FleeceOpenApi where FC.nameUnqualified name <> "." errOrStringSchema = - unFleeceOpenApi FC.text (PathSchema name : path) + unFleeceOpenApi (FC.schemaInterpreter FC.text) (PathSchema name : path) mkTagField tagSchema = FieldInfo @@ -1333,7 +1316,7 @@ instance FC.Fleece FleeceOpenApi where -- polymorphism pure (left ++ right) - jsonString (FleeceOpenApi _schemaInfo) = + interpretJsonString _schema = FleeceOpenApi . const . Left @@ -1347,25 +1330,35 @@ instance FC.Fleece FleeceOpenApi where -- we have no way to access and call the defaults. -- - int = setOpenApiType OpenApi.OpenApiInteger $ FC.boundedIntegralNumberAnonymous + interpretInt _name = + setOpenApiType OpenApi.OpenApiInteger (FC.schemaInterpreter FC.boundedIntegralNumberAnonymous) - int8 = setOpenApiType OpenApi.OpenApiInteger $ FC.format "int8" FC.boundedIntegralNumberAnonymous + interpretInt8 _name = + setOpenApiType OpenApi.OpenApiInteger (FC.schemaInterpreter $ FC.format "int8" FC.boundedIntegralNumberAnonymous) - int16 = setOpenApiType OpenApi.OpenApiInteger $ FC.format "int16" FC.boundedIntegralNumberAnonymous + interpretInt16 _name = + setOpenApiType OpenApi.OpenApiInteger (FC.schemaInterpreter $ FC.format "int16" FC.boundedIntegralNumberAnonymous) - int32 = setOpenApiType OpenApi.OpenApiInteger $ FC.format "int32" FC.boundedIntegralNumberAnonymous + interpretInt32 _name = + setOpenApiType OpenApi.OpenApiInteger (FC.schemaInterpreter $ FC.format "int32" FC.boundedIntegralNumberAnonymous) - int64 = setOpenApiType OpenApi.OpenApiInteger $ FC.format "int64" FC.boundedIntegralNumberAnonymous + interpretInt64 _name = + setOpenApiType OpenApi.OpenApiInteger (FC.schemaInterpreter $ FC.format "int64" FC.boundedIntegralNumberAnonymous) - word = setOpenApiType OpenApi.OpenApiInteger $ FC.format "word" FC.boundedIntegralNumberAnonymous + interpretWord _name = + setOpenApiType OpenApi.OpenApiInteger (FC.schemaInterpreter $ FC.format "word" FC.boundedIntegralNumberAnonymous) - word8 = setOpenApiType OpenApi.OpenApiInteger $ FC.format "word8" FC.boundedIntegralNumberAnonymous + interpretWord8 _name = + setOpenApiType OpenApi.OpenApiInteger (FC.schemaInterpreter $ FC.format "word8" FC.boundedIntegralNumberAnonymous) - word16 = setOpenApiType OpenApi.OpenApiInteger $ FC.format "word16" FC.boundedIntegralNumberAnonymous + interpretWord16 _name = + setOpenApiType OpenApi.OpenApiInteger (FC.schemaInterpreter $ FC.format "word16" FC.boundedIntegralNumberAnonymous) - word32 = setOpenApiType OpenApi.OpenApiInteger $ FC.format "word32" FC.boundedIntegralNumberAnonymous + interpretWord32 _name = + setOpenApiType OpenApi.OpenApiInteger (FC.schemaInterpreter $ FC.format "word32" FC.boundedIntegralNumberAnonymous) - word64 = setOpenApiType OpenApi.OpenApiInteger $ FC.format "word64" FC.boundedIntegralNumberAnonymous + interpretWord64 _name = + setOpenApiType OpenApi.OpenApiInteger (FC.schemaInterpreter $ FC.format "word64" FC.boundedIntegralNumberAnonymous) mkObjectForFields :: Path -> diff --git a/src/Orb/Response/Response.hs b/src/Orb/Response/Response.hs index 92a677c..87f8f7a 100644 --- a/src/Orb/Response/Response.hs +++ b/src/Orb/Response/Response.hs @@ -45,7 +45,7 @@ data ResponseBody where NoSchemaResponseBody :: Maybe ContentType -> ResponseBody SchemaResponseBody :: - (forall schema. FC.Fleece schema => schema body) -> ResponseBody + (forall t. FC.Fleece t => FC.Schema t body) -> ResponseBody EmptyResponseBody :: ResponseBody diff --git a/src/Orb/Response/Schemas.hs b/src/Orb/Response/Schemas.hs index 7069995..7d76420 100644 --- a/src/Orb/Response/Schemas.hs +++ b/src/Orb/Response/Schemas.hs @@ -28,7 +28,7 @@ import Fleece.Core qualified as FC newtype BadRequestMessage = BadRequestMessage {badRequestMessage :: T.Text} -badRequestMessageSchema :: FC.Fleece schema => schema BadRequestMessage +badRequestMessageSchema :: FC.Fleece t => FC.Schema t BadRequestMessage badRequestMessageSchema = FC.object $ FC.constructor BadRequestMessage @@ -37,7 +37,7 @@ badRequestMessageSchema = newtype ConflictMessage = ConflictMessage {conflictMessage :: T.Text} -conflictMessageSchema :: FC.Fleece schema => schema ConflictMessage +conflictMessageSchema :: FC.Fleece t => FC.Schema t ConflictMessage conflictMessageSchema = FC.object $ FC.constructor ConflictMessage @@ -45,7 +45,7 @@ conflictMessageSchema = data InternalServerError = InternalServerError -internalServerErrorSchema :: FC.Fleece schema => schema InternalServerError +internalServerErrorSchema :: FC.Fleece t => FC.Schema t InternalServerError internalServerErrorSchema = FC.object $ FC.constructor (const InternalServerError) @@ -56,7 +56,7 @@ data NoContent = NoContent newtype NotFoundMessage = NotFoundMessage {notFoundMessage :: T.Text} -notFoundMessageSchema :: FC.Fleece schema => schema NotFoundMessage +notFoundMessageSchema :: FC.Fleece t => FC.Schema t NotFoundMessage notFoundMessageSchema = FC.object $ FC.constructor NotFoundMessage @@ -65,7 +65,7 @@ notFoundMessageSchema = newtype ServiceUnavailableError = ServiceUnavailableError {serviceUnavailableText :: T.Text} -serviceUnavailableErrorSchema :: FC.Fleece schema => schema ServiceUnavailableError +serviceUnavailableErrorSchema :: FC.Fleece t => FC.Schema t ServiceUnavailableError serviceUnavailableErrorSchema = FC.object $ FC.constructor ServiceUnavailableError @@ -74,7 +74,7 @@ serviceUnavailableErrorSchema = newtype SuccessMessage = SuccessMessage {successMessage :: T.Text} -successMessageSchema :: FC.Fleece schema => schema SuccessMessage +successMessageSchema :: FC.Fleece t => FC.Schema t SuccessMessage successMessageSchema = FC.object $ FC.constructor SuccessMessage @@ -83,7 +83,7 @@ successMessageSchema = newtype UnauthorizedMessage = UnauthorizedMessage {unauthorizedMessage :: T.Text} -unauthorizedMessageSchema :: FC.Fleece schema => schema UnauthorizedMessage +unauthorizedMessageSchema :: FC.Fleece t => FC.Schema t UnauthorizedMessage unauthorizedMessageSchema = FC.object $ FC.constructor UnauthorizedMessage @@ -92,7 +92,7 @@ unauthorizedMessageSchema = newtype UnprocessableContentMessage = UnprocessableContentMessage {unprocessableContentText :: T.Text} -unprocessableContentSchema :: FC.Fleece schema => schema UnprocessableContentMessage +unprocessableContentSchema :: FC.Fleece t => FC.Schema t UnprocessableContentMessage unprocessableContentSchema = FC.object $ FC.constructor UnprocessableContentMessage diff --git a/src/Orb/Response/StatusCodes.hs b/src/Orb/Response/StatusCodes.hs index c76b18e..a1886ac 100644 --- a/src/Orb/Response/StatusCodes.hs +++ b/src/Orb/Response/StatusCodes.hs @@ -375,7 +375,7 @@ by Fleece, and the @Content-Type@ will be set to /application\/json/. addResponseSchema :: forall tag tags a. KnownHTTPStatus tag => - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder tags -> ResponseBodiesBuilder ((tag @= (a, HTTP.ResponseHeaders)) : tags) addResponseSchema schema builder = @@ -1283,7 +1283,7 @@ responseBodies -} addResponseSchema200 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response200 a : responseCodes) addResponseSchema200 = @@ -1350,7 +1350,7 @@ responseBodies -} addResponseSchema201 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response201 a : responseCodes) addResponseSchema201 = @@ -1417,7 +1417,7 @@ responseBodies -} addResponseSchema202 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response202 a : responseCodes) addResponseSchema202 = @@ -1484,7 +1484,7 @@ responseBodies -} addResponseSchema203 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response203 a : responseCodes) addResponseSchema203 = @@ -1589,7 +1589,7 @@ responseBodies -} addResponseSchema206 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response206 a : responseCodes) addResponseSchema206 = @@ -1656,7 +1656,7 @@ responseBodies -} addResponseSchema300 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response300 a : responseCodes) addResponseSchema300 = @@ -1723,7 +1723,7 @@ responseBodies -} addResponseSchema301 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response301 a : responseCodes) addResponseSchema301 = @@ -1790,7 +1790,7 @@ responseBodies -} addResponseSchema302 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response302 a : responseCodes) addResponseSchema302 = @@ -1857,7 +1857,7 @@ responseBodies -} addResponseSchema303 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response303 a : responseCodes) addResponseSchema303 = @@ -1943,7 +1943,7 @@ responseBodies -} addResponseSchema305 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response305 a : responseCodes) addResponseSchema305 = @@ -2010,7 +2010,7 @@ responseBodies -} addResponseSchema307 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response307 a : responseCodes) addResponseSchema307 = @@ -2077,7 +2077,7 @@ responseBodies -} addResponseSchema308 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response308 a : responseCodes) addResponseSchema308 = @@ -2144,7 +2144,7 @@ responseBodies -} addResponseSchema400 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response400 a : responseCodes) addResponseSchema400 = @@ -2211,7 +2211,7 @@ responseBodies -} addResponseSchema401 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response401 a : responseCodes) addResponseSchema401 = @@ -2278,7 +2278,7 @@ responseBodies -} addResponseSchema402 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response402 a : responseCodes) addResponseSchema402 = @@ -2345,7 +2345,7 @@ responseBodies -} addResponseSchema403 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response403 a : responseCodes) addResponseSchema403 = @@ -2412,7 +2412,7 @@ responseBodies -} addResponseSchema404 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response404 a : responseCodes) addResponseSchema404 = @@ -2479,7 +2479,7 @@ responseBodies -} addResponseSchema405 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response405 a : responseCodes) addResponseSchema405 = @@ -2546,7 +2546,7 @@ responseBodies -} addResponseSchema406 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response406 a : responseCodes) addResponseSchema406 = @@ -2613,7 +2613,7 @@ responseBodies -} addResponseSchema407 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response407 a : responseCodes) addResponseSchema407 = @@ -2680,7 +2680,7 @@ responseBodies -} addResponseSchema408 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response408 a : responseCodes) addResponseSchema408 = @@ -2747,7 +2747,7 @@ responseBodies -} addResponseSchema409 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response409 a : responseCodes) addResponseSchema409 = @@ -2814,7 +2814,7 @@ responseBodies -} addResponseSchema410 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response410 a : responseCodes) addResponseSchema410 = @@ -2881,7 +2881,7 @@ responseBodies -} addResponseSchema411 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response411 a : responseCodes) addResponseSchema411 = @@ -2948,7 +2948,7 @@ responseBodies -} addResponseSchema412 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response412 a : responseCodes) addResponseSchema412 = @@ -3015,7 +3015,7 @@ responseBodies -} addResponseSchema413 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response413 a : responseCodes) addResponseSchema413 = @@ -3082,7 +3082,7 @@ responseBodies -} addResponseSchema414 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response414 a : responseCodes) addResponseSchema414 = @@ -3149,7 +3149,7 @@ responseBodies -} addResponseSchema415 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response415 a : responseCodes) addResponseSchema415 = @@ -3216,7 +3216,7 @@ responseBodies -} addResponseSchema416 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response416 a : responseCodes) addResponseSchema416 = @@ -3283,7 +3283,7 @@ responseBodies -} addResponseSchema417 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response417 a : responseCodes) addResponseSchema417 = @@ -3350,7 +3350,7 @@ responseBodies -} addResponseSchema418 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response418 a : responseCodes) addResponseSchema418 = @@ -3417,7 +3417,7 @@ responseBodies -} addResponseSchema422 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response422 a : responseCodes) addResponseSchema422 = @@ -3484,7 +3484,7 @@ responseBodies -} addResponseSchema428 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response428 a : responseCodes) addResponseSchema428 = @@ -3551,7 +3551,7 @@ responseBodies -} addResponseSchema429 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response429 a : responseCodes) addResponseSchema429 = @@ -3618,7 +3618,7 @@ responseBodies -} addResponseSchema431 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response431 a : responseCodes) addResponseSchema431 = @@ -3685,7 +3685,7 @@ responseBodies -} addResponseSchema500 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response500 a : responseCodes) addResponseSchema500 = @@ -3752,7 +3752,7 @@ responseBodies -} addResponseSchema501 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response501 a : responseCodes) addResponseSchema501 = @@ -3819,7 +3819,7 @@ responseBodies -} addResponseSchema502 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response502 a : responseCodes) addResponseSchema502 = @@ -3886,7 +3886,7 @@ responseBodies -} addResponseSchema503 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response503 a : responseCodes) addResponseSchema503 = @@ -3953,7 +3953,7 @@ responseBodies -} addResponseSchema504 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response504 a : responseCodes) addResponseSchema504 = @@ -4020,7 +4020,7 @@ responseBodies -} addResponseSchema505 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response505 a : responseCodes) addResponseSchema505 = @@ -4087,7 +4087,7 @@ responseBodies -} addResponseSchema511 :: forall a responseCodes. - (forall schema. FC.Fleece schema => schema a) -> + (forall t. FC.Fleece t => FC.Schema t a) -> ResponseBodiesBuilder responseCodes -> ResponseBodiesBuilder (Response511 a : responseCodes) addResponseSchema511 = diff --git a/stack-ghc-9.10.yaml b/stack-ghc-9.10.yaml index b09ea70..ce9d00d 100644 --- a/stack-ghc-9.10.yaml +++ b/stack-ghc-9.10.yaml @@ -11,7 +11,7 @@ extra-deps: - github: flipstone/shrubbery commit: a064ede07e01b753a6eb310fc24d9fd8da1ad826 - github: flipstone/json-fleece - commit: 2064e681d594a603fcbaf2e58105c64ee53156a1 + commit: 641631cfc2b4fe7721b6d79b875564c6892ee007 subdirs: - json-fleece-aeson - json-fleece-core diff --git a/stack-ghc-9.10.yaml.lock b/stack-ghc-9.10.yaml.lock index 6a32957..b88183b 100644 --- a/stack-ghc-9.10.yaml.lock +++ b/stack-ghc-9.10.yaml.lock @@ -57,29 +57,29 @@ packages: - completed: name: json-fleece-aeson pantry-tree: - sha256: d687b890f3727930fba309980fdb2b7f099e3c6092006940867c7fed3c19bd64 + sha256: b8b35942a6cbdcd7f17481944eb2fc2241abfac881cb96b42e1dcce059023152 size: 628 - sha256: d37000c263116c1f30d69dde80ece99f2a0037a5f07a378537cb282c3ac5debf - size: 3073901 + sha256: c55a25175e1c1674b90d86adcce15f374c55d5ed81ee5cbcf45375d3df703ccf + size: 3074877 subdir: json-fleece-aeson - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz - version: 0.3.8.0 + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz + version: 0.4.0.0 original: subdir: json-fleece-aeson - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz - completed: name: json-fleece-core pantry-tree: - sha256: 5adc2bf8c045e936eeb32d4388ee1dcd44cb4557e078b485c9a7415b98a9387f + sha256: 2d318c363da8fb4bcd6b1c0817e7528764857dee5e85d1ec74084ff65bee5685 size: 491 - sha256: d37000c263116c1f30d69dde80ece99f2a0037a5f07a378537cb282c3ac5debf - size: 3073901 + sha256: c55a25175e1c1674b90d86adcce15f374c55d5ed81ee5cbcf45375d3df703ccf + size: 3074877 subdir: json-fleece-core - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz - version: 0.8.0.0 + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz + version: 0.9.0.0 original: subdir: json-fleece-core - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz snapshots: - completed: sha256: 0d0bb681dd5be9b930c8fc070d717aae757b9aed176ae6047d87624b46406816 diff --git a/stack-ghc-9.6.yaml b/stack-ghc-9.6.yaml index 41b78e0..23d26d7 100644 --- a/stack-ghc-9.6.yaml +++ b/stack-ghc-9.6.yaml @@ -11,7 +11,7 @@ extra-deps: - github: flipstone/shrubbery commit: a064ede07e01b753a6eb310fc24d9fd8da1ad826 - github: flipstone/json-fleece - commit: 2064e681d594a603fcbaf2e58105c64ee53156a1 + commit: 641631cfc2b4fe7721b6d79b875564c6892ee007 subdirs: - json-fleece-aeson - json-fleece-core diff --git a/stack-ghc-9.6.yaml.lock b/stack-ghc-9.6.yaml.lock index fbec44b..a620500 100644 --- a/stack-ghc-9.6.yaml.lock +++ b/stack-ghc-9.6.yaml.lock @@ -57,29 +57,29 @@ packages: - completed: name: json-fleece-aeson pantry-tree: - sha256: d687b890f3727930fba309980fdb2b7f099e3c6092006940867c7fed3c19bd64 + sha256: b8b35942a6cbdcd7f17481944eb2fc2241abfac881cb96b42e1dcce059023152 size: 628 - sha256: d37000c263116c1f30d69dde80ece99f2a0037a5f07a378537cb282c3ac5debf - size: 3073901 + sha256: c55a25175e1c1674b90d86adcce15f374c55d5ed81ee5cbcf45375d3df703ccf + size: 3074877 subdir: json-fleece-aeson - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz - version: 0.3.8.0 + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz + version: 0.4.0.0 original: subdir: json-fleece-aeson - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz - completed: name: json-fleece-core pantry-tree: - sha256: 5adc2bf8c045e936eeb32d4388ee1dcd44cb4557e078b485c9a7415b98a9387f + sha256: 2d318c363da8fb4bcd6b1c0817e7528764857dee5e85d1ec74084ff65bee5685 size: 491 - sha256: d37000c263116c1f30d69dde80ece99f2a0037a5f07a378537cb282c3ac5debf - size: 3073901 + sha256: c55a25175e1c1674b90d86adcce15f374c55d5ed81ee5cbcf45375d3df703ccf + size: 3074877 subdir: json-fleece-core - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz - version: 0.8.0.0 + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz + version: 0.9.0.0 original: subdir: json-fleece-core - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz snapshots: - completed: sha256: 238fa745b64f91184f9aa518fe04bdde6552533d169b0da5256670df83a0f1a9 diff --git a/stack-ghc-9.8.yaml b/stack-ghc-9.8.yaml index 93a0073..a673c5e 100644 --- a/stack-ghc-9.8.yaml +++ b/stack-ghc-9.8.yaml @@ -11,7 +11,7 @@ extra-deps: - github: flipstone/shrubbery commit: a064ede07e01b753a6eb310fc24d9fd8da1ad826 - github: flipstone/json-fleece - commit: 2064e681d594a603fcbaf2e58105c64ee53156a1 + commit: 641631cfc2b4fe7721b6d79b875564c6892ee007 subdirs: - json-fleece-aeson - json-fleece-core diff --git a/stack-ghc-9.8.yaml.lock b/stack-ghc-9.8.yaml.lock index 2e0d38b..ddddbe4 100644 --- a/stack-ghc-9.8.yaml.lock +++ b/stack-ghc-9.8.yaml.lock @@ -57,29 +57,29 @@ packages: - completed: name: json-fleece-aeson pantry-tree: - sha256: d687b890f3727930fba309980fdb2b7f099e3c6092006940867c7fed3c19bd64 + sha256: b8b35942a6cbdcd7f17481944eb2fc2241abfac881cb96b42e1dcce059023152 size: 628 - sha256: d37000c263116c1f30d69dde80ece99f2a0037a5f07a378537cb282c3ac5debf - size: 3073901 + sha256: c55a25175e1c1674b90d86adcce15f374c55d5ed81ee5cbcf45375d3df703ccf + size: 3074877 subdir: json-fleece-aeson - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz - version: 0.3.8.0 + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz + version: 0.4.0.0 original: subdir: json-fleece-aeson - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz - completed: name: json-fleece-core pantry-tree: - sha256: 5adc2bf8c045e936eeb32d4388ee1dcd44cb4557e078b485c9a7415b98a9387f + sha256: 2d318c363da8fb4bcd6b1c0817e7528764857dee5e85d1ec74084ff65bee5685 size: 491 - sha256: d37000c263116c1f30d69dde80ece99f2a0037a5f07a378537cb282c3ac5debf - size: 3073901 + sha256: c55a25175e1c1674b90d86adcce15f374c55d5ed81ee5cbcf45375d3df703ccf + size: 3074877 subdir: json-fleece-core - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz - version: 0.8.0.0 + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz + version: 0.9.0.0 original: subdir: json-fleece-core - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz + url: https://github.com/flipstone/json-fleece/archive/641631cfc2b4fe7721b6d79b875564c6892ee007.tar.gz snapshots: - completed: sha256: 7e724f347d5969cb5e8dde9f9aae30996e3231c29d1dafd45f21f1700d4c4fcb diff --git a/stack.yaml.lock b/stack.yaml.lock index 6a32957..7e31996 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -57,29 +57,29 @@ packages: - completed: name: json-fleece-aeson pantry-tree: - sha256: d687b890f3727930fba309980fdb2b7f099e3c6092006940867c7fed3c19bd64 + sha256: 311e51d278ac62af3fa97d3ca287d2899cb178c09e6848c2628d96396a11cfb7 size: 628 - sha256: d37000c263116c1f30d69dde80ece99f2a0037a5f07a378537cb282c3ac5debf - size: 3073901 + sha256: f18caef414a23f16270c2556fe9baf5963caaf92a93ebf2b20cea03cdd66867a + size: 3074757 subdir: json-fleece-aeson - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz - version: 0.3.8.0 + url: https://github.com/flipstone/json-fleece/archive/67ee72cbd712563e1135dfac391537a282ee870d.tar.gz + version: 0.4.0.0 original: subdir: json-fleece-aeson - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz + url: https://github.com/flipstone/json-fleece/archive/67ee72cbd712563e1135dfac391537a282ee870d.tar.gz - completed: name: json-fleece-core pantry-tree: - sha256: 5adc2bf8c045e936eeb32d4388ee1dcd44cb4557e078b485c9a7415b98a9387f + sha256: 2d318c363da8fb4bcd6b1c0817e7528764857dee5e85d1ec74084ff65bee5685 size: 491 - sha256: d37000c263116c1f30d69dde80ece99f2a0037a5f07a378537cb282c3ac5debf - size: 3073901 + sha256: f18caef414a23f16270c2556fe9baf5963caaf92a93ebf2b20cea03cdd66867a + size: 3074757 subdir: json-fleece-core - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz - version: 0.8.0.0 + url: https://github.com/flipstone/json-fleece/archive/67ee72cbd712563e1135dfac391537a282ee870d.tar.gz + version: 0.9.0.0 original: subdir: json-fleece-core - url: https://github.com/flipstone/json-fleece/archive/2064e681d594a603fcbaf2e58105c64ee53156a1.tar.gz + url: https://github.com/flipstone/json-fleece/archive/67ee72cbd712563e1135dfac391537a282ee870d.tar.gz snapshots: - completed: sha256: 0d0bb681dd5be9b930c8fc070d717aae757b9aed176ae6047d87624b46406816 diff --git a/test/Fixtures/NullableRef.hs b/test/Fixtures/NullableRef.hs index 69bc629..1492890 100644 --- a/test/Fixtures/NullableRef.hs +++ b/test/Fixtures/NullableRef.hs @@ -72,7 +72,7 @@ data NullableRefResponse = NullableRefResponse , arrayOfNullableField :: [Either FC.Null Bool] } -nullableRefResponseSchema :: FC.Fleece schema => schema NullableRefResponse +nullableRefResponseSchema :: FC.Fleece t => FC.Schema t NullableRefResponse nullableRefResponseSchema = FC.object $ FC.constructor NullableRefResponse diff --git a/test/Fixtures/NullableRefCollectComponents.hs b/test/Fixtures/NullableRefCollectComponents.hs index da5eb23..a2a5f33 100644 --- a/test/Fixtures/NullableRefCollectComponents.hs +++ b/test/Fixtures/NullableRefCollectComponents.hs @@ -67,13 +67,13 @@ newtype NullableRefCollectComponentsResponse = NullableRefCollectComponentsRespo newtype InnerObject = InnerObject {innerField :: Bool} -nullableRefCollectComponentsResponseSchema :: FC.Fleece schema => schema NullableRefCollectComponentsResponse +nullableRefCollectComponentsResponseSchema :: FC.Fleece t => FC.Schema t NullableRefCollectComponentsResponse nullableRefCollectComponentsResponseSchema = FC.object $ FC.constructor NullableRefCollectComponentsResponse #+ FC.required "outerField" outerField innerObjectSchema -innerObjectSchema :: FC.Fleece schema => schema InnerObject +innerObjectSchema :: FC.Fleece t => FC.Schema t InnerObject innerObjectSchema = FC.object $ FC.constructor InnerObject diff --git a/test/Fixtures/SimplePost.hs b/test/Fixtures/SimplePost.hs index 4656ba6..b5ec6be 100644 --- a/test/Fixtures/SimplePost.hs +++ b/test/Fixtures/SimplePost.hs @@ -44,7 +44,7 @@ newtype SimplePostBody = SimplePostBody { simplePostParam :: T.Text } -simplePostBodySchema :: FC.Fleece schema => schema SimplePostBody +simplePostBodySchema :: FC.Fleece t => FC.Schema t SimplePostBody simplePostBodySchema = FC.object $ FC.constructor SimplePostBody diff --git a/test/Fixtures/TaggedUnion.hs b/test/Fixtures/TaggedUnion.hs index 5bed60b..5f45b8a 100644 --- a/test/Fixtures/TaggedUnion.hs +++ b/test/Fixtures/TaggedUnion.hs @@ -63,7 +63,7 @@ type TaggedUnionResponse = , "bar" @= Bar ] -unionResponseSchema :: FC.Fleece schema => schema TaggedUnionResponse +unionResponseSchema :: FC.Fleece t => FC.Schema t TaggedUnionResponse unionResponseSchema = FC.taggedUnionNamed "TaggedUnionResponse" "type" $ FC.taggedUnionMember @"foo" fooObjectSchema @@ -73,7 +73,7 @@ data Foo = Foo { fooField :: Bool } -fooObjectSchema :: FC.Fleece schema => FC.Object schema Foo Foo +fooObjectSchema :: FC.Fleece t => FC.Object t Foo Foo fooObjectSchema = FC.constructor Foo #+ FC.required "fooField" fooField FC.boolean @@ -82,7 +82,7 @@ data Bar = Bar { barField :: T.Text } -barObjectSchema :: FC.Fleece schema => FC.Object schema Bar Bar +barObjectSchema :: FC.Fleece t => FC.Object t Bar Bar barObjectSchema = FC.constructor Bar #+ FC.required "barField" barField FC.text diff --git a/test/Fixtures/Union.hs b/test/Fixtures/Union.hs index 746384b..558e1b2 100644 --- a/test/Fixtures/Union.hs +++ b/test/Fixtures/Union.hs @@ -57,7 +57,7 @@ type UnionResponses = type UnionResponse = S.Union [Int, RandomObject] -unionResponseSchema :: FC.Fleece schema => schema UnionResponse +unionResponseSchema :: FC.Fleece t => FC.Schema t UnionResponse unionResponseSchema = FC.unionNamed "UnionResponse" $ FC.unionMember FC.int @@ -68,7 +68,7 @@ data RandomObject = RandomObject , randomText :: T.Text } -randomObjectSchema :: FC.Fleece schema => schema RandomObject +randomObjectSchema :: FC.Fleece t => FC.Schema t RandomObject randomObjectSchema = FC.object $ FC.constructor RandomObject