fix @type for generic interfaces in TypeScript clients

Type annotation in a comment should match the actual field type.

Author: saxicek

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

@@ -1107,25 +1107,17 @@ protected void updateDataTypeWithEnumForMap(CodegenProperty property) {
             // First, set the property's enumName using the property itself (not the inner item)
             property.enumName = toEnumName(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")
-            //
-            // 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.
+            // Replace only the LAST occurrence of baseType with enumName.
+            // In map types, the value type appears last (after the key type),
+            // so this approach is template-agnostic.
             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 + ">");
+            int lastIndex = datatypeWithEnum.lastIndexOf(baseItem.baseType);
+            if (lastIndex >= 0) {
+                property.datatypeWithEnum = datatypeWithEnum.substring(0, lastIndex)
+                        + property.enumName
+                        + datatypeWithEnum.substring(lastIndex + baseItem.baseType.length());
             }
-            property.datatypeWithEnum = replaced;
+            LOGGER.info("Updated datatypeWithEnum for map property '{}': {}", property.name, property.datatypeWithEnum);
 
             // set default value for variable with inner enum
             if (property.defaultValue != null) {

modules/openapi-generator/src/main/resources/typescript-fetch/modelGenericInterfaces.mustache

@@ -10,7 +10,7 @@ export interface {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{
 {{#vars}}
     /**
      * {{#lambda.indented_star_4}}{{{unescapedDescription}}}{{/lambda.indented_star_4}}
-     * @type {{=<% %>=}}{<%&datatype%>}<%={{ }}=%>
+     * @type {{=<% %>=}}{<%&datatypeWithEnum%>}<%={{ }}=%>
      * @memberof {{classname}}
     {{#deprecated}}
      * @deprecated

samples/client/petstore/typescript-axios/builds/test-petstore/api.ts

@@ -329,7 +329,7 @@ export type MammalAnyofTypeEnum = typeof MammalAnyofTypeEnum[keyof typeof Mammal
 
 export interface MapTest {
     'map_map_of_string'?: { [key: string]: { [key: string]: string; }; };
-    'map_of_enum_string'?: { [key: string]: string; };
+    'map_of_enum_string'?: { [key: string]: MapTestMapOfEnumStringEnum; };
     'direct_map'?: { [key: string]: boolean; };
     'indirect_map'?: { [key: string]: boolean; };
 }

samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts

@@ -227,7 +227,7 @@ export type Mammal = { className: 'whale' } & Whale | { className: 'zebra' } & Z
 
 export interface MapTest {
     'map_map_of_string'?: { [key: string]: { [key: string]: string; }; };
-    'map_of_enum_string'?: { [key: string]: string; };
+    'map_of_enum_string'?: { [key: string]: MapTestMapOfEnumStringEnum; };
     'direct_map'?: { [key: string]: boolean; };
     'indirect_map'?: { [key: string]: boolean; };
 }

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumArrays.ts

@@ -21,13 +21,13 @@ import { mapValues } from '../runtime';
 export interface EnumArrays {
     /**
      * 
-     * @type {string}
+     * @type {EnumArraysJustSymbolEnum}
      * @memberof EnumArrays
      */
     justSymbol?: EnumArraysJustSymbolEnum;
     /**
      * 
-     * @type {Array<string>}
+     * @type {Array<EnumArraysArrayEnumEnum>}
      * @memberof EnumArrays
      */
     arrayEnum?: Array<EnumArraysArrayEnumEnum>;

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumTest.ts

@@ -50,25 +50,25 @@ import {
 export interface EnumTest {
     /**
      * 
-     * @type {string}
+     * @type {EnumTestEnumStringEnum}
      * @memberof EnumTest
      */
     enumString?: EnumTestEnumStringEnum;
     /**
      * 
-     * @type {string}
+     * @type {EnumTestEnumStringRequiredEnum}
      * @memberof EnumTest
      */
     enumStringRequired: EnumTestEnumStringRequiredEnum;
     /**
      * 
-     * @type {number}
+     * @type {EnumTestEnumIntegerEnum}
      * @memberof EnumTest
      */
     enumInteger?: EnumTestEnumIntegerEnum;
     /**
      * 
-     * @type {number}
+     * @type {EnumTestEnumNumberEnum}
      * @memberof EnumTest
      */
     enumNumber?: EnumTestEnumNumberEnum;

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MapTest.ts

@@ -27,10 +27,10 @@ export interface MapTest {
     mapMapOfString?: { [key: string]: { [key: string]: string; }; };
     /**
      * 
-     * @type {{ [key: string]: string; }}
+     * @type {{ [key: string]: MapTestMapOfEnumStringEnum; }}
      * @memberof MapTest
      */
-    mapOfEnumString?: { [key: string]: string; };
+    mapOfEnumString?: { [key: string]: MapTestMapOfEnumStringEnum; };
     /**
      * 
      * @type {{ [key: string]: boolean; }}

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts

@@ -45,7 +45,7 @@ export interface Order {
     shipDate?: Date;
     /**
      * Order Status
-     * @type {string}
+     * @type {OrderStatusEnum}
      * @memberof Order
      */
     status?: OrderStatusEnum;

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ParentWithNullable.ts

@@ -22,7 +22,7 @@ import { type ChildWithNullable, ChildWithNullableFromJSONTyped, ChildWithNullab
 export interface ParentWithNullable {
     /**
      * 
-     * @type {string}
+     * @type {ParentWithNullableTypeEnum}
      * @memberof ParentWithNullable
      */
     type?: ParentWithNullableTypeEnum;

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts

@@ -66,7 +66,7 @@ export interface Pet {
     tags?: Array<Tag>;
     /**
      * pet status in the store
-     * @type {string}
+     * @type {PetStatusEnum}
      * @memberof Pet
      */
     status?: PetStatusEnum;