Use new sanitizer for TypeScript symbol which takes wider variety characters for enum var name

Signed-off-by: moznion <[email protected]>

Author: moznion

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java

@@ -315,13 +315,23 @@ public String toEnumVarName(String name, String datatype) {
 
         if (enumName.isEmpty()) {
             // After sanitizing *all* characters (e.g. multibyte characters), the var name becomes an empty string.
-            // An empty string would cause a syntax error, so this pads the pseudo var name to avoid that.
-            return "STRING";
+            // An empty string would cause a syntax error, so this code attempts to re-sanitize the name using another sanitizer that allows a wider variety of characters.
+            // For backward compatibility, this additional sanitization is only applied if the original sanitized name is empty.
+            final String sanitized = sanitizeNameForTypeScriptSymbol(name);
+            if (sanitized.isEmpty()) {
+                // After re-sanitizing, this pads a pseudo var name ("STRING") if still the name is empty.
+                return "STRING";
+            }
+            return "_" + sanitized;
         }
 
         return enumName;
     }
 
+    private String sanitizeNameForTypeScriptSymbol(String name) {
+        return sanitizeName(name, "[^\\p{L}\\p{Nd}\\$_]");
+    }
+
     private String getNameWithEnumPropertyNaming(String name) {
         switch (getEnumPropertyNaming()) {
             case original:

modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java

@@ -202,9 +202,11 @@ public void testForAllSanitizedEnum() throws Exception {
         TestUtils.assertFileContains(
             Paths.get(output + "/models/Greeting.ts"),
             "export enum Greeting {\n" +
-            "    STRING = 'こんにちは',\n" +
-            "    STRING2 = '你好',\n" +
-            "    STRING3 = '안녕하세요'\n" +
+            "    _こんにちは = 'こんにちは',\n" +
+            "    _你好 = '你好',\n" +
+            "    _안녕하세요 = '안녕하세요',\n" +
+            "    STRING = '!@#%',\n" +
+            "    STRING2 = '^&*\uD83C\uDF63'",
             "}"
         );
     }

modules/openapi-generator/src/test/resources/bugs/typescript_enum_var_name_all_sanitized.yaml

@@ -15,3 +15,5 @@ components:
         - 'こんにちは'
         - '你好'
         - '안녕하세요'
+        - '!@#%'
+        - '^&*🍣'