Skip to content

Make configuration public for testing and internalize primaryNamespace #9398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoshLove-msft merged 3 commits into from
Jan 16, 2026
Merged

Make configuration public for testing and internalize primaryNamespace #9398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2b08d7
Make configuration public for testing and internalize primaryNamespace
JoshLove-msft Jan 16, 2026
38ca39a
fix
JoshLove-msft Jan 16, 2026
bbedabb
regen
JoshLove-msft Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rosoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class ModelReaderWriterContextDefinition : TypeProvider
private static readonly CSharpTypeNameComparer s_cSharpTypeNameComparer = new CSharpTypeNameComparer();
private static readonly TypeProviderTypeNameComparer s_typeProviderNameComparer = new TypeProviderTypeNameComparer();

internal static readonly string s_name = $"{RemovePeriods(ScmCodeModelGenerator.Instance.TypeFactory.PrimaryNamespace)}Context";
internal static readonly string s_name = $"{ScmCodeModelGenerator.Instance.TypeFactory.ServiceName}Context";

protected override string BuildName() => s_name;

Expand Down
4 changes: 2 additions & 2 deletions packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Microsoft.TypeSpec.Generator
/// </summary>
public class Configuration
{
internal enum UnreferencedTypesHandlingOption
public enum UnreferencedTypesHandlingOption
{
RemoveOrInternalize = 0,
Internalize = 1,
Expand All @@ -29,7 +29,7 @@ protected Configuration()
{
}

private Configuration(
public Configuration(
string outputPath,
Dictionary<string, BinaryData> additionalConfigurationOptions,
string packageName,
Expand Down
2 changes: 1 addition & 1 deletion packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/TypeFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ public EnumCacheKey(InputEnumType enumType, TypeProvider? declaringType)
}

private string? _primaryNamespace;
public string PrimaryNamespace => _primaryNamespace ??= GetCleanNameSpace(CodeModelGenerator.Instance.InputLibrary.InputNamespace.Name);
internal string PrimaryNamespace => _primaryNamespace ??= GetCleanNameSpace(CodeModelGenerator.Instance.InputLibrary.InputNamespace.Name);

public string ServiceName => _serviceName ??= BuildServiceName();
private string? _serviceName;
Expand Down
2 changes: 1 addition & 1 deletion ...c/Generated/Models/Encode_ArrayContext.cs → ...rc/Generated/Models/EncodeArrayContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Encode._Array
[ModelReaderWriterBuildable(typeof(NewlineDelimitedArrayProperty))]
[ModelReaderWriterBuildable(typeof(PipeDelimitedArrayProperty))]
[ModelReaderWriterBuildable(typeof(SpaceDelimitedArrayProperty))]
public partial class Encode_ArrayContext : ModelReaderWriterContext
public partial class EncodeArrayContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...rc/Generated/Models/_Type_ArrayContext.cs → .../src/Generated/Models/TypeArrayContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
namespace _Type._Array
{
[ModelReaderWriterBuildable(typeof(InnerModel))]
public partial class _Type_ArrayContext : ModelReaderWriterContext
public partial class TypeArrayContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...enerated/Models/_TypeDictionaryContext.cs → ...Generated/Models/TypeDictionaryContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
namespace _Type.Dictionary
{
[ModelReaderWriterBuildable(typeof(InnerModel))]
public partial class _TypeDictionaryContext : ModelReaderWriterContext
public partial class TypeDictionaryContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...ted/Models/_Type_EnumExtensibleContext.cs → ...rated/Models/TypeEnumExtensibleContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace _Type._Enum.Extensible
{
public partial class _Type_EnumExtensibleContext : ModelReaderWriterContext
public partial class TypeEnumExtensibleContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...enerated/Models/_Type_EnumFixedContext.cs → .../Generated/Models/TypeEnumFixedContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace _Type._Enum.Fixed
{
public partial class _Type_EnumFixedContext : ModelReaderWriterContext
public partial class TypeEnumFixedContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...enerated/Models/_TypeModelEmptyContext.cs → ...Generated/Models/TypeModelEmptyContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace _Type.Model.Empty
[ModelReaderWriterBuildable(typeof(EmptyInput))]
[ModelReaderWriterBuildable(typeof(EmptyInputOutput))]
[ModelReaderWriterBuildable(typeof(EmptyOutput))]
public partial class _TypeModelEmptyContext : ModelReaderWriterContext
public partial class TypeModelEmptyContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...delInheritanceEnumDiscriminatorContext.cs → ...delInheritanceEnumDiscriminatorContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace _Type.Model.Inheritance.EnumDiscriminator
[ModelReaderWriterBuildable(typeof(Snake))]
[ModelReaderWriterBuildable(typeof(UnknownDog))]
[ModelReaderWriterBuildable(typeof(UnknownSnake))]
public partial class _TypeModelInheritanceEnumDiscriminatorContext : ModelReaderWriterContext
public partial class TypeModelInheritanceEnumDiscriminatorContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...lInheritanceNestedDiscriminatorContext.cs → ...lInheritanceNestedDiscriminatorContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace _Type.Model.Inheritance.NestedDiscriminator
[ModelReaderWriterBuildable(typeof(Shark))]
[ModelReaderWriterBuildable(typeof(UnknownFish))]
[ModelReaderWriterBuildable(typeof(UnknownShark))]
public partial class _TypeModelInheritanceNestedDiscriminatorContext : ModelReaderWriterContext
public partial class TypeModelInheritanceNestedDiscriminatorContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...odelInheritanceNotDiscriminatedContext.cs → ...odelInheritanceNotDiscriminatedContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace _Type.Model.Inheritance.NotDiscriminated
[ModelReaderWriterBuildable(typeof(Cat))]
[ModelReaderWriterBuildable(typeof(Pet))]
[ModelReaderWriterBuildable(typeof(Siamese))]
public partial class _TypeModelInheritanceNotDiscriminatedContext : ModelReaderWriterContext
public partial class TypeModelInheritanceNotDiscriminatedContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion .../_TypeModelInheritanceRecursiveContext.cs → ...s/TypeModelInheritanceRecursiveContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace _Type.Model.Inheritance.Recursive
{
[ModelReaderWriterBuildable(typeof(Element))]
[ModelReaderWriterBuildable(typeof(Extension))]
public partial class _TypeModelInheritanceRecursiveContext : ModelReaderWriterContext
public partial class TypeModelInheritanceRecursiveContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...lInheritanceSingleDiscriminatorContext.cs → ...lInheritanceSingleDiscriminatorContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace _Type.Model.Inheritance.SingleDiscriminator
[ModelReaderWriterBuildable(typeof(TRex))]
[ModelReaderWriterBuildable(typeof(UnknownBird))]
[ModelReaderWriterBuildable(typeof(UnknownDinosaur))]
public partial class _TypeModelInheritanceSingleDiscriminatorContext : ModelReaderWriterContext
public partial class TypeModelInheritanceSingleDiscriminatorContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...enerated/Models/_TypeModelUsageContext.cs → ...Generated/Models/TypeModelUsageContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace _Type.Model.Usage
[ModelReaderWriterBuildable(typeof(InputOutputRecord))]
[ModelReaderWriterBuildable(typeof(InputRecord))]
[ModelReaderWriterBuildable(typeof(OutputRecord))]
public partial class _TypeModelUsageContext : ModelReaderWriterContext
public partial class TypeModelUsageContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...ted/Models/_TypeModelVisibilityContext.cs → ...ated/Models/TypeModelVisibilityContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace _Type.Model.Visibility
{
[ModelReaderWriterBuildable(typeof(ReadOnlyModel))]
[ModelReaderWriterBuildable(typeof(VisibilityModel))]
public partial class _TypeModelVisibilityContext : ModelReaderWriterContext
public partial class TypeModelVisibilityContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...ypePropertyAdditionalPropertiesContext.cs → ...ypePropertyAdditionalPropertiesContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace _Type.Property.AdditionalProperties
[ModelReaderWriterBuildable(typeof(WidgetData0))]
[ModelReaderWriterBuildable(typeof(WidgetData1))]
[ModelReaderWriterBuildable(typeof(WidgetData2))]
public partial class _TypePropertyAdditionalPropertiesContext : ModelReaderWriterContext
public partial class TypePropertyAdditionalPropertiesContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...ed/Models/_TypePropertyNullableContext.cs → ...ted/Models/TypePropertyNullableContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace _Type.Property.Nullable
[ModelReaderWriterBuildable(typeof(DurationProperty))]
[ModelReaderWriterBuildable(typeof(InnerModel))]
[ModelReaderWriterBuildable(typeof(StringProperty))]
public partial class _TypePropertyNullableContext : ModelReaderWriterContext
public partial class TypePropertyNullableContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...ed/Models/_TypePropertyOptionalContext.cs → ...ted/Models/TypePropertyOptionalContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace _Type.Property.Optional
[ModelReaderWriterBuildable(typeof(UnionFloatLiteralProperty))]
[ModelReaderWriterBuildable(typeof(UnionIntLiteralProperty))]
[ModelReaderWriterBuildable(typeof(UnionStringLiteralProperty))]
public partial class _TypePropertyOptionalContext : ModelReaderWriterContext
public partial class TypePropertyOptionalContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion .../Models/_TypePropertyValueTypesContext.cs → ...d/Models/TypePropertyValueTypesContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace _Type.Property.ValueTypes
[ModelReaderWriterBuildable(typeof(UnknownDictProperty))]
[ModelReaderWriterBuildable(typeof(UnknownIntProperty))]
[ModelReaderWriterBuildable(typeof(UnknownStringProperty))]
public partial class _TypePropertyValueTypesContext : ModelReaderWriterContext
public partial class TypePropertyValueTypesContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...rc/Generated/Models/_TypeScalarContext.cs → ...src/Generated/Models/TypeScalarContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace _Type.Scalar
{
public partial class _TypeScalarContext : ModelReaderWriterContext
public partial class TypeScalarContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion .../Models/_TypeUnionDiscriminatedContext.cs → ...d/Models/TypeUnionDiscriminatedContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace _Type.Union.Discriminated
{
[ModelReaderWriterBuildable(typeof(Cat))]
[ModelReaderWriterBuildable(typeof(Dog))]
public partial class _TypeUnionDiscriminatedContext : ModelReaderWriterContext
public partial class TypeUnionDiscriminatedContext : ModelReaderWriterContext
{
}
}
2 changes: 1 addition & 1 deletion ...src/Generated/Models/_TypeUnionContext.cs → .../src/Generated/Models/TypeUnionContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace _Type.Union
[ModelReaderWriterBuildable(typeof(MixedLiteralsCases))]
[ModelReaderWriterBuildable(typeof(MixedTypesCases))]
[ModelReaderWriterBuildable(typeof(StringAndArrayCases))]
public partial class _TypeUnionContext : ModelReaderWriterContext
public partial class TypeUnionContext : ModelReaderWriterContext
{
}
}
Loading