Skip to content

Use [<Struct>] ? optional parameters and voption in Define/DefineRec and the introspection chain #604

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

Open
xperiandri wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Use [<Struct>] ? optional parameters and voption in Define/DefineRec and the introspection chain #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 35 additions & 37 deletions src/FSharp.Data.GraphQL.Client.DesignTime/ProvidedTypesHelper.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module internal QuotationHelpers =
let exprs = coerceValues (fun _ -> typ) instance
Expr.NewArray(typ, exprs)
let tupleExpr (tupleType : Type) (v : obj) =
let typ = FSharpType.GetTupleElements tupleType |> Array.mapi (fun i t -> i, t) |> Map.ofArray
let typ = FSharpType.GetTupleElements tupleType |> Seq.mapi (fun i t -> i, t) |> Map.ofSeq
let fieldTypeLookup i = typ.[i]
let fields = FSharpValue.GetTupleFields v
let exprs = coerceValues fieldTypeLookup fields
Expand Down Expand Up @@ -107,19 +107,19 @@ module internal ProvidedEnum =

type internal ProvidedTypeMetadata =
{ Name : string
Description : string option }
Description : string voption }

module internal ProvidedInterface =
let makeProvidedType(metadata : ProvidedTypeMetadata) =
let tdef = ProvidedTypeDefinition("I" + metadata.Name.FirstCharUpper(), None, nonNullable = true, isInterface = true)
metadata.Description |> Option.iter tdef.AddXmlDoc
metadata.Description |> ValueOption.iter tdef.AddXmlDoc
tdef

type internal RecordPropertyMetadata =
{ Name : string
Alias : string voption
Description : string option
DeprecationReason : string option
Description : string voption
DeprecationReason : string voption
Type : Type }
member x.AliasOrName =
match x.Alias with
Expand Down Expand Up @@ -154,8 +154,8 @@ module internal ProvidedRecord =
| Some prop -> prop.Value
| None -> failwith $"""Expected to find property "%s{pname}", but the property was not found.""" @@>
let pdef = ProvidedProperty(pname, metadata.Type, getterCode)
metadata.Description |> Option.iter pdef.AddXmlDoc
metadata.DeprecationReason |> Option.iter pdef.AddObsoleteAttribute
metadata.Description |> ValueOption.iter pdef.AddXmlDoc
metadata.DeprecationReason |> ValueOption.iter pdef.AddObsoleteAttribute
pdef))
let addConstructorDelayed (propertiesGetter : unit -> (string * string voption * Type) list) =
tdef.AddMembersDelayed(fun _ ->
Expand Down Expand Up @@ -529,7 +529,7 @@ module internal Provider =
else
let getIntrospectionFields typeName =
match schemaTypes.TryGetValue typeName with
| true, schematype -> schematype.Fields |> Option.defaultValue [||]
| true, schematype -> schematype.Fields |> ValueOption.defaultValue [||]
| false, _ -> failwith $"""Could not find a schema type based on a type reference. The reference is to a "%s{typeName}" type, but that type was not found in the schema types."""
let getPropertyMetadata typeName (info : AstFieldInfo) : RecordPropertyMetadata =
let ifield =
Expand Down Expand Up @@ -587,11 +587,11 @@ module internal Provider =
let schemaTypes = TypeMapping.getSchemaTypes schema
let getSchemaType (tref : IntrospectionTypeRef) =
match tref.Name with
| Some name ->
| ValueSome name ->
match schemaTypes.TryFind(name) with
| Some itype -> itype
| None -> failwithf "Type \"%s\" was not found on the schema custom types." name
| None -> failwith "Expected schema type to have a name, but it does not have one."
| ValueNone -> failwith "Expected schema type to have a name, but it does not have one."
let typeModifier (modifier : Type -> Type) (metadata : RecordPropertyMetadata) = { metadata with Type = modifier metadata.Type }
let makeOption = typeModifier TypeMapping.makeOption
let makeArrayOption = typeModifier (TypeMapping.makeArray >> TypeMapping.makeOption)
Expand Down Expand Up @@ -629,7 +629,7 @@ module internal Provider =
{ Name = field.Name
Alias = ValueNone
Description = field.Description
DeprecationReason = None
DeprecationReason = ValueNone
Type = providedType }
|> makeOption
| _ when uploadInputTypeName.IsSome && field.Type.Name.IsSome && uploadInputTypeName.Value = field.Type.Name.Value && field.Type.Kind <> TypeKind.INPUT_OBJECT ->
Expand All @@ -646,7 +646,7 @@ module internal Provider =
{ Name = field.Name
Alias = ValueNone
Description = field.Description
DeprecationReason = None
DeprecationReason = ValueNone
Type = providedType }
|> makeOption
| _ -> failwith "Could not find a schema type based on a type reference. The reference has an invalid or unsupported combination of Name, Kind and OfType fields."
Expand All @@ -661,7 +661,7 @@ module internal Provider =
providedTypes.Value <- providedTypes.Value.Add(itype.Name, tdef)
let properties =
itype.Fields
|> Option.defaultValue [||]
|> ValueOption.defaultValue [||]
|> Seq.map resolveFieldMetadata
|> Seq.toList
upcast ProvidedRecord.makeProvidedType(tdef, properties, explicitOptionalParameters)
Expand All @@ -670,7 +670,7 @@ module internal Provider =
providedTypes.Value <- providedTypes.Value.Add(itype.Name, tdef)
let properties =
itype.InputFields
|> Option.defaultValue [||]
|> ValueOption.defaultValue [||]
|> Seq.map resolveInputFieldMetadata
|> Seq.toList
upcast ProvidedRecord.makeProvidedType(tdef, properties, explicitOptionalParameters)
Expand All @@ -681,8 +681,8 @@ module internal Provider =
| TypeKind.ENUM ->
let items =
match itype.EnumValues with
| Some values -> values |> Array.map (fun value -> value.Name)
| None -> [||]
| ValueSome values -> values |> Array.map (fun value -> value.Name)
| ValueNone -> [||]
let tdef = ProvidedEnum.makeProvidedType(itype.Name, items)
providedTypes.Value <- providedTypes.Value.Add(itype.Name, tdef)
tdef
Expand All @@ -691,8 +691,8 @@ module internal Provider =
schemaTypes |> Map.iter (fun _ itype -> if not (List.contains itype.Kind ignoredKinds) then resolveProvidedType itype |> ignore)
let possibleTypes (itype : IntrospectionType) =
match itype.PossibleTypes with
| Some trefs -> trefs |> Array.map (getSchemaType >> resolveProvidedType)
| None -> [||]
| ValueSome trefs -> trefs |> Array.map (getSchemaType >> resolveProvidedType)
| ValueNone -> [||]
let getProvidedType typeName =
match providedTypes.Value.TryFind(typeName) with
| Some ptype -> ptype
Expand Down Expand Up @@ -833,16 +833,16 @@ module internal Provider =
| Query -> schema.QueryType
| Mutation ->
match schema.MutationType with
| Some tref -> tref
| None -> failwith "The operation is a mutation operation, but the schema does not have a mutation type."
| ValueSome tref -> tref
| ValueNone -> failwith "The operation is a mutation operation, but the schema does not have a mutation type."
| Subscription ->
match schema.SubscriptionType with
| Some tref -> tref
| None -> failwithf "The operation is a subscription operation, but the schema does not have a subscription type."
| ValueSome tref -> tref
| ValueNone -> failwithf "The operation is a subscription operation, but the schema does not have a subscription type."
let tinst =
match tref.Name with
| Some name -> schema.Types |> Array.tryFind (fun t -> t.Name = name)
| None -> None
| ValueSome name -> schema.Types |> Array.tryFind (fun t -> t.Name = name)
| ValueNone -> None
match tinst with
| Some t -> { tref with Kind = t.Kind }
| None -> failwith "The operation was found in the schema, but it does not have a name."
Expand All @@ -857,8 +857,8 @@ module internal Provider =
let metadata = getOperationMetadata(schemaTypes, uploadInputTypeName, enumProvidedTypes, operationAstFields, operationTypeRef, explicitOptionalParameters)
let operationTypeName : TypeName =
match operationTypeRef.Name with
| Some name -> name
| None -> failwith "Error parsing query. Operation type does not have a name."
| ValueSome name -> name
| ValueNone -> failwith "Error parsing query. Operation type does not have a name."
let rec getKind (tref : IntrospectionTypeRef) =
match tref.Kind with
| TypeKind.NON_NULL | TypeKind.LIST when tref.OfType.IsSome -> getKind tref.OfType.Value
Expand All @@ -868,8 +868,8 @@ module internal Provider =
| TypeKind.NON_NULL | TypeKind.LIST when tref.OfType.IsSome -> getTypeName tref.OfType.Value
| _ ->
match tref.Name with
| Some tname -> tname
| None -> failwithf "Expected type kind \"%s\" to have a name, but it does not have a name." (tref.Kind.ToString())
| ValueSome tname -> tname
| ValueNone -> failwithf "Expected type kind \"%s\" to have a name, but it does not have a name." (tref.Kind.ToString())
let rec getIntrospectionType (tref : IntrospectionTypeRef) =
match tref.Kind with
| TypeKind.NON_NULL | TypeKind.LIST when tref.OfType.IsSome -> getIntrospectionType tref.OfType.Value
Expand All @@ -891,7 +891,7 @@ module internal Provider =
| FragmentField fragf ->
let fragmentType =
let tref =
Option.defaultValue [||] introspectionType.PossibleTypes
ValueOption.defaultValue [||] introspectionType.PossibleTypes
|> Array.map getIntrospectionType
|> Array.append [|introspectionType|]
|> Array.tryFind (fun pt -> pt.Name = fragf.TypeCondition)
Expand All @@ -900,19 +900,17 @@ module internal Provider =
| None -> failwithf "Fragment field defines a type condition \"%s\", but that type was not found in the schema definition." fragf.TypeCondition
let field =
fragmentType.Fields
|> Option.map (Array.tryFind (fun f -> f.Name = fragf.Name))
|> Option.flatten
|> ValueOption.bind (Array.tryFind (fun f -> f.Name = fragf.Name) >> ValueOption.ofOption)
match field with
| Some f -> f.Type
| None -> throw fragmentType.Name
| ValueSome f -> f.Type
| ValueNone -> throw fragmentType.Name
| TypeField typef ->
let field =
introspectionType.Fields
|> Option.map (Array.tryFind (fun f -> f.Name = typef.Name))
|> Option.flatten
|> ValueOption.bind (Array.tryFind (fun f -> f.Name = typef.Name) >> ValueOption.ofOption)
match field with
| Some f -> f.Type
| None -> throw introspectionType.Name
| ValueSome f -> f.Type
| ValueNone -> throw introspectionType.Name
let fields =
match getKind tref with
| TypeKind.OBJECT | TypeKind.INTERFACE | TypeKind.UNION ->
Expand Down
Loading
Loading