From 2b47b77205e9e3ed8e31bcc8a756aa500c732e99 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Tue, 17 Nov 2026 20:57:16 +0000 Subject: [PATCH 01/10] Initial plan From ee8c21232ea600f2bb297998d27ca8e189cc3d03 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Tue, 17 Nov 2026 21:10:10 +0000 Subject: [PATCH 02/10] fix(http-client-csharp): preserve unknown discriminator names from last contract Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../DiscriminatorTests.cs | 46 ++++++ .../UnknownActivity.cs | 10 ++ ...istoricalUnknownNameUsedBySerialization.cs | 1 + .../Models.cs | 12 ++ .../BackCompatibilityChangeCategory.cs | 6 + .../src/EmitterRpc/Emitter.cs | 2 + .../src/Providers/ModelProvider.cs | 29 ++++ .../src/SourceInput/SourceInputModel.cs | 19 +++ .../src/TypeFactory.cs | 88 ++++++++++- .../ModelProviders/ModelProviderTests.cs | 137 ++++++++++++++++++ .../UnknownActivity.cs | 7 + .../UnknownActivity.cs | 10 ++ .../UnknownActivity.cs | 10 ++ .../UnknownActivity.cs | 7 + .../UnknownActivity.cs | 10 ++ .../UnknownActivity.cs | 10 ++ .../UnknownActivity.cs | 10 ++ .../Models.cs | 43 ++++++ 18 files changed, 455 insertions(+), 2 deletions(-) create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization(Public)/UnknownActivity.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization/Models.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(Custom)/UnknownActivity.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MappedModel)/UnknownActivity.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(UnrelatedMapping)/UnknownActivity.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Direct)/UnknownActivity.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyInternal)/UnknownActivity.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyPublic)/UnknownActivity.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Restored)/UnknownActivity.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameRestored(LastContract)/Models.cs diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs index 980c736d905..a220d60db92 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs @@ -4,6 +4,7 @@ using System.ClientModel.Primitives; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using Microsoft.TypeSpec.Generator.ClientModel.Providers; using Microsoft.TypeSpec.Generator.Input; using Microsoft.TypeSpec.Generator.Primitives; @@ -172,6 +173,51 @@ public void UnknownVariantPersistableCreateCoreShouldReturnDeserializeBase() Assert.IsTrue(statements!.Statements.Last().ToDisplayString().Contains("DeserializePet")); } + [TestCase(false)] + [TestCase(true)] + public async Task HistoricalUnknownNameUsedBySerialization(bool isPublic) + { + var input = InputFactory.Model("PipelineActivity", properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isRequired: true, isDiscriminator: true)]); + await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [input], + compilation: isPublic ? async () => await Helpers.GetCompilationFromDirectoryAsync("Public") : null, + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + var generator = ScmCodeModelGenerator.Instance; + var model = generator.TypeFactory.CreateModel(input)!; + var unknown = model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel); + var serialization = model.SerializationProviders.Single(); + var unknownSerialization = unknown.SerializationProviders.Single(); + var proxyAttribute = serialization.Attributes.Single(a => a.Type.Equals(typeof(PersistableModelProxyAttribute))); + + Assert.AreEqual("UnknownActivity", unknown.Name); + Assert.AreEqual(Helpers.GetExpectedFromFile().Trim(), proxyAttribute.ToDisplayString().Trim()); + Assert.AreEqual("UnknownActivity", unknownSerialization.Name); + Assert.IsTrue(unknownSerialization.Methods.Any(m => m.Signature.Name == "DeserializeUnknownActivity")); + var deserialize = serialization.Methods.Single(m => m.Signature.Name == "DeserializePipelineActivity"); + StringAssert.Contains("UnknownActivity", deserialize.BodyStatements!.ToDisplayString()); + StringAssert.DoesNotContain("UnknownPipelineActivity", deserialize.BodyStatements.ToDisplayString()); + var factoryMethod = generator.OutputLibrary.ModelFactory.Value.Methods.Single(m => m.Signature.Name == "PipelineActivity"); + StringAssert.Contains("UnknownActivity", factoryMethod.BodyStatements!.ToDisplayString()); + var context = generator.OutputLibrary.TypeProviders.OfType().Single(); + Assert.AreEqual(isPublic, context.Attributes.Any(a => a.ToDisplayString().Contains("UnknownActivity"))); + } + + [Test] + public async Task HistoricalUnknownNameDoesNotCollideWithClient() + { + var input = InputFactory.Model("PipelineActivity", properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); + await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [input], + clients: () => [InputFactory.Client("UnknownActivity", clientNamespace: "Sample.Models", isExactName: true)], + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( + method: nameof(HistoricalUnknownNameUsedBySerialization))); + var model = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(input)!; + + Assert.AreEqual("UnknownPipelineActivity", model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel).Name); + } + [Test] public void BaseShouldHaveProxyAttribute() { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization(Public)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization(Public)/UnknownActivity.cs new file mode 100644 index 00000000000..a767e9115d1 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization(Public)/UnknownActivity.cs @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenType("UnknownPipelineActivity")] + public partial class UnknownActivity { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization.cs new file mode 100644 index 00000000000..458162dc5ff --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization.cs @@ -0,0 +1 @@ +[global::System.ClientModel.Primitives.PersistableModelProxyAttribute(typeof(global::Sample.Models.UnknownActivity))] diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization/Models.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization/Models.cs new file mode 100644 index 00000000000..5ca23c4fedf --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameUsedBySerialization/Models.cs @@ -0,0 +1,12 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.ClientModel.Primitives; + +namespace Sample.Models +{ + [PersistableModelProxy(typeof(UnknownActivity))] + public abstract class PipelineActivity { } + + internal class UnknownActivity : PipelineActivity { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/EmitterRpc/BackCompatibilityChangeCategory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/EmitterRpc/BackCompatibilityChangeCategory.cs index adb294c57e2..ab8bb34505a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/EmitterRpc/BackCompatibilityChangeCategory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/EmitterRpc/BackCompatibilityChangeCategory.cs @@ -63,5 +63,11 @@ public enum BackCompatibilityChangeCategory /// A model base type was preserved from the last contract. ModelBaseTypePreserved, + + /// An unknown discriminator model name was preserved from the last contract. + UnknownDiscriminatorModelNamePreserved, + + /// An unknown discriminator model name could not be preserved from the last contract. + UnknownDiscriminatorModelNameSkipped, } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/EmitterRpc/Emitter.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/EmitterRpc/Emitter.cs index 1552b25c58e..132284d74ec 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/EmitterRpc/Emitter.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/EmitterRpc/Emitter.cs @@ -175,6 +175,8 @@ public void WriteBufferedMessages() BackCompatibilityChangeCategory.AdditionalPropertiesShapePreserved => "AdditionalProperties Shape Preserved", BackCompatibilityChangeCategory.PropertyTypePreserved => "Property Type Preserved", BackCompatibilityChangeCategory.ModelBaseTypePreserved => "Model Base Type Preserved", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNamePreserved => "Unknown Discriminator Model Name Preserved", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped => "Unknown Discriminator Model Name Back-Compat Skipped", BackCompatibilityChangeCategory.ConstructorModifierPreserved => "Constructor Modifier Preserved", BackCompatibilityChangeCategory.EnumMemberReordering => "Enum Member Reordering", BackCompatibilityChangeCategory.ApiVersionEnumMemberAdded => "Api Version Enum Member Added From Last Contract", diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs index 40a6b062a30..71842fccf51 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs @@ -6,6 +6,7 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; +using Microsoft.CodeAnalysis; using Microsoft.TypeSpec.Generator.EmitterRpc; using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Input; @@ -446,6 +447,28 @@ protected override string BuildName() : BuildNameWithoutCollisionCheck(); } + internal INamedTypeSymbol? GetLastContractProxyType(string typeName, string typeNamespace) + { + var attributes = BuildLastContractView(typeName, typeNamespace)?.Attributes + .Where(attribute => attribute.Data?.AttributeClass?.ToDisplayString() == + "System.ClientModel.Primitives.PersistableModelProxyAttribute").ToArray(); + if (attributes is null or { Length: 0 }) + { + return null; + } + + if (attributes.Length == 1 && + attributes[0].Data!.ConstructorArguments is [{ Kind: TypedConstantKind.Type, Value: INamedTypeSymbol { TypeKind: not TypeKind.Error } proxyType }]) + { + return proxyType; + } + + CodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name for '{typeNamespace}.{typeName}'; expected exactly one PersistableModelProxyAttribute with a resolvable type argument.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + return null; + } + internal (string Name, string FinalName, string OriginalName, string Namespace, string FinalNamespace, bool CanRename, bool HasTypeMapping) GetNameForCollisionCheck() { var name = BuildNameWithoutCollisionCheck(); @@ -508,6 +531,12 @@ private string RenameModelSuffix(string name) { var typeNamespace = generatedTypeNamespace ?? BuildNamespace(); var typeName = generatedTypeName ?? BuildName(); + if (IsUnknownDiscriminatorModel && + CodeModelGenerator.Instance.TypeFactory.GetOriginalUnknownModelName(_inputModel) is { } originalName && + base.BuildCustomCodeView(originalName, typeNamespace) is { } legacyCustomCodeView) + { + return legacyCustomCodeView; + } var customCodeView = base.BuildCustomCodeView(typeName, typeNamespace); return customCodeView ?? BuildModelSuffixFallbackView( typeName, diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/SourceInput/SourceInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/SourceInput/SourceInputModel.cs index e8e6edd28d2..42a8f8eb959 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/SourceInput/SourceInputModel.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/SourceInput/SourceInputModel.cs @@ -4,7 +4,10 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using System.Linq; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Utilities; @@ -71,6 +74,22 @@ private IReadOnlyDictionary PopulateNameMap() internal bool HasTypeMapping(string ns, string name, string? declaringTypeName = null) => _nameMap.Value.TryGetValue(name, out var type) && IsContainingTypeMatch(type, ns, declaringTypeName); + internal bool IsCustomizationOf(TypeProvider provider, params string[] generatedNames) + { + var symbol = Customization?.Assembly.GetTypeByMetadataName( + provider is NamedTypeSymbolProvider named ? named.MetadataName : provider.Type.FullyQualifiedName); + if (symbol is null) + { + return false; + } + + return TryGetName(symbol, out var mappedName) + ? generatedNames.Contains(mappedName, StringComparer.Ordinal) + : symbol.DeclaringSyntaxReferences.Any(reference => + reference.GetSyntax() is TypeDeclarationSyntax declaration && + declaration.Modifiers.Any(SyntaxKind.PartialKeyword)); + } + public TypeProvider? FindForTypeInLastContract(string ns, string name, string? declaringTypeName = null) { var type = FindTypeInCompilation(LastContract, ns, name, true, declaringTypeName, includeInternal: false); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs index 6b52511e778..38f8197feb9 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Net; using System.Text.Json; +using Microsoft.TypeSpec.Generator.EmitterRpc; using Microsoft.TypeSpec.Generator.Input; using Microsoft.TypeSpec.Generator.Input.Extensions; using Microsoft.TypeSpec.Generator.Primitives; @@ -35,6 +36,10 @@ internal IEnumerable CreatedModelProviders private IReadOnlyDictionary? _modelNames; internal IReadOnlyDictionary ModelNames => _modelNames ??= BuildModelNames(); + private readonly Dictionary _restoredUnknownModelOriginalNames = []; + + internal string? GetOriginalUnknownModelName(InputModelType model) + => _restoredUnknownModelOriginalNames.GetValueOrDefault(model); protected virtual IEnumerable<(string Name, string Namespace, string OriginalName)> GetReservedModelTypeNames() => []; @@ -42,6 +47,7 @@ private IReadOnlyDictionary BuildModelNames() { var input = CodeModelGenerator.Instance.InputLibrary.InputNamespace; var candidates = new Dictionary(); + var providers = new Dictionary(); var nameCounts = new Dictionary(StringComparer.OrdinalIgnoreCase); var reservedNames = GetReservedModelTypeNames().ToArray(); var originalNames = reservedNames.Select(type => type.OriginalName).ToHashSet(StringComparer.Ordinal); @@ -61,7 +67,9 @@ void AddModel(InputModelType model) } // Do not construct CSharpTypes while collecting names: their creation calls BuildName. - var candidate = new ModelProvider(model).GetNameForCollisionCheck(); + var provider = new ModelProvider(model); + var candidate = provider.GetNameForCollisionCheck(); + providers.Add(model, provider); candidates.Add(model, candidate); originalNames.Add(candidate.OriginalName); ReserveName(candidate.FinalName); @@ -81,7 +89,9 @@ void AddModel(InputModelType model) { if (inputEnum.External is null && !inputEnum.Usage.HasFlag(InputModelTypeUsage.ApiVersionEnum)) { - ReserveName(EnumProvider.Create(inputEnum).Name); + var enumProvider = EnumProvider.Create(inputEnum); + ReserveName(enumProvider.Name); + reservedTypes.Add((enumProvider.Name, enumProvider.Type.Namespace)); originalNames.Add(inputEnum.IsExactName ? inputEnum.Name : inputEnum.Name.ToIdentifierName().NormalizeCSharpAcronyms()); } } @@ -111,6 +121,80 @@ void AddModel(InputModelType model) result.Add(model, name); } + var source = CodeModelGenerator.Instance.SourceInputModel; + if (source.LastContract is null) + { + return result; + } + + // Resolve historical unknown names only after all base names are fixed. These lookups + // must not construct generated types or depend on an unknown model's name. + var emittedTypes = candidates.ToDictionary( + pair => pair.Key, + pair => (pair.Value.FinalName == pair.Value.Name ? result[pair.Key] : pair.Value.FinalName, pair.Value.FinalNamespace)); + foreach (var (model, candidate) in candidates) + { + if (!model.IsUnknownDiscriminatorModel || model.BaseModel is not { } baseModel || + !candidates.ContainsKey(baseModel)) + { + continue; + } + + var (baseName, baseNamespace) = emittedTypes[baseModel]; + var proxyType = providers[baseModel].GetLastContractProxyType(baseName, baseNamespace); + if (proxyType is null) + { + continue; + } + + var proxyNamespace = proxyType.ContainingNamespace.ToDisplayString(); + var custom = source.FindForTypeInCurrentCompilation(candidate.Namespace, proxyType.Name); + var legacyCustom = source.FindForTypeInCurrentCompilation(candidate.Namespace, result[model]); + var finalName = custom?.Name ?? proxyType.Name; + var finalNamespace = custom?.Type.Namespace ?? candidate.Namespace; + string? reason = null; + if (proxyNamespace != candidate.FinalNamespace) + { + reason = "the proxy type is in a different namespace"; + } + else if (proxyType.ContainingType is not null || proxyType.IsGenericType) + { + reason = "the proxy type is nested or generic"; + } + else if (source.ApiCompatBaseline.IsTypeSuppressed(proxyType.ToDisplayString())) + { + reason = "the proxy type is an accepted removal in the ApiCompat baseline"; + } + else if (emittedTypes.Any(pair => pair.Key != model && pair.Value == (finalName, finalNamespace)) || + reservedTypes.Contains((finalName, finalNamespace))) + { + reason = "the name is already used by another generated type"; + } + else if (custom is not null && custom.Type != legacyCustom?.Type && + !source.IsCustomizationOf(custom, result[model], proxyType.Name)) + { + reason = "the name is already used by an unrelated custom type"; + } + + if (reason is not null) + { + CodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name '{proxyType.ToDisplayString()}' for '{baseNamespace}.{baseName}'; {reason}.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + continue; + } + + if (result[model] != proxyType.Name) + { + CodeModelGenerator.Instance.Emitter.Info( + $"Changed unknown discriminator model name from '{result[model]}' to '{proxyType.Name}' for '{baseNamespace}.{baseName}' to match the last contract.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNamePreserved); + _restoredUnknownModelOriginalNames[model] = result[model]; + result[model] = proxyType.Name; + emittedTypes[model] = (legacyCustom?.Name ?? finalName, legacyCustom?.Type.Namespace ?? finalNamespace); + } + } + return result; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs index d5cf7949a01..466cea822e8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs @@ -350,6 +350,143 @@ public void TestBuildName_ModelSuffixReservesEnumNames(string modelName, string Assert.AreSame(enumProvider, factory.CSharpTypeMap[enumProvider.Type]); } + [TestCase(false)] + [TestCase(true)] + public async Task UnknownDiscriminatorNameRestored(bool unknownFirst) + { + var input = InputFactory.Model("PipelineActivity", properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: [input], + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync("LastContract")); + using var emitterStream = new MemoryStream(); + using var emitter = new Emitter(emitterStream); + mockGenerator.Setup(generator => generator.Emitter).Returns(emitter); + var factory = CodeModelGenerator.Instance.TypeFactory; + var unknownInput = input.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel); + var unknown = unknownFirst ? factory.CreateModel(unknownInput) : null; + var model = factory.CreateModel(input)!; + unknown ??= factory.CreateModel(unknownInput)!; + + Assert.AreEqual("PipelineActivity", model.Name); + Assert.AreEqual("UnknownActivity", unknown.Name); + Assert.AreEqual(TypeSignatureModifiers.Internal | TypeSignatureModifiers.Partial | TypeSignatureModifiers.Class, unknown.DeclarationModifiers); + Assert.AreSame(model, unknown.BaseModelProvider); + Assert.AreEqual("UnknownActivity.cs", Path.GetFileName(unknown.RelativeFilePath)); + Assert.AreSame(unknown, factory.CSharpTypeMap[unknown.Type]); + Assert.AreEqual("UnknownActivity", unknown.Name); + emitter.WriteBufferedMessages(); + var messages = Encoding.UTF8.GetString(emitterStream.ToArray()); + StringAssert.Contains("Unknown Discriminator Model Name Preserved", messages); + Assert.AreEqual(1, messages.Split("Changed unknown discriminator model name").Length - 1); + } + + [TestCase("LegacyInternal", "UnknownActivity", false)] + [TestCase("LegacyPublic", "UnknownActivity", true)] + [TestCase("Restored", "CustomizedActivity", true)] + [TestCase("Direct", "UnknownActivity", true)] + public async Task UnknownDiscriminatorNamePreservesCustomization(string customization, string expectedName, bool isPublic) + { + var input = InputFactory.Model("PipelineActivity", properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); + await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: [input], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync(customization), + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( + "LastContract", method: nameof(UnknownDiscriminatorNameRestored))); + var unknown = CodeModelGenerator.Instance.TypeFactory.CreateModel( + input.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; + + Assert.AreEqual(expectedName, unknown.Name); + Assert.IsNotNull(unknown.CustomCodeView); + Assert.AreEqual(isPublic, unknown.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public)); + } + + [Test] + public async Task UnknownDiscriminatorNameRestoredPerHierarchyLevel() + { + var root = InputFactory.Model("PipelineActivity", properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); + var child = InputFactory.Model("CopyActivitySource", baseModel: root, discriminatedKind: "copy", properties: + [InputFactory.Property("sourceKind", InputPrimitiveType.String, isDiscriminator: true)]); + await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: [child, root], + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( + "LastContract", method: nameof(UnknownDiscriminatorNameRestored))); + var factory = CodeModelGenerator.Instance.TypeFactory; + var childUnknown = factory.CreateModel(child.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; + var rootUnknown = factory.CreateModel(root.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; + + Assert.AreEqual("UnknownCopySource", childUnknown.Name); + Assert.AreEqual("UnknownActivity", rootUnknown.Name); + Assert.AreEqual("CopyActivitySource", childUnknown.BaseModelProvider!.Name); + Assert.AreEqual("PipelineActivity", rootUnknown.BaseModelProvider!.Name); + } + + [TestCase("Model", false)] + [TestCase("Model", true)] + [TestCase("Enum", false)] + [TestCase("Custom", false)] + [TestCase("MappedModel", false)] + [TestCase("UnrelatedMapping", false)] + public async Task UnknownDiscriminatorNameCollisionSkipped(string collision, bool reverseOrder) + { + var input = InputFactory.Model("PipelineActivity", properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); + var other = InputFactory.Model(collision == "MappedModel" ? "OtherModel" : "UnknownActivity"); + InputModelType[] models = collision is "Model" or "MappedModel" + ? (reverseOrder ? [other, input] : [input, other]) : [input]; + await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: models, + inputEnumTypes: collision == "Enum" ? [InputFactory.StringEnum("UnknownActivity", [("One", "one")])] : [], + compilation: collision is "Custom" or "MappedModel" or "UnrelatedMapping" + ? async () => await Helpers.GetCompilationFromDirectoryAsync(collision) : null, + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( + "LastContract", method: nameof(UnknownDiscriminatorNameRestored))); + var unknown = CodeModelGenerator.Instance.TypeFactory.CreateModel( + input.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; + + Assert.AreEqual("UnknownPipelineActivity", unknown.Name); + Assert.IsNull(unknown.CustomCodeView); + } + + [TestCase("NoProxy", true, false, null)] + [TestCase("PipelineActivity", false, false, null)] + [TestCase("WrongNamespace", true, false, "different namespace")] + [TestCase("DuplicateProxy", true, false, "exactly one PersistableModelProxyAttribute")] + [TestCase("UnresolvedProxy", true, false, "resolvable type argument")] + [TestCase("PipelineActivity", true, true, "accepted removal")] + public async Task UnknownDiscriminatorNameGuards(string modelName, bool lastContract, bool acceptedRemoval, string? reason) + { + var input = InputFactory.Model(modelName, properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); + var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: [input], + lastContractCompilation: lastContract + ? async () => await Helpers.GetCompilationFromDirectoryAsync( + "LastContract", method: nameof(UnknownDiscriminatorNameRestored)) : null, + apiCompatBaseline: acceptedRemoval + ? ApiCompatBaseline.Parse(["TypesMustExist : Type 'Sample.Models.UnknownActivity' does not exist in the implementation."]) + : null); + using var emitterStream = new MemoryStream(); + using var emitter = new Emitter(emitterStream); + mockGenerator.Setup(generator => generator.Emitter).Returns(emitter); + var unknown = CodeModelGenerator.Instance.TypeFactory.CreateModel( + input.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; + + Assert.AreEqual($"Unknown{modelName}", unknown.Name); + emitter.WriteBufferedMessages(); + var messages = Encoding.UTF8.GetString(emitterStream.ToArray()); + if (reason is null) + { + Assert.IsEmpty(messages); + } + else + { + StringAssert.Contains(reason, messages); + } + } + [TestCase(false)] [TestCase(true)] public void TestBuildName_ModelSuffixReservesUnknownDiscriminatorName(bool reverseOrder) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(Custom)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(Custom)/UnknownActivity.cs new file mode 100644 index 00000000000..9b51167743b --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(Custom)/UnknownActivity.cs @@ -0,0 +1,7 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +namespace Sample.Models +{ + internal class UnknownActivity { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MappedModel)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MappedModel)/UnknownActivity.cs new file mode 100644 index 00000000000..a27c4b2236a --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MappedModel)/UnknownActivity.cs @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenType("OtherModel")] + public partial class UnknownActivity { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(UnrelatedMapping)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(UnrelatedMapping)/UnknownActivity.cs new file mode 100644 index 00000000000..a27c4b2236a --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(UnrelatedMapping)/UnknownActivity.cs @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenType("OtherModel")] + public partial class UnknownActivity { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Direct)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Direct)/UnknownActivity.cs new file mode 100644 index 00000000000..131a587b3a4 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Direct)/UnknownActivity.cs @@ -0,0 +1,7 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +namespace Sample.Models +{ + public partial class UnknownActivity { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyInternal)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyInternal)/UnknownActivity.cs new file mode 100644 index 00000000000..a96d4102dd1 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyInternal)/UnknownActivity.cs @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenType("UnknownPipelineActivity")] + internal partial class UnknownActivity { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyPublic)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyPublic)/UnknownActivity.cs new file mode 100644 index 00000000000..a767e9115d1 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyPublic)/UnknownActivity.cs @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenType("UnknownPipelineActivity")] + public partial class UnknownActivity { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Restored)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Restored)/UnknownActivity.cs new file mode 100644 index 00000000000..46e16ea6118 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Restored)/UnknownActivity.cs @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenType("UnknownActivity")] + public partial class CustomizedActivity { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameRestored(LastContract)/Models.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameRestored(LastContract)/Models.cs new file mode 100644 index 00000000000..eb224d454c5 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameRestored(LastContract)/Models.cs @@ -0,0 +1,43 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.ClientModel.Primitives; + +namespace Sample.Models +{ + [PersistableModelProxy(typeof(UnknownActivity))] + public class PipelineActivity { } + + [PersistableModelProxy(typeof(UnknownCopySource))] + public class CopyActivitySource : PipelineActivity { } + + internal class UnknownActivity : PipelineActivity { } + internal class UnknownCopySource : CopyActivitySource { } + + public class NoProxy { } + + [PersistableModelProxy(typeof(Other.UnknownActivity))] + public class WrongNamespace { } + + [PersistableModelProxy(typeof(UnknownActivity))] + [PersistableModelProxy(typeof(UnknownCopySource))] + public class DuplicateProxy { } + + [PersistableModelProxy(typeof(MissingType))] + public class UnresolvedProxy { } +} + +namespace Other +{ + internal class UnknownActivity { } +} + +namespace System.ClientModel.Primitives +{ + [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] + internal sealed class PersistableModelProxyAttribute : Attribute + { + public PersistableModelProxyAttribute(Type proxyType) { } + } +} From 1bd69ccfcc648395faddc8bc570fd97998954da1 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Tue, 17 Nov 2026 21:19:18 +0000 Subject: [PATCH 03/10] fix(http-client-csharp): guard restored names against synthesized types Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Providers/ClientOptionsProvider.cs | 8 ++- .../src/ScmTypeFactory.cs | 55 +++++++++++++++++++ .../DiscriminatorTests.cs | 18 ++++++ .../Models.cs | 27 +++++++++ .../src/Providers/TypeProvider.cs | 3 + .../src/TypeFactory.cs | 20 ++++++- 6 files changed, 127 insertions(+), 4 deletions(-) create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs index 27940cb31ca..2da320fd659 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs @@ -289,16 +289,18 @@ protected override TypeSignatureModifiers BuildDeclarationModifiers() private static TypeSignatureModifiers GetAccessibilityModifiers(TypeSignatureModifiers modifiers) => modifiers & (TypeSignatureModifiers.Public | TypeSignatureModifiers.Internal | TypeSignatureModifiers.Protected | TypeSignatureModifiers.Private); - protected override string BuildName() + protected override string BuildName() => GetGeneratedName(_inputClient, _clientProvider.Name); + + internal static string GetGeneratedName(InputClient inputClient, string clientName) { - if (UseSingletonInstance(_inputClient)) + if (UseSingletonInstance(inputClient)) { // Use namespace-based naming for singleton return $"{ScmCodeModelGenerator.Instance.TypeFactory.ServiceName}ClientOptions"; } // Use client-specific naming - return $"{_clientProvider.Name}Options"; + return $"{clientName}Options"; } protected override string BuildNamespace() => _clientProvider.Type.Namespace; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs index 1f9bece558a..446879daf6c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs @@ -28,6 +28,61 @@ public class ScmTypeFactory : TypeFactory protected override IEnumerable<(string Name, string Namespace, string OriginalName)> GetReservedModelTypeNames() => ScmCodeModelGenerator.Instance.InputLibrary.InputNamespace.Clients.Select(ClientProvider.GetNameForCollisionCheck); + protected override IEnumerable<(string Name, string Namespace)> GetReservedHelperTypeNames() + { + var generator = ScmCodeModelGenerator.Instance; + TypeProvider[] helpers = [ + generator.ModelSerializationExtensionsDefinition, + generator.SerializationFormatDefinition, + generator.TypeFormattersDefinition, + new ErrorResultDefinition(), + new ClientUriBuilderDefinition(), + new Utf8JsonBinaryContentDefinition(), + new BinaryContentHelperDefinition(), + generator.ClientPipelineExtensionsDefinition, + new CancellationTokenExtensionsDefinition(), + generator.PipelineRequestHeadersExtensionsDefinition, + new ModelReaderWriterContextDefinition() + ]; + foreach (var name in base.GetReservedHelperTypeNames().Concat(helpers.Select(GetHelperTypeName))) + { + yield return name; + } + + var clients = generator.InputLibrary.InputNamespace.Clients; + foreach (var client in clients) + { + var (name, ns, _) = ClientProvider.GetNameForCollisionCheck(client); + if (client.Parent is null) + { + yield return ResolveCustomName(ClientOptionsProvider.GetGeneratedName(client, name), ns); + } + var custom = generator.SourceInputModel.FindForTypeInCurrentCompilation(ns, name); + if (client.InitializedBy.HasFlag(InputClientInitializedBy.Individually) && + (custom is null || custom.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public))) + { + yield return ResolveCustomName($"{name}Settings", ns); + } + } + + if (generator.InputLibrary.HasMultipartFormDataOperation) + { + yield return GetHelperTypeName(new MultiPartFormDataBinaryContentDefinition()); + yield return GetHelperTypeName(new MultipartFormDataHelperDefinition()); + } + if (clients.SelectMany(client => client.Methods).Any(method => method.Parameters.Any(parameter => + parameter.Type is InputStreamingType { StreamKind: InputStreamingType.JsonLinesStreamKind }))) + { + yield return GetHelperTypeName(new JsonLinesBinaryContentDefinition()); + } + + (string Name, string Namespace) ResolveCustomName(string name, string ns) + { + var custom = generator.SourceInputModel.FindForTypeInCurrentCompilation(ns, name); + return (custom?.Name ?? name, custom?.Type.Namespace ?? ns); + } + } + public virtual CSharpType MatchConditionsType => typeof(PipelineMessageClassifier); public virtual IClientResponseApi ClientResponseApi => ClientResultProvider.Instance; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs index a220d60db92..9fe1945b519 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs @@ -218,6 +218,24 @@ await MockHelpers.LoadMockGeneratorAsync( Assert.AreEqual("UnknownPipelineActivity", model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel).Name); } + [TestCase("FactoryCollision")] + [TestCase("ContextCollision")] + [TestCase("OptionsCollision")] + [TestCase("SettingsCollision")] + [TestCase("HelperCollision")] + public async Task HistoricalUnknownNameDoesNotCollideWithInfrastructure(string modelName) + { + var input = InputFactory.Model(modelName, @namespace: "Sample", properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); + await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [input], + clients: () => [InputFactory.Client("ServiceClient", clientNamespace: "Sample", isExactName: true)], + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + var model = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(input)!; + + Assert.AreEqual($"Unknown{modelName}", model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel).Name); + } + [Test] public void BaseShouldHaveProxyAttribute() { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs new file mode 100644 index 00000000000..0d6d94bd14d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs @@ -0,0 +1,27 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.ClientModel.Primitives; + +namespace Sample +{ + [PersistableModelProxy(typeof(SampleModelFactory))] + public abstract class FactoryCollision { } + internal class SampleModelFactory : FactoryCollision { } + + [PersistableModelProxy(typeof(SampleContext))] + public abstract class ContextCollision { } + internal class SampleContext : ContextCollision { } + + [PersistableModelProxy(typeof(ServiceClientOptions))] + public abstract class OptionsCollision { } + internal class ServiceClientOptions : OptionsCollision { } + + [PersistableModelProxy(typeof(ServiceClientSettings))] + public abstract class SettingsCollision { } + internal class ServiceClientSettings : SettingsCollision { } + + [PersistableModelProxy(typeof(Argument))] + public abstract class HelperCollision { } + internal class Argument : HelperCollision { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs index ee66844da5c..205ad344571 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs @@ -778,6 +778,9 @@ protected virtual XmlDocProvider BuildXmlDocs() protected abstract string BuildRelativeFilePath(); protected abstract string BuildName(); + internal (string Name, string Namespace) GetTypeNameForCollisionCheck() + => (CustomCodeView?.Name ?? BuildName(), CustomCodeView?.Type.Namespace ?? BuildNamespace()); + /// /// Gets the original identifier for compatibility lookup before acronym normalization, /// or null when the name must be used exactly as specified. diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs index 38f8197feb9..6103d66cd90 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs @@ -43,6 +43,22 @@ internal IEnumerable CreatedModelProviders protected virtual IEnumerable<(string Name, string Namespace, string OriginalName)> GetReservedModelTypeNames() => []; + protected static (string Name, string Namespace) GetHelperTypeName(TypeProvider provider) + => provider.GetTypeNameForCollisionCheck(); + + protected virtual IEnumerable<(string Name, string Namespace)> GetReservedHelperTypeNames() + { + TypeProvider[] helpers = [ + new ChangeTrackingListDefinition(), + new ChangeTrackingDictionaryDefinition(), + new ArgumentDefinition(), + new OptionalDefinition(), + CodeModelGenerator.Instance.OutputLibrary.ModelFactory.Value, + .. CodeModelGenerator.Instance.CustomCodeAttributeProviders + ]; + return helpers.Select(GetHelperTypeName); + } + private IReadOnlyDictionary BuildModelNames() { var input = CodeModelGenerator.Instance.InputLibrary.InputNamespace; @@ -132,6 +148,7 @@ void AddModel(InputModelType model) var emittedTypes = candidates.ToDictionary( pair => pair.Key, pair => (pair.Value.FinalName == pair.Value.Name ? result[pair.Key] : pair.Value.FinalName, pair.Value.FinalNamespace)); + HashSet<(string Name, string Namespace)>? helperTypes = null; foreach (var (model, candidate) in candidates) { if (!model.IsUnknownDiscriminatorModel || model.BaseModel is not { } baseModel || @@ -166,7 +183,8 @@ void AddModel(InputModelType model) reason = "the proxy type is an accepted removal in the ApiCompat baseline"; } else if (emittedTypes.Any(pair => pair.Key != model && pair.Value == (finalName, finalNamespace)) || - reservedTypes.Contains((finalName, finalNamespace))) + reservedTypes.Contains((finalName, finalNamespace)) || + (helperTypes ??= GetReservedHelperTypeNames().ToHashSet()).Contains((finalName, finalNamespace))) { reason = "the name is already used by another generated type"; } From e026916c58b1ae22acac289d47adb9a6c8fe780c Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Tue, 17 Nov 2026 21:32:20 +0000 Subject: [PATCH 04/10] fix(http-client-csharp): close historical name collision guard gaps Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Providers/ClientProvider.cs | 58 ++++++++++++++----- .../Providers/CollectionResultDefinition.cs | 18 +++--- .../src/ScmTypeFactory.cs | 13 +++++ .../DiscriminatorTests.cs | 21 +++++++ .../Models.cs | 4 ++ .../src/TypeFactory.cs | 12 ++-- .../ModelProviders/ModelProviderTests.cs | 11 +++- .../UnknownActivity.cs | 10 ++++ 8 files changed, 116 insertions(+), 31 deletions(-) create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MovedCustomization)/UnknownActivity.cs diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs index 391b2bbe5ff..2204753c363 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs @@ -216,11 +216,31 @@ public ClientProvider(InputClient inputClient) } private void CleanOperationNames(InputClient inputClient) + { + foreach (var (serviceMethod, name) in GetOperationNames(inputClient, HasExistingName)) + { + serviceMethod.Update(name: name); + serviceMethod.Operation.Update(name: name); + } + } + + internal static IReadOnlyDictionary GetOperationNamesForCollisionCheck(InputClient inputClient) + { + var (name, ns, _) = GetNameForCollisionCheck(inputClient); + var source = ScmCodeModelGenerator.Instance.SourceInputModel; + var custom = source.FindForTypeInCurrentCompilation(ns, name); + var lastContract = source.FindForTypeInLastContract(ns, name); + return GetOperationNames(inputClient, operationName => HasExistingName(operationName, lastContract, custom)) + .GroupBy(pair => pair.ServiceMethod.Operation) + .ToDictionary(group => group.Key, group => group.Last().Name); + } + + private static IEnumerable<(InputServiceMethod ServiceMethod, string Name)> GetOperationNames(InputClient inputClient, Func hasExistingName) { var projectedNames = inputClient.Methods.Select(serviceMethod => ( ServiceMethod: serviceMethod, - OriginalName: GetOperationName(serviceMethod, normalizePublicName: false), - UpdatedName: GetOperationName(serviceMethod))).ToArray(); + OriginalName: GetOperationName(inputClient, serviceMethod, hasExistingName, normalizePublicName: false), + UpdatedName: GetOperationName(inputClient, serviceMethod, hasExistingName))).ToArray(); foreach (var projectedName in projectedNames) { @@ -233,15 +253,14 @@ private void CleanOperationNames(InputClient inputClient) updatedOperationName = projectedName.OriginalName; } - projectedName.ServiceMethod.Update(name: updatedOperationName); - projectedName.ServiceMethod.Operation.Update(name: updatedOperationName); + yield return (projectedName.ServiceMethod, updatedOperationName); } } private static bool OperationNamesCollide(string firstName, string secondName) => firstName == secondName || firstName == $"{secondName}Async" || $"{firstName}Async" == secondName; - private string GetOperationName(InputServiceMethod serviceMethod, bool normalizePublicName = true) + private static string GetOperationName(InputClient inputClient, InputServiceMethod serviceMethod, Func hasExistingName, bool normalizePublicName = true) { if (serviceMethod.IsExactName) { @@ -249,7 +268,7 @@ private string GetOperationName(InputServiceMethod serviceMethod, bool normalize } var originalName = (serviceMethod.Operation.OriginalName ?? serviceMethod.Operation.Name).ToIdentifierName(); - var operationName = TryNormalizeListOperationName(serviceMethod, originalName, out var listNormalizedName) + var operationName = TryNormalizeListOperationName(inputClient, serviceMethod, originalName, hasExistingName, out var listNormalizedName) ? listNormalizedName : originalName; @@ -258,10 +277,10 @@ private string GetOperationName(InputServiceMethod serviceMethod, bool normalize return operationName; } - return ProjectPublicName(serviceMethod, operationName); + return ProjectPublicName(serviceMethod, operationName, hasExistingName); } - private string ProjectPublicName(InputServiceMethod serviceMethod, string operationName) + private static string ProjectPublicName(InputServiceMethod serviceMethod, string operationName, Func hasExistingName) { if (serviceMethod.IsExactName) { @@ -275,13 +294,13 @@ private string ProjectPublicName(InputServiceMethod serviceMethod, string operat return operationName; } - if (HasExistingName(operationName)) + if (hasExistingName(operationName)) { return operationName; } // Previous generators may already have normalized Url to Uri without normalizing acronyms. - if (urlNormalizedName != operationName && HasExistingName(urlNormalizedName)) + if (urlNormalizedName != operationName && hasExistingName(urlNormalizedName)) { return urlNormalizedName; } @@ -289,9 +308,11 @@ private string ProjectPublicName(InputServiceMethod serviceMethod, string operat return normalizedName; } - private bool TryNormalizeListOperationName( + private static bool TryNormalizeListOperationName( + InputClient inputClient, InputServiceMethod serviceMethod, string originalName, + Func hasExistingName, out string normalizedName, bool checkPublicCollisions = true) { @@ -302,7 +323,7 @@ private bool TryNormalizeListOperationName( } // Keep distinct input operations distinct before public names and request builders are projected. - foreach (var other in _inputClient.Methods) + foreach (var other in inputClient.Methods) { if (ReferenceEquals(serviceMethod, other)) { @@ -332,8 +353,8 @@ private bool TryNormalizeListOperationName( } var otherName = other.IsExactName ? other.Operation.Name : NormalizeName(otherInputName); - var candidatePublicNames = GetProtocolMethodNames(serviceMethod, ProjectPublicName(serviceMethod, normalizedName)); - var otherPublicNames = GetProtocolMethodNames(other, ProjectPublicName(other, otherName)); + var candidatePublicNames = GetProtocolMethodNames(serviceMethod, ProjectPublicName(serviceMethod, normalizedName, hasExistingName)); + var otherPublicNames = GetProtocolMethodNames(other, ProjectPublicName(other, otherName, hasExistingName)); var candidateNamesBeforeProjection = GetProtocolMethodNames(serviceMethod, normalizedName); var otherNamesBeforeProjection = GetProtocolMethodNames(other, otherName); if (candidatePublicNames.Intersect(otherPublicNames, StringComparer.Ordinal).Any() && @@ -385,9 +406,12 @@ private static string NormalizeName(string operationName) } private bool HasExistingName(string name) + => HasExistingName(name, BackCompatProvider.LastContractView ?? LastContractView, BackCompatProvider.CustomCodeView ?? CustomCodeView); + + private static bool HasExistingName(string name, TypeProvider? lastContract, TypeProvider? custom) { var asyncName = $"{name}Async"; - var lastContractMethods = BackCompatProvider.LastContractView?.Methods ?? LastContractView?.Methods; + var lastContractMethods = lastContract?.Methods; foreach (var method in lastContractMethods ?? []) { if (MethodSignatureHelper.IsPublicApi(method.Signature.Modifiers) && @@ -397,7 +421,7 @@ private bool HasExistingName(string name) } } - var customMethods = BackCompatProvider.CustomCodeView?.Methods ?? CustomCodeView?.Methods; + var customMethods = custom?.Methods; foreach (var method in customMethods ?? []) { if (method.Signature.Name == name || method.Signature.Name == asyncName) @@ -421,8 +445,10 @@ internal string GetRestOperationName(InputServiceMethod serviceMethod) var originalName = (serviceMethod.Operation.OriginalName ?? serviceMethod.Operation.Name).ToIdentifierName(); return TryNormalizeListOperationName( + _inputClient, serviceMethod, originalName, + HasExistingName, out var normalizedName, checkPublicCollisions: false) ? normalizedName.ToIdentifierName() diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs index 5b636e56dc5..71aee0136b2 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs @@ -189,24 +189,28 @@ protected override SuppressionStatement[] BuildDisabledFileWarnings() => ExperimentalApiHelpers.GetReferenceSuppressions(ItemModelType); protected override string BuildName() + => GetGeneratedName(Client.InputClient, Client.Type.Name, Operation, IsAsync, ItemModelType is not null); + + internal static string GetGeneratedName(InputClient client, string clientName, InputOperation operation, bool isAsync, bool isGeneric, + IReadOnlyDictionary? operationNames = null) { - var operationName = Operation.Name.ToIdentifierName(); + var operationName = (operationNames?.GetValueOrDefault(operation) ?? operation.Name).ToIdentifierName(); // Check if there is another paging operation in the same client whose name would produce a collision. // If so, use the OriginalName to differentiate. - if (HasPagingOperationNameCollision(operationName)) + if (HasPagingOperationNameCollision(client, operationName, operationNames)) { - operationName = (Operation.OriginalName ?? Operation.Name).ToIdentifierName(); + operationName = (operation.OriginalName ?? operation.Name).ToIdentifierName(); } - return $"{Client.Type.Name}{operationName}{(IsAsync ? "Async" : "")}CollectionResult{(ItemModelType == null ? "" : "OfT")}"; + return $"{clientName}{operationName}{(isAsync ? "Async" : "")}CollectionResult{(isGeneric ? "OfT" : "")}"; } - private bool HasPagingOperationNameCollision(string operationName) + private static bool HasPagingOperationNameCollision(InputClient client, string operationName, IReadOnlyDictionary? operationNames) { - var pagingMethods = Client.InputClient.Methods.OfType(); + var pagingMethods = client.Methods.OfType(); int count = 0; foreach (var method in pagingMethods) { - if (method.Operation.Name.ToIdentifierName() == operationName) + if ((operationNames?.GetValueOrDefault(method.Operation) ?? method.Operation.Name).ToIdentifierName() == operationName) { count++; if (count > 1) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs index 446879daf6c..4b01a8ce1b1 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs @@ -63,6 +63,19 @@ public class ScmTypeFactory : TypeFactory { yield return ResolveCustomName($"{name}Settings", ns); } + var pagingMethods = client.Methods.OfType().ToArray(); + var operationNames = pagingMethods.Length > 0 ? ClientProvider.GetOperationNamesForCollisionCheck(client) : null; + foreach (var method in pagingMethods) + { + foreach (var isAsync in new[] { false, true }) + { + yield return ResolveCustomName(CollectionResultDefinition.GetGeneratedName(client, name, method.Operation, isAsync, false, operationNames), ns); + if (method.Operation.GenerateConvenienceMethod) + { + yield return ResolveCustomName(CollectionResultDefinition.GetGeneratedName(client, name, method.Operation, isAsync, true, operationNames), ns); + } + } + } } if (generator.InputLibrary.HasMultipartFormDataOperation) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs index 9fe1945b519..93fa33327d0 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs @@ -236,6 +236,27 @@ await MockHelpers.LoadMockGeneratorAsync( Assert.AreEqual($"Unknown{modelName}", model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel).Name); } + [Test] + public async Task HistoricalUnknownNameDoesNotCollideWithPagingCollection() + { + var input = InputFactory.Model("PagingCollision", @namespace: "Sample", properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); + var page = InputFactory.Model("Page", properties: + [InputFactory.Property("items", InputFactory.Array(input))]); + var operation = InputFactory.Operation("List", responses: [InputFactory.OperationResponse(bodytype: page)]); + var method = InputFactory.PagingServiceMethod("List", operation, pagingMetadata: InputFactory.PagingMetadata(["items"], null, null)); + await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [input, page], + clients: () => [InputFactory.Client("ServiceClient", clientNamespace: "Sample", methods: [method], isExactName: true)], + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( + method: nameof(HistoricalUnknownNameDoesNotCollideWithInfrastructure))); + var model = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(input)!; + + Assert.AreEqual("UnknownPagingCollision", model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel).Name); + CollectionAssert.Contains(ScmCodeModelGenerator.Instance.OutputLibrary.TypeProviders.OfType() + .Select(type => type.Name).ToArray(), "ServiceClientGetAllAsyncCollectionResultOfT"); + } + [Test] public void BaseShouldHaveProxyAttribute() { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs index 0d6d94bd14d..25e5aa9e6d5 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs @@ -24,4 +24,8 @@ internal class ServiceClientSettings : SettingsCollision { } [PersistableModelProxy(typeof(Argument))] public abstract class HelperCollision { } internal class Argument : HelperCollision { } + + [PersistableModelProxy(typeof(ServiceClientGetAllAsyncCollectionResultOfT))] + public abstract class PagingCollision { } + internal class ServiceClientGetAllAsyncCollectionResultOfT : PagingCollision { } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs index 6103d66cd90..5193ae44fd6 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs @@ -148,7 +148,8 @@ void AddModel(InputModelType model) var emittedTypes = candidates.ToDictionary( pair => pair.Key, pair => (pair.Value.FinalName == pair.Value.Name ? result[pair.Key] : pair.Value.FinalName, pair.Value.FinalNamespace)); - HashSet<(string Name, string Namespace)>? helperTypes = null; + var reservedOutputNames = reservedTypes.Select(type => type.Name).ToHashSet(StringComparer.OrdinalIgnoreCase); + HashSet? helperNames = null; foreach (var (model, candidate) in candidates) { if (!model.IsUnknownDiscriminatorModel || model.BaseModel is not { } baseModel || @@ -170,7 +171,7 @@ void AddModel(InputModelType model) var finalName = custom?.Name ?? proxyType.Name; var finalNamespace = custom?.Type.Namespace ?? candidate.Namespace; string? reason = null; - if (proxyNamespace != candidate.FinalNamespace) + if (proxyNamespace != (legacyCustom?.Type.Namespace ?? finalNamespace)) { reason = "the proxy type is in a different namespace"; } @@ -182,9 +183,10 @@ void AddModel(InputModelType model) { reason = "the proxy type is an accepted removal in the ApiCompat baseline"; } - else if (emittedTypes.Any(pair => pair.Key != model && pair.Value == (finalName, finalNamespace)) || - reservedTypes.Contains((finalName, finalNamespace)) || - (helperTypes ??= GetReservedHelperTypeNames().ToHashSet()).Contains((finalName, finalNamespace))) + else if (emittedTypes.Any(pair => pair.Key != model && + string.Equals(pair.Value.Item1, finalName, StringComparison.OrdinalIgnoreCase)) || + reservedOutputNames.Contains(finalName) || + (helperNames ??= GetReservedHelperTypeNames().Select(type => type.Name).ToHashSet(StringComparer.OrdinalIgnoreCase)).Contains(finalName)) { reason = "the name is already used by another generated type"; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs index 466cea822e8..a28989bb780 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs @@ -429,17 +429,22 @@ await MockHelpers.LoadMockGeneratorAsync( [TestCase("Custom", false)] [TestCase("MappedModel", false)] [TestCase("UnrelatedMapping", false)] + [TestCase("MovedCustomization", false)] + [TestCase("OtherNamespace", false)] + [TestCase("CaseOnly", false)] public async Task UnknownDiscriminatorNameCollisionSkipped(string collision, bool reverseOrder) { var input = InputFactory.Model("PipelineActivity", properties: [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); - var other = InputFactory.Model(collision == "MappedModel" ? "OtherModel" : "UnknownActivity"); - InputModelType[] models = collision is "Model" or "MappedModel" + var other = InputFactory.Model( + collision == "MappedModel" ? "OtherModel" : collision == "CaseOnly" ? "Unknownactivity" : "UnknownActivity", + @namespace: collision == "OtherNamespace" ? "Other.Models" : "Sample.Models"); + InputModelType[] models = collision is "Model" or "MappedModel" or "OtherNamespace" or "CaseOnly" ? (reverseOrder ? [other, input] : [input, other]) : [input]; await MockHelpers.LoadMockGeneratorAsync( inputModelTypes: models, inputEnumTypes: collision == "Enum" ? [InputFactory.StringEnum("UnknownActivity", [("One", "one")])] : [], - compilation: collision is "Custom" or "MappedModel" or "UnrelatedMapping" + compilation: collision is "Custom" or "MappedModel" or "UnrelatedMapping" or "MovedCustomization" ? async () => await Helpers.GetCompilationFromDirectoryAsync(collision) : null, lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( "LastContract", method: nameof(UnknownDiscriminatorNameRestored))); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MovedCustomization)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MovedCustomization)/UnknownActivity.cs new file mode 100644 index 00000000000..f5ab1916df6 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MovedCustomization)/UnknownActivity.cs @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Other.Models +{ + [CodeGenType("UnknownActivity")] + public partial class CustomizedActivity { } +} From ef8efab8c57e3960fad80c540b437a32739adfe5 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Tue, 17 Nov 2026 21:43:36 +0000 Subject: [PATCH 05/10] fix(http-client-csharp): reserve paging names across compatibility views Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Providers/ClientProvider.cs | 73 ++++++++----------- .../Providers/CollectionResultDefinition.cs | 21 +++--- .../src/ScmTypeFactory.cs | 15 ++-- .../DiscriminatorTests.cs | 35 ++++++--- .../Models.cs | 14 ++++ 5 files changed, 88 insertions(+), 70 deletions(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs index 2204753c363..c9fa2784cee 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs @@ -216,31 +216,11 @@ public ClientProvider(InputClient inputClient) } private void CleanOperationNames(InputClient inputClient) - { - foreach (var (serviceMethod, name) in GetOperationNames(inputClient, HasExistingName)) - { - serviceMethod.Update(name: name); - serviceMethod.Operation.Update(name: name); - } - } - - internal static IReadOnlyDictionary GetOperationNamesForCollisionCheck(InputClient inputClient) - { - var (name, ns, _) = GetNameForCollisionCheck(inputClient); - var source = ScmCodeModelGenerator.Instance.SourceInputModel; - var custom = source.FindForTypeInCurrentCompilation(ns, name); - var lastContract = source.FindForTypeInLastContract(ns, name); - return GetOperationNames(inputClient, operationName => HasExistingName(operationName, lastContract, custom)) - .GroupBy(pair => pair.ServiceMethod.Operation) - .ToDictionary(group => group.Key, group => group.Last().Name); - } - - private static IEnumerable<(InputServiceMethod ServiceMethod, string Name)> GetOperationNames(InputClient inputClient, Func hasExistingName) { var projectedNames = inputClient.Methods.Select(serviceMethod => ( ServiceMethod: serviceMethod, - OriginalName: GetOperationName(inputClient, serviceMethod, hasExistingName, normalizePublicName: false), - UpdatedName: GetOperationName(inputClient, serviceMethod, hasExistingName))).ToArray(); + OriginalName: GetOperationName(serviceMethod, normalizePublicName: false), + UpdatedName: GetOperationName(serviceMethod))).ToArray(); foreach (var projectedName in projectedNames) { @@ -253,14 +233,15 @@ internal static IReadOnlyDictionary GetOperationNamesFor updatedOperationName = projectedName.OriginalName; } - yield return (projectedName.ServiceMethod, updatedOperationName); + projectedName.ServiceMethod.Update(name: updatedOperationName); + projectedName.ServiceMethod.Operation.Update(name: updatedOperationName); } } private static bool OperationNamesCollide(string firstName, string secondName) => firstName == secondName || firstName == $"{secondName}Async" || $"{firstName}Async" == secondName; - private static string GetOperationName(InputClient inputClient, InputServiceMethod serviceMethod, Func hasExistingName, bool normalizePublicName = true) + private string GetOperationName(InputServiceMethod serviceMethod, bool normalizePublicName = true) { if (serviceMethod.IsExactName) { @@ -268,7 +249,7 @@ private static string GetOperationName(InputClient inputClient, InputServiceMeth } var originalName = (serviceMethod.Operation.OriginalName ?? serviceMethod.Operation.Name).ToIdentifierName(); - var operationName = TryNormalizeListOperationName(inputClient, serviceMethod, originalName, hasExistingName, out var listNormalizedName) + var operationName = TryNormalizeListOperationName(serviceMethod, originalName, out var listNormalizedName) ? listNormalizedName : originalName; @@ -277,10 +258,10 @@ private static string GetOperationName(InputClient inputClient, InputServiceMeth return operationName; } - return ProjectPublicName(serviceMethod, operationName, hasExistingName); + return ProjectPublicName(serviceMethod, operationName); } - private static string ProjectPublicName(InputServiceMethod serviceMethod, string operationName, Func hasExistingName) + private string ProjectPublicName(InputServiceMethod serviceMethod, string operationName) { if (serviceMethod.IsExactName) { @@ -294,13 +275,13 @@ private static string ProjectPublicName(InputServiceMethod serviceMethod, string return operationName; } - if (hasExistingName(operationName)) + if (HasExistingName(operationName)) { return operationName; } // Previous generators may already have normalized Url to Uri without normalizing acronyms. - if (urlNormalizedName != operationName && hasExistingName(urlNormalizedName)) + if (urlNormalizedName != operationName && HasExistingName(urlNormalizedName)) { return urlNormalizedName; } @@ -308,11 +289,9 @@ private static string ProjectPublicName(InputServiceMethod serviceMethod, string return normalizedName; } - private static bool TryNormalizeListOperationName( - InputClient inputClient, + private bool TryNormalizeListOperationName( InputServiceMethod serviceMethod, string originalName, - Func hasExistingName, out string normalizedName, bool checkPublicCollisions = true) { @@ -323,7 +302,7 @@ private static bool TryNormalizeListOperationName( } // Keep distinct input operations distinct before public names and request builders are projected. - foreach (var other in inputClient.Methods) + foreach (var other in _inputClient.Methods) { if (ReferenceEquals(serviceMethod, other)) { @@ -353,8 +332,8 @@ private static bool TryNormalizeListOperationName( } var otherName = other.IsExactName ? other.Operation.Name : NormalizeName(otherInputName); - var candidatePublicNames = GetProtocolMethodNames(serviceMethod, ProjectPublicName(serviceMethod, normalizedName, hasExistingName)); - var otherPublicNames = GetProtocolMethodNames(other, ProjectPublicName(other, otherName, hasExistingName)); + var candidatePublicNames = GetProtocolMethodNames(serviceMethod, ProjectPublicName(serviceMethod, normalizedName)); + var otherPublicNames = GetProtocolMethodNames(other, ProjectPublicName(other, otherName)); var candidateNamesBeforeProjection = GetProtocolMethodNames(serviceMethod, normalizedName); var otherNamesBeforeProjection = GetProtocolMethodNames(other, otherName); if (candidatePublicNames.Intersect(otherPublicNames, StringComparer.Ordinal).Any() && @@ -406,12 +385,9 @@ private static string NormalizeName(string operationName) } private bool HasExistingName(string name) - => HasExistingName(name, BackCompatProvider.LastContractView ?? LastContractView, BackCompatProvider.CustomCodeView ?? CustomCodeView); - - private static bool HasExistingName(string name, TypeProvider? lastContract, TypeProvider? custom) { var asyncName = $"{name}Async"; - var lastContractMethods = lastContract?.Methods; + var lastContractMethods = BackCompatProvider.LastContractView?.Methods ?? LastContractView?.Methods; foreach (var method in lastContractMethods ?? []) { if (MethodSignatureHelper.IsPublicApi(method.Signature.Modifiers) && @@ -421,7 +397,7 @@ private static bool HasExistingName(string name, TypeProvider? lastContract, Typ } } - var customMethods = custom?.Methods; + var customMethods = BackCompatProvider.CustomCodeView?.Methods ?? CustomCodeView?.Methods; foreach (var method in customMethods ?? []) { if (method.Signature.Name == name || method.Signature.Name == asyncName) @@ -445,10 +421,8 @@ internal string GetRestOperationName(InputServiceMethod serviceMethod) var originalName = (serviceMethod.Operation.OriginalName ?? serviceMethod.Operation.Name).ToIdentifierName(); return TryNormalizeListOperationName( - _inputClient, serviceMethod, originalName, - HasExistingName, out var normalizedName, checkPublicCollisions: false) ? normalizedName.ToIdentifierName() @@ -489,6 +463,21 @@ internal static (string Name, string Namespace, string OriginalName) GetNameForC return (customType?.Name ?? name, customType?.Type.Namespace ?? typeNamespace, name); } + internal static IEnumerable GetOperationNameCandidatesForCollisionCheck(InputServiceMethod method) + { + var originalName = (method.IsExactName ? method.Operation.Name : method.Operation.OriginalName ?? method.Operation.Name).ToIdentifierName(); + if (method.IsExactName) + { + return [originalName]; + } + + // Cross-client backcompat views can change which spelling is preserved after model names + // are fixed, so reserve each possible projection without constructing a client. + return new[] { originalName, NormalizeName(originalName) } + .SelectMany(name => new[] { name, name.NormalizeCSharpUrlSuffix(), name.NormalizeCSharpUrlSuffix().NormalizeCSharpAcronyms() }) + .Distinct(StringComparer.Ordinal); + } + /// /// Checks if two namespaces share the same last segment /// diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs index 71aee0136b2..bab01e19e61 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs @@ -189,28 +189,27 @@ protected override SuppressionStatement[] BuildDisabledFileWarnings() => ExperimentalApiHelpers.GetReferenceSuppressions(ItemModelType); protected override string BuildName() - => GetGeneratedName(Client.InputClient, Client.Type.Name, Operation, IsAsync, ItemModelType is not null); - - internal static string GetGeneratedName(InputClient client, string clientName, InputOperation operation, bool isAsync, bool isGeneric, - IReadOnlyDictionary? operationNames = null) { - var operationName = (operationNames?.GetValueOrDefault(operation) ?? operation.Name).ToIdentifierName(); + var operationName = Operation.Name.ToIdentifierName(); // Check if there is another paging operation in the same client whose name would produce a collision. // If so, use the OriginalName to differentiate. - if (HasPagingOperationNameCollision(client, operationName, operationNames)) + if (HasPagingOperationNameCollision(operationName)) { - operationName = (operation.OriginalName ?? operation.Name).ToIdentifierName(); + operationName = (Operation.OriginalName ?? Operation.Name).ToIdentifierName(); } - return $"{clientName}{operationName}{(isAsync ? "Async" : "")}CollectionResult{(isGeneric ? "OfT" : "")}"; + return GetGeneratedName(Client.Type.Name, operationName, IsAsync, ItemModelType is not null); } - private static bool HasPagingOperationNameCollision(InputClient client, string operationName, IReadOnlyDictionary? operationNames) + internal static string GetGeneratedName(string clientName, string operationName, bool isAsync, bool isGeneric) + => $"{clientName}{operationName}{(isAsync ? "Async" : "")}CollectionResult{(isGeneric ? "OfT" : "")}"; + + private bool HasPagingOperationNameCollision(string operationName) { - var pagingMethods = client.Methods.OfType(); + var pagingMethods = Client.InputClient.Methods.OfType(); int count = 0; foreach (var method in pagingMethods) { - if ((operationNames?.GetValueOrDefault(method.Operation) ?? method.Operation.Name).ToIdentifierName() == operationName) + if (method.Operation.Name.ToIdentifierName() == operationName) { count++; if (count > 1) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs index 4b01a8ce1b1..971be1d960d 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs @@ -63,16 +63,17 @@ public class ScmTypeFactory : TypeFactory { yield return ResolveCustomName($"{name}Settings", ns); } - var pagingMethods = client.Methods.OfType().ToArray(); - var operationNames = pagingMethods.Length > 0 ? ClientProvider.GetOperationNamesForCollisionCheck(client) : null; - foreach (var method in pagingMethods) + foreach (var method in client.Methods.OfType()) { - foreach (var isAsync in new[] { false, true }) + foreach (var operationName in ClientProvider.GetOperationNameCandidatesForCollisionCheck(method)) { - yield return ResolveCustomName(CollectionResultDefinition.GetGeneratedName(client, name, method.Operation, isAsync, false, operationNames), ns); - if (method.Operation.GenerateConvenienceMethod) + foreach (var isAsync in new[] { false, true }) { - yield return ResolveCustomName(CollectionResultDefinition.GetGeneratedName(client, name, method.Operation, isAsync, true, operationNames), ns); + yield return ResolveCustomName(CollectionResultDefinition.GetGeneratedName(name, operationName, isAsync, false), ns); + if (method.Operation.GenerateConvenienceMethod) + { + yield return ResolveCustomName(CollectionResultDefinition.GetGeneratedName(name, operationName, isAsync, true), ns); + } } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs index 93fa33327d0..e4a5e4db926 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs @@ -236,25 +236,40 @@ await MockHelpers.LoadMockGeneratorAsync( Assert.AreEqual($"Unknown{modelName}", model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel).Name); } - [Test] - public async Task HistoricalUnknownNameDoesNotCollideWithPagingCollection() + [TestCase("PagingCollision", "List", "ServiceClientGetAllAsyncCollectionResultOfT")] + [TestCase("PagingBackCompatCollision", "GetUrl", "ServiceClientGetUriAsyncCollectionResultOfT")] + public async Task HistoricalUnknownNameDoesNotCollideWithPagingCollection(string modelName, string operationName, string helperName) { - var input = InputFactory.Model("PagingCollision", @namespace: "Sample", properties: + var input = InputFactory.Model(modelName, @namespace: "Sample", properties: [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); var page = InputFactory.Model("Page", properties: [InputFactory.Property("items", InputFactory.Array(input))]); - var operation = InputFactory.Operation("List", responses: [InputFactory.OperationResponse(bodytype: page)]); - var method = InputFactory.PagingServiceMethod("List", operation, pagingMetadata: InputFactory.PagingMetadata(["items"], null, null)); + var operation = InputFactory.Operation(operationName, responses: [InputFactory.OperationResponse(bodytype: page)]); + var method = InputFactory.PagingServiceMethod(operationName, operation, pagingMetadata: InputFactory.PagingMetadata(["items"], null, null)); + var clientInput = InputFactory.Client("ServiceClient", clientNamespace: "Sample", methods: [method], isExactName: true); + var otherClientInput = InputFactory.Client("OtherClient", clientNamespace: "Sample", isExactName: true); await MockHelpers.LoadMockGeneratorAsync( inputModels: () => [input, page], - clients: () => [InputFactory.Client("ServiceClient", clientNamespace: "Sample", methods: [method], isExactName: true)], + clients: () => [clientInput, otherClientInput], lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( method: nameof(HistoricalUnknownNameDoesNotCollideWithInfrastructure))); - var model = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(input)!; + var factory = ScmCodeModelGenerator.Instance.TypeFactory; + var model = factory.CreateModel(input)!; - Assert.AreEqual("UnknownPagingCollision", model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel).Name); - CollectionAssert.Contains(ScmCodeModelGenerator.Instance.OutputLibrary.TypeProviders.OfType() - .Select(type => type.Name).ToArray(), "ServiceClientGetAllAsyncCollectionResultOfT"); + Assert.AreEqual($"Unknown{modelName}", model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel).Name); + if (operationName == "GetUrl") + { + var client = factory.CreateClient(clientInput)!; + client.GetMethodCollectionByOperation(operation, factory.CreateClient(otherClientInput)); + Assert.AreEqual("GetUri", operation.Name); + CollectionAssert.Contains(client.Methods.OfType() + .Select(method => method.CollectionDefinition?.Name).ToArray(), helperName); + } + else + { + CollectionAssert.Contains(ScmCodeModelGenerator.Instance.OutputLibrary.TypeProviders.OfType() + .Select(type => type.Name).ToArray(), helperName); + } } [Test] diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs index 25e5aa9e6d5..1eaf29d775f 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs @@ -28,4 +28,18 @@ internal class Argument : HelperCollision { } [PersistableModelProxy(typeof(ServiceClientGetAllAsyncCollectionResultOfT))] public abstract class PagingCollision { } internal class ServiceClientGetAllAsyncCollectionResultOfT : PagingCollision { } + + [PersistableModelProxy(typeof(ServiceClientGetUriAsyncCollectionResultOfT))] + public abstract class PagingBackCompatCollision { } + internal class ServiceClientGetUriAsyncCollectionResultOfT : PagingBackCompatCollision { } + + public class ServiceClient + { + public void GetUrl() { } + } + + public class OtherClient + { + public void OtherMethod() { } + } } From c0e1570af71b1519fe88ffc39ab8bf50c9ca990d Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Tue, 17 Nov 2026 22:32:56 +0000 Subject: [PATCH 06/10] fix(http-client-csharp): resolve historical unknown names independently of input order Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/TypeFactory.cs | 63 +++++++--- .../ModelProviders/ModelProviderTests.cs | 108 ++++++++++++++++++ .../CustomizedPipelineActivity.cs | 10 ++ .../UnknownActivity.cs | 7 ++ .../Models.cs | 72 ++++++++++++ 5 files changed, 246 insertions(+), 14 deletions(-) create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionUsesLegacyCustomization/CustomizedPipelineActivity.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesRejectedTogether(LegacyCustomization)/UnknownActivity.cs create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesResolvedTogether(LastContract)/Models.cs diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs index 5193ae44fd6..ba9c070de29 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Net; using System.Text.Json; +using Microsoft.CodeAnalysis; using Microsoft.TypeSpec.Generator.EmitterRpc; using Microsoft.TypeSpec.Generator.Input; using Microsoft.TypeSpec.Generator.Input.Extensions; @@ -145,9 +146,12 @@ void AddModel(InputModelType model) // Resolve historical unknown names only after all base names are fixed. These lookups // must not construct generated types or depend on an unknown model's name. - var emittedTypes = candidates.ToDictionary( + var defaultTypes = candidates.ToDictionary( pair => pair.Key, - pair => (pair.Value.FinalName == pair.Value.Name ? result[pair.Key] : pair.Value.FinalName, pair.Value.FinalNamespace)); + pair => (Name: pair.Value.FinalName == pair.Value.Name ? result[pair.Key] : pair.Value.FinalName, Namespace: pair.Value.FinalNamespace)); + var emittedTypes = new Dictionary(defaultTypes); + var restorations = new Dictionary(); + var proxyTypes = new Dictionary(); var reservedOutputNames = reservedTypes.Select(type => type.Name).ToHashSet(StringComparer.OrdinalIgnoreCase); HashSet? helperNames = null; foreach (var (model, candidate) in candidates) @@ -158,8 +162,12 @@ void AddModel(InputModelType model) continue; } - var (baseName, baseNamespace) = emittedTypes[baseModel]; - var proxyType = providers[baseModel].GetLastContractProxyType(baseName, baseNamespace); + var (baseName, baseNamespace) = defaultTypes[baseModel]; + if (!proxyTypes.TryGetValue(baseModel, out var proxyType)) + { + proxyType = providers[baseModel].GetLastContractProxyType(baseName, baseNamespace); + proxyTypes.Add(baseModel, proxyType); + } if (proxyType is null) { continue; @@ -168,10 +176,10 @@ void AddModel(InputModelType model) var proxyNamespace = proxyType.ContainingNamespace.ToDisplayString(); var custom = source.FindForTypeInCurrentCompilation(candidate.Namespace, proxyType.Name); var legacyCustom = source.FindForTypeInCurrentCompilation(candidate.Namespace, result[model]); - var finalName = custom?.Name ?? proxyType.Name; - var finalNamespace = custom?.Type.Namespace ?? candidate.Namespace; + var finalName = legacyCustom?.Name ?? custom?.Name ?? proxyType.Name; + var finalNamespace = legacyCustom?.Type.Namespace ?? custom?.Type.Namespace ?? candidate.Namespace; string? reason = null; - if (proxyNamespace != (legacyCustom?.Type.Namespace ?? finalNamespace)) + if (proxyNamespace != finalNamespace) { reason = "the proxy type is in a different namespace"; } @@ -183,9 +191,7 @@ void AddModel(InputModelType model) { reason = "the proxy type is an accepted removal in the ApiCompat baseline"; } - else if (emittedTypes.Any(pair => pair.Key != model && - string.Equals(pair.Value.Item1, finalName, StringComparison.OrdinalIgnoreCase)) || - reservedOutputNames.Contains(finalName) || + else if (reservedOutputNames.Contains(finalName) || (helperNames ??= GetReservedHelperTypeNames().Select(type => type.Name).ToHashSet(StringComparer.OrdinalIgnoreCase)).Contains(finalName)) { reason = "the name is already used by another generated type"; @@ -204,14 +210,43 @@ void AddModel(InputModelType model) continue; } - if (result[model] != proxyType.Name) + restorations.Add(model, (proxyType.Name, proxyType.ToDisplayString(), baseName, baseNamespace)); + emittedTypes[model] = (finalName, finalNamespace); + } + + // Check proposed final names together so chains and swaps can vacate default names. + // Reject every competing proposal at once, then recheck the defaults they retain. + while (true) + { + var collisions = emittedTypes.GroupBy(pair => pair.Value.Name, StringComparer.OrdinalIgnoreCase) + .Where(group => group.Count() > 1) + .SelectMany(group => group.Select(pair => pair.Key)) + .Where(restorations.ContainsKey).ToArray(); + if (collisions.Length == 0) + { + break; + } + + foreach (var model in collisions) + { + var restoration = restorations[model]; + restorations.Remove(model); + emittedTypes[model] = defaultTypes[model]; + CodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name '{restoration.DisplayName}' for '{restoration.BaseNamespace}.{restoration.BaseName}'; the name is already used by another generated type.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + } + } + + foreach (var (model, restoration) in restorations) + { + if (result[model] != restoration.Name) { CodeModelGenerator.Instance.Emitter.Info( - $"Changed unknown discriminator model name from '{result[model]}' to '{proxyType.Name}' for '{baseNamespace}.{baseName}' to match the last contract.", + $"Changed unknown discriminator model name from '{result[model]}' to '{restoration.Name}' for '{restoration.BaseNamespace}.{restoration.BaseName}' to match the last contract.", BackCompatibilityChangeCategory.UnknownDiscriminatorModelNamePreserved); _restoredUnknownModelOriginalNames[model] = result[model]; - result[model] = proxyType.Name; - emittedTypes[model] = (legacyCustom?.Name ?? finalName, legacyCustom?.Type.Namespace ?? finalNamespace); + result[model] = restoration.Name; } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs index a28989bb780..68b747d9e75 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs @@ -423,6 +423,114 @@ await MockHelpers.LoadMockGeneratorAsync( Assert.AreEqual("PipelineActivity", rootUnknown.BaseModelProvider!.Name); } + [TestCase("Pair", false)] + [TestCase("Pair", true)] + [TestCase("Chain", false)] + [TestCase("Chain", true)] + [TestCase("Swap", false)] + [TestCase("Swap", true)] + [TestCase("Cycle", false)] + [TestCase("Cycle", true)] + public async Task UnknownDiscriminatorNamesResolvedTogether(string scenario, bool reverseOrder) + { + string[] names = scenario switch + { + "Pair" => ["PipelineActivity", "Activity"], + "Chain" => ["Tail", "PipelineActivity", "Activity"], + "Swap" => ["SwapFirst", "SwapSecond"], + _ => ["CycleFirst", "CycleSecond", "CycleThird"] + }; + string[] expected = scenario switch + { + "Pair" => ["UnknownActivity", "OldUnknownActivity"], + "Chain" => ["UnknownPipelineActivity", "UnknownActivity", "OldUnknownActivity"], + "Swap" => ["UnknownSwapSecond", "UnknownSwapFirst"], + _ => ["UnknownCycleSecond", "UnknownCycleThird", "UnknownCycleFirst"] + }; + var models = names.Select(name => InputFactory.Model(name, properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)])).ToArray(); + await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: reverseOrder ? models.Reverse().ToArray() : models, + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync("LastContract")); + var factory = CodeModelGenerator.Instance.TypeFactory; + var unknowns = models.Select(model => factory.CreateModel( + model.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!).ToArray(); + + Assert.AreEqual(expected, unknowns.Select(model => model.Name)); + Assert.AreEqual(expected.Select(name => $"{name}.cs"), unknowns.Select(model => Path.GetFileName(model.RelativeFilePath))); + foreach (var unknown in unknowns) + { + Assert.AreSame(unknown, factory.CSharpTypeMap[unknown.Type]); + Assert.AreSame(unknown, factory.TypeProvidersByName[unknown.Name]); + } + } + + [TestCase("Model", false)] + [TestCase("Model", true)] + [TestCase("Enum", false)] + [TestCase("Enum", true)] + [TestCase("AcceptedRemoval", false)] + [TestCase("AcceptedRemoval", true)] + [TestCase("CompetingTargets", false)] + [TestCase("CompetingTargets", true)] + [TestCase("CaseOnlyOtherNamespace", false)] + [TestCase("CaseOnlyOtherNamespace", true)] + [TestCase("LegacyCustomization", false)] + [TestCase("LegacyCustomization", true)] + public async Task UnknownDiscriminatorNamesRejectedTogether(string collision, bool reverseOrder) + { + string[] names = collision is "CompetingTargets" or "CaseOnlyOtherNamespace" + ? ["CompetingTail", "CompetingFirst", collision == "CompetingTargets" ? "CompetingSecond" : "CaseCompeting"] + : ["Tail", "PipelineActivity", "Activity"]; + var models = names.Select(name => InputFactory.Model(name, + @namespace: name == "CaseCompeting" ? "Other.Models" : "Sample.Models", + properties: [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)])).ToArray(); + InputModelType[] inputs = collision == "Model" ? [.. models, InputFactory.Model("OldUnknownActivity")] : models; + await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: reverseOrder ? inputs.Reverse().ToArray() : inputs, + inputEnumTypes: collision == "Enum" ? [InputFactory.StringEnum("OldUnknownActivity", [("One", "one")])] : [], + compilation: collision == "LegacyCustomization" + ? async () => await Helpers.GetCompilationFromDirectoryAsync(collision) : null, + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( + "LastContract", method: nameof(UnknownDiscriminatorNamesResolvedTogether)), + apiCompatBaseline: collision == "AcceptedRemoval" + ? ApiCompatBaseline.Parse(["TypesMustExist : Type 'Sample.Models.OldUnknownActivity' does not exist in the implementation."]) + : null); + var factory = CodeModelGenerator.Instance.TypeFactory; + var unknowns = models.Select(model => factory.CreateModel( + model.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!).ToArray(); + + Assert.AreEqual(names.Select(name => $"Unknown{name}"), unknowns.Select(model => model.Name)); + Assert.AreEqual(unknowns.Length, unknowns.Select(model => model.RelativeFilePath).Distinct(StringComparer.OrdinalIgnoreCase).Count()); + foreach (var unknown in unknowns) + { + Assert.AreSame(unknown, factory.CSharpTypeMap[unknown.Type]); + } + } + + [TestCase(false)] + [TestCase(true)] + public async Task UnknownDiscriminatorNameCollisionUsesLegacyCustomization(bool reverseOrder) + { + var input = InputFactory.Model("PipelineActivity", properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); + var other = InputFactory.Model("UnknownActivity"); + await MockHelpers.LoadMockGeneratorAsync( + inputModelTypes: reverseOrder ? [other, input] : [input, other], + compilation: async () => await Helpers.GetCompilationFromDirectoryAsync(), + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( + "LastContract", method: nameof(UnknownDiscriminatorNameRestored))); + var factory = CodeModelGenerator.Instance.TypeFactory; + var unknownInput = input.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel); + var unknown = factory.CreateModel(unknownInput)!; + + Assert.AreEqual("UnknownActivity", factory.ModelNames[unknownInput]); + Assert.AreEqual("CustomizedPipelineActivity", unknown.Name); + Assert.IsNotNull(unknown.CustomCodeView); + Assert.AreEqual("UnknownActivity", factory.CreateModel(other)!.Name); + Assert.AreSame(unknown, factory.CSharpTypeMap[unknown.Type]); + } + [TestCase("Model", false)] [TestCase("Model", true)] [TestCase("Enum", false)] diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionUsesLegacyCustomization/CustomizedPipelineActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionUsesLegacyCustomization/CustomizedPipelineActivity.cs new file mode 100644 index 00000000000..ea6754cca63 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionUsesLegacyCustomization/CustomizedPipelineActivity.cs @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.TypeSpec.Generator.Customizations; + +namespace Sample.Models +{ + [CodeGenType("UnknownPipelineActivity")] + internal partial class CustomizedPipelineActivity { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesRejectedTogether(LegacyCustomization)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesRejectedTogether(LegacyCustomization)/UnknownActivity.cs new file mode 100644 index 00000000000..1b32907314d --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesRejectedTogether(LegacyCustomization)/UnknownActivity.cs @@ -0,0 +1,7 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +namespace Sample.Models +{ + internal partial class UnknownActivity { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesResolvedTogether(LastContract)/Models.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesResolvedTogether(LastContract)/Models.cs new file mode 100644 index 00000000000..761f36fd361 --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesResolvedTogether(LastContract)/Models.cs @@ -0,0 +1,72 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.ClientModel.Primitives; + +namespace Sample.Models +{ + [PersistableModelProxy(typeof(UnknownPipelineActivity))] + public class Tail { } + + [PersistableModelProxy(typeof(UnknownActivity))] + public class PipelineActivity { } + + [PersistableModelProxy(typeof(OldUnknownActivity))] + public class Activity { } + + internal class UnknownPipelineActivity : Tail { } + internal class UnknownActivity : PipelineActivity { } + internal class OldUnknownActivity : Activity { } + + [PersistableModelProxy(typeof(UnknownSwapSecond))] + public class SwapFirst { } + + [PersistableModelProxy(typeof(UnknownSwapFirst))] + public class SwapSecond { } + + internal class UnknownSwapSecond : SwapFirst { } + internal class UnknownSwapFirst : SwapSecond { } + + [PersistableModelProxy(typeof(UnknownCycleSecond))] + public class CycleFirst { } + + [PersistableModelProxy(typeof(UnknownCycleThird))] + public class CycleSecond { } + + [PersistableModelProxy(typeof(UnknownCycleFirst))] + public class CycleThird { } + + internal class UnknownCycleSecond : CycleFirst { } + internal class UnknownCycleThird : CycleSecond { } + internal class UnknownCycleFirst : CycleThird { } + + [PersistableModelProxy(typeof(UnknownCompetingFirst))] + public class CompetingTail { } + + [PersistableModelProxy(typeof(SharedUnknown))] + public class CompetingFirst { } + + [PersistableModelProxy(typeof(SharedUnknown))] + public class CompetingSecond { } + + internal class UnknownCompetingFirst : CompetingTail { } + internal class SharedUnknown : CompetingFirst { } +} + +namespace Other.Models +{ + [PersistableModelProxy(typeof(Sharedunknown))] + public class CaseCompeting { } + + internal class Sharedunknown : CaseCompeting { } +} + +namespace System.ClientModel.Primitives +{ + [AttributeUsage(AttributeTargets.Class)] + internal sealed class PersistableModelProxyAttribute : Attribute + { + public PersistableModelProxyAttribute(Type proxyType) { } + } +} From 6c015a00e93465f8b42cc8bb34c0b966e47a1962 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Tue, 17 Nov 2026 23:12:32 +0000 Subject: [PATCH 07/10] refactor(http-client-csharp): keep unknown-name changes focused Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Providers/ClientOptionsProvider.cs | 8 +- .../src/Providers/ClientProvider.cs | 15 --- .../Providers/CollectionResultDefinition.cs | 5 +- .../src/ScmTypeFactory.cs | 69 ---------- .../DiscriminatorTests.cs | 54 -------- .../Models.cs | 45 ------- .../src/Providers/TypeProvider.cs | 3 - .../src/TypeFactory.cs | 81 ++---------- .../ModelProviders/ModelProviderTests.cs | 119 +----------------- .../UnknownActivity.cs | 10 -- .../CustomizedPipelineActivity.cs | 10 -- .../UnknownActivity.cs | 7 -- .../Models.cs | 72 ----------- 13 files changed, 20 insertions(+), 478 deletions(-) delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MovedCustomization)/UnknownActivity.cs delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionUsesLegacyCustomization/CustomizedPipelineActivity.cs delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesRejectedTogether(LegacyCustomization)/UnknownActivity.cs delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesResolvedTogether(LastContract)/Models.cs diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs index 2da320fd659..27940cb31ca 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientOptionsProvider.cs @@ -289,18 +289,16 @@ protected override TypeSignatureModifiers BuildDeclarationModifiers() private static TypeSignatureModifiers GetAccessibilityModifiers(TypeSignatureModifiers modifiers) => modifiers & (TypeSignatureModifiers.Public | TypeSignatureModifiers.Internal | TypeSignatureModifiers.Protected | TypeSignatureModifiers.Private); - protected override string BuildName() => GetGeneratedName(_inputClient, _clientProvider.Name); - - internal static string GetGeneratedName(InputClient inputClient, string clientName) + protected override string BuildName() { - if (UseSingletonInstance(inputClient)) + if (UseSingletonInstance(_inputClient)) { // Use namespace-based naming for singleton return $"{ScmCodeModelGenerator.Instance.TypeFactory.ServiceName}ClientOptions"; } // Use client-specific naming - return $"{clientName}Options"; + return $"{_clientProvider.Name}Options"; } protected override string BuildNamespace() => _clientProvider.Type.Namespace; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs index c9fa2784cee..391b2bbe5ff 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs @@ -463,21 +463,6 @@ internal static (string Name, string Namespace, string OriginalName) GetNameForC return (customType?.Name ?? name, customType?.Type.Namespace ?? typeNamespace, name); } - internal static IEnumerable GetOperationNameCandidatesForCollisionCheck(InputServiceMethod method) - { - var originalName = (method.IsExactName ? method.Operation.Name : method.Operation.OriginalName ?? method.Operation.Name).ToIdentifierName(); - if (method.IsExactName) - { - return [originalName]; - } - - // Cross-client backcompat views can change which spelling is preserved after model names - // are fixed, so reserve each possible projection without constructing a client. - return new[] { originalName, NormalizeName(originalName) } - .SelectMany(name => new[] { name, name.NormalizeCSharpUrlSuffix(), name.NormalizeCSharpUrlSuffix().NormalizeCSharpAcronyms() }) - .Distinct(StringComparer.Ordinal); - } - /// /// Checks if two namespaces share the same last segment /// diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs index bab01e19e61..5b636e56dc5 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/CollectionResultDefinition.cs @@ -197,12 +197,9 @@ protected override string BuildName() { operationName = (Operation.OriginalName ?? Operation.Name).ToIdentifierName(); } - return GetGeneratedName(Client.Type.Name, operationName, IsAsync, ItemModelType is not null); + return $"{Client.Type.Name}{operationName}{(IsAsync ? "Async" : "")}CollectionResult{(ItemModelType == null ? "" : "OfT")}"; } - internal static string GetGeneratedName(string clientName, string operationName, bool isAsync, bool isGeneric) - => $"{clientName}{operationName}{(isAsync ? "Async" : "")}CollectionResult{(isGeneric ? "OfT" : "")}"; - private bool HasPagingOperationNameCollision(string operationName) { var pagingMethods = Client.InputClient.Methods.OfType(); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs index 971be1d960d..1f9bece558a 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmTypeFactory.cs @@ -28,75 +28,6 @@ public class ScmTypeFactory : TypeFactory protected override IEnumerable<(string Name, string Namespace, string OriginalName)> GetReservedModelTypeNames() => ScmCodeModelGenerator.Instance.InputLibrary.InputNamespace.Clients.Select(ClientProvider.GetNameForCollisionCheck); - protected override IEnumerable<(string Name, string Namespace)> GetReservedHelperTypeNames() - { - var generator = ScmCodeModelGenerator.Instance; - TypeProvider[] helpers = [ - generator.ModelSerializationExtensionsDefinition, - generator.SerializationFormatDefinition, - generator.TypeFormattersDefinition, - new ErrorResultDefinition(), - new ClientUriBuilderDefinition(), - new Utf8JsonBinaryContentDefinition(), - new BinaryContentHelperDefinition(), - generator.ClientPipelineExtensionsDefinition, - new CancellationTokenExtensionsDefinition(), - generator.PipelineRequestHeadersExtensionsDefinition, - new ModelReaderWriterContextDefinition() - ]; - foreach (var name in base.GetReservedHelperTypeNames().Concat(helpers.Select(GetHelperTypeName))) - { - yield return name; - } - - var clients = generator.InputLibrary.InputNamespace.Clients; - foreach (var client in clients) - { - var (name, ns, _) = ClientProvider.GetNameForCollisionCheck(client); - if (client.Parent is null) - { - yield return ResolveCustomName(ClientOptionsProvider.GetGeneratedName(client, name), ns); - } - var custom = generator.SourceInputModel.FindForTypeInCurrentCompilation(ns, name); - if (client.InitializedBy.HasFlag(InputClientInitializedBy.Individually) && - (custom is null || custom.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public))) - { - yield return ResolveCustomName($"{name}Settings", ns); - } - foreach (var method in client.Methods.OfType()) - { - foreach (var operationName in ClientProvider.GetOperationNameCandidatesForCollisionCheck(method)) - { - foreach (var isAsync in new[] { false, true }) - { - yield return ResolveCustomName(CollectionResultDefinition.GetGeneratedName(name, operationName, isAsync, false), ns); - if (method.Operation.GenerateConvenienceMethod) - { - yield return ResolveCustomName(CollectionResultDefinition.GetGeneratedName(name, operationName, isAsync, true), ns); - } - } - } - } - } - - if (generator.InputLibrary.HasMultipartFormDataOperation) - { - yield return GetHelperTypeName(new MultiPartFormDataBinaryContentDefinition()); - yield return GetHelperTypeName(new MultipartFormDataHelperDefinition()); - } - if (clients.SelectMany(client => client.Methods).Any(method => method.Parameters.Any(parameter => - parameter.Type is InputStreamingType { StreamKind: InputStreamingType.JsonLinesStreamKind }))) - { - yield return GetHelperTypeName(new JsonLinesBinaryContentDefinition()); - } - - (string Name, string Namespace) ResolveCustomName(string name, string ns) - { - var custom = generator.SourceInputModel.FindForTypeInCurrentCompilation(ns, name); - return (custom?.Name ?? name, custom?.Type.Namespace ?? ns); - } - } - public virtual CSharpType MatchConditionsType => typeof(PipelineMessageClassifier); public virtual IClientResponseApi ClientResponseApi => ClientResultProvider.Instance; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs index e4a5e4db926..a220d60db92 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs @@ -218,60 +218,6 @@ await MockHelpers.LoadMockGeneratorAsync( Assert.AreEqual("UnknownPipelineActivity", model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel).Name); } - [TestCase("FactoryCollision")] - [TestCase("ContextCollision")] - [TestCase("OptionsCollision")] - [TestCase("SettingsCollision")] - [TestCase("HelperCollision")] - public async Task HistoricalUnknownNameDoesNotCollideWithInfrastructure(string modelName) - { - var input = InputFactory.Model(modelName, @namespace: "Sample", properties: - [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); - await MockHelpers.LoadMockGeneratorAsync( - inputModels: () => [input], - clients: () => [InputFactory.Client("ServiceClient", clientNamespace: "Sample", isExactName: true)], - lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); - var model = ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(input)!; - - Assert.AreEqual($"Unknown{modelName}", model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel).Name); - } - - [TestCase("PagingCollision", "List", "ServiceClientGetAllAsyncCollectionResultOfT")] - [TestCase("PagingBackCompatCollision", "GetUrl", "ServiceClientGetUriAsyncCollectionResultOfT")] - public async Task HistoricalUnknownNameDoesNotCollideWithPagingCollection(string modelName, string operationName, string helperName) - { - var input = InputFactory.Model(modelName, @namespace: "Sample", properties: - [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); - var page = InputFactory.Model("Page", properties: - [InputFactory.Property("items", InputFactory.Array(input))]); - var operation = InputFactory.Operation(operationName, responses: [InputFactory.OperationResponse(bodytype: page)]); - var method = InputFactory.PagingServiceMethod(operationName, operation, pagingMetadata: InputFactory.PagingMetadata(["items"], null, null)); - var clientInput = InputFactory.Client("ServiceClient", clientNamespace: "Sample", methods: [method], isExactName: true); - var otherClientInput = InputFactory.Client("OtherClient", clientNamespace: "Sample", isExactName: true); - await MockHelpers.LoadMockGeneratorAsync( - inputModels: () => [input, page], - clients: () => [clientInput, otherClientInput], - lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( - method: nameof(HistoricalUnknownNameDoesNotCollideWithInfrastructure))); - var factory = ScmCodeModelGenerator.Instance.TypeFactory; - var model = factory.CreateModel(input)!; - - Assert.AreEqual($"Unknown{modelName}", model.DerivedModels.Single(m => m.IsUnknownDiscriminatorModel).Name); - if (operationName == "GetUrl") - { - var client = factory.CreateClient(clientInput)!; - client.GetMethodCollectionByOperation(operation, factory.CreateClient(otherClientInput)); - Assert.AreEqual("GetUri", operation.Name); - CollectionAssert.Contains(client.Methods.OfType() - .Select(method => method.CollectionDefinition?.Name).ToArray(), helperName); - } - else - { - CollectionAssert.Contains(ScmCodeModelGenerator.Instance.OutputLibrary.TypeProviders.OfType() - .Select(type => type.Name).ToArray(), helperName); - } - } - [Test] public void BaseShouldHaveProxyAttribute() { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs deleted file mode 100644 index 1eaf29d775f..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameDoesNotCollideWithInfrastructure/Models.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System.ClientModel.Primitives; - -namespace Sample -{ - [PersistableModelProxy(typeof(SampleModelFactory))] - public abstract class FactoryCollision { } - internal class SampleModelFactory : FactoryCollision { } - - [PersistableModelProxy(typeof(SampleContext))] - public abstract class ContextCollision { } - internal class SampleContext : ContextCollision { } - - [PersistableModelProxy(typeof(ServiceClientOptions))] - public abstract class OptionsCollision { } - internal class ServiceClientOptions : OptionsCollision { } - - [PersistableModelProxy(typeof(ServiceClientSettings))] - public abstract class SettingsCollision { } - internal class ServiceClientSettings : SettingsCollision { } - - [PersistableModelProxy(typeof(Argument))] - public abstract class HelperCollision { } - internal class Argument : HelperCollision { } - - [PersistableModelProxy(typeof(ServiceClientGetAllAsyncCollectionResultOfT))] - public abstract class PagingCollision { } - internal class ServiceClientGetAllAsyncCollectionResultOfT : PagingCollision { } - - [PersistableModelProxy(typeof(ServiceClientGetUriAsyncCollectionResultOfT))] - public abstract class PagingBackCompatCollision { } - internal class ServiceClientGetUriAsyncCollectionResultOfT : PagingBackCompatCollision { } - - public class ServiceClient - { - public void GetUrl() { } - } - - public class OtherClient - { - public void OtherMethod() { } - } -} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs index 205ad344571..ee66844da5c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs @@ -778,9 +778,6 @@ protected virtual XmlDocProvider BuildXmlDocs() protected abstract string BuildRelativeFilePath(); protected abstract string BuildName(); - internal (string Name, string Namespace) GetTypeNameForCollisionCheck() - => (CustomCodeView?.Name ?? BuildName(), CustomCodeView?.Type.Namespace ?? BuildNamespace()); - /// /// Gets the original identifier for compatibility lookup before acronym normalization, /// or null when the name must be used exactly as specified. diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs index ba9c070de29..38f8197feb9 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Net; using System.Text.Json; -using Microsoft.CodeAnalysis; using Microsoft.TypeSpec.Generator.EmitterRpc; using Microsoft.TypeSpec.Generator.Input; using Microsoft.TypeSpec.Generator.Input.Extensions; @@ -44,22 +43,6 @@ internal IEnumerable CreatedModelProviders protected virtual IEnumerable<(string Name, string Namespace, string OriginalName)> GetReservedModelTypeNames() => []; - protected static (string Name, string Namespace) GetHelperTypeName(TypeProvider provider) - => provider.GetTypeNameForCollisionCheck(); - - protected virtual IEnumerable<(string Name, string Namespace)> GetReservedHelperTypeNames() - { - TypeProvider[] helpers = [ - new ChangeTrackingListDefinition(), - new ChangeTrackingDictionaryDefinition(), - new ArgumentDefinition(), - new OptionalDefinition(), - CodeModelGenerator.Instance.OutputLibrary.ModelFactory.Value, - .. CodeModelGenerator.Instance.CustomCodeAttributeProviders - ]; - return helpers.Select(GetHelperTypeName); - } - private IReadOnlyDictionary BuildModelNames() { var input = CodeModelGenerator.Instance.InputLibrary.InputNamespace; @@ -146,14 +129,9 @@ void AddModel(InputModelType model) // Resolve historical unknown names only after all base names are fixed. These lookups // must not construct generated types or depend on an unknown model's name. - var defaultTypes = candidates.ToDictionary( + var emittedTypes = candidates.ToDictionary( pair => pair.Key, - pair => (Name: pair.Value.FinalName == pair.Value.Name ? result[pair.Key] : pair.Value.FinalName, Namespace: pair.Value.FinalNamespace)); - var emittedTypes = new Dictionary(defaultTypes); - var restorations = new Dictionary(); - var proxyTypes = new Dictionary(); - var reservedOutputNames = reservedTypes.Select(type => type.Name).ToHashSet(StringComparer.OrdinalIgnoreCase); - HashSet? helperNames = null; + pair => (pair.Value.FinalName == pair.Value.Name ? result[pair.Key] : pair.Value.FinalName, pair.Value.FinalNamespace)); foreach (var (model, candidate) in candidates) { if (!model.IsUnknownDiscriminatorModel || model.BaseModel is not { } baseModel || @@ -162,12 +140,8 @@ void AddModel(InputModelType model) continue; } - var (baseName, baseNamespace) = defaultTypes[baseModel]; - if (!proxyTypes.TryGetValue(baseModel, out var proxyType)) - { - proxyType = providers[baseModel].GetLastContractProxyType(baseName, baseNamespace); - proxyTypes.Add(baseModel, proxyType); - } + var (baseName, baseNamespace) = emittedTypes[baseModel]; + var proxyType = providers[baseModel].GetLastContractProxyType(baseName, baseNamespace); if (proxyType is null) { continue; @@ -176,10 +150,10 @@ void AddModel(InputModelType model) var proxyNamespace = proxyType.ContainingNamespace.ToDisplayString(); var custom = source.FindForTypeInCurrentCompilation(candidate.Namespace, proxyType.Name); var legacyCustom = source.FindForTypeInCurrentCompilation(candidate.Namespace, result[model]); - var finalName = legacyCustom?.Name ?? custom?.Name ?? proxyType.Name; - var finalNamespace = legacyCustom?.Type.Namespace ?? custom?.Type.Namespace ?? candidate.Namespace; + var finalName = custom?.Name ?? proxyType.Name; + var finalNamespace = custom?.Type.Namespace ?? candidate.Namespace; string? reason = null; - if (proxyNamespace != finalNamespace) + if (proxyNamespace != candidate.FinalNamespace) { reason = "the proxy type is in a different namespace"; } @@ -191,8 +165,8 @@ void AddModel(InputModelType model) { reason = "the proxy type is an accepted removal in the ApiCompat baseline"; } - else if (reservedOutputNames.Contains(finalName) || - (helperNames ??= GetReservedHelperTypeNames().Select(type => type.Name).ToHashSet(StringComparer.OrdinalIgnoreCase)).Contains(finalName)) + else if (emittedTypes.Any(pair => pair.Key != model && pair.Value == (finalName, finalNamespace)) || + reservedTypes.Contains((finalName, finalNamespace))) { reason = "the name is already used by another generated type"; } @@ -210,43 +184,14 @@ void AddModel(InputModelType model) continue; } - restorations.Add(model, (proxyType.Name, proxyType.ToDisplayString(), baseName, baseNamespace)); - emittedTypes[model] = (finalName, finalNamespace); - } - - // Check proposed final names together so chains and swaps can vacate default names. - // Reject every competing proposal at once, then recheck the defaults they retain. - while (true) - { - var collisions = emittedTypes.GroupBy(pair => pair.Value.Name, StringComparer.OrdinalIgnoreCase) - .Where(group => group.Count() > 1) - .SelectMany(group => group.Select(pair => pair.Key)) - .Where(restorations.ContainsKey).ToArray(); - if (collisions.Length == 0) - { - break; - } - - foreach (var model in collisions) - { - var restoration = restorations[model]; - restorations.Remove(model); - emittedTypes[model] = defaultTypes[model]; - CodeModelGenerator.Instance.Emitter.Info( - $"Skipping back-compat unknown discriminator model name '{restoration.DisplayName}' for '{restoration.BaseNamespace}.{restoration.BaseName}'; the name is already used by another generated type.", - BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); - } - } - - foreach (var (model, restoration) in restorations) - { - if (result[model] != restoration.Name) + if (result[model] != proxyType.Name) { CodeModelGenerator.Instance.Emitter.Info( - $"Changed unknown discriminator model name from '{result[model]}' to '{restoration.Name}' for '{restoration.BaseNamespace}.{restoration.BaseName}' to match the last contract.", + $"Changed unknown discriminator model name from '{result[model]}' to '{proxyType.Name}' for '{baseNamespace}.{baseName}' to match the last contract.", BackCompatibilityChangeCategory.UnknownDiscriminatorModelNamePreserved); _restoredUnknownModelOriginalNames[model] = result[model]; - result[model] = restoration.Name; + result[model] = proxyType.Name; + emittedTypes[model] = (legacyCustom?.Name ?? finalName, legacyCustom?.Type.Namespace ?? finalNamespace); } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs index 68b747d9e75..466cea822e8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs @@ -423,136 +423,23 @@ await MockHelpers.LoadMockGeneratorAsync( Assert.AreEqual("PipelineActivity", rootUnknown.BaseModelProvider!.Name); } - [TestCase("Pair", false)] - [TestCase("Pair", true)] - [TestCase("Chain", false)] - [TestCase("Chain", true)] - [TestCase("Swap", false)] - [TestCase("Swap", true)] - [TestCase("Cycle", false)] - [TestCase("Cycle", true)] - public async Task UnknownDiscriminatorNamesResolvedTogether(string scenario, bool reverseOrder) - { - string[] names = scenario switch - { - "Pair" => ["PipelineActivity", "Activity"], - "Chain" => ["Tail", "PipelineActivity", "Activity"], - "Swap" => ["SwapFirst", "SwapSecond"], - _ => ["CycleFirst", "CycleSecond", "CycleThird"] - }; - string[] expected = scenario switch - { - "Pair" => ["UnknownActivity", "OldUnknownActivity"], - "Chain" => ["UnknownPipelineActivity", "UnknownActivity", "OldUnknownActivity"], - "Swap" => ["UnknownSwapSecond", "UnknownSwapFirst"], - _ => ["UnknownCycleSecond", "UnknownCycleThird", "UnknownCycleFirst"] - }; - var models = names.Select(name => InputFactory.Model(name, properties: - [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)])).ToArray(); - await MockHelpers.LoadMockGeneratorAsync( - inputModelTypes: reverseOrder ? models.Reverse().ToArray() : models, - lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync("LastContract")); - var factory = CodeModelGenerator.Instance.TypeFactory; - var unknowns = models.Select(model => factory.CreateModel( - model.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!).ToArray(); - - Assert.AreEqual(expected, unknowns.Select(model => model.Name)); - Assert.AreEqual(expected.Select(name => $"{name}.cs"), unknowns.Select(model => Path.GetFileName(model.RelativeFilePath))); - foreach (var unknown in unknowns) - { - Assert.AreSame(unknown, factory.CSharpTypeMap[unknown.Type]); - Assert.AreSame(unknown, factory.TypeProvidersByName[unknown.Name]); - } - } - - [TestCase("Model", false)] - [TestCase("Model", true)] - [TestCase("Enum", false)] - [TestCase("Enum", true)] - [TestCase("AcceptedRemoval", false)] - [TestCase("AcceptedRemoval", true)] - [TestCase("CompetingTargets", false)] - [TestCase("CompetingTargets", true)] - [TestCase("CaseOnlyOtherNamespace", false)] - [TestCase("CaseOnlyOtherNamespace", true)] - [TestCase("LegacyCustomization", false)] - [TestCase("LegacyCustomization", true)] - public async Task UnknownDiscriminatorNamesRejectedTogether(string collision, bool reverseOrder) - { - string[] names = collision is "CompetingTargets" or "CaseOnlyOtherNamespace" - ? ["CompetingTail", "CompetingFirst", collision == "CompetingTargets" ? "CompetingSecond" : "CaseCompeting"] - : ["Tail", "PipelineActivity", "Activity"]; - var models = names.Select(name => InputFactory.Model(name, - @namespace: name == "CaseCompeting" ? "Other.Models" : "Sample.Models", - properties: [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)])).ToArray(); - InputModelType[] inputs = collision == "Model" ? [.. models, InputFactory.Model("OldUnknownActivity")] : models; - await MockHelpers.LoadMockGeneratorAsync( - inputModelTypes: reverseOrder ? inputs.Reverse().ToArray() : inputs, - inputEnumTypes: collision == "Enum" ? [InputFactory.StringEnum("OldUnknownActivity", [("One", "one")])] : [], - compilation: collision == "LegacyCustomization" - ? async () => await Helpers.GetCompilationFromDirectoryAsync(collision) : null, - lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( - "LastContract", method: nameof(UnknownDiscriminatorNamesResolvedTogether)), - apiCompatBaseline: collision == "AcceptedRemoval" - ? ApiCompatBaseline.Parse(["TypesMustExist : Type 'Sample.Models.OldUnknownActivity' does not exist in the implementation."]) - : null); - var factory = CodeModelGenerator.Instance.TypeFactory; - var unknowns = models.Select(model => factory.CreateModel( - model.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!).ToArray(); - - Assert.AreEqual(names.Select(name => $"Unknown{name}"), unknowns.Select(model => model.Name)); - Assert.AreEqual(unknowns.Length, unknowns.Select(model => model.RelativeFilePath).Distinct(StringComparer.OrdinalIgnoreCase).Count()); - foreach (var unknown in unknowns) - { - Assert.AreSame(unknown, factory.CSharpTypeMap[unknown.Type]); - } - } - - [TestCase(false)] - [TestCase(true)] - public async Task UnknownDiscriminatorNameCollisionUsesLegacyCustomization(bool reverseOrder) - { - var input = InputFactory.Model("PipelineActivity", properties: - [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); - var other = InputFactory.Model("UnknownActivity"); - await MockHelpers.LoadMockGeneratorAsync( - inputModelTypes: reverseOrder ? [other, input] : [input, other], - compilation: async () => await Helpers.GetCompilationFromDirectoryAsync(), - lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( - "LastContract", method: nameof(UnknownDiscriminatorNameRestored))); - var factory = CodeModelGenerator.Instance.TypeFactory; - var unknownInput = input.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel); - var unknown = factory.CreateModel(unknownInput)!; - - Assert.AreEqual("UnknownActivity", factory.ModelNames[unknownInput]); - Assert.AreEqual("CustomizedPipelineActivity", unknown.Name); - Assert.IsNotNull(unknown.CustomCodeView); - Assert.AreEqual("UnknownActivity", factory.CreateModel(other)!.Name); - Assert.AreSame(unknown, factory.CSharpTypeMap[unknown.Type]); - } - [TestCase("Model", false)] [TestCase("Model", true)] [TestCase("Enum", false)] [TestCase("Custom", false)] [TestCase("MappedModel", false)] [TestCase("UnrelatedMapping", false)] - [TestCase("MovedCustomization", false)] - [TestCase("OtherNamespace", false)] - [TestCase("CaseOnly", false)] public async Task UnknownDiscriminatorNameCollisionSkipped(string collision, bool reverseOrder) { var input = InputFactory.Model("PipelineActivity", properties: [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); - var other = InputFactory.Model( - collision == "MappedModel" ? "OtherModel" : collision == "CaseOnly" ? "Unknownactivity" : "UnknownActivity", - @namespace: collision == "OtherNamespace" ? "Other.Models" : "Sample.Models"); - InputModelType[] models = collision is "Model" or "MappedModel" or "OtherNamespace" or "CaseOnly" + var other = InputFactory.Model(collision == "MappedModel" ? "OtherModel" : "UnknownActivity"); + InputModelType[] models = collision is "Model" or "MappedModel" ? (reverseOrder ? [other, input] : [input, other]) : [input]; await MockHelpers.LoadMockGeneratorAsync( inputModelTypes: models, inputEnumTypes: collision == "Enum" ? [InputFactory.StringEnum("UnknownActivity", [("One", "one")])] : [], - compilation: collision is "Custom" or "MappedModel" or "UnrelatedMapping" or "MovedCustomization" + compilation: collision is "Custom" or "MappedModel" or "UnrelatedMapping" ? async () => await Helpers.GetCompilationFromDirectoryAsync(collision) : null, lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( "LastContract", method: nameof(UnknownDiscriminatorNameRestored))); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MovedCustomization)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MovedCustomization)/UnknownActivity.cs deleted file mode 100644 index f5ab1916df6..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MovedCustomization)/UnknownActivity.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Microsoft.TypeSpec.Generator.Customizations; - -namespace Other.Models -{ - [CodeGenType("UnknownActivity")] - public partial class CustomizedActivity { } -} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionUsesLegacyCustomization/CustomizedPipelineActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionUsesLegacyCustomization/CustomizedPipelineActivity.cs deleted file mode 100644 index ea6754cca63..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionUsesLegacyCustomization/CustomizedPipelineActivity.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Microsoft.TypeSpec.Generator.Customizations; - -namespace Sample.Models -{ - [CodeGenType("UnknownPipelineActivity")] - internal partial class CustomizedPipelineActivity { } -} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesRejectedTogether(LegacyCustomization)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesRejectedTogether(LegacyCustomization)/UnknownActivity.cs deleted file mode 100644 index 1b32907314d..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesRejectedTogether(LegacyCustomization)/UnknownActivity.cs +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -namespace Sample.Models -{ - internal partial class UnknownActivity { } -} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesResolvedTogether(LastContract)/Models.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesResolvedTogether(LastContract)/Models.cs deleted file mode 100644 index 761f36fd361..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamesResolvedTogether(LastContract)/Models.cs +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using System.ClientModel.Primitives; - -namespace Sample.Models -{ - [PersistableModelProxy(typeof(UnknownPipelineActivity))] - public class Tail { } - - [PersistableModelProxy(typeof(UnknownActivity))] - public class PipelineActivity { } - - [PersistableModelProxy(typeof(OldUnknownActivity))] - public class Activity { } - - internal class UnknownPipelineActivity : Tail { } - internal class UnknownActivity : PipelineActivity { } - internal class OldUnknownActivity : Activity { } - - [PersistableModelProxy(typeof(UnknownSwapSecond))] - public class SwapFirst { } - - [PersistableModelProxy(typeof(UnknownSwapFirst))] - public class SwapSecond { } - - internal class UnknownSwapSecond : SwapFirst { } - internal class UnknownSwapFirst : SwapSecond { } - - [PersistableModelProxy(typeof(UnknownCycleSecond))] - public class CycleFirst { } - - [PersistableModelProxy(typeof(UnknownCycleThird))] - public class CycleSecond { } - - [PersistableModelProxy(typeof(UnknownCycleFirst))] - public class CycleThird { } - - internal class UnknownCycleSecond : CycleFirst { } - internal class UnknownCycleThird : CycleSecond { } - internal class UnknownCycleFirst : CycleThird { } - - [PersistableModelProxy(typeof(UnknownCompetingFirst))] - public class CompetingTail { } - - [PersistableModelProxy(typeof(SharedUnknown))] - public class CompetingFirst { } - - [PersistableModelProxy(typeof(SharedUnknown))] - public class CompetingSecond { } - - internal class UnknownCompetingFirst : CompetingTail { } - internal class SharedUnknown : CompetingFirst { } -} - -namespace Other.Models -{ - [PersistableModelProxy(typeof(Sharedunknown))] - public class CaseCompeting { } - - internal class Sharedunknown : CaseCompeting { } -} - -namespace System.ClientModel.Primitives -{ - [AttributeUsage(AttributeTargets.Class)] - internal sealed class PersistableModelProxyAttribute : Attribute - { - public PersistableModelProxyAttribute(Type proxyType) { } - } -} From 0a550746219bbbe269201a1e388dff9341ee7f11 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:09:00 +0000 Subject: [PATCH 08/10] fix(http-client-csharp): resolve unknown names in BuildName Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Providers/ModelProvider.cs | 80 ++++++++--- .../src/TypeFactory.cs | 128 +++++++----------- 2 files changed, 112 insertions(+), 96 deletions(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs index 71842fccf51..9ded21b87d0 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs @@ -25,6 +25,7 @@ public class ModelProvider : TypeProvider private const string RequestSuffix = "Request"; private const string ResponseSuffix = "Response"; private readonly InputModelType _inputModel; + private readonly Lazy _lastContractUnknownDiscriminatorModelName; internal InputModelType InputModel => _inputModel; // Note the description cannot be built from the constructor as it would lead to a circular dependency between the base @@ -88,6 +89,7 @@ protected override FormattableString BuildDescription() public ModelProvider(InputModelType inputModel) : base(inputModel) { _inputModel = inputModel; + _lastContractUnknownDiscriminatorModelName = new(BuildLastContractUnknownDiscriminatorModelName); _isDiscriminatedBaseType = inputModel.DiscriminatorProperty is not null && inputModel.DiscriminatorValue is null; _useObjectAdditionalProperties = new Lazy(ShouldUseObjectAdditionalProperties); } @@ -442,14 +444,26 @@ protected override TypeProvider[] BuildSerializationProviders() protected override string BuildName() { - return CodeModelGenerator.Instance.TypeFactory.ModelNames.TryGetValue(_inputModel, out var name) - ? name + if (CodeModelGenerator.Instance.TypeFactory.TryGetModelName(_inputModel, out var name)) + { + return name; + } + + return IsUnknownDiscriminatorModel && _lastContractUnknownDiscriminatorModelName.Value is { } historicalName + ? historicalName : BuildNameWithoutCollisionCheck(); } - internal INamedTypeSymbol? GetLastContractProxyType(string typeName, string typeNamespace) + private string? BuildLastContractUnknownDiscriminatorModelName() { - var attributes = BuildLastContractView(typeName, typeNamespace)?.Attributes + if (_inputModel.BaseModel is not { } baseModel || + CodeModelGenerator.Instance.SourceInputModel.LastContract is null || + new ModelProvider(baseModel).LastContractView is not { } lastContractBase) + { + return null; + } + + var attributes = lastContractBase.Attributes .Where(attribute => attribute.Data?.AttributeClass?.ToDisplayString() == "System.ClientModel.Primitives.PersistableModelProxyAttribute").ToArray(); if (attributes is null or { Length: 0 }) @@ -457,28 +471,59 @@ protected override string BuildName() return null; } - if (attributes.Length == 1 && - attributes[0].Data!.ConstructorArguments is [{ Kind: TypedConstantKind.Type, Value: INamedTypeSymbol { TypeKind: not TypeKind.Error } proxyType }]) + if (attributes.Length != 1 || + attributes[0].Data!.ConstructorArguments is not [{ Kind: TypedConstantKind.Type, Value: INamedTypeSymbol { TypeKind: not TypeKind.Error } proxyType }]) { - return proxyType; + CodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; expected exactly one PersistableModelProxyAttribute with a resolvable type argument.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + return null; } - CodeModelGenerator.Instance.Emitter.Info( - $"Skipping back-compat unknown discriminator model name for '{typeNamespace}.{typeName}'; expected exactly one PersistableModelProxyAttribute with a resolvable type argument.", - BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); - return null; + var typeNamespace = BuildNamespace(); + var proxyNamespace = proxyType.ContainingNamespace.ToDisplayString(); + string? reason = null; + if (proxyNamespace != typeNamespace) + { + reason = "the proxy type is in a different namespace"; + } + else if (proxyType.ContainingType is not null || proxyType.IsGenericType) + { + reason = "the proxy type is nested or generic"; + } + else if (CodeModelGenerator.Instance.SourceInputModel.ApiCompatBaseline.IsTypeSuppressed(proxyType.ToDisplayString())) + { + reason = "the proxy type is an accepted removal in the ApiCompat baseline"; + } + else if (CodeModelGenerator.Instance.SourceInputModel.FindForTypeInCurrentCompilation(typeNamespace, proxyType.Name) is { } custom && + !CodeModelGenerator.Instance.SourceInputModel.IsCustomizationOf(custom, BuildNameWithoutCollisionCheck(), proxyType.Name)) + { + reason = "the name is already used by an unrelated custom type"; + } + + if (reason is not null) + { + CodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name '{proxyType.ToDisplayString()}' for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; {reason}.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + return null; + } + + return proxyType.Name; } - internal (string Name, string FinalName, string OriginalName, string Namespace, string FinalNamespace, bool CanRename, bool HasTypeMapping) GetNameForCollisionCheck() + internal (string Name, string FinalName, string OriginalName, string Namespace, string FinalNamespace, bool CanRename, bool HasTypeMapping, bool IsRestoredUnknownName, string DefaultName) GetNameForCollisionCheck() { - var name = BuildNameWithoutCollisionCheck(); + var defaultName = BuildNameWithoutCollisionCheck(); + var name = BuildName(); var originalName = _inputModel.IsExactName ? _inputModel.Name : _inputModel.Name.ToIdentifierName().NormalizeCSharpAcronyms(); var typeNamespace = BuildNamespace(); var customType = base.BuildCustomCodeView(name, typeNamespace); - var canRename = !_inputModel.IsExactName && name != originalName && - name == RenameModelSuffix(originalName); + var canRename = !_inputModel.IsExactName && defaultName != originalName && + defaultName == RenameModelSuffix(originalName); return (name, customType?.Name ?? name, originalName, typeNamespace, customType?.Type.Namespace ?? typeNamespace, - canRename, CodeModelGenerator.Instance.SourceInputModel.HasTypeMapping(typeNamespace, name, DeclaringTypeName)); + canRename, CodeModelGenerator.Instance.SourceInputModel.HasTypeMapping(typeNamespace, name, DeclaringTypeName), + IsUnknownDiscriminatorModel && name != defaultName, defaultName); } private string BuildNameWithoutCollisionCheck() @@ -532,8 +577,7 @@ private string RenameModelSuffix(string name) var typeNamespace = generatedTypeNamespace ?? BuildNamespace(); var typeName = generatedTypeName ?? BuildName(); if (IsUnknownDiscriminatorModel && - CodeModelGenerator.Instance.TypeFactory.GetOriginalUnknownModelName(_inputModel) is { } originalName && - base.BuildCustomCodeView(originalName, typeNamespace) is { } legacyCustomCodeView) + base.BuildCustomCodeView(BuildNameWithoutCollisionCheck(), typeNamespace) is { } legacyCustomCodeView) { return legacyCustomCodeView; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs index 38f8197feb9..c57f97a3495 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs @@ -35,19 +35,34 @@ internal IEnumerable CreatedModelProviders => InputTypeToModelProvider.Values.OfType(); private IReadOnlyDictionary? _modelNames; - internal IReadOnlyDictionary ModelNames => _modelNames ??= BuildModelNames(); - private readonly Dictionary _restoredUnknownModelOriginalNames = []; + private bool _isBuildingModelNames; + internal IReadOnlyDictionary ModelNames + { + get + { + if (_modelNames is null) + { + _isBuildingModelNames = true; + try + { + _modelNames = BuildModelNames(); + } + finally + { + _isBuildingModelNames = false; + } + } - internal string? GetOriginalUnknownModelName(InputModelType model) - => _restoredUnknownModelOriginalNames.GetValueOrDefault(model); + return _modelNames; + } + } protected virtual IEnumerable<(string Name, string Namespace, string OriginalName)> GetReservedModelTypeNames() => []; private IReadOnlyDictionary BuildModelNames() { var input = CodeModelGenerator.Instance.InputLibrary.InputNamespace; - var candidates = new Dictionary(); - var providers = new Dictionary(); + var candidates = new Dictionary(); var nameCounts = new Dictionary(StringComparer.OrdinalIgnoreCase); var reservedNames = GetReservedModelTypeNames().ToArray(); var originalNames = reservedNames.Select(type => type.OriginalName).ToHashSet(StringComparer.Ordinal); @@ -67,9 +82,7 @@ void AddModel(InputModelType model) } // Do not construct CSharpTypes while collecting names: their creation calls BuildName. - var provider = new ModelProvider(model); - var candidate = provider.GetNameForCollisionCheck(); - providers.Add(model, provider); + var candidate = new ModelProvider(model).GetNameForCollisionCheck(); candidates.Add(model, candidate); originalNames.Add(candidate.OriginalName); ReserveName(candidate.FinalName); @@ -99,6 +112,23 @@ void AddModel(InputModelType model) var result = new Dictionary(); foreach (var (model, candidate) in candidates) { + if (candidate.IsRestoredUnknownName && + (nameCounts[candidate.FinalName] > 1 || reservedTypes.Contains((candidate.FinalName, candidate.FinalNamespace)))) + { + CodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name '{candidate.FinalName}' for '{candidate.Namespace}.{candidate.DefaultName}'; the name is already used by another generated type.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + result.Add(model, candidate.DefaultName); + continue; + } + + if (candidate.IsRestoredUnknownName) + { + CodeModelGenerator.Instance.Emitter.Info( + $"Changed unknown discriminator model name from '{candidate.DefaultName}' to '{candidate.Name}' to match the last contract.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNamePreserved); + } + // A direct input takes precedence over an implicit suffix match for the same mapping. var mappingBelongsToModel = candidate.HasTypeMapping && !originalNames.Contains(candidate.Name); @@ -120,82 +150,24 @@ void AddModel(InputModelType model) ReserveName(name); result.Add(model, name); } + return result; + } - var source = CodeModelGenerator.Instance.SourceInputModel; - if (source.LastContract is null) + internal bool TryGetModelName(InputModelType model, out string name) + { + if (!_isBuildingModelNames && _modelNames is null) { - return result; + _ = ModelNames; } - // Resolve historical unknown names only after all base names are fixed. These lookups - // must not construct generated types or depend on an unknown model's name. - var emittedTypes = candidates.ToDictionary( - pair => pair.Key, - pair => (pair.Value.FinalName == pair.Value.Name ? result[pair.Key] : pair.Value.FinalName, pair.Value.FinalNamespace)); - foreach (var (model, candidate) in candidates) + if (_modelNames is not null && _modelNames.TryGetValue(model, out var modelName)) { - if (!model.IsUnknownDiscriminatorModel || model.BaseModel is not { } baseModel || - !candidates.ContainsKey(baseModel)) - { - continue; - } - - var (baseName, baseNamespace) = emittedTypes[baseModel]; - var proxyType = providers[baseModel].GetLastContractProxyType(baseName, baseNamespace); - if (proxyType is null) - { - continue; - } - - var proxyNamespace = proxyType.ContainingNamespace.ToDisplayString(); - var custom = source.FindForTypeInCurrentCompilation(candidate.Namespace, proxyType.Name); - var legacyCustom = source.FindForTypeInCurrentCompilation(candidate.Namespace, result[model]); - var finalName = custom?.Name ?? proxyType.Name; - var finalNamespace = custom?.Type.Namespace ?? candidate.Namespace; - string? reason = null; - if (proxyNamespace != candidate.FinalNamespace) - { - reason = "the proxy type is in a different namespace"; - } - else if (proxyType.ContainingType is not null || proxyType.IsGenericType) - { - reason = "the proxy type is nested or generic"; - } - else if (source.ApiCompatBaseline.IsTypeSuppressed(proxyType.ToDisplayString())) - { - reason = "the proxy type is an accepted removal in the ApiCompat baseline"; - } - else if (emittedTypes.Any(pair => pair.Key != model && pair.Value == (finalName, finalNamespace)) || - reservedTypes.Contains((finalName, finalNamespace))) - { - reason = "the name is already used by another generated type"; - } - else if (custom is not null && custom.Type != legacyCustom?.Type && - !source.IsCustomizationOf(custom, result[model], proxyType.Name)) - { - reason = "the name is already used by an unrelated custom type"; - } - - if (reason is not null) - { - CodeModelGenerator.Instance.Emitter.Info( - $"Skipping back-compat unknown discriminator model name '{proxyType.ToDisplayString()}' for '{baseNamespace}.{baseName}'; {reason}.", - BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); - continue; - } - - if (result[model] != proxyType.Name) - { - CodeModelGenerator.Instance.Emitter.Info( - $"Changed unknown discriminator model name from '{result[model]}' to '{proxyType.Name}' for '{baseNamespace}.{baseName}' to match the last contract.", - BackCompatibilityChangeCategory.UnknownDiscriminatorModelNamePreserved); - _restoredUnknownModelOriginalNames[model] = result[model]; - result[model] = proxyType.Name; - emittedTypes[model] = (legacyCustom?.Name ?? finalName, legacyCustom?.Type.Namespace ?? finalNamespace); - } + name = modelName; + return true; } - return result; + name = string.Empty; + return false; } public IDictionary CSharpTypeMap { get; } = new Dictionary(CSharpType.IgnoreNullableComparer); From 25dde1f593768bd90d423fcc20bff3deeea4b5a9 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Thu, 19 Nov 2026 22:52:16 +0000 Subject: [PATCH 09/10] refactor(http-client-csharp): simplify unknown model name restoration Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Providers/ModelProvider.cs | 86 ++++++++++--------- .../src/SourceInput/SourceInputModel.cs | 19 ---- .../src/TypeFactory.cs | 64 +------------- .../ModelProviders/ModelProviderTests.cs | 57 ++---------- .../UnknownActivity.cs | 7 -- .../UnknownActivity.cs | 10 --- .../UnknownActivity.cs | 10 --- 7 files changed, 56 insertions(+), 197 deletions(-) delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(Custom)/UnknownActivity.cs delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MappedModel)/UnknownActivity.cs delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(UnrelatedMapping)/UnknownActivity.cs diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs index 9ded21b87d0..7e57eec4f58 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs @@ -444,35 +444,51 @@ protected override TypeProvider[] BuildSerializationProviders() protected override string BuildName() { - if (CodeModelGenerator.Instance.TypeFactory.TryGetModelName(_inputModel, out var name)) + if (IsUnknownDiscriminatorModel && _lastContractUnknownDiscriminatorModelName.Value is { } historicalName) { - return name; + return historicalName; } - return IsUnknownDiscriminatorModel && _lastContractUnknownDiscriminatorModelName.Value is { } historicalName - ? historicalName + return CodeModelGenerator.Instance.TypeFactory.ModelNames.TryGetValue(_inputModel, out var name) + ? name : BuildNameWithoutCollisionCheck(); } private string? BuildLastContractUnknownDiscriminatorModelName() { if (_inputModel.BaseModel is not { } baseModel || - CodeModelGenerator.Instance.SourceInputModel.LastContract is null || - new ModelProvider(baseModel).LastContractView is not { } lastContractBase) + CodeModelGenerator.Instance.TypeFactory.CreateModel(baseModel)?.LastContractView is not { } lastContractBase) { return null; } - var attributes = lastContractBase.Attributes - .Where(attribute => attribute.Data?.AttributeClass?.ToDisplayString() == - "System.ClientModel.Primitives.PersistableModelProxyAttribute").ToArray(); - if (attributes is null or { Length: 0 }) + AttributeData? proxyAttribute = null; + foreach (var attribute in lastContractBase.Attributes) + { + if (attribute.Data?.AttributeClass?.ToDisplayString() != + "System.ClientModel.Primitives.PersistableModelProxyAttribute") + { + continue; + } + + if (proxyAttribute is not null) + { + CodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; expected exactly one PersistableModelProxyAttribute.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + return null; + } + + proxyAttribute = attribute.Data; + } + + if (proxyAttribute is null) { return null; } - if (attributes.Length != 1 || - attributes[0].Data!.ConstructorArguments is not [{ Kind: TypedConstantKind.Type, Value: INamedTypeSymbol { TypeKind: not TypeKind.Error } proxyType }]) + if (proxyAttribute.ConstructorArguments is not + [{ Kind: TypedConstantKind.Type, Value: INamedTypeSymbol { TypeKind: not TypeKind.Error } proxyType }]) { CodeModelGenerator.Instance.Emitter.Info( $"Skipping back-compat unknown discriminator model name for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; expected exactly one PersistableModelProxyAttribute with a resolvable type argument.", @@ -480,50 +496,42 @@ CodeModelGenerator.Instance.SourceInputModel.LastContract is null || return null; } - var typeNamespace = BuildNamespace(); - var proxyNamespace = proxyType.ContainingNamespace.ToDisplayString(); - string? reason = null; - if (proxyNamespace != typeNamespace) + if (proxyType.ContainingNamespace.ToDisplayString() != BuildNamespace()) { - reason = "the proxy type is in a different namespace"; - } - else if (proxyType.ContainingType is not null || proxyType.IsGenericType) - { - reason = "the proxy type is nested or generic"; - } - else if (CodeModelGenerator.Instance.SourceInputModel.ApiCompatBaseline.IsTypeSuppressed(proxyType.ToDisplayString())) - { - reason = "the proxy type is an accepted removal in the ApiCompat baseline"; - } - else if (CodeModelGenerator.Instance.SourceInputModel.FindForTypeInCurrentCompilation(typeNamespace, proxyType.Name) is { } custom && - !CodeModelGenerator.Instance.SourceInputModel.IsCustomizationOf(custom, BuildNameWithoutCollisionCheck(), proxyType.Name)) - { - reason = "the name is already used by an unrelated custom type"; + CodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name '{proxyType.ToDisplayString()}' for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; the proxy type is in a different namespace.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + return null; } - if (reason is not null) + if (CodeModelGenerator.Instance.SourceInputModel.ApiCompatBaseline.IsTypeSuppressed(proxyType.ToDisplayString())) { CodeModelGenerator.Instance.Emitter.Info( - $"Skipping back-compat unknown discriminator model name '{proxyType.ToDisplayString()}' for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; {reason}.", + $"Skipping back-compat unknown discriminator model name '{proxyType.ToDisplayString()}' for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; the proxy type is an accepted removal in the ApiCompat baseline.", BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); return null; } + if (proxyType.Name != BuildNameWithoutCollisionCheck()) + { + CodeModelGenerator.Instance.Emitter.Info( + $"Changed unknown discriminator model name from '{BuildNameWithoutCollisionCheck()}' to '{proxyType.Name}' to match the last contract.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNamePreserved); + } + return proxyType.Name; } - internal (string Name, string FinalName, string OriginalName, string Namespace, string FinalNamespace, bool CanRename, bool HasTypeMapping, bool IsRestoredUnknownName, string DefaultName) GetNameForCollisionCheck() + internal (string Name, string FinalName, string OriginalName, string Namespace, string FinalNamespace, bool CanRename, bool HasTypeMapping) GetNameForCollisionCheck() { - var defaultName = BuildNameWithoutCollisionCheck(); - var name = BuildName(); + var name = BuildNameWithoutCollisionCheck(); var originalName = _inputModel.IsExactName ? _inputModel.Name : _inputModel.Name.ToIdentifierName().NormalizeCSharpAcronyms(); var typeNamespace = BuildNamespace(); var customType = base.BuildCustomCodeView(name, typeNamespace); - var canRename = !_inputModel.IsExactName && defaultName != originalName && - defaultName == RenameModelSuffix(originalName); + var canRename = !_inputModel.IsExactName && name != originalName && + name == RenameModelSuffix(originalName); return (name, customType?.Name ?? name, originalName, typeNamespace, customType?.Type.Namespace ?? typeNamespace, - canRename, CodeModelGenerator.Instance.SourceInputModel.HasTypeMapping(typeNamespace, name, DeclaringTypeName), - IsUnknownDiscriminatorModel && name != defaultName, defaultName); + canRename, CodeModelGenerator.Instance.SourceInputModel.HasTypeMapping(typeNamespace, name, DeclaringTypeName)); } private string BuildNameWithoutCollisionCheck() diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/SourceInput/SourceInputModel.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/SourceInput/SourceInputModel.cs index 42a8f8eb959..e8e6edd28d2 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/SourceInput/SourceInputModel.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/SourceInput/SourceInputModel.cs @@ -4,10 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.TypeSpec.Generator.Providers; using Microsoft.TypeSpec.Generator.Utilities; @@ -74,22 +71,6 @@ private IReadOnlyDictionary PopulateNameMap() internal bool HasTypeMapping(string ns, string name, string? declaringTypeName = null) => _nameMap.Value.TryGetValue(name, out var type) && IsContainingTypeMatch(type, ns, declaringTypeName); - internal bool IsCustomizationOf(TypeProvider provider, params string[] generatedNames) - { - var symbol = Customization?.Assembly.GetTypeByMetadataName( - provider is NamedTypeSymbolProvider named ? named.MetadataName : provider.Type.FullyQualifiedName); - if (symbol is null) - { - return false; - } - - return TryGetName(symbol, out var mappedName) - ? generatedNames.Contains(mappedName, StringComparer.Ordinal) - : symbol.DeclaringSyntaxReferences.Any(reference => - reference.GetSyntax() is TypeDeclarationSyntax declaration && - declaration.Modifiers.Any(SyntaxKind.PartialKeyword)); - } - public TypeProvider? FindForTypeInLastContract(string ns, string name, string? declaringTypeName = null) { var type = FindTypeInCompilation(LastContract, ns, name, true, declaringTypeName, includeInternal: false); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs index c57f97a3495..6b52511e778 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Net; using System.Text.Json; -using Microsoft.TypeSpec.Generator.EmitterRpc; using Microsoft.TypeSpec.Generator.Input; using Microsoft.TypeSpec.Generator.Input.Extensions; using Microsoft.TypeSpec.Generator.Primitives; @@ -35,34 +34,14 @@ internal IEnumerable CreatedModelProviders => InputTypeToModelProvider.Values.OfType(); private IReadOnlyDictionary? _modelNames; - private bool _isBuildingModelNames; - internal IReadOnlyDictionary ModelNames - { - get - { - if (_modelNames is null) - { - _isBuildingModelNames = true; - try - { - _modelNames = BuildModelNames(); - } - finally - { - _isBuildingModelNames = false; - } - } - - return _modelNames; - } - } + internal IReadOnlyDictionary ModelNames => _modelNames ??= BuildModelNames(); protected virtual IEnumerable<(string Name, string Namespace, string OriginalName)> GetReservedModelTypeNames() => []; private IReadOnlyDictionary BuildModelNames() { var input = CodeModelGenerator.Instance.InputLibrary.InputNamespace; - var candidates = new Dictionary(); + var candidates = new Dictionary(); var nameCounts = new Dictionary(StringComparer.OrdinalIgnoreCase); var reservedNames = GetReservedModelTypeNames().ToArray(); var originalNames = reservedNames.Select(type => type.OriginalName).ToHashSet(StringComparer.Ordinal); @@ -102,9 +81,7 @@ void AddModel(InputModelType model) { if (inputEnum.External is null && !inputEnum.Usage.HasFlag(InputModelTypeUsage.ApiVersionEnum)) { - var enumProvider = EnumProvider.Create(inputEnum); - ReserveName(enumProvider.Name); - reservedTypes.Add((enumProvider.Name, enumProvider.Type.Namespace)); + ReserveName(EnumProvider.Create(inputEnum).Name); originalNames.Add(inputEnum.IsExactName ? inputEnum.Name : inputEnum.Name.ToIdentifierName().NormalizeCSharpAcronyms()); } } @@ -112,23 +89,6 @@ void AddModel(InputModelType model) var result = new Dictionary(); foreach (var (model, candidate) in candidates) { - if (candidate.IsRestoredUnknownName && - (nameCounts[candidate.FinalName] > 1 || reservedTypes.Contains((candidate.FinalName, candidate.FinalNamespace)))) - { - CodeModelGenerator.Instance.Emitter.Info( - $"Skipping back-compat unknown discriminator model name '{candidate.FinalName}' for '{candidate.Namespace}.{candidate.DefaultName}'; the name is already used by another generated type.", - BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); - result.Add(model, candidate.DefaultName); - continue; - } - - if (candidate.IsRestoredUnknownName) - { - CodeModelGenerator.Instance.Emitter.Info( - $"Changed unknown discriminator model name from '{candidate.DefaultName}' to '{candidate.Name}' to match the last contract.", - BackCompatibilityChangeCategory.UnknownDiscriminatorModelNamePreserved); - } - // A direct input takes precedence over an implicit suffix match for the same mapping. var mappingBelongsToModel = candidate.HasTypeMapping && !originalNames.Contains(candidate.Name); @@ -150,24 +110,8 @@ void AddModel(InputModelType model) ReserveName(name); result.Add(model, name); } - return result; - } - - internal bool TryGetModelName(InputModelType model, out string name) - { - if (!_isBuildingModelNames && _modelNames is null) - { - _ = ModelNames; - } - if (_modelNames is not null && _modelNames.TryGetValue(model, out var modelName)) - { - name = modelName; - return true; - } - - name = string.Empty; - return false; + return result; } public IDictionary CSharpTypeMap { get; } = new Dictionary(CSharpType.IgnoreNullableComparer); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs index 466cea822e8..658aaf84194 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs @@ -423,68 +423,21 @@ await MockHelpers.LoadMockGeneratorAsync( Assert.AreEqual("PipelineActivity", rootUnknown.BaseModelProvider!.Name); } - [TestCase("Model", false)] - [TestCase("Model", true)] - [TestCase("Enum", false)] - [TestCase("Custom", false)] - [TestCase("MappedModel", false)] - [TestCase("UnrelatedMapping", false)] - public async Task UnknownDiscriminatorNameCollisionSkipped(string collision, bool reverseOrder) - { - var input = InputFactory.Model("PipelineActivity", properties: - [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); - var other = InputFactory.Model(collision == "MappedModel" ? "OtherModel" : "UnknownActivity"); - InputModelType[] models = collision is "Model" or "MappedModel" - ? (reverseOrder ? [other, input] : [input, other]) : [input]; - await MockHelpers.LoadMockGeneratorAsync( - inputModelTypes: models, - inputEnumTypes: collision == "Enum" ? [InputFactory.StringEnum("UnknownActivity", [("One", "one")])] : [], - compilation: collision is "Custom" or "MappedModel" or "UnrelatedMapping" - ? async () => await Helpers.GetCompilationFromDirectoryAsync(collision) : null, - lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( - "LastContract", method: nameof(UnknownDiscriminatorNameRestored))); - var unknown = CodeModelGenerator.Instance.TypeFactory.CreateModel( - input.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; - - Assert.AreEqual("UnknownPipelineActivity", unknown.Name); - Assert.IsNull(unknown.CustomCodeView); - } - - [TestCase("NoProxy", true, false, null)] - [TestCase("PipelineActivity", false, false, null)] - [TestCase("WrongNamespace", true, false, "different namespace")] - [TestCase("DuplicateProxy", true, false, "exactly one PersistableModelProxyAttribute")] - [TestCase("UnresolvedProxy", true, false, "resolvable type argument")] - [TestCase("PipelineActivity", true, true, "accepted removal")] - public async Task UnknownDiscriminatorNameGuards(string modelName, bool lastContract, bool acceptedRemoval, string? reason) + [TestCase("NoProxy", true)] + [TestCase("PipelineActivity", false)] + public async Task UnknownDiscriminatorNameUnchangedWithoutProxy(string modelName, bool lastContract) { var input = InputFactory.Model(modelName, properties: [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); - var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( + await MockHelpers.LoadMockGeneratorAsync( inputModelTypes: [input], lastContractCompilation: lastContract ? async () => await Helpers.GetCompilationFromDirectoryAsync( - "LastContract", method: nameof(UnknownDiscriminatorNameRestored)) : null, - apiCompatBaseline: acceptedRemoval - ? ApiCompatBaseline.Parse(["TypesMustExist : Type 'Sample.Models.UnknownActivity' does not exist in the implementation."]) - : null); - using var emitterStream = new MemoryStream(); - using var emitter = new Emitter(emitterStream); - mockGenerator.Setup(generator => generator.Emitter).Returns(emitter); + "LastContract", method: nameof(UnknownDiscriminatorNameRestored)) : null); var unknown = CodeModelGenerator.Instance.TypeFactory.CreateModel( input.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; Assert.AreEqual($"Unknown{modelName}", unknown.Name); - emitter.WriteBufferedMessages(); - var messages = Encoding.UTF8.GetString(emitterStream.ToArray()); - if (reason is null) - { - Assert.IsEmpty(messages); - } - else - { - StringAssert.Contains(reason, messages); - } } [TestCase(false)] diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(Custom)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(Custom)/UnknownActivity.cs deleted file mode 100644 index 9b51167743b..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(Custom)/UnknownActivity.cs +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -namespace Sample.Models -{ - internal class UnknownActivity { } -} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MappedModel)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MappedModel)/UnknownActivity.cs deleted file mode 100644 index a27c4b2236a..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(MappedModel)/UnknownActivity.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Microsoft.TypeSpec.Generator.Customizations; - -namespace Sample.Models -{ - [CodeGenType("OtherModel")] - public partial class UnknownActivity { } -} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(UnrelatedMapping)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(UnrelatedMapping)/UnknownActivity.cs deleted file mode 100644 index a27c4b2236a..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameCollisionSkipped(UnrelatedMapping)/UnknownActivity.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Microsoft.TypeSpec.Generator.Customizations; - -namespace Sample.Models -{ - [CodeGenType("OtherModel")] - public partial class UnknownActivity { } -} From 00f28e88b72646d01a358cb810a76f2b3e17b428 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Thu, 19 Nov 2026 23:47:30 +0000 Subject: [PATCH 10/10] refactor(http-client-csharp): move proxy naming to SCM model provider Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Providers/ScmModelProvider.cs | 89 ++++++++++++++++++ .../DiscriminatorTests.cs | 18 ++++ .../Models.cs | 17 ++++ .../src/Providers/ModelProvider.cs | 75 ---------------- .../ModelProviders/ModelProviderTests.cs | 90 ------------------- .../UnknownActivity.cs | 7 -- .../UnknownActivity.cs | 10 --- .../UnknownActivity.cs | 10 --- .../UnknownActivity.cs | 10 --- .../Models.cs | 43 --------- 10 files changed, 124 insertions(+), 245 deletions(-) create mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameRestoredPerHierarchyLevel/Models.cs delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Direct)/UnknownActivity.cs delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyInternal)/UnknownActivity.cs delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyPublic)/UnknownActivity.cs delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Restored)/UnknownActivity.cs delete mode 100644 packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameRestored(LastContract)/Models.cs diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmModelProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmModelProvider.cs index f35d4ae05f5..239869ece49 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmModelProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmModelProvider.cs @@ -31,6 +31,7 @@ namespace Microsoft.TypeSpec.Generator.ClientModel.Providers public class ScmModelProvider : ModelProvider { private readonly InputModelType _inputModel; + private readonly Lazy _lastContractUnknownDiscriminatorModelName; private readonly Dictionary _nullablePropertyPresence = []; // MRW and multipart serialization can add an empty constructor with an implicit base() call. @@ -77,12 +78,100 @@ protected override bool RequiresParameterlessBaseConstructor public ScmModelProvider(InputModelType inputModel) : base(inputModel) { _inputModel = inputModel; + _lastContractUnknownDiscriminatorModelName = new(BuildLastContractUnknownDiscriminatorModelName); IsDynamicModel = inputModel.IsDynamicModel; // Resolve the hierarchy only after TypeFactory has registered this provider. Eager // resolution here lets compatibility probes cache null types for recursive properties. BaseJsonPatchProperty = new(GetBaseJsonPatchProperty); } + protected override string BuildName() + { + return _inputModel.IsUnknownDiscriminatorModel && + _lastContractUnknownDiscriminatorModelName.Value is { } historicalName + ? historicalName + : base.BuildName(); + } + + private string? BuildLastContractUnknownDiscriminatorModelName() + { + if (_inputModel.BaseModel is not { } baseModel || + ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(baseModel)?.LastContractView is not { } lastContractBase) + { + return null; + } + + AttributeStatement? proxyAttribute = null; + foreach (var attribute in lastContractBase.Attributes) + { + if (!attribute.Type.Equals(typeof(PersistableModelProxyAttribute))) + { + continue; + } + + if (proxyAttribute is not null) + { + ScmCodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; expected exactly one {nameof(PersistableModelProxyAttribute)}.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + return null; + } + + proxyAttribute = attribute; + } + + if (proxyAttribute is null) + { + return null; + } + + if (proxyAttribute.Arguments is not [TypeOfExpression { Type: var proxyType }]) + { + ScmCodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; expected exactly one {nameof(PersistableModelProxyAttribute)} with a resolvable type argument.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + return null; + } + + if (proxyType.Namespace != BuildNamespace()) + { + ScmCodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name '{proxyType.FullyQualifiedName}' for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; the proxy type is in a different namespace.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + return null; + } + + if (ScmCodeModelGenerator.Instance.InputLibrary.InputNamespace.Clients.Any(client => + string.Equals( + ClientProvider.GetNameForCollisionCheck(client).Name, + proxyType.Name, + StringComparison.OrdinalIgnoreCase))) + { + ScmCodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name '{proxyType.FullyQualifiedName}' for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; the name is already used by a generated client.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + return null; + } + + if (ScmCodeModelGenerator.Instance.SourceInputModel.ApiCompatBaseline.IsTypeSuppressed(proxyType.FullyQualifiedName)) + { + ScmCodeModelGenerator.Instance.Emitter.Info( + $"Skipping back-compat unknown discriminator model name '{proxyType.FullyQualifiedName}' for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; the proxy type is an accepted removal in the ApiCompat baseline.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); + return null; + } + + var defaultName = base.BuildName(); + if (proxyType.Name != defaultName) + { + ScmCodeModelGenerator.Instance.Emitter.Info( + $"Changed unknown discriminator model name from '{defaultName}' to '{proxyType.Name}' to match the last contract.", + BackCompatibilityChangeCategory.UnknownDiscriminatorModelNamePreserved); + } + + return proxyType.Name; + } + protected override TypeSignatureModifiers BuildDeclarationModifiers() { var modifiers = base.BuildDeclarationModifiers(); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs index a220d60db92..ee7c2a3d455 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/DiscriminatorTests.cs @@ -203,6 +203,24 @@ await MockHelpers.LoadMockGeneratorAsync( Assert.AreEqual(isPublic, context.Attributes.Any(a => a.ToDisplayString().Contains("UnknownActivity"))); } + [Test] + public async Task HistoricalUnknownNameRestoredPerHierarchyLevel() + { + var root = InputFactory.Model("PipelineActivity", properties: + [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); + var child = InputFactory.Model("CopyActivitySource", baseModel: root, discriminatedKind: "copy", properties: + [InputFactory.Property("sourceKind", InputPrimitiveType.String, isDiscriminator: true)]); + await MockHelpers.LoadMockGeneratorAsync( + inputModels: () => [child, root], + lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); + var factory = ScmCodeModelGenerator.Instance.TypeFactory; + var rootUnknown = factory.CreateModel(root.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; + var childUnknown = factory.CreateModel(child.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; + + Assert.AreEqual("UnknownActivity", rootUnknown.Name); + Assert.AreEqual("UnknownCopySource", childUnknown.Name); + } + [Test] public async Task HistoricalUnknownNameDoesNotCollideWithClient() { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameRestoredPerHierarchyLevel/Models.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameRestoredPerHierarchyLevel/Models.cs new file mode 100644 index 00000000000..84e9c27f63e --- /dev/null +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/MrwSerializationTypeDefinitions/TestData/DiscriminatorTests/HistoricalUnknownNameRestoredPerHierarchyLevel/Models.cs @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.ClientModel.Primitives; + +namespace Sample.Models +{ + [PersistableModelProxy(typeof(UnknownActivity))] + public abstract class PipelineActivity { } + + [PersistableModelProxy(typeof(UnknownCopySource))] + public abstract class CopyActivitySource : PipelineActivity { } + + internal class UnknownActivity : PipelineActivity { } + + internal class UnknownCopySource : CopyActivitySource { } +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs index 7e57eec4f58..69e6ab28afe 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs @@ -25,7 +25,6 @@ public class ModelProvider : TypeProvider private const string RequestSuffix = "Request"; private const string ResponseSuffix = "Response"; private readonly InputModelType _inputModel; - private readonly Lazy _lastContractUnknownDiscriminatorModelName; internal InputModelType InputModel => _inputModel; // Note the description cannot be built from the constructor as it would lead to a circular dependency between the base @@ -89,7 +88,6 @@ protected override FormattableString BuildDescription() public ModelProvider(InputModelType inputModel) : base(inputModel) { _inputModel = inputModel; - _lastContractUnknownDiscriminatorModelName = new(BuildLastContractUnknownDiscriminatorModelName); _isDiscriminatedBaseType = inputModel.DiscriminatorProperty is not null && inputModel.DiscriminatorValue is null; _useObjectAdditionalProperties = new Lazy(ShouldUseObjectAdditionalProperties); } @@ -444,84 +442,11 @@ protected override TypeProvider[] BuildSerializationProviders() protected override string BuildName() { - if (IsUnknownDiscriminatorModel && _lastContractUnknownDiscriminatorModelName.Value is { } historicalName) - { - return historicalName; - } - return CodeModelGenerator.Instance.TypeFactory.ModelNames.TryGetValue(_inputModel, out var name) ? name : BuildNameWithoutCollisionCheck(); } - private string? BuildLastContractUnknownDiscriminatorModelName() - { - if (_inputModel.BaseModel is not { } baseModel || - CodeModelGenerator.Instance.TypeFactory.CreateModel(baseModel)?.LastContractView is not { } lastContractBase) - { - return null; - } - - AttributeData? proxyAttribute = null; - foreach (var attribute in lastContractBase.Attributes) - { - if (attribute.Data?.AttributeClass?.ToDisplayString() != - "System.ClientModel.Primitives.PersistableModelProxyAttribute") - { - continue; - } - - if (proxyAttribute is not null) - { - CodeModelGenerator.Instance.Emitter.Info( - $"Skipping back-compat unknown discriminator model name for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; expected exactly one PersistableModelProxyAttribute.", - BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); - return null; - } - - proxyAttribute = attribute.Data; - } - - if (proxyAttribute is null) - { - return null; - } - - if (proxyAttribute.ConstructorArguments is not - [{ Kind: TypedConstantKind.Type, Value: INamedTypeSymbol { TypeKind: not TypeKind.Error } proxyType }]) - { - CodeModelGenerator.Instance.Emitter.Info( - $"Skipping back-compat unknown discriminator model name for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; expected exactly one PersistableModelProxyAttribute with a resolvable type argument.", - BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); - return null; - } - - if (proxyType.ContainingNamespace.ToDisplayString() != BuildNamespace()) - { - CodeModelGenerator.Instance.Emitter.Info( - $"Skipping back-compat unknown discriminator model name '{proxyType.ToDisplayString()}' for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; the proxy type is in a different namespace.", - BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); - return null; - } - - if (CodeModelGenerator.Instance.SourceInputModel.ApiCompatBaseline.IsTypeSuppressed(proxyType.ToDisplayString())) - { - CodeModelGenerator.Instance.Emitter.Info( - $"Skipping back-compat unknown discriminator model name '{proxyType.ToDisplayString()}' for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; the proxy type is an accepted removal in the ApiCompat baseline.", - BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped); - return null; - } - - if (proxyType.Name != BuildNameWithoutCollisionCheck()) - { - CodeModelGenerator.Instance.Emitter.Info( - $"Changed unknown discriminator model name from '{BuildNameWithoutCollisionCheck()}' to '{proxyType.Name}' to match the last contract.", - BackCompatibilityChangeCategory.UnknownDiscriminatorModelNamePreserved); - } - - return proxyType.Name; - } - internal (string Name, string FinalName, string OriginalName, string Namespace, string FinalNamespace, bool CanRename, bool HasTypeMapping) GetNameForCollisionCheck() { var name = BuildNameWithoutCollisionCheck(); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs index 658aaf84194..d5cf7949a01 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/ModelProviderTests.cs @@ -350,96 +350,6 @@ public void TestBuildName_ModelSuffixReservesEnumNames(string modelName, string Assert.AreSame(enumProvider, factory.CSharpTypeMap[enumProvider.Type]); } - [TestCase(false)] - [TestCase(true)] - public async Task UnknownDiscriminatorNameRestored(bool unknownFirst) - { - var input = InputFactory.Model("PipelineActivity", properties: - [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); - var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( - inputModelTypes: [input], - lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync("LastContract")); - using var emitterStream = new MemoryStream(); - using var emitter = new Emitter(emitterStream); - mockGenerator.Setup(generator => generator.Emitter).Returns(emitter); - var factory = CodeModelGenerator.Instance.TypeFactory; - var unknownInput = input.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel); - var unknown = unknownFirst ? factory.CreateModel(unknownInput) : null; - var model = factory.CreateModel(input)!; - unknown ??= factory.CreateModel(unknownInput)!; - - Assert.AreEqual("PipelineActivity", model.Name); - Assert.AreEqual("UnknownActivity", unknown.Name); - Assert.AreEqual(TypeSignatureModifiers.Internal | TypeSignatureModifiers.Partial | TypeSignatureModifiers.Class, unknown.DeclarationModifiers); - Assert.AreSame(model, unknown.BaseModelProvider); - Assert.AreEqual("UnknownActivity.cs", Path.GetFileName(unknown.RelativeFilePath)); - Assert.AreSame(unknown, factory.CSharpTypeMap[unknown.Type]); - Assert.AreEqual("UnknownActivity", unknown.Name); - emitter.WriteBufferedMessages(); - var messages = Encoding.UTF8.GetString(emitterStream.ToArray()); - StringAssert.Contains("Unknown Discriminator Model Name Preserved", messages); - Assert.AreEqual(1, messages.Split("Changed unknown discriminator model name").Length - 1); - } - - [TestCase("LegacyInternal", "UnknownActivity", false)] - [TestCase("LegacyPublic", "UnknownActivity", true)] - [TestCase("Restored", "CustomizedActivity", true)] - [TestCase("Direct", "UnknownActivity", true)] - public async Task UnknownDiscriminatorNamePreservesCustomization(string customization, string expectedName, bool isPublic) - { - var input = InputFactory.Model("PipelineActivity", properties: - [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); - await MockHelpers.LoadMockGeneratorAsync( - inputModelTypes: [input], - compilation: async () => await Helpers.GetCompilationFromDirectoryAsync(customization), - lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( - "LastContract", method: nameof(UnknownDiscriminatorNameRestored))); - var unknown = CodeModelGenerator.Instance.TypeFactory.CreateModel( - input.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; - - Assert.AreEqual(expectedName, unknown.Name); - Assert.IsNotNull(unknown.CustomCodeView); - Assert.AreEqual(isPublic, unknown.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public)); - } - - [Test] - public async Task UnknownDiscriminatorNameRestoredPerHierarchyLevel() - { - var root = InputFactory.Model("PipelineActivity", properties: - [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); - var child = InputFactory.Model("CopyActivitySource", baseModel: root, discriminatedKind: "copy", properties: - [InputFactory.Property("sourceKind", InputPrimitiveType.String, isDiscriminator: true)]); - await MockHelpers.LoadMockGeneratorAsync( - inputModelTypes: [child, root], - lastContractCompilation: async () => await Helpers.GetCompilationFromDirectoryAsync( - "LastContract", method: nameof(UnknownDiscriminatorNameRestored))); - var factory = CodeModelGenerator.Instance.TypeFactory; - var childUnknown = factory.CreateModel(child.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; - var rootUnknown = factory.CreateModel(root.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; - - Assert.AreEqual("UnknownCopySource", childUnknown.Name); - Assert.AreEqual("UnknownActivity", rootUnknown.Name); - Assert.AreEqual("CopyActivitySource", childUnknown.BaseModelProvider!.Name); - Assert.AreEqual("PipelineActivity", rootUnknown.BaseModelProvider!.Name); - } - - [TestCase("NoProxy", true)] - [TestCase("PipelineActivity", false)] - public async Task UnknownDiscriminatorNameUnchangedWithoutProxy(string modelName, bool lastContract) - { - var input = InputFactory.Model(modelName, properties: - [InputFactory.Property("kind", InputPrimitiveType.String, isDiscriminator: true)]); - await MockHelpers.LoadMockGeneratorAsync( - inputModelTypes: [input], - lastContractCompilation: lastContract - ? async () => await Helpers.GetCompilationFromDirectoryAsync( - "LastContract", method: nameof(UnknownDiscriminatorNameRestored)) : null); - var unknown = CodeModelGenerator.Instance.TypeFactory.CreateModel( - input.DiscriminatedSubtypes.Values.Single(m => m.IsUnknownDiscriminatorModel))!; - - Assert.AreEqual($"Unknown{modelName}", unknown.Name); - } - [TestCase(false)] [TestCase(true)] public void TestBuildName_ModelSuffixReservesUnknownDiscriminatorName(bool reverseOrder) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Direct)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Direct)/UnknownActivity.cs deleted file mode 100644 index 131a587b3a4..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Direct)/UnknownActivity.cs +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -namespace Sample.Models -{ - public partial class UnknownActivity { } -} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyInternal)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyInternal)/UnknownActivity.cs deleted file mode 100644 index a96d4102dd1..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyInternal)/UnknownActivity.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Microsoft.TypeSpec.Generator.Customizations; - -namespace Sample.Models -{ - [CodeGenType("UnknownPipelineActivity")] - internal partial class UnknownActivity { } -} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyPublic)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyPublic)/UnknownActivity.cs deleted file mode 100644 index a767e9115d1..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(LegacyPublic)/UnknownActivity.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Microsoft.TypeSpec.Generator.Customizations; - -namespace Sample.Models -{ - [CodeGenType("UnknownPipelineActivity")] - public partial class UnknownActivity { } -} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Restored)/UnknownActivity.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Restored)/UnknownActivity.cs deleted file mode 100644 index 46e16ea6118..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNamePreservesCustomization(Restored)/UnknownActivity.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Microsoft.TypeSpec.Generator.Customizations; - -namespace Sample.Models -{ - [CodeGenType("UnknownActivity")] - public partial class CustomizedActivity { } -} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameRestored(LastContract)/Models.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameRestored(LastContract)/Models.cs deleted file mode 100644 index eb224d454c5..00000000000 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/TestData/ModelProviderTests/UnknownDiscriminatorNameRestored(LastContract)/Models.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using System.ClientModel.Primitives; - -namespace Sample.Models -{ - [PersistableModelProxy(typeof(UnknownActivity))] - public class PipelineActivity { } - - [PersistableModelProxy(typeof(UnknownCopySource))] - public class CopyActivitySource : PipelineActivity { } - - internal class UnknownActivity : PipelineActivity { } - internal class UnknownCopySource : CopyActivitySource { } - - public class NoProxy { } - - [PersistableModelProxy(typeof(Other.UnknownActivity))] - public class WrongNamespace { } - - [PersistableModelProxy(typeof(UnknownActivity))] - [PersistableModelProxy(typeof(UnknownCopySource))] - public class DuplicateProxy { } - - [PersistableModelProxy(typeof(MissingType))] - public class UnresolvedProxy { } -} - -namespace Other -{ - internal class UnknownActivity { } -} - -namespace System.ClientModel.Primitives -{ - [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] - internal sealed class PersistableModelProxyAttribute : Attribute - { - public PersistableModelProxyAttribute(Type proxyType) { } - } -}