Skip to content

Commit 4437349

Browse files
authored
Merge pull request #491 from fsprojects/missing_parameters
Added missing `deprecationReason` parameter to `AsyncField` member
2 parents 2437f4e + 8bfd64f commit 4437349

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

src/FSharp.Data.GraphQL.Server/Exceptions.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ type GQLMessageExceptionBase (errorKind, msg, [<Optional>] extensions) =
3030
|> GQLProblemDetails.SetErrorKind errorKind
3131
|> ValueSome
3232

33-
type GQLMessageException (msg) =
34-
inherit GQLMessageExceptionBase (Execution, msg)
33+
type GQLMessageException (msg, [<Optional>] extensions) =
34+
inherit GQLMessageExceptionBase (Execution, msg, extensions)
3535

3636
type InvalidInputTypeException (msg, unmatchedOptionalFields) =
3737
inherit GQLMessageExceptionBase (InputCoercion, msg)

src/FSharp.Data.GraphQL.Shared/SchemaDefinitions.fs

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -908,14 +908,16 @@ module SchemaDefinitions =
908908
/// <param name="name">Field name. Must be unique in scope of the defining object.</param>
909909
/// <param name="typedef">GraphQL type definition of the current field's type.</param>
910910
/// <param name="resolve">Expression used to resolve value from defining object.</param>
911+
/// <param name="deprecationReason">Deprecation reason.</param>
911912
static member AsyncField(name : string, typedef : #OutputDef<'Res>,
912-
[<ReflectedDefinition(true)>] resolve : Expr<ResolveFieldContext -> 'Val -> Async<'Res>>) : FieldDef<'Val> =
913+
[<ReflectedDefinition(true)>] resolve : Expr<ResolveFieldContext -> 'Val -> Async<'Res>>,
914+
?deprecationReason : string) : FieldDef<'Val> =
913915
upcast { FieldDefinition.Name = name
914916
Description = None
915917
TypeDef = typedef
916918
Resolve = Async(typeof<'Val>, typeof<'Res>, resolve)
917919
Args = [||]
918-
DeprecationReason = None
920+
DeprecationReason = deprecationReason
919921
Metadata = Metadata.Empty }
920922

921923
/// <summary>
@@ -925,33 +927,35 @@ module SchemaDefinitions =
925927
/// <param name="typedef">GraphQL type definition of the current field's type.</param>
926928
/// <param name="description">Optional field description. Usefull for generating documentation.</param>
927929
/// <param name="resolve">Expression used to resolve value from defining object.</param>
930+
/// <param name="deprecationReason">Deprecation reason.</param>
928931
static member AsyncField(name : string, typedef : #OutputDef<'Res>, description : string,
929-
[<ReflectedDefinition(true)>] resolve : Expr<ResolveFieldContext -> 'Val -> Async<'Res>>) : FieldDef<'Val> =
932+
[<ReflectedDefinition(true)>] resolve : Expr<ResolveFieldContext -> 'Val -> Async<'Res>>,
933+
?deprecationReason : string) : FieldDef<'Val> =
930934
upcast { FieldDefinition.Name = name
931935
Description = Some description
932936
TypeDef = typedef
933937
Resolve = Async(typeof<'Val>, typeof<'Res>, resolve)
934938
Args = [||]
935-
DeprecationReason = None
939+
DeprecationReason = deprecationReason
936940
Metadata = Metadata.Empty }
937941

938942
/// <summary>
939943
/// Creates field defined inside object type with asynchronously resolved value.
940944
/// </summary>
941945
/// <param name="name">Field name. Must be unique in scope of the defining object.</param>
942946
/// <param name="typedef">GraphQL type definition of the current field's type.</param>
943-
/// <param name="description">Optional field description. Usefull for generating documentation.</param>
944947
/// <param name="args">List of field arguments used to parametrize resolve expression output.</param>
945948
/// <param name="resolve">Expression used to resolve value from defining object.</param>
946-
static member AsyncField(name : string, typedef : #OutputDef<'Res>, description : string,
947-
args : InputFieldDef list,
948-
[<ReflectedDefinition(true)>] resolve : Expr<ResolveFieldContext -> 'Val -> Async<'Res>>) : FieldDef<'Val> =
949+
/// <param name="deprecationReason">Deprecation reason.</param>
950+
static member AsyncField(name : string, typedef : #OutputDef<'Res>, args : InputFieldDef list,
951+
[<ReflectedDefinition(true)>] resolve : Expr<ResolveFieldContext -> 'Val -> Async<'Res>>,
952+
?deprecationReason : string) : FieldDef<'Val> =
949953
upcast { FieldDefinition.Name = name
950-
Description = Some description
954+
Description = None
951955
TypeDef = typedef
952956
Resolve = Async(typeof<'Val>, typeof<'Res>, resolve)
953957
Args = args |> List.toArray
954-
DeprecationReason = None
958+
DeprecationReason = deprecationReason
955959
Metadata = Metadata.Empty }
956960

957961
/// <summary>
@@ -966,13 +970,13 @@ module SchemaDefinitions =
966970
static member AsyncField(name : string, typedef : #OutputDef<'Res>, description : string,
967971
args : InputFieldDef list,
968972
[<ReflectedDefinition(true)>] resolve : Expr<ResolveFieldContext -> 'Val -> Async<'Res>>,
969-
deprecationReason : string) : FieldDef<'Val> =
973+
?deprecationReason : string) : FieldDef<'Val> =
970974
upcast { FieldDefinition.Name = name
971975
Description = Some description
972976
TypeDef = typedef
973977
Resolve = Async(typeof<'Val>, typeof<'Res>, resolve)
974978
Args = args |> List.toArray
975-
DeprecationReason = Some deprecationReason
979+
DeprecationReason = deprecationReason
976980
Metadata = Metadata.Empty }
977981

978982
/// <summary>

0 commit comments

Comments
 (0)