feat(annotations): fixed issue with DioSerializationLibrary and updat…

…ed tests fixes #152
gibahjoe · Nov 4, 2024 · f2be6b6 · f2be6b6
1 parent b0340df
commit f2be6b6
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 5 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
@@ -165,8 +165,6 @@ class InputSpec {
   const InputSpec.yaml({bool shortExtension = false})
       : this(path: 'openapi.y${shortExtension ? '' : 'a'}ml');
 
-  Map<String, dynamic> toJsonMap() => {'path': path};
-
   InputSpec.fromMap(Map<String, dynamic> map) : this(path: map['path']);
 }
 
@@ -545,6 +543,12 @@ class DioAltProperties extends AdditionalProperties {
 
   /// Anything in this will be split on a command added to the dependencies section of your generated code.
   /// pubspec-dependencies
+  ///
+  /// this allows a user to specify additional dependencies required for this artifact, it spits
+  /// the comma separated list into a proper list, removing empty ones and makes it available in the appropriate
+  /// vendor-prefix to allow the mustache template to pick it up.
+  ///
+  /// dependencies should be comma separated
   final String? pubspecDependencies;
 
   /// pubspec-dev-dependencies
@@ -668,8 +672,10 @@ class EnumTransformer {
   static DioSerializationLibrary? dioSerializationLibrary(String? name) {
     switch (name) {
       case 'json_serializable':
+      case 'jsonSerializable':
         return DioSerializationLibrary.jsonSerializable;
       case 'built_value':
+      case 'builtValue':
         return DioSerializationLibrary.builtValue;
     }
     return null;

diff --git a/openapi-generator/test/generator_arguments_test.dart b/openapi-generator/test/generator_arguments_test.dart
@@ -225,6 +225,12 @@ void main() {
         expect(args.additionalProperties?.useEnumExtension, isTrue);
         expect((args.additionalProperties as DioProperties?)?.nullableFields,
             isTrue);
+        expect((args.additionalProperties as DioProperties).dateLibrary,
+            DioDateLibrary.core);
+        expect(
+            (args.additionalProperties as DioProperties).serializationLibrary,
+            DioSerializationLibrary.jsonSerializable);
+
         expect(await args.jarArgs, [
           'generate',
           '-o=${args.outputDirectory}',
@@ -275,6 +281,16 @@ void main() {
         expect(args.shouldGenerateSources, isTrue);
         expect(args.updateAnnotatedFile, isTrue);
         expect(args.additionalProperties?.useEnumExtension, isTrue);
+        expect(
+            (args.additionalProperties as DioAltProperties).pubspecDependencies,
+            'path: 1.0.0');
+        expect(
+            (args.additionalProperties as DioAltProperties)
+                .pubspecDevDependencies,
+            'pedantic: 1.0.0');
+        expect((await args.jarArgs).last, contains('path: 1.0.0'));
+        expect((await args.jarArgs).last, contains('pedantic: 1.0.0'));
+        expect(args.additionalProperties.runtimeType, DioAltProperties);
 
         expect(await args.jarArgs, [
           'generate',
@@ -290,8 +306,9 @@ void main() {
             '--import-mappings=${args.importMappings!.entries.fold('', foldStringMap())}',
           if (args.typeMappings?.isNotEmpty ?? false)
             '--type-mappings=${args.typeMappings!.entries.fold('', foldStringMap())}',
-          if (args.additionalProperties != null)
-            '--additional-properties=${args.additionalProperties!.toMap().entries.fold('', foldStringMap(keyModifier: convertToPropertyKey))}'
+          if (args.additionalProperties != null) ...[
+            '--additional-properties=${(args.additionalProperties as DioAltProperties).toMap().entries.fold('', foldStringMap(keyModifier: convertToPropertyKey))}'
+          ]
         ]);
       });
       test(

diff --git a/openapi-generator/test/specs/dio_alt_properties_test_config.dart b/openapi-generator/test/specs/dio_alt_properties_test_config.dart
@@ -15,7 +15,12 @@ import 'package:openapi_generator_annotations/openapi_generator_annotations.dart
   importMappings: {'package': 'test'},
   reservedWordsMappings: {'const': 'final'},
   additionalProperties: DioAltProperties(
-      wrapper: Wrapper.fvm, useEnumExtension: true, pubAuthor: 'test author'),
+    wrapper: Wrapper.fvm,
+    useEnumExtension: true,
+    pubAuthor: 'test author',
+    pubspecDependencies: 'path: 1.0.0',
+    pubspecDevDependencies: 'pedantic: 1.0.0',
+  ),
   inlineSchemaNameMappings: {'200resp': 'OkResp'},
   projectPubspecPath: './test/specs/dart_pubspec.test.yaml',
   updateAnnotatedFile: true,

diff --git a/openapi-generator/test/specs/dio_properties_test_config.dart b/openapi-generator/test/specs/dio_properties_test_config.dart
@@ -18,6 +18,8 @@ import 'package:openapi_generator_annotations/openapi_generator_annotations.dart
       wrapper: Wrapper.fvm,
       useEnumExtension: true,
       pubAuthor: 'test author',
+      dateLibrary: DioDateLibrary.core,
+      serializationLibrary: DioSerializationLibrary.jsonSerializable,
       nullableFields: true),
   inlineSchemaNameMappings: {'200resp': 'OkResp'},
   projectPubspecPath: './test/specs/dart_pubspec.test.yaml',