Merge branch 'mine-master' into refactor-testing

Nexushunter · Nexushunter · commit 6b871bd95a73 · 2023-09-22T21:01:41.000-04:00
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
@@ -537,9 +537,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);
@@ -613,12 +611,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
@@ -70,4 +70,4 @@ extension TypeMethods on ConstantReader {
 
     return values[enumIndex];
   }
-}
+}
diff --git a/openapi-generator/lib/src/openapi_generator_runner.dart b/openapi-generator/lib/src/openapi_generator_runner.dart
@@ -34,6 +34,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:
diff --git a/openapi-generator/test/specs/dio_alt_properties_test_config.dart b/openapi-generator/test/specs/dio_alt_properties_test_config.dart
@@ -0,0 +1,30 @@
+library test_lib;
+
+import 'package:openapi_generator_annotations/openapi_generator_annotations.dart';
+
+@Openapi(
+  inputSpecFile: './openapi.test.yaml',
+  inputSpec: InputSpec(path: './test/specs/openapi.test.yaml'),
+  generatorName: Generator.dio,
+  useNextGen: true,
+  cachePath: './test/specs/output/cache.json',
+  typeMappings: {'key': 'value'},
+  templateDirectory: 'template',
+  alwaysRun: true,
+  outputDirectory: './test/specs/output',
+  runSourceGenOnOutput: true,
+  apiPackage: 'test',
+  skipSpecValidation: false,
+  importMappings: {'package': 'test'},
+  reservedWordsMappings: {'const': 'final'},
+  additionalProperties: DioAltProperties(
+      wrapper: Wrapper.fvm,
+      useEnumExtension: true,
+      pubAuthor: 'test author',
+      nullSafe: true,
+      nullSafeArrayDefault: true),
+  inlineSchemaNameMappings: {'200resp': 'OkResp'},
+  overwriteExistingFiles: true,
+  projectPubspecPath: './test/specs/dart_pubspec.test.yaml',
+)
+class DioAltPropertiesTestConfig {}
diff --git a/openapi-generator/test/specs/dio_properties_test_config.dart b/openapi-generator/test/specs/dio_properties_test_config.dart
@@ -0,0 +1,29 @@
+library test_lib;
+
+import 'package:openapi_generator_annotations/openapi_generator_annotations.dart';
+
+@Openapi(
+  inputSpecFile: './openapi.test.yaml',
+  inputSpec: InputSpec(path: './test/specs/openapi.test.yaml'),
+  generatorName: Generator.dio,
+  useNextGen: true,
+  cachePath: './test/specs/output/cache.json',
+  typeMappings: {'key': 'value'},
+  templateDirectory: 'template',
+  alwaysRun: true,
+  outputDirectory: './test/specs/output',
+  runSourceGenOnOutput: true,
+  apiPackage: 'test',
+  skipSpecValidation: false,
+  importMappings: {'package': 'test'},
+  reservedWordsMappings: {'const': 'final'},
+  additionalProperties: DioProperties(
+      wrapper: Wrapper.fvm,
+      useEnumExtension: true,
+      pubAuthor: 'test author',
+      nullableFields: true),
+  inlineSchemaNameMappings: {'200resp': 'OkResp'},
+  overwriteExistingFiles: true,
+  projectPubspecPath: './test/specs/dart_pubspec.test.yaml',
+)
+class DioPropertiesTestConfig {}
diff --git a/openapi-generator/test/specs/test_config.dart b/openapi-generator/test/specs/test_config.dart
@@ -17,7 +17,12 @@ import 'package:openapi_generator_annotations/openapi_generator_annotations.dart
   skipSpecValidation: false,
   importMappings: {'package': 'test'},
   reservedWordsMappings: {'const': 'final'},
-  additionalProperties: AdditionalProperties(wrapper: Wrapper.fvm),
+  additionalProperties: AdditionalProperties(
+      wrapper: Wrapper.fvm,
+      useEnumExtension: true,
+      pubAuthor: 'test author',
+      sortModelPropertiesByRequiredFlag: true,
+      legacyDiscriminatorBehavior: true),
   inlineSchemaNameMappings: {'200resp': 'OkResp'},
   overwriteExistingFiles: true,
   projectPubspecPath: './test/specs/dart_pubspec.test.yaml',

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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,4 @@ extension TypeMethods on ConstantReader {`
`70`	`70`
`71`	`71`	`return values[enumIndex];`
`72`	`72`	`}`
`73`		`-}`
	`73`	`+}`