Skip to content

fix(typescript): keep non-latin letters in enum keys #25562

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

Open
thekhegay wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −2
Open

fix(typescript): keep non-latin letters in enum keys #25562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions ...tor/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,8 +982,12 @@ public String toEnumVarName(String name, String datatype) {
varName = varName.replaceAll("\\+", "_plus_");
varName = varName.replaceAll("_+", "_");
}
varName = sanitizeName(varName);
varName = varName.replaceFirst("^_", "");
String sanitizedName = sanitizeName(varName);
if (sanitizedName.replace("_", "").isEmpty()) {
// nothing is left of non-latin values like "Москва", keep their letters as TypeScript allows them
sanitizedName = sanitizeName(varName, "(?U)\\W");
}
varName = sanitizedName.replaceFirst("^_", "");
varName = varName.replaceFirst("_$", "");

varName = getNameUsingEnumPropertyNaming(varName);
Expand Down
9 changes: 9 additions & 0 deletions ...openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,15 @@ public void toEnumVarName() {
Assert.assertEquals(codegen.toEnumVarName("Illegal-Id+", "string"), "illegal_id");
}

@Test
public void toEnumVarNameWithoutLatinCharacters() {
TypeScriptAngularClientCodegen codegen = new TypeScriptAngularClientCodegen();
codegen.processOpts();
Assert.assertEquals(codegen.toEnumVarName("À", "string"), "À");
Assert.assertEquals(codegen.toEnumVarName("Москва", "string"), "Москва");
Assert.assertEquals(codegen.toEnumVarName("Нур-Султан", "string"), "НурСултан");
}

@Test
public void testModelSuffix() {
TypeScriptAngularClientCodegen codegen = new TypeScriptAngularClientCodegen();
Expand Down
Loading