Colocate Edge and Connection Type (#8152)

michaelstaib · michaelstaib · commit f1b9da5cf201 · 2025-03-19T11:31:46.000+01:00
diff --git a/src/HotChocolate/Core/src/Types.Analyzers/Inspectors/ConnectionTypeTransformer.cs b/src/HotChocolate/Core/src/Types.Analyzers/Inspectors/ConnectionTypeTransformer.cs
@@ -116,7 +116,8 @@ public ImmutableArray<SyntaxInfo> Transform(
                         edgeTypeInfo = EdgeTypeInfo.CreateEdge(
                             compilation,
                             connectionType,
-                            null);
+                            null,
+                            connectionType.ContainingNamespace.ToDisplayString());
                         edgeTypeInfo.AddDiagnosticRange(diagnostics);
                         connectionTypeInfos ??= [];
                         connectionTypeInfos.Add(edgeTypeInfo);
@@ -129,12 +130,14 @@ public ImmutableArray<SyntaxInfo> Transform(
                                 compilation,
                                 edge.Type,
                                 edgeClass.ClassDeclarations,
+                                connectionType.ContainingNamespace.ToDisplayString(),
                                 edge.Name,
                                 edge.NameFormat ?? edge.Name)
                             : EdgeTypeInfo.CreateEdge(
                                 compilation,
                                 edge.Type,
                                 null,
+                                connectionType.ContainingNamespace.ToDisplayString(),
                                 edge.Name,
                                 edge.NameFormat ?? edge.Name);
 
@@ -180,7 +183,7 @@ public ImmutableArray<SyntaxInfo> Transform(
                         continue;
                     }
 
-                    string connectionFullTypeName = connectionType.ToFullyQualified();
+                    var connectionFullTypeName = connectionType.ToFullyQualified();
                     string? connectionName = null;
                     string? edgeName = null;
 
@@ -205,8 +208,15 @@ public ImmutableArray<SyntaxInfo> Transform(
 
                     edgeTypeInfo =
                         connectionClassLookup.TryGetValue(edgeType.ToFullyQualified(), out edgeClass)
-                            ? EdgeTypeInfo.CreateEdgeFrom(edgeClass, edgeName, edgeName)
-                            : EdgeTypeInfo.CreateEdge(compilation, edgeType, null, edgeName, edgeName);
+                            ? EdgeTypeInfo.CreateEdgeFrom(
+                                edgeClass,
+                                connectionType.ContainingNamespace.ToDisplayString(),
+                                edgeName,
+                                edgeName)
+                            : EdgeTypeInfo.CreateEdge(compilation, edgeType, null,
+                                connectionType.ContainingNamespace.ToDisplayString(),
+                                edgeName,
+                                edgeName);
 
                     connectionTypeInfo =
                         connectionClassLookup.TryGetValue(connectionFullTypeName, out connectionClass)
diff --git a/src/HotChocolate/Core/src/Types.Analyzers/Models/EdgeTypeInfo.cs b/src/HotChocolate/Core/src/Types.Analyzers/Models/EdgeTypeInfo.cs
@@ -13,6 +13,7 @@ public sealed class EdgeTypeInfo
     private EdgeTypeInfo(
         string name,
         string? nameFormat,
+        string @namespace,
         INamedTypeSymbol runtimeType,
         ClassDeclarationSyntax? classDeclaration,
         ImmutableArray<Resolver> resolvers)
@@ -21,7 +22,7 @@ private EdgeTypeInfo(
         NameFormat = nameFormat;
         RuntimeTypeFullName = runtimeType.ToDisplayString();
         RuntimeType = runtimeType;
-        Namespace = runtimeType.ContainingNamespace.ToDisplayString();
+        Namespace = @namespace;
         ClassDeclaration = classDeclaration;
         Resolvers = resolvers;
     }
@@ -87,12 +88,14 @@ public override int GetHashCode()
 
     public static EdgeTypeInfo CreateEdgeFrom(
         ConnectionClassInfo connectionClass,
+        string @namespace,
         string? name = null,
         string? nameFormat = null)
     {
         return new EdgeTypeInfo(
             (name ?? connectionClass.RuntimeType.Name) + "Type",
             nameFormat,
+            @namespace,
             connectionClass.RuntimeType,
             connectionClass.ClassDeclarations,
             connectionClass.Resolvers);
@@ -102,14 +105,16 @@ public static EdgeTypeInfo CreateEdge(
         Compilation compilation,
         INamedTypeSymbol runtimeType,
         ClassDeclarationSyntax? classDeclaration,
+        string @namespace,
         string? name = null,
         string? nameFormat = null)
-        => Create(compilation, runtimeType, classDeclaration, name, nameFormat);
+        => Create(compilation, runtimeType, classDeclaration, @namespace, name, nameFormat);
 
     private static EdgeTypeInfo Create(
         Compilation compilation,
         INamedTypeSymbol runtimeType,
         ClassDeclarationSyntax? classDeclaration,
+        string @namespace,
         string? name = null,
         string? nameFormat = null)
     {
@@ -141,6 +146,7 @@ private static EdgeTypeInfo Create(
         return new EdgeTypeInfo(
             edgeName,
             nameFormat,
+            @namespace,
             runtimeType,
             classDeclaration,
             resolvers.ToImmutable());
diff --git a/src/HotChocolate/Core/test/Types.Analyzers.Tests/__snapshots__/PagingTests.GenerateSource_Inherit_From_ConnectionBase_Reuse_PageEdge.md b/src/HotChocolate/Core/test/Types.Analyzers.Tests/__snapshots__/PagingTests.GenerateSource_Inherit_From_ConnectionBase_Reuse_PageEdge.md
@@ -114,7 +114,7 @@ namespace TestNamespace
 
 ```
 
-## AuthorEdgeType.GMN8-ZMy56jZWutjKaKAXQ.hc.g.cs
+## AuthorEdgeType.WaAdMHmlGJHjtEI4nqY7WA.hc.g.cs
 
 ```csharp
 // <auto-generated/>
@@ -130,7 +130,7 @@ using HotChocolate.Execution.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using HotChocolate.Internal;
 
-namespace HotChocolate.Types.Pagination
+namespace TestNamespace
 {
     public partial class AuthorEdgeType : ObjectType<global::HotChocolate.Types.Pagination.PageEdge<TestNamespace.Author>>
     {
@@ -305,7 +305,7 @@ namespace Microsoft.Extensions.DependencyInjection
     {
         public static IRequestExecutorBuilder AddTestsTypes(this IRequestExecutorBuilder builder)
         {
-            builder.AddType<global::HotChocolate.Types.Pagination.AuthorEdgeType>();
+            builder.AddType<global::TestNamespace.AuthorEdgeType>();
             builder.AddType<global::TestNamespace.AuthorConnectionType>();
             builder.ConfigureDescriptorContext(ctx => ctx.TypeConfiguration.TryAdd(
                 "Tests::TestNamespace.Types.Root.AuthorQueries",
diff --git a/src/HotChocolate/Core/test/Types.Analyzers.Tests/__snapshots__/PagingTests.GenerateSource_Inherit_From_ConnectionBase_Reuse_PageEdge_Generic.md b/src/HotChocolate/Core/test/Types.Analyzers.Tests/__snapshots__/PagingTests.GenerateSource_Inherit_From_ConnectionBase_Reuse_PageEdge_Generic.md
@@ -117,7 +117,7 @@ namespace TestNamespace
 
 ```
 
-## AuthorEdgeType.GMN8-ZMy56jZWutjKaKAXQ.hc.g.cs
+## AuthorEdgeType.WaAdMHmlGJHjtEI4nqY7WA.hc.g.cs
 
 ```csharp
 // <auto-generated/>
@@ -133,7 +133,7 @@ using HotChocolate.Execution.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using HotChocolate.Internal;
 
-namespace HotChocolate.Types.Pagination
+namespace TestNamespace
 {
     public partial class AuthorEdgeType : ObjectType<global::HotChocolate.Types.Pagination.PageEdge<TestNamespace.Author>>
     {
@@ -311,7 +311,7 @@ namespace Microsoft.Extensions.DependencyInjection
     {
         public static IRequestExecutorBuilder AddTestsTypes(this IRequestExecutorBuilder builder)
         {
-            builder.AddType<global::HotChocolate.Types.Pagination.AuthorEdgeType>();
+            builder.AddType<global::TestNamespace.AuthorEdgeType>();
             builder.AddType<global::TestNamespace.AuthorCustomConnectionType>();
             builder.ConfigureDescriptorContext(ctx => ctx.TypeConfiguration.TryAdd(
                 "Tests::TestNamespace.Types.Root.AuthorQueries",
diff --git a/src/HotChocolate/Core/test/Types.Analyzers.Tests/__snapshots__/PagingTests.GenerateSource_Inherit_From_PageConnection.md b/src/HotChocolate/Core/test/Types.Analyzers.Tests/__snapshots__/PagingTests.GenerateSource_Inherit_From_PageConnection.md
@@ -134,7 +134,7 @@ namespace TestNamespace
 
 ```
 
-## AuthorEdgeType.GMN8-ZMy56jZWutjKaKAXQ.hc.g.cs
+## AuthorEdgeType.WaAdMHmlGJHjtEI4nqY7WA.hc.g.cs
 
 ```csharp
 // <auto-generated/>
@@ -150,7 +150,7 @@ using HotChocolate.Execution.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using HotChocolate.Internal;
 
-namespace HotChocolate.Types.Pagination
+namespace TestNamespace
 {
     public partial class AuthorEdgeType : ObjectType<global::HotChocolate.Types.Pagination.PageEdge<TestNamespace.Author>>
     {
@@ -325,7 +325,7 @@ namespace Microsoft.Extensions.DependencyInjection
     {
         public static IRequestExecutorBuilder AddTestsTypes(this IRequestExecutorBuilder builder)
         {
-            builder.AddType<global::HotChocolate.Types.Pagination.AuthorEdgeType>();
+            builder.AddType<global::TestNamespace.AuthorEdgeType>();
             builder.AddType<global::TestNamespace.AuthorConnectionType>();
             builder.ConfigureDescriptorContext(ctx => ctx.TypeConfiguration.TryAdd(
                 "Tests::TestNamespace.Types.Root.AuthorQueries",

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ namespace TestNamespace`
`114`	`114`
`115`	`115`	```
`116`	`116`
`117`		`-## AuthorEdgeType.GMN8-ZMy56jZWutjKaKAXQ.hc.g.cs`
	`117`	`+## AuthorEdgeType.WaAdMHmlGJHjtEI4nqY7WA.hc.g.cs`
`118`	`118`
`119`	`119`	```csharp
`120`	`120`	`// <auto-generated/>`
`@@ -130,7 +130,7 @@ using HotChocolate.Execution.Configuration;`
`130`	`130`	`using Microsoft.Extensions.DependencyInjection;`
`131`	`131`	`using HotChocolate.Internal;`
`132`	`132`
`133`		`-namespace HotChocolate.Types.Pagination`
	`133`	`+namespace TestNamespace`
`134`	`134`	`{`
`135`	`135`	`public partial class AuthorEdgeType : ObjectType<global::HotChocolate.Types.Pagination.PageEdge<TestNamespace.Author>>`
`136`	`136`	`{`
`@@ -305,7 +305,7 @@ namespace Microsoft.Extensions.DependencyInjection`
`305`	`305`	`{`
`306`	`306`	`public static IRequestExecutorBuilder AddTestsTypes(this IRequestExecutorBuilder builder)`
`307`	`307`	`{`
`308`		`- builder.AddType<global::HotChocolate.Types.Pagination.AuthorEdgeType>();`
	`308`	`+ builder.AddType<global::TestNamespace.AuthorEdgeType>();`
`309`	`309`	`builder.AddType<global::TestNamespace.AuthorConnectionType>();`
`310`	`310`	`builder.ConfigureDescriptorContext(ctx => ctx.TypeConfiguration.TryAdd(`
`311`	`311`	`"Tests::TestNamespace.Types.Root.AuthorQueries",`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ namespace TestNamespace`
`117`	`117`
`118`	`118`	```
`119`	`119`
`120`		`-## AuthorEdgeType.GMN8-ZMy56jZWutjKaKAXQ.hc.g.cs`
	`120`	`+## AuthorEdgeType.WaAdMHmlGJHjtEI4nqY7WA.hc.g.cs`
`121`	`121`
`122`	`122`	```csharp
`123`	`123`	`// <auto-generated/>`
`@@ -133,7 +133,7 @@ using HotChocolate.Execution.Configuration;`
`133`	`133`	`using Microsoft.Extensions.DependencyInjection;`
`134`	`134`	`using HotChocolate.Internal;`
`135`	`135`
`136`		`-namespace HotChocolate.Types.Pagination`
	`136`	`+namespace TestNamespace`
`137`	`137`	`{`
`138`	`138`	`public partial class AuthorEdgeType : ObjectType<global::HotChocolate.Types.Pagination.PageEdge<TestNamespace.Author>>`
`139`	`139`	`{`
`@@ -311,7 +311,7 @@ namespace Microsoft.Extensions.DependencyInjection`
`311`	`311`	`{`
`312`	`312`	`public static IRequestExecutorBuilder AddTestsTypes(this IRequestExecutorBuilder builder)`
`313`	`313`	`{`
`314`		`- builder.AddType<global::HotChocolate.Types.Pagination.AuthorEdgeType>();`
	`314`	`+ builder.AddType<global::TestNamespace.AuthorEdgeType>();`
`315`	`315`	`builder.AddType<global::TestNamespace.AuthorCustomConnectionType>();`
`316`	`316`	`builder.ConfigureDescriptorContext(ctx => ctx.TypeConfiguration.TryAdd(`
`317`	`317`	`"Tests::TestNamespace.Types.Root.AuthorQueries",`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ namespace TestNamespace`
`134`	`134`
`135`	`135`	```
`136`	`136`
`137`		`-## AuthorEdgeType.GMN8-ZMy56jZWutjKaKAXQ.hc.g.cs`
	`137`	`+## AuthorEdgeType.WaAdMHmlGJHjtEI4nqY7WA.hc.g.cs`
`138`	`138`
`139`	`139`	```csharp
`140`	`140`	`// <auto-generated/>`
`@@ -150,7 +150,7 @@ using HotChocolate.Execution.Configuration;`
`150`	`150`	`using Microsoft.Extensions.DependencyInjection;`
`151`	`151`	`using HotChocolate.Internal;`
`152`	`152`
`153`		`-namespace HotChocolate.Types.Pagination`
	`153`	`+namespace TestNamespace`
`154`	`154`	`{`
`155`	`155`	`public partial class AuthorEdgeType : ObjectType<global::HotChocolate.Types.Pagination.PageEdge<TestNamespace.Author>>`
`156`	`156`	`{`
`@@ -325,7 +325,7 @@ namespace Microsoft.Extensions.DependencyInjection`
`325`	`325`	`{`
`326`	`326`	`public static IRequestExecutorBuilder AddTestsTypes(this IRequestExecutorBuilder builder)`
`327`	`327`	`{`
`328`		`- builder.AddType<global::HotChocolate.Types.Pagination.AuthorEdgeType>();`
	`328`	`+ builder.AddType<global::TestNamespace.AuthorEdgeType>();`
`329`	`329`	`builder.AddType<global::TestNamespace.AuthorConnectionType>();`
`330`	`330`	`builder.ConfigureDescriptorContext(ctx => ctx.TypeConfiguration.TryAdd(`
`331`	`331`	`"Tests::TestNamespace.Types.Root.AuthorQueries",`