Merge pull request #149 from DmitrySboychakov/master

fix: Bump generator versions and add support for --name-mappings
gibahjoe · Nov 1, 2024 · 2ff3b99 · 2ff3b99
2 parents 639cf5b + f5c6aed
commit 2ff3b99
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/openapi-generator-annotations/lib/src/openapi_generator_annotations_base.dart b/openapi-generator-annotations/lib/src/openapi_generator_annotations_base.dart
@@ -84,6 +84,13 @@ class Openapi {
   ///   --type-mappings
   final Map<String, String>? typeMappings;
 
+  ///  sets mappings between OpenAPI spec properties name and generated code
+  ///  var/param/model in the format of OpenAPIName=generatedName.
+  ///  For example: update=updatable,_=underscore.
+
+  ///   --name-mappings
+  final Map<String, String>? nameMappings;
+
   /// specifies mappings between a given class and the import that should
   /// be used for that class in the format of type=import,type=import. You
   /// can also have multiple occurrences of this option.
@@ -129,6 +136,7 @@ class Openapi {
     this.outputDirectory,
     this.cleanSubOutputDirectory,
     this.typeMappings,
+    this.nameMappings,
     this.importMappings,
     this.reservedWordsMappings,
     this.inlineSchemaNameMappings,
@@ -532,14 +540,6 @@ class DioProperties extends AdditionalProperties {
 }
 
 class DioAltProperties extends AdditionalProperties {
-  /// Changes the minimum version of Dart to 2.12 and generate null safe code
-  final bool? nullSafe;
-
-  /// nullSafe-array-default
-  /// Makes even arrays that are not listed as being required in your OpenAPI "required"
-  /// but making them always generate a default value of []
-  final bool? nullSafeArrayDefault;
-
   /// This will turn off AnyOf support. This would be a bit weird, but you can do it if you want.
   final bool? listAnyOf;
 
@@ -552,9 +552,7 @@ class DioAltProperties extends AdditionalProperties {
   final String? pubspecDevDependencies;
 
   const DioAltProperties(
-      {this.nullSafe,
-      this.nullSafeArrayDefault,
-      this.pubspecDependencies,
+      {this.pubspecDependencies,
       this.pubspecDevDependencies,
       this.listAnyOf,
       bool allowUnicodeIdentifiers = false,
@@ -591,18 +589,13 @@ class DioAltProperties extends AdditionalProperties {
             wrapper: wrapper);
 
   DioAltProperties.fromMap(Map<String, dynamic> map)
-      : nullSafe = map['nullSafe'],
-        nullSafeArrayDefault = map['nullSafeArrayDefault'],
-        listAnyOf = map['listAnyOf'],
+      : listAnyOf = map['listAnyOf'],
         pubspecDependencies = map['pubspecDependencies'],
         pubspecDevDependencies = map['pubspecDevDependencies'],
         super.fromMap(map);
 
   Map<String, dynamic> toMap() => Map.from(super.toMap())
     ..addAll({
-      if (nullSafe != null) 'nullSafe': nullSafe,
-      if (nullSafeArrayDefault != null)
-        'nullSafeArrayDefault': nullSafeArrayDefault,
       if (listAnyOf != null) 'listAnyOf': listAnyOf,
       if (pubspecDependencies != null)
         'pubspecDependencies': pubspecDependencies,

diff --git a/openapi-generator-cli/lib/openapi-generator.jar b/openapi-generator-cli/lib/openapi-generator.jar
diff --git a/openapi-generator-cli/pom.xml b/openapi-generator-cli/pom.xml
@@ -47,13 +47,13 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>openapi-generator-cli</artifactId>
-            <version>7.2.0</version>
+            <version>7.7.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.bluetrainsoftware.maven</groupId>
             <artifactId>openapi-dart-generator</artifactId>
-            <version>7.2</version>
+            <version>8.1</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/openapi-generator/lib/src/models/generator_arguments.dart b/openapi-generator/lib/src/models/generator_arguments.dart
@@ -78,6 +78,9 @@ class GeneratorArguments {
   /// Defines mappings between OpenAPI spec types and generated types.
   final Map<String, String>? typeMappings;
 
+  /// Defines mappings between OpenAPI spec var/param/model and generated code.
+  final Map<String, String>? nameMappings;
+
   /// Adds reserved words mappings.
   ///
   /// Supported by [Generator.dio] & [Generator.dioAlt] generators.
@@ -97,6 +100,7 @@ class GeneratorArguments {
         generator =
             annotations.readPropertyOrDefault('generatorName', Generator.dart),
         typeMappings = annotations.readPropertyOrNull('typeMappings'),
+        nameMappings = annotations.readPropertyOrNull('nameMappings'),
         importMappings = annotations.readPropertyOrNull('importMappings'),
         reservedWordsMappings =
             annotations.readPropertyOrNull('reservedWordsMappings'),
@@ -179,6 +183,8 @@ class GeneratorArguments {
           '--import-mappings=${importMappings!.entries.fold('', foldStringMap())}',
         if (typeMappings?.isNotEmpty ?? false)
           '--type-mappings=${typeMappings!.entries.fold('', foldStringMap())}',
+        if (nameMappings?.isNotEmpty ?? false)
+          '--name-mappings=${nameMappings!.entries.fold('', foldStringMap())}',
         if (inlineSchemaOptions != null)
           '--inline-schema-options=${inlineSchemaOptions!.toMap().entries.fold('', foldStringMap(keyModifier: convertToPropertyKey))}',
         if (additionalProperties != null)