Reduced option type allocations (#493)

* Reduced `option` type allocations
* Fixed bug converting `option` to `voption`
* Fix for missing `FsToolkit.ErrorHandling` in the type provider project

Author: xperiandri

src/FSharp.Data.GraphQL.Client.DesignTime/FSharp.Data.GraphQL.Client.DesignTime.fsproj

@@ -19,6 +19,7 @@
       <ExcludeAssets>contentFiles;runtime</ExcludeAssets>
     </PackageReference>
     <PackageReference Include="FSharp.TypeProviders.SDK" VersionOverride="8.0.2" />
+    <PackageReference Include="FsToolkit.ErrorHandling" />
     <PackageReference Include="FParsec" />
     <PackageReference Include="Microsoft.Extensions.Http">
       <PrivateAssets>all</PrivateAssets>

src/FSharp.Data.GraphQL.Client.DesignTime/ProvidedTypesHelper.fs

@@ -117,14 +117,14 @@ module internal ProvidedInterface =
 
 type internal RecordPropertyMetadata =
     { Name : string
-      Alias : string option
+      Alias : string voption
       Description : string option
       DeprecationReason : string option
       Type : Type }
     member x.AliasOrName =
         match x.Alias with
-        | Some x -> x
-        | None -> x.Name
+        | ValueSome x -> x
+        | ValueNone -> x.Name
 
 type internal ProvidedRecordTypeDefinition(className, baseType) =
     inherit ProvidedTypeDefinition(className, baseType, nonNullable = true)
@@ -157,7 +157,7 @@ module internal ProvidedRecord =
                 metadata.Description |> Option.iter pdef.AddXmlDoc
                 metadata.DeprecationReason |> Option.iter pdef.AddObsoleteAttribute
                 pdef))
-        let addConstructorDelayed (propertiesGetter : unit -> (string * string option * Type) list) =
+        let addConstructorDelayed (propertiesGetter : unit -> (string * string voption * Type) list) =
             tdef.AddMembersDelayed(fun _ ->
                 // We need to build a constructor that takes all optional properties wrapped in another option.
                 // We need to do this because optional parameters have issues with non-nullable types
@@ -180,7 +180,7 @@ module internal ProvidedRecord =
                 let properties = propertiesGetter()
                 let optionalProperties, requiredProperties =
                     properties
-                    |> List.map (fun (name, alias, t) -> Option.defaultValue name alias, t)
+                    |> List.map (fun (name, alias, t) -> ValueOption.defaultValue name alias, t)
                     |> List.partition (fun (_, t) -> isOption t)
                 if explicitOptionalParameters then
                     let constructorProperties = requiredProperties @ optionalProperties
@@ -380,7 +380,7 @@ module internal ProvidedOperation =
                     | _ -> t = typeof<Upload>
                 variables |> Seq.exists (snd >> existsUploadType [])
             let runMethodOverloads : MemberInfo list =
-                let operationName = Option.toObj operationDefinition.Name
+                let operationName = ValueOption.toObj operationDefinition.Name
                 methodOverloadDefinitions |> List.map (fun overloadParameters ->
                     let variableNames = overloadParameters |> List.map fst |> List.filter (fun name -> name <> "runtimeContext")
                     let invoker (args : Expr list) =
@@ -422,7 +422,7 @@ module internal ProvidedOperation =
                     methodDef.AddXmlDoc("Executes the operation on the server and fetch its results.")
                     upcast methodDef)
             let asyncRunMethodOverloads : MemberInfo list =
-                let operationName = Option.toObj operationDefinition.Name
+                let operationName = ValueOption.toObj operationDefinition.Name
                 methodOverloadDefinitions |> List.map (fun overloadParameters ->
                     let variableNames = overloadParameters |> List.map fst |> List.filter (fun name -> name <> "runtimeContext")
                     let invoker (args : Expr list) =
@@ -601,7 +601,7 @@ module internal Provider =
             | TypeKind.SCALAR when field.Type.Name.IsSome ->
                 let providedType = TypeMapping.mapScalarType uploadInputTypeName field.Type.Name.Value
                 { Name = field.Name
-                  Alias = None
+                  Alias = ValueNone
                   Description = field.Description
                   DeprecationReason = field.DeprecationReason
                   Type = providedType }
@@ -613,7 +613,7 @@ module internal Provider =
                 let itype = getSchemaType field.Type
                 let providedType = resolveProvidedType itype
                 { Name = field.Name
-                  Alias = None
+                  Alias = ValueNone
                   Description = field.Description
                   DeprecationReason = field.DeprecationReason
                   Type = providedType }
@@ -624,7 +624,7 @@ module internal Provider =
             | TypeKind.SCALAR when field.Type.Name.IsSome ->
                 let providedType = TypeMapping.mapScalarType uploadInputTypeName field.Type.Name.Value
                 { Name = field.Name
-                  Alias = None
+                  Alias = ValueNone
                   Description = field.Description
                   DeprecationReason = None
                   Type = providedType }
@@ -636,7 +636,7 @@ module internal Provider =
                 let itype = getSchemaType field.Type
                 let providedType = resolveProvidedType itype
                 { Name = field.Name
-                  Alias = None
+                  Alias = ValueNone
                   Description = field.Description
                   DeprecationReason = None
                   Type = providedType }
@@ -798,22 +798,22 @@ module internal Provider =
                                     |> QueryValidationDesignTimeCache.getOrAdd key
                                     |> throwExceptionIfValidationFailed
                                 #endif
-                                let operationName : OperationName option =
+                                let operationName : OperationName voption =
                                     match args.[2] :?> string with
                                     | null | "" ->
                                         let operationDefinitions = queryAst.Definitions |> List.filter (function OperationDefinition _ -> true | _ -> false)
                                         match operationDefinitions with
                                         | opdef :: _ -> opdef.Name
                                         | _ -> failwith "Error parsing query. Can not choose a default operation: query document has no operation definitions."
-                                    | x -> Some x
-                                let explicitOperationTypeName : TypeName option =
+                                    | x -> ValueSome x
+                                let explicitOperationTypeName : TypeName voption =
                                     match args.[3] :?> string with
-                                    | null | "" -> None
-                                    | x -> Some x
+                                    | null | "" -> ValueNone
+                                    | x -> ValueSome x
                                 let operationDefinition =
                                     queryAst.Definitions
-                                    |> List.choose (function OperationDefinition odef -> Some odef | _ -> None)
-                                    |> List.find (fun d -> d.Name = operationName)
+                                    |> Seq.vchoose (function OperationDefinition odef -> ValueSome odef | _ -> ValueNone)
+                                    |> Seq.find (fun d -> d.Name = operationName)
                                 let operationAstFields =
                                     let infoMap = queryAst.GetInfoMap()
                                     match infoMap.TryFind(operationName) with
@@ -843,9 +843,9 @@ module internal Provider =
                                 let actualQuery = queryAst.ToQueryString(QueryStringPrintingOptions.IncludeTypeNames).Replace("\r\n", "\n")
                                 let className =
                                     match explicitOperationTypeName, operationDefinition.Name with
-                                    | Some name, _ -> name.FirstCharUpper()
-                                    | None, Some name -> name.FirstCharUpper()
-                                    | None, None -> "Operation" + actualQuery.MD5Hash()
+                                    | ValueSome name, _ -> name.FirstCharUpper()
+                                    | ValueNone, ValueSome name -> name.FirstCharUpper()
+                                    | ValueNone, ValueNone -> "Operation" + actualQuery.MD5Hash()
                                 let metadata = getOperationMetadata(schemaTypes, uploadInputTypeName, enumProvidedTypes, operationAstFields, operationTypeRef, explicitOptionalParameters)
                                 let operationTypeName : TypeName =
                                     match operationTypeRef.Name with

src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLRequestHandler.fs

@@ -161,7 +161,7 @@ type GraphQLRequestHandler<'Root> (
         let checkAnonymousFieldsOnly (ctx: HttpContext) = taskResult {
             let! gqlRequest = ctx.TryBindJsonAsync<GQLRequestContent>(GQLRequestContent.expectedJSON)
             let! ast = Parser.parseOrIResult ctx.Request.Path.Value gqlRequest.Query
-            let operationName = gqlRequest.OperationName |> Skippable.toOption
+            let operationName = gqlRequest.OperationName |> Skippable.toValueOption
 
             let createParsedContent() = {
                 Query = gqlRequest.Query

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

@@ -207,7 +207,7 @@ let internal findOperation doc opName =
     | [def], _ -> Some def
     | defs, name ->
         defs
-        |> List.tryFind (fun def -> def.Name = name)
+        |> List.tryFind (fun def -> def.Name = (name |> ValueOption.ofOption))
 
 let private defaultResolveType possibleTypesFn abstractDef : obj -> ObjectDef =
     let possibleTypes = possibleTypesFn abstractDef

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

@@ -79,7 +79,7 @@ let private objectInfo (ctx: PlanningContext) (parentDef: ObjectDef) field inclu
 let rec private abstractionInfo (ctx : PlanningContext) (parentDef : AbstractDef) field typeCondition includer =
     let objDefs = ctx.Schema.GetPossibleTypes parentDef
     match typeCondition with
-    | None ->
+    | ValueNone ->
         objDefs
         |> Array.choose (fun objDef ->
             match tryFindDef ctx.Schema objDef field with
@@ -96,7 +96,7 @@ let rec private abstractionInfo (ctx : PlanningContext) (parentDef : AbstractDef
                 Some (objDef.Name, data)
             | None -> None)
         |> Map.ofArray
-    | Some typeName ->
+    | ValueSome typeName ->
         match objDefs |> Array.tryFind (fun o -> o.Name = typeName) with
         | Some objDef ->
             match tryFindDef ctx.Schema objDef field with
@@ -115,7 +115,7 @@ let rec private abstractionInfo (ctx : PlanningContext) (parentDef : AbstractDef
         | None ->
             match ctx.Schema.TryFindType typeName with
             | Some (Abstract abstractDef) ->
-                abstractionInfo ctx abstractDef field None includer
+                abstractionInfo ctx abstractDef field ValueNone includer
             | _ ->
                 let pname = parentDef :?> NamedDef
                 Debug.Fail "Must be prevented by validation"
@@ -149,8 +149,8 @@ let private getIncluder (directives: Directive list) parentIncluder : Includer =
 
 let private doesFragmentTypeApply (schema: ISchema) fragment (objectType: ObjectDef) =
     match fragment.TypeCondition with
-    | None -> true
-    | Some typeCondition ->
+    | ValueNone -> true
+    | ValueSome typeCondition ->
         match schema.TryFindType typeCondition with
         | None -> false
         | Some conditionalType when conditionalType.Name = objectType.Name -> true
@@ -243,7 +243,7 @@ let rec private plan (ctx : PlanningContext) (info : ExecutionInfo) : ExecutionI
         let inner = plan ctx { info with ParentDef = info.ReturnDef; ReturnDef = downcast returnDef; }
         { info with Kind = ResolveCollection inner }
     | Abstract _ ->
-        planAbstraction ctx info.Ast.SelectionSet info (ref []) None
+        planAbstraction ctx info.Ast.SelectionSet info (ref []) ValueNone
     | _ ->
         Debug.Fail "Must be prevented by validation"
         failwith "Invalid Return Type in Planning!"

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

@@ -31,7 +31,7 @@ and Definition =
 /// 2.2.1 Operations
 and OperationDefinition = {
     OperationType : OperationType
-    Name : string option
+    Name : string voption
     VariableDefinitions : VariableDefinition list
     Directives : Directive list
     SelectionSet : Selection list
@@ -64,7 +64,7 @@ and Selection =
 /// 2.2.3 Fields
 and Field = {
     /// 2.2.5 Field Alias
-    Alias : string option
+    Alias : string voption
     Name : string
     Arguments : Argument list
     Directives : Directive list
@@ -73,8 +73,8 @@ and Field = {
 
     member x.AliasOrName =
         match x.Alias with
-        | Some alias -> alias
-        | None -> x.Name
+        | ValueSome alias -> alias
+        | ValueNone -> x.Name
 
 /// 2.2.4 Arguments
 and Argument = { Name : string; Value : InputValue }
@@ -83,9 +83,9 @@ and Argument = { Name : string; Value : InputValue }
 and FragmentSpread = { Name : string; Directives : Directive list }
 
 and FragmentDefinition = {
-    Name : string option
+    Name : string voption
     /// 2.2.6.1 Type Conditions
-    TypeCondition : string option
+    TypeCondition : string voption
     Directives : Directive list
     SelectionSet : Selection list
 }
@@ -146,7 +146,7 @@ and ObjectTypeDefinition = { Name : string; Interfaces : string[]; Fields : Fiel
 
 and FieldDefinition = { Name : string; Arguments : InputValueDefinition[]; Type : InputType }
 
-and InputValueDefinition = { Name : string; Type : InputType; DefaultValue : InputValue option }
+and InputValueDefinition = { Name : string; Type : InputType; DefaultValue : InputValue voption }
 
 and InterfaceTypeDefinition = { Name : string; Fields : FieldDefinition[] }