Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RFC] Add support for generic IDictionary<string,obj> query inputs - for #472 #475

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

[RFC] Add support for generic IDictionary<string,obj> query inputs - for #472 #475

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b70eeb
Add support for generic IDictionary<string,obj> query inputs
pkese Apr 6, 2024
e6ae5a3
Skip populating Nullable fields with nulls
pkese Apr 6, 2024
33e608c
Hack around the case where field.ExecuteInput is null
pkese Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 42 additions & 4 deletions src/FSharp.Data.GraphQL.Server/Values.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,35 @@ let rec internal compileByType (inputObjectPath: FieldPath) (inputSource : Input

| InputObject objDef ->
let objtype = objDef.Type
let ctor = ReflectionHelper.matchConstructor objtype (objDef.Fields |> Array.map (fun x -> x.Name))
let (constructor : obj[] -> obj), (parameterInfos : Reflection.ParameterInfo[]) =
if typeof<IDictionary<string,obj>>.IsAssignableFrom(objtype) then
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also check for IReadOnlyDictionary<string, obj> and obj and create ImmutableDictionary<string, obj> in that case

let parameterInfos = [|
for f in objDef.Fields ->
{ new Reflection.ParameterInfo() with
member _.Name = f.Name
member _.ParameterType = f.TypeDef.Type
member _.Attributes =
match f.TypeDef with
| Nullable _ -> Reflection.ParameterAttributes.Optional
| _ -> Reflection.ParameterAttributes.None
}
|]
let constructor (args:obj[]) =
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And format according to the Fantomas settings

Suggested change
let constructor (args:obj[]) =
let constructor (args : obj[]) =

let o = Activator.CreateInstance(objtype)
let dict = o :?> IDictionary<string, obj>
for fld,arg in Seq.zip objDef.Fields args do
match arg, fld.TypeDef with
| null, Nullable _ -> () // skip populating Nullable fields with nulls
pkese marked this conversation as resolved.
Show resolved Hide resolved
| _, _ -> dict.Add(fld.Name, arg)
box o
constructor, parameterInfos
else
let ctor = ReflectionHelper.matchConstructor objtype (objDef.Fields |> Array.map (fun x -> x.Name))
ctor.Invoke, ctor.GetParameters()


let struct (mapper, nullableMismatchParameters, missingParameters) =
ctor.GetParameters ()
parameterInfos
|> Array.fold (
fun
struct(all: ResizeArray<_>, areNullable: HashSet<_>, missing: HashSet<_>)
Expand Down Expand Up @@ -163,14 +188,27 @@ let rec internal compileByType (inputObjectPath: FieldPath) (inputSource : Input
| ValueSome field ->
match Map.tryFind field.Name props with
| None -> Ok <| wrapOptionalNone param.ParameterType field.TypeDef.Type
| Some input when isNull (box field.ExecuteInput) ->
// hack around the case where field.ExecuteInput is null
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe take this hack as a separate function and not a nested function inside many loops...

let rec extract = function
| NullValue -> null
| IntValue i -> box i
| FloatValue f -> box f
| BooleanValue b -> box b
| StringValue s -> box s
| EnumValue e -> box e
| ListValue l -> box (l |> List.map extract)
| ObjectValue o -> o |> Map.map (fun k v -> extract v) |> box
| VariableName v -> failwithf "Todo: extract variable"
extract input |> Ok
| Some prop ->
field.ExecuteInput prop variables |> Result.map (normalizeOptional param.ParameterType)
|> attachErrorExtensionsIfScalar inputSource inputObjectPath originalInputDef field
| ValueNone -> Ok <| wrapOptionalNone param.ParameterType typeof<obj>)

let! args = argResults |> splitSeqErrorsList

let instance = ctor.Invoke args
let instance = constructor args
do! objDef.Validator instance
|> ValidationResult.mapErrors (fun err -> err |> mapInputObjectError inputSource inputObjectPath originalInputDef)
return instance
Expand All @@ -197,7 +235,7 @@ let rec internal compileByType (inputObjectPath: FieldPath) (inputSource : Input

let! args = argResults |> splitSeqErrorsList

let instance = ctor.Invoke args
let instance = constructor args
do! objDef.Validator instance
|> ValidationResult.mapErrors (fun err -> err |> mapInputObjectError inputSource inputObjectPath originalInputDef)
return instance
Expand Down