Merge branch 'master' into upgrade-5.0-start

gibahjoe · gibahjoe · commit 4c3e59a46aa6 · 2024-01-15T17:42:53.000+01:00
# Conflicts:
#	openapi-generator/pubspec.yaml
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,5 +1,5 @@
 {
-  "openapi-generator": "4.13.0",
-  "openapi-generator-annotations": "4.13.0",
-  "openapi-generator-cli": "4.13.0"
+  "openapi-generator": "4.13.1",
+  "openapi-generator-annotations": "4.13.1",
+  "openapi-generator-cli": "4.13.1"
 }
diff --git a/openapi-generator-annotations/CHANGELOG.md b/openapi-generator-annotations/CHANGELOG.md
@@ -13,6 +13,14 @@
 * remove duplicate run test, fix failing tests ([677a318](https://github.com/gibahjoe/openapi-generator-dart/commit/677a3189d4f694c999d3ea1cf0075543649e40c1))
 * repair the docker run command, update the type_methods to expand out the remote delegate ([c00b334](https://github.com/gibahjoe/openapi-generator-dart/commit/c00b3345d934e2f1508ba1129a3a769f86a85017))
 
+## [4.13.1](https://github.com/gibahjoe/openapi-generator-dart/compare/v4.13.0...v4.13.1) (2023-09-04)
+
+
+### Bug Fixes
+
+* **dependencies:** added required dependencies to pubspec ([7738439](https://github.com/gibahjoe/openapi-generator-dart/commit/7738439a89637bb1226f6586a0c9d311053e1702))
+* fixes useEnumExtension and other non string additional properties fields throwing error ([53b711a](https://github.com/gibahjoe/openapi-generator-dart/commit/53b711a3c9319e31ec0b159edfc76674b62feb19))
+
 ## 4.12.0
 
 - Added spec diff tracking. This means you Openapi generator now tracks changes to your spec and only regenerates the
diff --git a/openapi-generator-annotations/lib/src/openapi_generator_annotations_base.dart b/openapi-generator-annotations/lib/src/openapi_generator_annotations_base.dart
@@ -533,9 +533,7 @@ class DioProperties extends AdditionalProperties {
 
   DioProperties.fromMap(Map<String, dynamic> map)
       : dateLibrary = EnumTransformer.dioDateLibrary(map['dateLibrary']),
-        nullableFields = map['nullableFields'] != null
-            ? map['nullableFields'] == 'true'
-            : null,
+        nullableFields = map['nullableFields'],
         serializationLibrary = EnumTransformer.dioSerializationLibrary(
             map['serializationLibrary']),
         super.fromMap(map);
@@ -609,12 +607,9 @@ class DioAltProperties extends AdditionalProperties {
             wrapper: wrapper);
 
   DioAltProperties.fromMap(Map<String, dynamic> map)
-      : nullSafe = map['nullSafe'] != null ? map['nullSafe'] == 'true' : null,
-        nullSafeArrayDefault = map['nullSafeArrayDefault'] != null
-            ? map['nullSafeArrayDefault'] == 'true'
-            : null,
-        listAnyOf =
-            map['listAnyOf'] != null ? map['listAnyOf'] == 'true' : null,
+      : nullSafe = map['nullSafe'],
+        nullSafeArrayDefault = map['nullSafeArrayDefault'],
+        listAnyOf = map['listAnyOf'],
         pubspecDependencies = map['pubspecDependencies'],
         pubspecDevDependencies = map['pubspecDevDependencies'],
         super.fromMap(map);
diff --git a/openapi-generator-annotations/pubspec.yaml b/openapi-generator-annotations/pubspec.yaml
@@ -1,6 +1,6 @@
 name: openapi_generator_annotations
 description: Annotation package for openapi_generator https://pub.dev/packages/openapi_generator.
-version: 4.13.0
+version: 4.13.1
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 
diff --git a/openapi-generator-annotations/test/additional_properties_test.dart b/openapi-generator-annotations/test/additional_properties_test.dart
@@ -175,7 +175,7 @@ void main() {
         'sortParamsByRequiredFlag': props.sortParamsByRequiredFlag,
         'sourceFolder': props.sourceFolder,
         'wrapper': 'none',
-        'nullableFields': '${props.nullableFields}',
+        'nullableFields': props.nullableFields,
         'dateLibrary': 'core',
         'serializationLibrary': 'json_serializable',
       };
@@ -289,9 +289,9 @@ void main() {
         'sortParamsByRequiredFlag': props.sortParamsByRequiredFlag,
         'sourceFolder': props.sourceFolder,
         'wrapper': 'none',
-        'nullSafe': '${props.nullSafe}',
-        'nullSafeArrayDefault': '${props.nullSafeArrayDefault}',
-        'listAnyOf': '${props.listAnyOf}',
+        'nullSafe': props.nullSafe,
+        'nullSafeArrayDefault': props.nullSafeArrayDefault,
+        'listAnyOf': props.listAnyOf,
         'pubspecDevDependencies': props.pubspecDevDependencies,
         'pubspecDependencies': props.pubspecDependencies,
       };
diff --git a/openapi-generator-cli/CHANGELOG.md b/openapi-generator-cli/CHANGELOG.md
@@ -5,6 +5,13 @@
 
 * Bumped versions to match ([506689c](https://github.com/gibahjoe/openapi-generator-dart/commit/506689c960491962c56cbb4418fc86dafc1a4c2e))
 
+## [4.13.1](https://github.com/gibahjoe/openapi-generator-dart/compare/v4.13.0...v4.13.1) (2023-09-04)
+
+
+### Bug Fixes
+
+* Trigger version bump for CLI ([996f328](https://github.com/gibahjoe/openapi-generator-dart/commit/996f3281cad0bdaf58a3d0bbdc4df7dbdc7b135f))
+
 ## 4.12.0
 
 - Bumped version to match annotations and core.
diff --git a/openapi-generator-cli/README.md b/openapi-generator-cli/README.md
@@ -51,6 +51,10 @@ pubspec.yaml
 The above steps are usefull when you have issues with dependency conflicts, clashes. You can even use it to upgrade the
 library packages in the generated source.
 
+## Contributing
+
+Please read our [Contributing guidelines](../CONTRIBUTING.md) before submitting a Pull Request.
+
 ## Features and bugs
 
 Please file feature requests and bugs at the [issue tracker][tracker].
diff --git a/openapi-generator-cli/pubspec.yaml b/openapi-generator-cli/pubspec.yaml
@@ -1,6 +1,6 @@
 name: openapi_generator_cli
 description: A dart wrapper around openapi-generator inspired by the node implementation.
-version: 4.13.0
+version: 4.13.1
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 environment:
diff --git a/openapi-generator/CHANGELOG.md b/openapi-generator/CHANGELOG.md
@@ -15,6 +15,15 @@
 * remove unused imports ([4eb64c9](https://github.com/gibahjoe/openapi-generator-dart/commit/4eb64c90c2468a8ce26b79266c0e705be3e979de))
 * repair the docker run command, update the type_methods to expand out the remote delegate ([c00b334](https://github.com/gibahjoe/openapi-generator-dart/commit/c00b3345d934e2f1508ba1129a3a769f86a85017))
 
+## [4.13.1](https://github.com/gibahjoe/openapi-generator-dart/compare/v4.13.0...v4.13.1) (2023-09-04)
+
+
+### Bug Fixes
+
+* **dependencies:** added required dependencies to pubspec ([7738439](https://github.com/gibahjoe/openapi-generator-dart/commit/7738439a89637bb1226f6586a0c9d311053e1702))
+* fixes useEnumExtension and other non string additional properties fields throwing error ([53b711a](https://github.com/gibahjoe/openapi-generator-dart/commit/53b711a3c9319e31ec0b159edfc76674b62feb19))
+* updated logs ([45af1cf](https://github.com/gibahjoe/openapi-generator-dart/commit/45af1cf21ab1d11b12898b6cb8f2ee9895dca133))
+
 ## 4.12.0
 
 - Added spec diff tracking. This means you Openapi generator now tracks changes to your spec and only regenerates the
diff --git a/openapi-generator/lib/src/extensions/type_methods.dart b/openapi-generator/lib/src/extensions/type_methods.dart
@@ -144,9 +144,10 @@ extension ReadProperty on ConstantReader {
       ) as T;
     }
 
-    if (isA(v, Map)) {
+    if (isA(v, Map<String, String>)) {
       return v.mapValue.map((key, value) => MapEntry(
-          convertToPropertyValue(key!), convertToPropertyValue(value!))) as T;
+          convertToPropertyValue(key!) as String,
+          convertToPropertyValue(value!) as String)) as T;
     } else if (isA(v, bool)) {
       return v.boolValue as T;
     } else if (isA(v, double)) {
diff --git a/openapi-generator/lib/src/openapi_generator_runner.dart b/openapi-generator/lib/src/openapi_generator_runner.dart
@@ -30,6 +30,7 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
       log: log,
       communication: OutputMessage(
         message: [
+          '\n',
           ':::::::::::::::::::::::::::::::::::::::::::',
           '::      Openapi generator for dart       ::',
           ':::::::::::::::::::::::::::::::::::::::::::',
diff --git a/openapi-generator/lib/src/utils.dart b/openapi-generator/lib/src/utils.dart
@@ -18,13 +18,13 @@ String getMapAsString(Map<dynamic, dynamic> data) {
 }
 
 /// Converts a [DartObject] to it's given type.
-String convertToPropertyValue(DartObject value) {
+dynamic convertToPropertyValue(DartObject value) {
   if (value.isNull) {
     return '';
   }
   return value.toStringValue() ??
-      value.toBoolValue()?.toString() ??
-      value.toIntValue()?.toString() ??
+      value.toBoolValue() ??
+      value.toIntValue() ??
       value.getField('_name')?.toStringValue() ??
       '';
 }
diff --git a/openapi-generator/pubspec.yaml b/openapi-generator/pubspec.yaml
@@ -1,6 +1,6 @@
 name: openapi_generator
 description: Generator for openapi client sdk inspired by the npm implementation of openapi-generator-cli.
-version: 4.13.0
+version: 4.13.1
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 environment:
@@ -25,6 +25,6 @@ dev_dependencies:
   pedantic:
   coverage: ^1.6.3
 
-dependency_overrides:
-  openapi_generator_annotations:
-    path: ../openapi-generator-annotations
+#dependency_overrides:
+#  openapi_generator_annotations:
+#    path: ../openapi-generator-annotations
diff --git a/openapi-generator/test/generator_arguments_test.dart b/openapi-generator/test/generator_arguments_test.dart
@@ -153,50 +153,155 @@ void main() {
         ),
       );
     });
-    test('uses config', () async {
-      final config = File(
-              '${Directory.current.path}${Platform.pathSeparator}test${Platform.pathSeparator}specs${Platform.pathSeparator}test_config.dart')
-          .readAsStringSync();
-      final annotations = (await resolveSource(
-              config,
-              (resolver) async =>
-                  (await resolver.findLibraryByName('test_lib'))!))
-          .getClass('TestClassConfig')!
-          .metadata
-          .map((e) => src_gen.ConstantReader(e.computeConstantValue()!))
-          .first;
-      final args = GeneratorArguments(annotations: annotations);
-      expect(args.alwaysRun, isTrue);
-      expect(args.useNextGen, isTrue);
-      expect(args.cachePath, './test/specs/output/cache.json');
-      expect(args.outputDirectory, './test/specs/output');
-      expect(args.runSourceGen, isTrue);
-      expect(args.shouldFetchDependencies, isTrue);
-      expect(args.skipValidation, isFalse);
-      expect(await args.inputFileOrFetch, './test/specs/openapi.test.yaml');
-      expect(args.templateDirectory, 'template');
-      expect(args.generator, Generator.dio);
-      expect(args.wrapper, Wrapper.fvm);
-      expect(args.importMappings, {'package': 'test'});
-      expect(args.typeMappings, {'key': 'value'});
-      expect(args.reservedWordsMappings, {'const': 'final'});
-      expect(args.inlineSchemaNameMappings, {'200resp': 'OkResp'});
-      expect(args.pubspecPath, './test/specs/dart_pubspec.test.yaml');
-      expect(args.isRemote, isFalse);
-      expect(args.generatorName, 'dart-dio');
-      expect(args.shouldGenerateSources, isTrue);
-      expect(await args.jarArgs, [
-        'generate',
-        '-o=${args.outputDirectory}',
-        '-i=${await args.inputFileOrFetch}',
-        '-t=${args.templateDirectory}',
-        '-g=${args.generatorName}',
-        '--reserved-words-mappings=${args.reservedWordsMappings.entries.fold('', foldStringMap())}',
-        '--inline-schema-name-mappings=${args.inlineSchemaNameMappings.entries.fold('', foldStringMap())}',
-        '--import-mappings=${args.importMappings.entries.fold('', foldStringMap())}',
-        '--type-mappings=${args.typeMappings.entries.fold('', foldStringMap())}',
-        '--additional-properties=${args.additionalProperties!.toMap().entries.fold('', foldStringMap(keyModifier: convertToPropertyKey))}'
-      ]);
+    group('annotation specification', () {
+      // https://github.com/gibahjoe/openapi-generator-dart/issues/110
+      test('Processes annotations correctly', () async {
+        final config = File(
+                '${Directory.current.path}${Platform.pathSeparator}test${Platform.pathSeparator}specs${Platform.pathSeparator}test_config.dart')
+            .readAsStringSync();
+        final annotations = (await resolveSource(
+                config,
+                (resolver) async =>
+                    (await resolver.findLibraryByName('test_lib'))!))
+            .getClass('TestClassConfig')!
+            .metadata
+            .map((e) => src_gen.ConstantReader(e.computeConstantValue()!))
+            .first;
+        final args = GeneratorArguments(annotations: annotations);
+        expect(args.alwaysRun, isTrue);
+        expect(args.useNextGen, isTrue);
+        expect(args.cachePath, './test/specs/output/cache.json');
+        expect(args.outputDirectory, './test/specs/output');
+        expect(args.runSourceGen, isTrue);
+        expect(args.shouldFetchDependencies, isTrue);
+        expect(args.skipValidation, isFalse);
+        expect(await args.inputFileOrFetch, './test/specs/openapi.test.yaml');
+        expect(args.templateDirectory, 'template');
+        expect(args.generator, Generator.dio);
+        expect(args.wrapper, Wrapper.fvm);
+        expect(args.importMappings, {'package': 'test'});
+        expect(args.typeMappings, {'key': 'value'});
+        expect(args.reservedWordsMappings, {'const': 'final'});
+        expect(args.inlineSchemaNameMappings, {'200resp': 'OkResp'});
+        expect(args.pubspecPath, './test/specs/dart_pubspec.test.yaml');
+        expect(args.isRemote, isFalse);
+        expect(args.generatorName, 'dart-dio');
+        expect(args.shouldGenerateSources, isTrue);
+        expect(args.additionalProperties?.useEnumExtension, isTrue);
+        expect(args.additionalProperties?.pubAuthor, 'test author');
+        expect(await args.jarArgs, [
+          'generate',
+          '-o=${args.outputDirectory}',
+          '-i=${await args.inputFileOrFetch}',
+          '-t=${args.templateDirectory}',
+          '-g=${args.generatorName}',
+          '--reserved-words-mappings=${args.reservedWordsMappings.entries.fold('', foldStringMap())}',
+          '--inline-schema-name-mappings=${args.inlineSchemaNameMappings.entries.fold('', foldStringMap())}',
+          '--import-mappings=${args.importMappings.entries.fold('', foldStringMap())}',
+          '--type-mappings=${args.typeMappings.entries.fold('', foldStringMap())}',
+          '--additional-properties=${args.additionalProperties!.toMap().entries.fold('', foldStringMap(keyModifier: convertToPropertyKey))}'
+        ]);
+      });
+      test('Processes annotation with DioProperties correctly', () async {
+        final config = File(
+                '${Directory.current.path}${Platform.pathSeparator}test${Platform.pathSeparator}specs${Platform.pathSeparator}dio_properties_test_config.dart')
+            .readAsStringSync();
+        final annotations = (await resolveSource(
+                config,
+                (resolver) async =>
+                    (await resolver.findLibraryByName('test_lib'))!))
+            .getClass('DioPropertiesTestConfig')!
+            .metadata
+            .map((e) => src_gen.ConstantReader(e.computeConstantValue()!))
+            .first;
+        final args = GeneratorArguments(annotations: annotations);
+        expect(args.alwaysRun, isTrue);
+        expect(args.useNextGen, isTrue);
+        expect(args.cachePath, './test/specs/output/cache.json');
+        expect(args.outputDirectory, './test/specs/output');
+        expect(args.runSourceGen, isTrue);
+        expect(args.shouldFetchDependencies, isTrue);
+        expect(args.skipValidation, isFalse);
+        expect(await args.inputFileOrFetch, './test/specs/openapi.test.yaml');
+        expect(args.templateDirectory, 'template');
+        expect(args.generator, Generator.dio);
+        expect(args.wrapper, Wrapper.fvm);
+        expect(args.importMappings, {'package': 'test'});
+        expect(args.typeMappings, {'key': 'value'});
+        expect(args.reservedWordsMappings, {'const': 'final'});
+        expect(args.inlineSchemaNameMappings, {'200resp': 'OkResp'});
+        expect(args.pubspecPath, './test/specs/dart_pubspec.test.yaml');
+        expect(args.isRemote, isFalse);
+        expect(args.generatorName, 'dart-dio');
+        expect(args.shouldGenerateSources, isTrue);
+        expect(args.additionalProperties?.useEnumExtension, isTrue);
+        expect((args.additionalProperties as DioProperties?)?.nullableFields,
+            isTrue);
+        expect(await args.jarArgs, [
+          'generate',
+          '-o=${args.outputDirectory}',
+          '-i=${await args.inputFileOrFetch}',
+          '-t=${args.templateDirectory}',
+          '-g=${args.generatorName}',
+          '--reserved-words-mappings=${args.reservedWordsMappings.entries.fold('', foldStringMap())}',
+          '--inline-schema-name-mappings=${args.inlineSchemaNameMappings.entries.fold('', foldStringMap())}',
+          '--import-mappings=${args.importMappings.entries.fold('', foldStringMap())}',
+          '--type-mappings=${args.typeMappings.entries.fold('', foldStringMap())}',
+          '--additional-properties=${args.additionalProperties!.toMap().entries.fold('', foldStringMap(keyModifier: convertToPropertyKey))}'
+        ]);
+      });
+      test('Processes annotation with DioAltProperties correctly', () async {
+        final config = File(
+                '${Directory.current.path}${Platform.pathSeparator}test${Platform.pathSeparator}specs${Platform.pathSeparator}dio_alt_properties_test_config.dart')
+            .readAsStringSync();
+        final annotations = (await resolveSource(
+                config,
+                (resolver) async =>
+                    (await resolver.findLibraryByName('test_lib'))!))
+            .getClass('DioAltPropertiesTestConfig')!
+            .metadata
+            .map((e) => src_gen.ConstantReader(e.computeConstantValue()!))
+            .first;
+        final args = GeneratorArguments(annotations: annotations);
+        expect(args.alwaysRun, isTrue);
+        expect(args.useNextGen, isTrue);
+        expect(args.cachePath, './test/specs/output/cache.json');
+        expect(args.outputDirectory, './test/specs/output');
+        expect(args.runSourceGen, isTrue);
+        expect(args.shouldFetchDependencies, isTrue);
+        expect(args.skipValidation, isFalse);
+        expect(await args.inputFileOrFetch, './test/specs/openapi.test.yaml');
+        expect(args.templateDirectory, 'template');
+        expect(args.generator, Generator.dio);
+        expect(args.wrapper, Wrapper.fvm);
+        expect(args.importMappings, {'package': 'test'});
+        expect(args.typeMappings, {'key': 'value'});
+        expect(args.reservedWordsMappings, {'const': 'final'});
+        expect(args.inlineSchemaNameMappings, {'200resp': 'OkResp'});
+        expect(args.pubspecPath, './test/specs/dart_pubspec.test.yaml');
+        expect(args.isRemote, isFalse);
+        expect(args.generatorName, 'dart-dio');
+        expect(args.shouldGenerateSources, isTrue);
+        expect(args.additionalProperties?.useEnumExtension, isTrue);
+        expect(
+            (args.additionalProperties as DioAltProperties?)?.nullSafe, isTrue);
+        expect(
+            (args.additionalProperties as DioAltProperties?)
+                ?.nullSafeArrayDefault,
+            isTrue);
+        expect(await args.jarArgs, [
+          'generate',
+          '-o=${args.outputDirectory}',
+          '-i=${await args.inputFileOrFetch}',
+          '-t=${args.templateDirectory}',
+          '-g=${args.generatorName}',
+          '--reserved-words-mappings=${args.reservedWordsMappings.entries.fold('', foldStringMap())}',
+          '--inline-schema-name-mappings=${args.inlineSchemaNameMappings.entries.fold('', foldStringMap())}',
+          '--import-mappings=${args.importMappings.entries.fold('', foldStringMap())}',
+          '--type-mappings=${args.typeMappings.entries.fold('', foldStringMap())}',
+          '--additional-properties=${args.additionalProperties!.toMap().entries.fold('', foldStringMap(keyModifier: convertToPropertyKey))}'
+        ]);
+      });
     });
   });
 }
diff --git a/openapi-generator/test/specs/dio_alt_properties_test_config.dart b/openapi-generator/test/specs/dio_alt_properties_test_config.dart
diff --git a/openapi-generator/test/specs/dio_properties_test_config.dart b/openapi-generator/test/specs/dio_properties_test_config.dart
diff --git a/openapi-generator/test/specs/test_config.dart b/openapi-generator/test/specs/test_config.dart
diff --git a/openapi-generator/test/test_annotations/test_configs.dart b/openapi-generator/test/test_annotations/test_configs.dart

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "openapi-generator": "4.13.0",`
`3`		`- "openapi-generator-annotations": "4.13.0",`
`4`		`- "openapi-generator-cli": "4.13.0"`
	`2`	`+ "openapi-generator": "4.13.1",`
	`3`	`+ "openapi-generator-annotations": "4.13.1",`
	`4`	`+ "openapi-generator-cli": "4.13.1"`
`5`	`5`	`}`