fix: ensure consistent file naming for tags with alphanumeric suffixes (#354)

Co-authored-by: Claude <[email protected]>

Author: Peetee06

swagger_parser/lib/src/generator/generator/fill_controller.dart

@@ -56,6 +56,7 @@ final class FillController {
         dioOptionsParameterByDefault: config.dioOptionsParameterByDefault,
         originalHttpResponse: config.originalHttpResponse,
         useMultipartFile: config.useMultipartFile,
+        fileName: fileName,
       ),
     );
   }
@@ -65,6 +66,10 @@ final class FillController {
     final rootClientName = config.rootClientName ?? 'RestClient';
     final postfix = config.clientPostfix ?? 'Client';
     final clientsNames = clients.map((c) => c.name.toPascal).toSet();
+    // Create a map from Pascal names to snake names
+    final clientsNameMap = <String, String>{
+      for (final client in clients) client.name.toPascal: client.name.toSnake
+    };
 
     return GeneratedFile(
       name: '${rootClientName.toSnake}.${config.language.fileExtension}',
@@ -75,6 +80,7 @@ final class FillController {
         postfix: postfix.toPascal,
         putClientsInFolder: config.putClientsInFolder,
         markFilesAsGenerated: config.markFilesAsGenerated,
+        clientsNameMap: clientsNameMap,
       ),
     );
   }

swagger_parser/lib/src/generator/model/programming_language.dart

@@ -122,6 +122,7 @@ enum ProgrammingLanguage {
     bool extrasParameterByDefault = false,
     bool dioOptionsParameterByDefault = false,
     bool originalHttpResponse = false,
+    String? fileName,
   }) =>
       switch (this) {
         dart => dartRetrofitClientTemplate(
@@ -133,6 +134,7 @@ enum ProgrammingLanguage {
             dioOptionsParameterByDefault: dioOptionsParameterByDefault,
             originalHttpResponse: originalHttpResponse,
             useMultipartFile: useMultipartFile,
+            fileName: fileName,
           ),
         kotlin => kotlinRetrofitClientTemplate(
             restClient: restClient,
@@ -149,6 +151,7 @@ enum ProgrammingLanguage {
     required String postfix,
     required bool putClientsInFolder,
     required bool markFilesAsGenerated,
+    Map<String, String>? clientsNameMap,
   }) =>
       switch (this) {
         dart => dartRootClientTemplate(
@@ -158,6 +161,7 @@ enum ProgrammingLanguage {
             postfix: postfix,
             putClientsInFolder: putClientsInFolder,
             markFileAsGenerated: markFilesAsGenerated,
+            clientsNameMap: clientsNameMap,
           ),
         kotlin => '',
       };

swagger_parser/lib/src/generator/templates/dart_retrofit_client_template.dart

@@ -16,6 +16,7 @@ String dartRetrofitClientTemplate({
   bool extrasParameterByDefault = false,
   bool dioOptionsParameterByDefault = false,
   bool originalHttpResponse = false,
+  String? fileName,
 }) {
   final parameterTypes = restClient.requests
       .expand((r) => r.parameters.map((p) => p.type))
@@ -24,7 +25,7 @@ String dartRetrofitClientTemplate({
 ${generatedFileComment(markFileAsGenerated: markFileAsGenerated)}${_convertImport(restClient)}${ioImport(parameterTypes, useMultipartFile: useMultipartFile)}import 'package:dio/dio.dart'${_hideHeaders(restClient, defaultContentType)};
 import 'package:retrofit/retrofit.dart';
 ${dartImports(imports: restClient.imports, pathPrefix: '../models/')}
-part '${name.toSnake}.g.dart';
+part '${fileName ?? name.toSnake}.g.dart';
 
 @RestApi()
 abstract class $name {

swagger_parser/lib/src/generator/templates/dart_root_client_template.dart

@@ -9,6 +9,7 @@ String dartRootClientTemplate({
   required String postfix,
   required bool putClientsInFolder,
   required bool markFileAsGenerated,
+  Map<String, String>? clientsNameMap,
 }) {
   if (clientsNames.isEmpty) {
     return '';
@@ -32,7 +33,7 @@ String dartRootClientTemplate({
 
   return '''
 ${generatedFileComment(markFileAsGenerated: markFileAsGenerated)}import 'package:dio/dio.dart';
-${_clientsImport(clientsNames, postfix, putClientsInFolder: putClientsInFolder)}
+${_clientsImport(clientsNames, postfix, putClientsInFolder: putClientsInFolder, clientsNameMap: clientsNameMap)}
 ${descriptionComment(comment)}class $className {
   $className(
     Dio dio, {
@@ -53,9 +54,13 @@ ${_getters(clientsNames, postfix)}
 }
 
 String _clientsImport(Set<String> imports, String postfix,
-        {required bool putClientsInFolder}) =>
-    '\n${imports.map((import) => "import '${putClientsInFolder ? 'clients' : import.toSnake}/"
-        "${'${import}_$postfix'.toSnake}.dart';").join('\n')}\n';
+    {required bool putClientsInFolder, Map<String, String>? clientsNameMap}) {
+  return '\n${imports.map((import) {
+    final snakeName = clientsNameMap?[import] ?? import.toSnake;
+    return "import '${putClientsInFolder ? 'clients' : snakeName}/"
+        "${snakeName}_${postfix.toSnake}.dart';";
+  }).join('\n')}\n';
+}
 
 String _privateFields(Set<String> names, String postfix) => names
     .map((n) => '  ${n.toPascal + postfix.toPascal}? _${n.toCamel};')

swagger_parser/test/e2e/e2e_test.dart

@@ -533,5 +533,32 @@ void main() {
         schemaFileName: 'wrapping_collections.3.0.json',
       );
     });
+
+    // https://github.com/Carapacik/swagger_parser/issues/353
+    test('tag_with_alphanumeric', () async {
+      await e2eTest(
+        'tag_with_alphanumeric',
+        (outputDirectory, schemaPath) => SWPConfig(
+          outputDirectory: outputDirectory,
+          schemaPath: schemaPath,
+          jsonSerializer: JsonSerializer.freezed,
+          putClientsInFolder: true,
+        ),
+        schemaFileName: 'openapi.json',
+      );
+    });
+
+    test('tag_edge_cases', () async {
+      await e2eTest(
+        'tag_edge_cases',
+        (outputDirectory, schemaPath) => SWPConfig(
+          outputDirectory: outputDirectory,
+          schemaPath: schemaPath,
+          jsonSerializer: JsonSerializer.freezed,
+          putClientsInFolder: true,
+        ),
+        schemaFileName: 'openapi.yaml',
+      );
+    });
   });
 }