Release 2.2.1 (epam-cross-platform-lab#260)

* FIX epam-cross-platform-lab#244 * Update CHANGELOG.md * Fix test Co-authored-by: uladzimir_paliukhovich <> Co-authored-by: Eugeny Sampir <ysampir@gmail.com>
via-guy · Oct 7, 2021 · 2d767aa · 2d767aa
1 parent 84f73f0
commit 2d767aa
Show file tree

Hide file tree

Showing 9 changed files with 162 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2.2.1
+
+* Added ability to generated models to separate file
+* **BREAKING** Removed generation of client_index if generate only models
+* Fixed Issue ([#244](https://github.com/epam-cross-platform-lab/swagger-dart-code-generator/issues/244))
+
 # 2.2.0+1
 
 * Updated changelog (see previous version changes)

diff --git a/example/build.yaml b/example/build.yaml
@@ -20,6 +20,7 @@ targets:
           use_path_for_request_names: true
           use_default_null_for_lists: false
           build_only_models: false
+          separate_models: true
           enums_case_sensitive: false
           ignore_headers: false
           use_required_attribute_for_headers: false

diff --git a/lib/src/code_generators/swagger_additions_generator.dart b/lib/src/code_generators/swagger_additions_generator.dart
@@ -56,8 +56,13 @@ $maps};
   }
 
   ///Generated imports for concrete service
-  String generateImportsContent(String swaggerFileName, bool hasModels,
-      bool buildOnlyModels, bool hasEnums) {
+  String generateImportsContent(
+    String swaggerFileName,
+    bool hasModels,
+    bool buildOnlyModels,
+    bool hasEnums,
+    bool separateModels,
+  ) {
     final result = StringBuffer();
 
     final chopperPartImport =
@@ -75,13 +80,17 @@ import 'package:chopper/chopper.dart' as chopper;''';
     final enumsExport =
         hasEnums ? "export '$swaggerFileName.enums.swagger.dart';" : '';
 
-    if (hasModels) {
+    if (hasModels && !separateModels) {
       result.writeln("""
 import 'package:json_annotation/json_annotation.dart';
 import 'package:collection/collection.dart';
 """);
     }
 
+    if (hasModels && separateModels) {
+      result.write("import '$swaggerFileName.models.swagger.dart';");
+    }
+
     if (chopperImports.isNotEmpty) {
       result.write(chopperImports);
     }
@@ -93,12 +102,16 @@ import 'package:collection/collection.dart';
       result.write(enumsExport);
     }
 
+    if (hasModels && separateModels) {
+      result.write("export '$swaggerFileName.models.swagger.dart';");
+    }
+
     result.write('\n\n');
 
     if (chopperPartImport.isNotEmpty) {
       result.write(chopperPartImport);
     }
-    if (hasModels) {
+    if (hasModels && !separateModels) {
       result.write("part '$swaggerFileName.swagger.g.dart';");
     }
 

diff --git a/lib/src/models/generator_options.dart b/lib/src/models/generator_options.dart
@@ -9,6 +9,7 @@ class GeneratorOptions {
     this.withBaseUrl = true,
     this.withConverter = true,
     this.ignoreHeaders = false,
+    this.separateModels = false,
     this.useDefaultNullForLists = false,
     this.buildOnlyModels = false,
     this.defaultValuesMap = const <DefaultValueMap>[],
@@ -35,6 +36,9 @@ class GeneratorOptions {
   @JsonKey(defaultValue: true)
   final bool withConverter;
 
+  @JsonKey(defaultValue: false)
+  final bool separateModels;
+
   @JsonKey(defaultValue: true)
   final bool useRequiredAttributeForHeaders;
 

diff --git a/lib/src/models/generator_options.g2.dart b/lib/src/models/generator_options.g2.dart
diff --git a/lib/src/swagger_code_generator.dart b/lib/src/swagger_code_generator.dart
@@ -40,10 +40,20 @@ class SwaggerCodeGenerator {
       _getSwaggerAdditionsGenerator(dartCode)
           .generateConverterMappings(buildExtensions, hasModels);
 
-  String generateImportsContent(String dartCode, String swaggerFileName,
-          bool hasModels, bool buildOnlyModels, bool hasEnums) =>
+  String generateImportsContent(
+    String dartCode,
+    String swaggerFileName,
+    bool hasModels,
+    bool buildOnlyModels,
+    bool hasEnums,
+    bool separateModels,
+  ) =>
       _getSwaggerAdditionsGenerator(dartCode).generateImportsContent(
-          swaggerFileName, hasModels, buildOnlyModels, hasEnums);
+          swaggerFileName,
+          hasModels,
+          buildOnlyModels,
+          hasEnums,
+          separateModels);
 
   String generateConverter(
           String dartCode, String fileName, GeneratorOptions options) =>

diff --git a/lib/swagger_dart_code_generator.dart b/lib/swagger_dart_code_generator.dart
@@ -13,6 +13,7 @@ const _inputFileExtensions = ['.swagger', '.json'];
 
 const String _outputFileExtension = '.swagger.dart';
 const String _outputEnumsFileExtension = '.enums.swagger.dart';
+const String _outputModelsFileExtension = '.models.swagger.dart';
 const String _outputResponsesFileExtension = '.responses.swagger.dart';
 const String _indexFileName = 'client_index.dart';
 const String _mappingFileName = 'client_mapping.dart';
@@ -29,6 +30,7 @@ Map<String, List<String>> _generateExtensions(GeneratorOptions options) {
     result[element.path] = <String>[
       '${options.outputFolder}$name$_outputFileExtension',
       '${options.outputFolder}$name$_outputEnumsFileExtension',
+      '${options.outputFolder}$name$_outputModelsFileExtension',
       '${options.outputFolder}$name$_outputResponsesFileExtension',
     ];
   });
@@ -79,11 +81,13 @@ class SwaggerDartCodeGenerator implements Builder {
         contents, getFileNameWithoutExtension(fileNameWithExtension));
 
     final imports = codeGenerator.generateImportsContent(
-        contents,
-        fileNameWithoutExtension,
-        models.isNotEmpty,
-        options.buildOnlyModels,
-        enums.isNotEmpty);
+      contents,
+      fileNameWithoutExtension,
+      models.isNotEmpty,
+      options.buildOnlyModels,
+      enums.isNotEmpty,
+      options.separateModels,
+    );
 
     final converter = codeGenerator.generateConverter(
         contents, getFileNameWithoutExtension(fileNameWithExtension), options);
@@ -102,10 +106,19 @@ class SwaggerDartCodeGenerator implements Builder {
     final copyAssetId = AssetId(buildStep.inputId.package,
         '${options.outputFolder}$fileNameWithoutExtension$_outputFileExtension');
 
-    await buildStep.writeAsString(
-        copyAssetId,
-        _generateFileContent(imports, requests, converter, models, responses,
-            requestBodies, customDecoder, dateToJson));
+    if (!options.separateModels || !options.buildOnlyModels) {
+      await buildStep.writeAsString(
+          copyAssetId,
+          _generateFileContent(
+              imports,
+              requests,
+              converter,
+              options.separateModels ? '' : models,
+              responses,
+              requestBodies,
+              customDecoder,
+              dateToJson));
+    }
 
     if (enums.isNotEmpty) {
       ///Write enums
@@ -117,6 +130,20 @@ class SwaggerDartCodeGenerator implements Builder {
       await buildStep.writeAsString(enumsAssetId, formatterEnums);
     }
 
+    if (options.separateModels) {
+      ///Write models to separate file
+      final formattedModels = _tryFormatCode(_generateSeparateModelsFileContent(
+        models,
+        fileNameWithoutExtension,
+        enums.isNotEmpty,
+      ));
+
+      final enumsAssetId = AssetId(buildStep.inputId.package,
+          '${options.outputFolder}$fileNameWithoutExtension$_outputModelsFileExtension');
+
+      await buildStep.writeAsString(enumsAssetId, formattedModels);
+    }
+
     ///Write additional files on first input
     if (buildExtensions.keys.first == buildStep.inputId.path) {
       await _generateAdditionalFiles(
@@ -175,7 +202,9 @@ $dateToJson
 
     final imports = codeGenerator.generateIndexes(swaggerCode, buildExtensions);
 
-    await buildStep.writeAsString(indexAssetId, _formatter.format(imports));
+    if (!options.buildOnlyModels) {
+      await buildStep.writeAsString(indexAssetId, _formatter.format(imports));
+    }
 
     if (options.withConverter && !options.buildOnlyModels) {
       final mappingAssetId =
@@ -187,4 +216,24 @@ $dateToJson
       await buildStep.writeAsString(mappingAssetId, _formatter.format(mapping));
     }
   }
+
+  String _generateSeparateModelsFileContent(
+    String models,
+    String fileNameWithoutExtension,
+    bool hasEnums,
+  ) {
+    final enumsImport = hasEnums
+        ? "import '$fileNameWithoutExtension.enums.swagger.dart' as enums;"
+        : '';
+
+    return '''
+import 'package:json_annotation/json_annotation.dart';
+import 'package:collection/collection.dart';
+$enumsImport
+
+    part '$fileNameWithoutExtension.models.swagger.g.dart';
+
+    $models
+    ''';
+  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: swagger_dart_code_generator
 
-version: 2.2.0+1
+version: 2.2.1
 
 homepage: https://github.com/epam-cross-platform-lab/swagger-dart-code-generator
 repository: https://github.com/epam-cross-platform-lab/swagger-dart-code-generator