Merge branch 'main' into mst/fusion-spec-refac-1

ChilliCream · Sep 1, 2023 · a7a5773 · a7a5773
2 parents d750e9e + de63bd0
commit a7a5773
Show file tree

Hide file tree

Showing 192 changed files with 1,360 additions and 68 deletions.
diff --git a/.gitignore b/.gitignore
@@ -322,3 +322,4 @@ conferences.db-wal
 
 .server/
 .nuke/
+.mono/
diff --git a/src/HotChocolate/Core/src/Abstractions/Path.cs b/src/HotChocolate/Core/src/Abstractions/Path.cs
@@ -14,22 +14,24 @@ namespace HotChocolate;
 /// </summary>
 public abstract class Path : IEquatable<Path>
 {
+    private readonly Path? _parent;
+
     protected Path()
     {
-        Parent = this;
+        _parent = null;
         Length = 0;
     }
 
     protected Path(Path parent)
     {
-        Parent = parent ?? throw new ArgumentNullException(nameof(parent));
+        _parent = parent ?? throw new ArgumentNullException(nameof(parent));
         Length = parent.Length + 1;
     }
-    
+
     /// <summary>
     /// Gets the parent path segment.
     /// </summary>
-    public Path Parent { get; }
+    public Path Parent => _parent!;
 
     /// <summary>
     /// Gets the count of segments this path contains.
@@ -238,11 +240,7 @@ public override bool Equals(Path? other)
 
         /// <inheritdoc />
         public override int GetHashCode()
-        {
-            // ReSharper disable NonReadonlyMemberInGetHashCode
-            return HashCode.Combine(Parent, Length);
-            // ReSharper restore NonReadonlyMemberInGetHashCode
-        }
+            => 0;
 
         public static RootPathSegment Instance { get; } = new();
     }

diff --git a/src/HotChocolate/Core/src/Subscriptions.Postgres/ContinuousTask.cs b/src/HotChocolate/Core/src/Subscriptions.Postgres/ContinuousTask.cs
@@ -7,6 +7,7 @@ internal sealed class ContinuousTask : IAsyncDisposable
     private readonly CancellationTokenSource _completion = new();
     private readonly Func<CancellationToken, Task> _handler;
     private readonly Task _task;
+    private bool disposed;
 
     public ContinuousTask(Func<CancellationToken, Task> handler)
     {
@@ -46,13 +47,22 @@ private async Task RunContinuously()
     /// <inheritdoc />
     public async ValueTask DisposeAsync()
     {
+        if(disposed)
+        {
+            return;
+        }
+
+        if(!_completion.IsCancellationRequested)
+        {
 #if NET8_0_OR_GREATER
-        await _completion.CancelAsync();
+            await _completion.CancelAsync();
 #else
-        _completion.Cancel();
+            _completion.Cancel();
 #endif
+        }
+
         _completion.Dispose();
 
-        await _task;
+        disposed = true;
     }
 }
diff --git a/src/HotChocolate/Core/src/Types.Mutations/Extensions/ObjectFieldDefinitionExtensions.cs b/src/HotChocolate/Core/src/Types.Mutations/Extensions/ObjectFieldDefinitionExtensions.cs
@@ -40,7 +40,7 @@ public static void AddErrorType(
             throw new ArgumentNullException(nameof(errorType));
         }
 
-        if (descriptorContext.ContextData[MutationContextDataKeys.Options] == null)
+        if (!descriptorContext.ContextData.ContainsKey(MutationContextDataKeys.Options))
         {
             var richMessage = string.Format(
                 MutationConvention_ShouldBeEnabled_WhenAddingErrorType,

diff --git a/src/HotChocolate/Core/test/Abstractions.Tests/PathTests.cs b/src/HotChocolate/Core/test/Abstractions.Tests/PathTests.cs
@@ -4,6 +4,19 @@ namespace HotChocolate.Execution.Instrumentation;
 
 public class PathExtensionsTests
 {
+    [Fact]
+    public void GetHashCode_Test()
+    {
+        var path = Path.Root.Append("hero");
+        Assert.NotEqual(0, path.GetHashCode());
+    }
+
+    [Fact]
+    public void GetHashCode_Root_Test()
+    {
+        Assert.Equal(0, Path.Root.GetHashCode());
+    }
+
     [Fact]
     public void Path_ToString()
     {

diff --git a/...ableCoercionHelperTests.Error_When_Input_Field_Has_Different_Properties_Than_Defined.snap b/...ableCoercionHelperTests.Error_When_Input_Field_Has_Different_Properties_Than_Defined.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "abc",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/.../VariableCoercionHelperTests.Error_When_PlainValue_Type_Does_Not_Match_Variable_Type.snap b/.../VariableCoercionHelperTests.Error_When_PlainValue_Type_Does_Not_Match_Variable_Type.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "abc",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/...ots__/VariableCoercionHelperTests.Error_When_Value_Type_Does_Not_Match_Variable_Type.snap b/...ots__/VariableCoercionHelperTests.Error_When_Value_Type_Does_Not_Match_Variable_Type.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "abc",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/src/HotChocolate/Core/test/Types.Tests/Types/InputParserTests.cs b/src/HotChocolate/Core/test/Types.Tests/Types/InputParserTests.cs
@@ -382,8 +382,7 @@ public void OneOf_A_and_B_Are_Set()
             new ObjectFieldNode("b", 123));
 
         // act
-        void Fail()
-            => parser.ParseLiteral(data, oneOfInput, Path.Root.Append("root"));
+        void Fail() => parser.ParseLiteral(data, oneOfInput, Path.Root.Append("root"));
 
         // assert
         Assert.Throws<SerializationException>(Fail).Errors.MatchSnapshot();

diff --git a/...ate/Core/test/Types.Tests/Types/__snapshots__/InputParserTests.OneOf_A_and_B_Are_Set.snap b/...ate/Core/test/Types.Tests/Types/__snapshots__/InputParserTests.OneOf_A_and_B_Are_Set.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "root",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/...est/Types.Tests/Types/__snapshots__/InputParserTests.OneOf_A_is_Null_and_B_has_Value.snap b/...est/Types.Tests/Types/__snapshots__/InputParserTests.OneOf_A_is_Null_and_B_has_Value.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "root",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/.../Validation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.BooleanArgQuery.snap b/.../Validation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.BooleanArgQuery.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/...ts/__snapshots__/AllVariableUsagesAreAllowedRuleTests.BooleanListCannotGoIntoBoolean.snap b/...ts/__snapshots__/AllVariableUsagesAreAllowedRuleTests.BooleanListCannotGoIntoBoolean.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/...Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.BooleanToBooleanInDirective.snap b/...Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.BooleanToBooleanInDirective.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/...tion.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.IntCannotGoIntoBoolean.snap b/...tion.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.IntCannotGoIntoBoolean.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/...ts/__snapshots__/AllVariableUsagesAreAllowedRuleTests.IntNullableToIntWithinFragment.snap b/...ts/__snapshots__/AllVariableUsagesAreAllowedRuleTests.IntNullableToIntWithinFragment.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/...napshots__/AllVariableUsagesAreAllowedRuleTests.IntNullableToIntWithinNestedFragment.snap b/...napshots__/AllVariableUsagesAreAllowedRuleTests.IntNullableToIntWithinNestedFragment.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/...Validation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.IntToNullableInt.snap b/...Validation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.IntToNullableInt.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/...eUsagesAreAllowedRuleTests.IntToNullableIntFailsWhenVariableProvidesNullDefaultValue.snap b/...eUsagesAreAllowedRuleTests.IntToNullableIntFailsWhenVariableProvidesNullDefaultValue.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/...alidation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.ListToNonNullList.snap b/...alidation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.ListToNonNullList.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/...napshots__/AllVariableUsagesAreAllowedRuleTests.NullableBooleanVariableAsListElement.snap b/...napshots__/AllVariableUsagesAreAllowedRuleTests.NullableBooleanVariableAsListElement.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/...alidation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.StringOverBoolean.snap b/...alidation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.StringOverBoolean.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/...s/__snapshots__/AllVariableUsagesAreAllowedRuleTests.StringToElementIsNullableString.snap b/...s/__snapshots__/AllVariableUsagesAreAllowedRuleTests.StringToElementIsNullableString.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/..._snapshots__/AllVariableUsagesAreAllowedRuleTests.StringToNullableBooleanInDirective.snap b/..._snapshots__/AllVariableUsagesAreAllowedRuleTests.StringToNullableBooleanInDirective.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/...idation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.StringToStringArray.snap b/...idation.Tests/__snapshots__/AllVariableUsagesAreAllowedRuleTests.StringToStringArray.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "arguments",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/...alidation.Tests/__snapshots__/ArgumentNamesRuleTests.DirectiveWithWrongArgsIsInvalid.snap b/...alidation.Tests/__snapshots__/ArgumentNamesRuleTests.DirectiveWithWrongArgsIsInvalid.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/...st/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.DuplicateDirectiveArguments.snap b/...st/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.DuplicateDirectiveArguments.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "fieldWithArg",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/...e/test/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.InvalidDirectiveArgName.snap b/...e/test/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.InvalidDirectiveArgName.snap
@@ -7,6 +7,7 @@
       "Parent": {
         "Name": "dog",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },
@@ -66,6 +67,7 @@
       "Parent": {
         "Name": "dog",
         "Parent": {
+          "Parent": null,
           "Length": 0,
           "IsRoot": true
         },

diff --git a/.../Core/test/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.InvalidFieldArgName.snap b/.../Core/test/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.InvalidFieldArgName.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },
@@ -60,6 +61,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/...alidation.Tests/__snapshots__/ArgumentNamesRuleTests.ManyDuplicateDirectiveArguments.snap b/...alidation.Tests/__snapshots__/ArgumentNamesRuleTests.ManyDuplicateDirectiveArguments.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "fieldWithArg",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },
@@ -60,6 +61,7 @@
     "Path": {
       "Name": "fieldWithArg",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/...dation.Tests/__snapshots__/ArgumentNamesRuleTests.MisspelledDirectiveArgsAreReported.snap b/...dation.Tests/__snapshots__/ArgumentNamesRuleTests.MisspelledDirectiveArgsAreReported.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },
@@ -59,6 +60,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/...Validation.Tests/__snapshots__/ArgumentNamesRuleTests.MisspelledFieldArgsAreReported.snap b/...Validation.Tests/__snapshots__/ArgumentNamesRuleTests.MisspelledFieldArgsAreReported.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },
@@ -60,6 +61,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/...est/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.UnknownArgsAmongstKnowArgs.snap b/...est/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.UnknownArgsAmongstKnowArgs.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },
@@ -60,6 +61,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },

diff --git a/...te/Core/test/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.UnknownArgsDeeply.snap b/...te/Core/test/Validation.Tests/__snapshots__/ArgumentNamesRuleTests.UnknownArgsDeeply.snap
@@ -5,6 +5,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },
@@ -60,6 +61,7 @@
     "Path": {
       "Name": "dog",
       "Parent": {
+        "Parent": null,
         "Length": 0,
         "IsRoot": true
       },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -322,3 +322,4 @@ conferences.db-wal

		.server/
		.nuke/
		.mono/