Hot Chocolate v13 (#104)

glen-84 · web-flow · commit 52574a64f7dd · 2022-10-07T14:51:27.000+03:00
diff --git a/src/AppAny.HotChocolate.FluentValidation.csproj b/src/AppAny.HotChocolate.FluentValidation.csproj
@@ -34,7 +34,7 @@
 
   <ItemGroup Label="Packages">
     <PackageReference Include="FluentValidation" Version="11.1.1" />
-    <PackageReference Include="HotChocolate.Execution" Version="12.12.1" />
+    <PackageReference Include="HotChocolate.Execution" Version="13.0.0-preview.66" />
   </ItemGroup>
 
   <ItemGroup Label="Assets">
diff --git a/src/ValidationDefaults.cs b/src/ValidationDefaults.cs
@@ -107,7 +107,7 @@ public static void Default(IErrorBuilder errorBuilder, ErrorMappingContext mappi
       public static void Details(IErrorBuilder errorBuilder, ErrorMappingContext mappingContext)
       {
         errorBuilder
-          .SetExtension(ExtensionKeys.OperationKey, mappingContext.MiddlewareContext.Operation.Name?.Value)
+          .SetExtension(ExtensionKeys.OperationKey, mappingContext.MiddlewareContext.Operation.Name)
           .SetExtension(ExtensionKeys.FieldKey, mappingContext.MiddlewareContext.Selection.Field.Name)
           .SetExtension(ExtensionKeys.ArgumentKey, mappingContext.Argument.Name)
           .SetExtension(ExtensionKeys.PropertyKey, mappingContext.ValidationFailure.PropertyName)
diff --git a/tests/AppAny.HotChocolate.FluentValidation.Tests/MultipleMutations.cs b/tests/AppAny.HotChocolate.FluentValidation.Tests/MultipleMutations.cs
@@ -61,12 +61,12 @@ public async Task Multiple()
             field =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);
-              Assert.Equal(new NameString("test"), field.Value);
+              Assert.Equal("test", field.Value);
             },
             argument =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);
-              Assert.Equal(new NameString("input"), argument.Value);
+              Assert.Equal("input", argument.Value);
             },
             property =>
             {
@@ -98,12 +98,12 @@ public async Task Multiple()
             field =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);
-              Assert.Equal(new NameString("test"), field.Value);
+              Assert.Equal("test", field.Value);
             },
             argument =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);
-              Assert.Equal(new NameString("input"), argument.Value);
+              Assert.Equal("input", argument.Value);
             },
             property =>
             {
diff --git a/tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideErrorMappers.cs b/tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideErrorMappers.cs
@@ -133,12 +133,12 @@ public async Task UseDefaultErrorMapperWithDetails()
             field =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);
-              Assert.Equal(new NameString("test"), field.Value);
+              Assert.Equal("test", field.Value);
             },
             argument =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);
-              Assert.Equal(new NameString("input"), argument.Value);
+              Assert.Equal("input", argument.Value);
             },
             property =>
             {
@@ -197,12 +197,12 @@ public async Task UseDefaultErrorMapperWithDetailsWithOperationName()
             field =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);
-              Assert.Equal(new NameString("test"), field.Value);
+              Assert.Equal("test", field.Value);
             },
             argument =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);
-              Assert.Equal(new NameString("input"), argument.Value);
+              Assert.Equal("input", argument.Value);
             },
             property =>
             {
@@ -261,12 +261,12 @@ public async Task UseDefaultErrorMapperWithExtendedDetails()
             field =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);
-              Assert.Equal(new NameString("test"), field.Value);
+              Assert.Equal("test", field.Value);
             },
             argument =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);
-              Assert.Equal(new NameString("input"), argument.Value);
+              Assert.Equal("input", argument.Value);
             },
             property =>
             {
@@ -358,12 +358,12 @@ public async Task UseDefaultErrorMapperWithCustomExtendedDetails()
             field =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);
-              Assert.Equal(new NameString("test"), field.Value);
+              Assert.Equal("test", field.Value);
             },
             argument =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);
-              Assert.Equal(new NameString("input"), argument.Value);
+              Assert.Equal("input", argument.Value);
             },
             property =>
             {
@@ -458,12 +458,12 @@ public async Task MultipleErrorMappers()
             field =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);
-              Assert.Equal(new NameString("test"), field.Value);
+              Assert.Equal("test", field.Value);
             },
             argument =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);
-              Assert.Equal(new NameString("input"), argument.Value);
+              Assert.Equal("input", argument.Value);
             },
             property =>
             {
diff --git a/tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideUseFluentValidation.cs b/tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideUseFluentValidation.cs
@@ -85,12 +85,12 @@ public async Task UseDefaultErrorMapperWithDetailsFieldOverride()
             field =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);
-              Assert.Equal(new NameString("test"), field.Value);
+              Assert.Equal("test", field.Value);
             },
             argument =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);
-              Assert.Equal(new NameString("input"), argument.Value);
+              Assert.Equal("input", argument.Value);
             },
             property =>
             {
diff --git a/tests/AppAny.HotChocolate.FluentValidation.Tests/UsingAttributes.cs b/tests/AppAny.HotChocolate.FluentValidation.Tests/UsingAttributes.cs
@@ -147,12 +147,12 @@ public async Task DefaultErrorMapperWithDetails()
             field =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);
-              Assert.Equal(new NameString("test"), field.Value);
+              Assert.Equal("test", field.Value);
             },
             argument =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);
-              Assert.Equal(new NameString("input"), argument.Value);
+              Assert.Equal("input", argument.Value);
             },
             property =>
             {
@@ -205,12 +205,12 @@ public async Task DefaultErrorMapperWithExtendedDetails()
             field =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);
-              Assert.Equal(new NameString("test"), field.Value);
+              Assert.Equal("test", field.Value);
             },
             argument =>
             {
               Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);
-              Assert.Equal(new NameString("input"), argument.Value);
+              Assert.Equal("input", argument.Value);
             },
             property =>
             {

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public static void Default(IErrorBuilder errorBuilder, ErrorMappingContext mappi`
`107`	`107`	`public static void Details(IErrorBuilder errorBuilder, ErrorMappingContext mappingContext)`
`108`	`108`	`{`
`109`	`109`	`errorBuilder`
`110`		`- .SetExtension(ExtensionKeys.OperationKey, mappingContext.MiddlewareContext.Operation.Name?.Value)`
	`110`	`+ .SetExtension(ExtensionKeys.OperationKey, mappingContext.MiddlewareContext.Operation.Name)`
`111`	`111`	`.SetExtension(ExtensionKeys.FieldKey, mappingContext.MiddlewareContext.Selection.Field.Name)`
`112`	`112`	`.SetExtension(ExtensionKeys.ArgumentKey, mappingContext.Argument.Name)`
`113`	`113`	`.SetExtension(ExtensionKeys.PropertyKey, mappingContext.ValidationFailure.PropertyName)`
Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,12 @@ public async Task Multiple()`
`61`	`61`	`field =>`
`62`	`62`	`{`
`63`	`63`	`Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);`
`64`		`- Assert.Equal(new NameString("test"), field.Value);`
	`64`	`+ Assert.Equal("test", field.Value);`
`65`	`65`	`},`
`66`	`66`	`argument =>`
`67`	`67`	`{`
`68`	`68`	`Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);`
`69`		`- Assert.Equal(new NameString("input"), argument.Value);`
	`69`	`+ Assert.Equal("input", argument.Value);`
`70`	`70`	`},`
`71`	`71`	`property =>`
`72`	`72`	`{`
`@@ -98,12 +98,12 @@ public async Task Multiple()`
`98`	`98`	`field =>`
`99`	`99`	`{`
`100`	`100`	`Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);`
`101`		`- Assert.Equal(new NameString("test"), field.Value);`
	`101`	`+ Assert.Equal("test", field.Value);`
`102`	`102`	`},`
`103`	`103`	`argument =>`
`104`	`104`	`{`
`105`	`105`	`Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);`
`106`		`- Assert.Equal(new NameString("input"), argument.Value);`
	`106`	`+ Assert.Equal("input", argument.Value);`
`107`	`107`	`},`
`108`	`108`	`property =>`
`109`	`109`	`{`
Original file line number	Diff line number	Diff line change
`@@ -133,12 +133,12 @@ public async Task UseDefaultErrorMapperWithDetails()`
`133`	`133`	`field =>`
`134`	`134`	`{`
`135`	`135`	`Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);`
`136`		`- Assert.Equal(new NameString("test"), field.Value);`
	`136`	`+ Assert.Equal("test", field.Value);`
`137`	`137`	`},`
`138`	`138`	`argument =>`
`139`	`139`	`{`
`140`	`140`	`Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);`
`141`		`- Assert.Equal(new NameString("input"), argument.Value);`
	`141`	`+ Assert.Equal("input", argument.Value);`
`142`	`142`	`},`
`143`	`143`	`property =>`
`144`	`144`	`{`
`@@ -197,12 +197,12 @@ public async Task UseDefaultErrorMapperWithDetailsWithOperationName()`
`197`	`197`	`field =>`
`198`	`198`	`{`
`199`	`199`	`Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);`
`200`		`- Assert.Equal(new NameString("test"), field.Value);`
	`200`	`+ Assert.Equal("test", field.Value);`
`201`	`201`	`},`
`202`	`202`	`argument =>`
`203`	`203`	`{`
`204`	`204`	`Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);`
`205`		`- Assert.Equal(new NameString("input"), argument.Value);`
	`205`	`+ Assert.Equal("input", argument.Value);`
`206`	`206`	`},`
`207`	`207`	`property =>`
`208`	`208`	`{`
`@@ -261,12 +261,12 @@ public async Task UseDefaultErrorMapperWithExtendedDetails()`
`261`	`261`	`field =>`
`262`	`262`	`{`
`263`	`263`	`Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);`
`264`		`- Assert.Equal(new NameString("test"), field.Value);`
	`264`	`+ Assert.Equal("test", field.Value);`
`265`	`265`	`},`
`266`	`266`	`argument =>`
`267`	`267`	`{`
`268`	`268`	`Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);`
`269`		`- Assert.Equal(new NameString("input"), argument.Value);`
	`269`	`+ Assert.Equal("input", argument.Value);`
`270`	`270`	`},`
`271`	`271`	`property =>`
`272`	`272`	`{`
`@@ -358,12 +358,12 @@ public async Task UseDefaultErrorMapperWithCustomExtendedDetails()`
`358`	`358`	`field =>`
`359`	`359`	`{`
`360`	`360`	`Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);`
`361`		`- Assert.Equal(new NameString("test"), field.Value);`
	`361`	`+ Assert.Equal("test", field.Value);`
`362`	`362`	`},`
`363`	`363`	`argument =>`
`364`	`364`	`{`
`365`	`365`	`Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);`
`366`		`- Assert.Equal(new NameString("input"), argument.Value);`
	`366`	`+ Assert.Equal("input", argument.Value);`
`367`	`367`	`},`
`368`	`368`	`property =>`
`369`	`369`	`{`
`@@ -458,12 +458,12 @@ public async Task MultipleErrorMappers()`
`458`	`458`	`field =>`
`459`	`459`	`{`
`460`	`460`	`Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);`
`461`		`- Assert.Equal(new NameString("test"), field.Value);`
	`461`	`+ Assert.Equal("test", field.Value);`
`462`	`462`	`},`
`463`	`463`	`argument =>`
`464`	`464`	`{`
`465`	`465`	`Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);`
`466`		`- Assert.Equal(new NameString("input"), argument.Value);`
	`466`	`+ Assert.Equal("input", argument.Value);`
`467`	`467`	`},`
`468`	`468`	`property =>`
`469`	`469`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,12 @@ public async Task UseDefaultErrorMapperWithDetailsFieldOverride()`
`85`	`85`	`field =>`
`86`	`86`	`{`
`87`	`87`	`Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);`
`88`		`- Assert.Equal(new NameString("test"), field.Value);`
	`88`	`+ Assert.Equal("test", field.Value);`
`89`	`89`	`},`
`90`	`90`	`argument =>`
`91`	`91`	`{`
`92`	`92`	`Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);`
`93`		`- Assert.Equal(new NameString("input"), argument.Value);`
	`93`	`+ Assert.Equal("input", argument.Value);`
`94`	`94`	`},`
`95`	`95`	`property =>`
`96`	`96`	`{`
Original file line number	Diff line number	Diff line change
`@@ -147,12 +147,12 @@ public async Task DefaultErrorMapperWithDetails()`
`147`	`147`	`field =>`
`148`	`148`	`{`
`149`	`149`	`Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);`
`150`		`- Assert.Equal(new NameString("test"), field.Value);`
	`150`	`+ Assert.Equal("test", field.Value);`
`151`	`151`	`},`
`152`	`152`	`argument =>`
`153`	`153`	`{`
`154`	`154`	`Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);`
`155`		`- Assert.Equal(new NameString("input"), argument.Value);`
	`155`	`+ Assert.Equal("input", argument.Value);`
`156`	`156`	`},`
`157`	`157`	`property =>`
`158`	`158`	`{`
`@@ -205,12 +205,12 @@ public async Task DefaultErrorMapperWithExtendedDetails()`
`205`	`205`	`field =>`
`206`	`206`	`{`
`207`	`207`	`Assert.Equal(ValidationDefaults.ExtensionKeys.FieldKey, field.Key);`
`208`		`- Assert.Equal(new NameString("test"), field.Value);`
	`208`	`+ Assert.Equal("test", field.Value);`
`209`	`209`	`},`
`210`	`210`	`argument =>`
`211`	`211`	`{`
`212`	`212`	`Assert.Equal(ValidationDefaults.ExtensionKeys.ArgumentKey, argument.Key);`
`213`		`- Assert.Equal(new NameString("input"), argument.Value);`
	`213`	`+ Assert.Equal("input", argument.Value);`
`214`	`214`	`},`
`215`	`215`	`property =>`
`216`	`216`	`{`