Merge pull request #264 from Cratis:fix/import-uniqueness

Making sure all import statements are unique per type
Cratis · Sep 30, 2024 · ba697ca · ba697ca
2 parents b5b104d + cdefd77
commit ba697ca
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -25,12 +25,12 @@
             "cwd": "${workspaceFolder}/Source/DotNET/Tools/ProxyGenerator",
             "program": "${workspaceFolder}/Source/DotNET/Tools/ProxyGenerator/bin/Debug/net8.0/Cratis.Applications.ProxyGenerator.dll",
             "args": [
-                // "/Volumes/Code/KDI/Ocean/Source/Accounts/Api/bin/Debug/net8.0/Api.dll",
-                // "/Volumes/Code/KDI/Ocean/Source/Accounts/Web/Api",
+                "/Volumes/Code/KDI/Ocean/Source/Exercises/Main/bin/Debug/net8.0/Kongsberg.KSim.Ocean.Exercises.Main.dll",
+                "/Volumes/Code/KDI/Ocean/Source/Exercises/Web/Api",
                 // "/Volumes/Code/Cratis/Chronicle/Source/Api/bin/Debug/net8.0/Cratis.Chronicle.Api.dll",
                 // "/Volumes/Code/Cratis/Chronicle/Source/Workbench/Api",
-                "${workspaceFolder}/Samples/eCommerce/Basic/Main/bin/Debug/net8.0/Main.dll",
-                "${workspaceFolder}/Samples/eCommerce/Basic/Web/API",
+                // "${workspaceFolder}/Samples/eCommerce/Basic/Main/bin/Debug/net8.0/Main.dll",
+                // "${workspaceFolder}/Samples/eCommerce/Basic/Web/API",
                 "1"
             ],
             "stopAtEntry": false,

diff --git a/Source/DotNET/Tools/ProxyGenerator/CommandExtensions.cs b/Source/DotNET/Tools/ProxyGenerator/CommandExtensions.cs
@@ -59,7 +59,7 @@ public static CommandDescriptor ToCommandDescriptor(this MethodInfo method, stri
             property.CollectTypesInvolved(additionalTypesInvolved);
         }
 
-        imports = imports.Distinct().ToList();
+        imports = imports.DistinctBy(_ => _.Type).ToList();
 
         var route = method.GetRoute();
 

diff --git a/Source/DotNET/Tools/ProxyGenerator/QueryExtensions.cs b/Source/DotNET/Tools/ProxyGenerator/QueryExtensions.cs
@@ -42,7 +42,10 @@ public static QueryDescriptor ToQueryDescriptor(this MethodInfo method, string t
         var argumentsWithComplexTypes = arguments.Where(_ => !_.OriginalType.IsKnownType());
         typesInvolved.AddRange(argumentsWithComplexTypes.Select(_ => _.OriginalType));
 
-        var imports = typesInvolved.GetImports(targetPath, method.DeclaringType!.ResolveTargetPath(segmentsToSkip), segmentsToSkip).ToList();
+        var imports = typesInvolved
+                        .GetImports(targetPath, method.DeclaringType!.ResolveTargetPath(segmentsToSkip), segmentsToSkip)
+                        .DistinctBy(_ => _.Type)
+                        .ToList();
 
         var additionalTypesInvolved = new List<Type>();
         foreach (var argument in argumentsWithComplexTypes)

diff --git a/Source/DotNET/Tools/ProxyGenerator/TypeExtensions.cs b/Source/DotNET/Tools/ProxyGenerator/TypeExtensions.cs
@@ -300,8 +300,9 @@ public static TypeDescriptor ToTypeDescriptor(this Type type, string targetPath,
 
         imports.AddRange(typesInvolved.GetImports(targetPath, type!.ResolveTargetPath(segmentsToSkip), segmentsToSkip));
         imports = imports
-                    .Distinct()
-                    .Where(_ => propertyDescriptors.Exists(pd => pd.Type == _.Type) && _.OriginalType != type).ToList();
+                    .DistinctBy(_ => _.Type)
+                    .Where(_ => propertyDescriptors.Exists(pd => pd.Type == _.Type) && _.OriginalType != type)
+                    .ToList();
 
         return new TypeDescriptor(
             type,