Implement review comment about the trailing >

This implements comment #22748 (comment)

Author: saxicek

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

@@ -1110,11 +1110,26 @@ protected void updateDataTypeWithEnumForMap(CodegenProperty property) {
             // Now use property.enumName for datatypeWithEnum instead of toEnumName(baseItem)
             // This ensures the correct enum name (e.g., "ProjectRolesEnum") is used
             // instead of the generic inner item name (e.g., "InnerEnum")
-            property.datatypeWithEnum = property.datatypeWithEnum.replace(baseItem.baseType + ">", property.enumName + ">");
+            //
+            // TypeScript map types use index signature syntax: { [key: string]: ValueType; }
+            // We must only replace the VALUE type, not the key type (which must remain string/number).
+            // Target the value position by replacing "]: baseType" patterns.
+            String datatypeWithEnum = property.datatypeWithEnum;
+            // Try replacing value type in nested context (e.g., "]: Array<string>>" or "]: string>")
+            String replaced = datatypeWithEnum.replace("]: " + baseItem.baseType + ">", "]: " + property.enumName + ">");
+            if (replaced.equals(datatypeWithEnum)) {
+                // Try replacing value type in simple map context (e.g., "]: string;")
+                replaced = datatypeWithEnum.replace("]: " + baseItem.baseType + ";", "]: " + property.enumName + ";");
+            }
+            if (replaced.equals(datatypeWithEnum)) {
+                // Fallback: replace container types like "Array<string>" or "Set<string>"
+                replaced = datatypeWithEnum.replace("<" + baseItem.baseType + ">", "<" + property.enumName + ">");
+            }
+            property.datatypeWithEnum = replaced;
 
             // set default value for variable with inner enum
             if (property.defaultValue != null) {
-                property.defaultValue = property.defaultValue.replace(", " + property.items.baseType, ", " + property.enumName);
+                property.defaultValue = property.defaultValue.replace(baseItem.baseType, property.enumName);
             }
 
             updateCodegenPropertyEnum(property);

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

@@ -226,9 +226,15 @@ public void givenMapWithArrayOfEnumsThenCorrectEnumNameIsUsed() throws Exception
                 "typescript-rxjs"
         );
 
-        Pattern modelDefinition = Pattern.compile("\\b(interface|type|class)\\s+EmployeeWithMultiMapOfEnum\\b");
-        Pattern namespacedEnumRef = Pattern.compile("projectRoles[^\\n]*ProjectRolesEnum");
-        Pattern flatEnumRef = Pattern.compile("projectRoles[^\\n]*EmployeeWithMultiMapOfEnumProjectRolesEnum");
+        // Patterns for EmployeeWithMultiMapOfEnum (map of array of enums)
+        Pattern multiMapModelDefinition = Pattern.compile("\\b(interface|type|class)\\s+EmployeeWithMultiMapOfEnum\\b");
+        Pattern multiMapNamespacedEnumRef = Pattern.compile("projectRoles[^\\n]*ProjectRolesEnum");
+        Pattern multiMapFlatEnumRef = Pattern.compile("projectRoles[^\\n]*EmployeeWithMultiMapOfEnumProjectRolesEnum");
+
+        // Patterns for EmployeeWithMapOfEnum (simple map of enums)
+        Pattern simpleMapModelDefinition = Pattern.compile("\\b(interface|type|class)\\s+EmployeeWithMapOfEnum\\b");
+        Pattern simpleMapNamespacedEnumRef = Pattern.compile("projectRole[^s][^\\n]*ProjectRoleEnum");
+        Pattern simpleMapFlatEnumRef = Pattern.compile("projectRole[^s][^\\n]*EmployeeWithMapOfEnumProjectRoleEnum");
 
         for (String generatorName : generators) {
             File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
@@ -242,16 +248,29 @@ public void givenMapWithArrayOfEnumsThenCorrectEnumNameIsUsed() throws Exception
             Generator generator = new DefaultGenerator();
             generator.opts(configurator.toClientOptInput()).generate();
 
-            Path modelFile = findModelDefinitionFile(output.toPath(), modelDefinition);
-            String fileContents = Files.readString(modelFile);
+            // Test EmployeeWithMultiMapOfEnum (map of array of enums)
+            Path multiMapModelFile = findModelDefinitionFile(output.toPath(), multiMapModelDefinition);
+            String multiMapFileContents = Files.readString(multiMapModelFile);
+
+            Assert.assertFalse(multiMapFileContents.contains("InnerEnum"),
+                    generatorName + ": Should not contain 'InnerEnum' reference in " + multiMapModelFile);
+
+            boolean hasMultiMapEnumRef = multiMapNamespacedEnumRef.matcher(multiMapFileContents).find()
+                    || multiMapFlatEnumRef.matcher(multiMapFileContents).find();
+            Assert.assertTrue(hasMultiMapEnumRef,
+                    generatorName + ": Expected enum reference not found in " + multiMapModelFile);
+
+            // Test EmployeeWithMapOfEnum (simple map of enums)
+            Path simpleMapModelFile = findModelDefinitionFile(output.toPath(), simpleMapModelDefinition);
+            String simpleMapFileContents = Files.readString(simpleMapModelFile);
 
-            Assert.assertFalse(fileContents.contains("InnerEnum"),
-                    generatorName + ": Should not contain 'InnerEnum' reference in " + modelFile);
+            Assert.assertFalse(simpleMapFileContents.contains("InnerEnum"),
+                    generatorName + ": Should not contain 'InnerEnum' reference in " + simpleMapModelFile);
 
-            boolean hasEnumRef = namespacedEnumRef.matcher(fileContents).find()
-                    || flatEnumRef.matcher(fileContents).find();
-            Assert.assertTrue(hasEnumRef,
-                    generatorName + ": Expected enum reference not found in " + modelFile);
+            boolean hasSimpleMapEnumRef = simpleMapNamespacedEnumRef.matcher(simpleMapFileContents).find()
+                    || simpleMapFlatEnumRef.matcher(simpleMapFileContents).find();
+            Assert.assertTrue(hasSimpleMapEnumRef,
+                    generatorName + ": Expected enum reference for simple map not found in " + simpleMapModelFile);
         }
     }