Skip to content

Commit bd8fa09

Browse files
author
Andrii Chebukin
committed
Removed deprecated language constructs usage (! and := for reference cells)
1 parent e516479 commit bd8fa09

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -631,14 +631,14 @@ module internal Provider =
631631
|> makeOption
632632
| _ -> 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."
633633
and resolveProvidedType (itype : IntrospectionType) : ProvidedTypeDefinition =
634-
if (!providedTypes).ContainsKey(itype.Name)
635-
then (!providedTypes).[itype.Name]
634+
if providedTypes.Value.ContainsKey(itype.Name)
635+
then providedTypes.Value.[itype.Name]
636636
else
637637
let metadata = { Name = itype.Name; Description = itype.Description }
638638
match itype.Kind with
639639
| TypeKind.OBJECT ->
640640
let tdef = ProvidedRecord.preBuildProvidedType(metadata, None)
641-
providedTypes := (!providedTypes).Add(itype.Name, tdef)
641+
providedTypes.Value <- providedTypes.Value.Add(itype.Name, tdef)
642642
let properties =
643643
itype.Fields
644644
|> Option.defaultValue [||]
@@ -647,7 +647,7 @@ module internal Provider =
647647
upcast ProvidedRecord.makeProvidedType(tdef, properties, explicitOptionalParameters)
648648
| TypeKind.INPUT_OBJECT ->
649649
let tdef = ProvidedRecord.preBuildProvidedType(metadata, None)
650-
providedTypes := (!providedTypes).Add(itype.Name, tdef)
650+
providedTypes.Value <- providedTypes.Value.Add(itype.Name, tdef)
651651
let properties =
652652
itype.InputFields
653653
|> Option.defaultValue [||]
@@ -656,15 +656,15 @@ module internal Provider =
656656
upcast ProvidedRecord.makeProvidedType(tdef, properties, explicitOptionalParameters)
657657
| TypeKind.INTERFACE | TypeKind.UNION ->
658658
let bdef = ProvidedInterface.makeProvidedType(metadata)
659-
providedTypes := (!providedTypes).Add(itype.Name, bdef)
659+
providedTypes.Value <- providedTypes.Value.Add(itype.Name, bdef)
660660
bdef
661661
| TypeKind.ENUM ->
662662
let items =
663663
match itype.EnumValues with
664664
| Some values -> values |> Array.map (fun value -> value.Name)
665665
| None -> [||]
666666
let tdef = ProvidedEnum.makeProvidedType(itype.Name, items)
667-
providedTypes := (!providedTypes).Add(itype.Name, tdef)
667+
providedTypes.Value <- providedTypes.Value.Add(itype.Name, tdef)
668668
tdef
669669
| _ -> failwithf "Type \"%s\" is not a Record, Union, Enum, Input Object, or Interface type." itype.Name
670670
let ignoredKinds = [TypeKind.SCALAR; TypeKind.LIST; TypeKind.NON_NULL]
@@ -674,7 +674,7 @@ module internal Provider =
674674
| Some trefs -> trefs |> Array.map (getSchemaType >> resolveProvidedType)
675675
| None -> [||]
676676
let getProvidedType typeName =
677-
match (!providedTypes).TryFind(typeName) with
677+
match providedTypes.Value.TryFind(typeName) with
678678
| Some ptype -> ptype
679679
| None -> failwithf "Expected to find a type \"%s\" on the schema type map, but it was not found." typeName
680680
schemaTypes
@@ -683,7 +683,7 @@ module internal Provider =
683683
let itype = getProvidedType kvp.Value.Name
684684
let ptypes = possibleTypes kvp.Value
685685
ptypes |> Array.iter (fun ptype -> ptype.AddInterfaceImplementation(itype)))
686-
!providedTypes
686+
providedTypes.Value
687687

688688
let makeProvidedType(asm : Assembly, ns : string, resolutionFolder : string) =
689689
let generator = ProvidedTypeDefinition(asm, ns, "GraphQLProvider", None)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,10 @@ and private planSelection (ctx: PlanningContext) (selectionSet: Selection list)
246246
| Planned -> fields @ [ executionPlan ]
247247
| FragmentSpread spread ->
248248
let spreadName = spread.Name
249-
if !visitedFragments |> List.exists (fun name -> name = spreadName)
249+
if visitedFragments.Value |> List.exists (fun name -> name = spreadName)
250250
then fields // Fragment already found
251251
else
252-
visitedFragments := spreadName::!visitedFragments
252+
visitedFragments.Value <- spreadName::visitedFragments.Value
253253
match ctx.Document.Definitions |> List.tryFind (function FragmentDefinition f -> f.Name.Value = spreadName | _ -> false) with
254254
| Some (FragmentDefinition fragment) when doesFragmentTypeApply ctx.Schema fragment parentDef ->
255255
// Retrieve fragment data just as it was normal selection set
@@ -288,10 +288,10 @@ and private planAbstraction (ctx:PlanningContext) (selectionSet: Selection list)
288288
| Planned -> Map.merge (fun _ -> deepMerge) fields infoMap
289289
| FragmentSpread spread ->
290290
let spreadName = spread.Name
291-
if !visitedFragments |> List.exists (fun name -> name = spreadName)
291+
if visitedFragments.Value |> List.exists (fun name -> name = spreadName)
292292
then fields // Fragment already found
293293
else
294-
visitedFragments := spreadName::!visitedFragments
294+
visitedFragments.Value <- spreadName::visitedFragments.Value
295295
match ctx.Document.Definitions |> List.tryFind (function FragmentDefinition f -> f.Name.Value = spreadName | _ -> false) with
296296
| Some (FragmentDefinition fragment) ->
297297
// Retrieve fragment data just as it was normal selection set

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ module internal Internal =
176176
// 2.9 Value
177177
// Variable|IntValue|FloatValue|StringValue|
178178
// BooleanValue|NullValue|EnumValue|ListValue|ObjectValue
179-
inputValueRef :=
179+
inputValueRef.Value <-
180180
choice [ variable |>> Variable <?> "Variable"
181181
(attempt floatValue) |>> FloatValue <?> "Float"
182182
integerValue |>> IntValue <?> "Integer"
@@ -222,7 +222,7 @@ module internal Internal =
222222
let nonNullType =
223223
(listType <|> namedType) .>> pchar '!'
224224
|>> NonNullType <?> "NonNullType"
225-
inputTypeRef :=
225+
inputTypeRef.Value <-
226226
choice [ attempt nonNullType
227227
namedType
228228
listType ]
@@ -264,10 +264,10 @@ module internal Internal =
264264

265265
pstring "..." .>> whitespaces >>. (inlineFragment <|> fragmentSpread) <?> "Fragment"
266266

267-
selectionRef :=
267+
selectionRef.Value <-
268268
field <|> selectionFragment <?> "Selection"
269269

270-
selectionSetRef :=
270+
selectionSetRef.Value <-
271271
betweenCharsMany1 '{' '}' selection <?> "SelectionSet"
272272

273273

tests/FSharp.Data.GraphQL.Tests/Program.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module Program =
1515
runner.Start(null)
1616
finished.WaitOne() |> ignore
1717
finished.Dispose()
18-
!result
18+
result.Value
1919

2020
[<assembly: CollectionBehavior(DisableTestParallelization = true)>]
21-
do()
21+
do()

0 commit comments

Comments
 (0)