Skip to content

fix(ts): support discriminator properties starting with double unders… #6764

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

Closed
wants to merge 2 commits into from
Closed

fix(ts): support discriminator properties starting with double unders… #6764

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c4d127
fix(ts): support discriminator properties starting with double unders…
sidhartthhhhh Jul 14, 2025
c05f905
Merge branch 'main' into fix/typescript-double-underscore-discriminator
sidhartthhhhh Jul 22, 2025
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
9 changes: 9 additions & 0 deletions src/Kiota.Builder/Writers/TypeScript/TypeScriptConventionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ public static string GetTypescriptTypeString(CodeTypeBase code, CodeElement targ
* @param targetElement The target element
* @returns The composed type string representation
*/

private static string GetComposedTypeTypeString(CodeComposedTypeBase composedType, CodeElement targetElement, string collectionSuffix, bool includeCollectionInformation = true)
{
if (!composedType.Types.Any())
Expand Down Expand Up @@ -347,6 +348,14 @@ public static string GetFactoryMethodName(CodeTypeBase targetClassType, CodeElem
return definitionClass.GetImmediateParentOfType<CodeFile>(definitionClass)?.FindChildByName<CodeFunction>(factoryMethodName);
}

public override string GetPropertyName(string originalName)
{
if (originalName.StartsWith("__"))
Copy link
Member

@baywet baywet Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this fix is super specific to this use case, it should most likely be fixed in the generation code instead.

Here is where the switch statement gets written

kiota/src/Kiota.Builder/Writers/TypeScript/CodeFunctionWriter.cs

Line 419 in 5fb1a91

writer.StartBlock($"switch ({param.Name.ToFirstCharacterLowerCase()}.{discriminatorProperty.Name.ToFirstCharacterLowerCase()}) {{");

(should use the symbol name instead, and avoid normalizing the casing)

Here is where it gets tested

kiota/tests/Kiota.Builder.Tests/Writers/TypeScript/CodeFunctionWriterTests.cs

Line 502 in 5fb1a91

Assert.Contains("switch (parentClass.odataType) {", result);

return originalName; // Don't transform property names starting with double underscore

return base.GetPropertyName(originalName); // fallback to default
}

public string GetDeserializationMethodName(CodeTypeBase codeType, CodeElement targetElement, bool? IsCollection = null)
{
ArgumentNullException.ThrowIfNull(codeType);
Expand Down