Fix hybrid reference map public roots

Preserve public custom partial declarations as public roots during pre-write accessibility and prune model factory methods for removed models.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: live1206

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/PostProcessing/PostProcessor.cs

@@ -345,6 +345,14 @@ public async Task<Project> RemoveAsync(Project project)
                 nodesToRemove.AddRange(definitions.DeclaredNodesCache[symbol]);
             }
 
+            var modelNamesToRemove = nodesToRemove
+                .Select(static item => item.Identifier.Text)
+                .ToHashSet(StringComparer.Ordinal);
+            if (modelNamesToRemove.Count > 0)
+            {
+                project = await RemoveMethodsFromModelFactoryAsync(project, definitions, modelNamesToRemove);
+            }
+
             // remove them one by one
             var referencedTypeNames = referencedSet
                 .Select(static symbol => symbol.GetFullyQualifiedName())

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/PostProcessing/ProviderReferenceMapAnalyzer.cs

@@ -132,7 +132,9 @@ public static void Analyze(IReadOnlyList<TypeProvider> providers, Project projec
             var publicizeReachable = GetReachableTypes(publicizeRoots, internalizeReferences, publicApiTraversalNodes);
             var internalizeCandidates = internalizeDeclaredNodes
                 .Except(publicizeReachable, StringComparer.Ordinal)
-                .Union(internalizeDeclaredNodes.Intersect(customInternalBoundaryNodes, StringComparer.Ordinal), StringComparer.Ordinal)
+                .Union(internalizeDeclaredNodes
+                    .Intersect(customInternalBoundaryNodes, StringComparer.Ordinal)
+                    .Except(publicizeRoots, StringComparer.Ordinal), StringComparer.Ordinal)
                 .OrderBy(static name => name, StringComparer.Ordinal)
                 .ToArray();
             var publicizeCandidates = publicizeDeclaredNodes
@@ -229,7 +231,9 @@ private static (HashSet<string> InternalizeCandidates, HashSet<string> Publicize
             var publicizeReachable = GetReachableTypes(publicizeRoots, internalizeReferences, publicApiTraversalNodes);
             var internalizeCandidates = internalizeDeclaredNodes
                 .Except(publicizeReachable, StringComparer.Ordinal)
-                .Union(internalizeDeclaredNodes.Intersect(customInternalBoundaryNodes, StringComparer.Ordinal), StringComparer.Ordinal)
+                .Union(internalizeDeclaredNodes
+                    .Intersect(customInternalBoundaryNodes, StringComparer.Ordinal)
+                    .Except(publicizeRoots, StringComparer.Ordinal), StringComparer.Ordinal)
                 .ToHashSet(StringComparer.Ordinal);
             var publicizeCandidates = publicizeDeclaredNodes
                 .Except(customInternalDeclarations, StringComparer.Ordinal)
@@ -403,6 +407,8 @@ private static HashSet<string> GetCustomCodePublicGeneratedTypeRootsFromSyntax(P
                         continue;
                     }
 
+                    AddMatchingName(roots, typeDeclaration.Identifier.ValueText, generatedTypeNames);
+
                     if (typeDeclaration.BaseList != null)
                     {
                         AddSyntaxTypeReferences(roots, typeDeclaration.BaseList, generatedTypeNames);