Fixed Middleware Source Generator (#6940)

ChilliCream · Feb 23, 2024 · 0ef04a7 · 0ef04a7
1 parent b73979b
commit 0ef04a7
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 18 deletions.
diff --git a/src/HotChocolate/Core/src/Types.Analyzers/Generators/RequestMiddlewareSyntaxGenerator.cs b/src/HotChocolate/Core/src/Types.Analyzers/Generators/RequestMiddlewareSyntaxGenerator.cs
@@ -106,14 +106,14 @@ private void WriteCtorServiceResolution(List<RequestMiddlewareParameterInfo> par
             {
                 case RequestMiddlewareParameterKind.Service when !parameter.IsNullable:
                     _writer.WriteIndentedLine(
-                        "var cp{0} = core.Services.GetRequiredService<global::{1}>();",
+                        "var cp{0} = core.Services.GetRequiredService<{1}>();",
                         i,
                         parameter.TypeName);
                     break;
 
                 case RequestMiddlewareParameterKind.Service when parameter.IsNullable:
                     _writer.WriteIndentedLine(
-                        "var cp{0} = core.Services.GetService<global::{1}>();",
+                        "var cp{0} = core.Services.GetService<{1}>();",
                         i,
                         parameter.TypeName);
                     break;
@@ -155,6 +155,11 @@ private void WriteFactory(string typeName, List<RequestMiddlewareParameterInfo>
         for (var i = 0; i < parameters.Count; i++)
         {
             var parameter = parameters[i];
+
+            if(i > 0)
+            {
+                _writer.Write(", ");
+            }
 
             if (parameter.Kind is RequestMiddlewareParameterKind.Next)
             {
@@ -179,14 +184,14 @@ private void WriteInvokeServiceResolution(List<RequestMiddlewareParameterInfo> p
             {
                 case RequestMiddlewareParameterKind.Service when !parameter.IsNullable:
                     _writer.WriteIndentedLine(
-                        "var ip{0} = context.Services.GetRequiredService<global::{1}>();",
+                        "var ip{0} = context.Services.GetRequiredService<{1}>();",
                         i,
                         parameter.TypeName);
                     break;
 
                 case RequestMiddlewareParameterKind.Service when parameter.IsNullable:
                     _writer.WriteIndentedLine(
-                        "var ip{0} = context.Services.GetService<global::{1}>();",
+                        "var ip{0} = context.Services.GetService<{1}>();",
                         i,
                         parameter.TypeName);
                     break;
@@ -217,6 +222,11 @@ private void WriteInvoke(string methodName, List<RequestMiddlewareParameterInfo>
         for (var i = 0; i < parameters.Count; i++)
         {
             var parameter = parameters[i];
+
+            if(i > 0)
+            {
+                _writer.Write(", ");
+            }
 
             if (parameter.Kind is RequestMiddlewareParameterKind.Next)
             {
@@ -243,7 +253,7 @@ public void WriteInterceptMethod(
 
         _writer.WriteIndentedLine(
             "[InterceptsLocation(\"{0}\", {1}, {2})]",
-            location.FilePath,
+            location.FilePath.Replace("\\", "\\\\"),
             location.LineNumber,
             location.CharacterNumber);
         _writer.WriteIndentedLine(

diff --git a/src/HotChocolate/Core/test/Types.Analyzers.Tests/AnnotationBasedSchemaTests.cs b/src/HotChocolate/Core/test/Types.Analyzers.Tests/AnnotationBasedSchemaTests.cs
@@ -17,7 +17,7 @@ public async Task SchemaSnapshot()
                 .AddCustomModule()
                 .BuildSchemaAsync();
 
-        schema.MatchSnapshot();
+        schema.MatchMarkdownSnapshot();
     }
 
     [Fact]
@@ -29,20 +29,23 @@ public async Task ExecuteRootField()
 
         var result = await services.ExecuteRequestAsync("{ foo }");
 
-        result.MatchSnapshot();
+        result.MatchMarkdownSnapshot();
     }
 
     [Fact]
     public async Task ExecuteWithMiddleware()
     {
         var services = new ServiceCollection()
+            .AddSingleton<Service1>()
+            .AddSingleton<Service2>()
+            .AddSingleton<Service3>()
             .AddGraphQL()
             .AddCustomModule()
             .UseRequest<SomeRequestMiddleware>()
             .UseDefaultPipeline();
 
         var result = await services.ExecuteRequestAsync("{ foo }");
 
-        result.MatchSnapshot();
+        result.MatchMarkdownSnapshot();
     }
 }
diff --git a/src/HotChocolate/Core/test/Types.Analyzers.Tests/SomeRequestMiddleware.cs b/src/HotChocolate/Core/test/Types.Analyzers.Tests/SomeRequestMiddleware.cs
@@ -4,15 +4,36 @@
 
 namespace HotChocolate.Types;
 
-public class SomeRequestMiddleware(RequestDelegate next)
+public class SomeRequestMiddleware(RequestDelegate next, Service1 service1, Service2 service2)
 {
-    public async ValueTask InvokeAsync(IRequestContext context)
+    public async ValueTask InvokeAsync(IRequestContext context, Service3 service3)
     {
         await next(context);
 
         context.Result =
             QueryResultBuilder.New()
-                .SetData(new Dictionary<string, object?> { { "hello", true } })
+                .SetData(
+                    new Dictionary<string, object?>
+                    {
+                        {
+                            $"{service1.Say()} {service3.Hello()} {service2.World()}", true
+                        }
+                    })
                 .Create();
     }
+}
+
+public class Service1
+{
+    public string Say() => nameof(Say);
+}
+
+public class Service2
+{
+    public string World() => nameof(World);
+}
+
+public class Service3
+{
+    public string Hello() => nameof(Hello);
 }
diff --git a/...shots__/SchemaTests.ExecuteRootField.snap → ...apshots__/SchemaTests.ExecuteRootField.md b/...shots__/SchemaTests.ExecuteRootField.snap → ...apshots__/SchemaTests.ExecuteRootField.md
@@ -1,5 +1,9 @@
+# ExecuteRootField
+
+```json
 {
   "data": {
     "foo": "foo"
   }
-}
+}
+```
diff --git a/...e/test/Types.Analyzers.Tests/__snapshots__/SchemaTests.ExecuteWithMiddleware.md b/...e/test/Types.Analyzers.Tests/__snapshots__/SchemaTests.ExecuteWithMiddleware.md
@@ -0,0 +1,9 @@
+# ExecuteWithMiddleware
+
+```json
+{
+  "data": {
+    "Say Hello World": true
+  }
+}
+```
diff --git a/...late/Core/test/Types.Analyzers.Tests/__snapshots__/SchemaTests.ExecuteWithMiddleware.snap b/...late/Core/test/Types.Analyzers.Tests/__snapshots__/SchemaTests.ExecuteWithMiddleware.snap
diff --git a/...hots__/SchemaTests.SchemaSnapshot.graphql → ...snapshots__/SchemaTests.SchemaSnapshot.md b/...hots__/SchemaTests.SchemaSnapshot.graphql → ...snapshots__/SchemaTests.SchemaSnapshot.md
@@ -1,3 +1,6 @@
+# SchemaSnapshot
+
+```graphql
 schema {
   query: Query
   mutation: Mutation
@@ -39,4 +42,5 @@ type Subscription {
 enum CustomEnum {
   ABC
   DEF
-}
+}
+```