updated generator

gibahjoe · gibahjoe · commit e5e3b5eeb758 · 2021-03-14T19:42:02.000+01:00
diff --git a/openapi-generator-annotations/CHANGELOG.md b/openapi-generator-annotations/CHANGELOG.md
@@ -1,7 +1,11 @@
+## 3.0.1
+- ###BREAKING CHANGE -> Updated generator enums to camelCase and removed old ones.
+
 ## 3.0.0-nullsafety.1
 
 - Bumped generator version to 5.0.0. This has some breaking changes. [Click here](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0) to view changes
 - bumped null safety
+
 ## 2.2.0
 
 - Added support for flutter wrappers
diff --git a/openapi-generator-annotations/README.md b/openapi-generator-annotations/README.md
@@ -49,6 +49,26 @@ The api sdk will be generated in the folder specified in the annotation. See exa
 
 Give a thumbs up if you like this library
 
+
+## Known Issues
+### Dependency issues/conflicts
+This is not an issue with this library but with flutter/dart in general. If you are having issues with dependencies, what
+you can do is make use of dependency overrides. This is added to the pubspec.yaml of the generated package and then the pubspec
+must be added to the .openapi-generator-ignore of the generated package.
+For example, let's assume you want to override the analyzer package for the generated source
+
+in generatedsource/pubspec.yaml add the following
+```yaml
+dependency_overrides:
+    analyzer: 1.0.0
+```
+Then in generatedsources/.openapi-generator-ignore, add the below so that the pubspec is not overwritten next time you run source gen
+```.gitignore
+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.
+
+
 ## Features and bugs
 
 Please file feature requests and bugs at the [issue tracker][tracker].
diff --git a/openapi-generator-annotations/example/example.dart b/openapi-generator-annotations/example/example.dart
@@ -4,6 +4,6 @@ import 'package:openapi_generator_annotations/openapi_generator_annotations.dart
     additionalProperties:
         AdditionalProperties(pubName: 'petstore_api', pubAuthor: 'Johnny dep'),
     inputSpecFile: 'example/openapi-spec.yaml',
-    generatorName: Generator.DART_JAGUAR,
+    generatorName: Generator.dio,
     outputDirectory: 'api/petstore_api')
 class Example extends OpenapiGeneratorConfig {}
diff --git a/openapi-generator-annotations/lib/src/openapi_generator_annotations_base.dart b/openapi-generator-annotations/lib/src/openapi_generator_annotations_base.dart
@@ -247,18 +247,6 @@ enum SerializationFormat { JSON, PROTO }
 
 /// The name of the generator to use
 enum Generator {
-  @Deprecated('Use Generator.dart instead')
-  DART,
-
-  @Deprecated('Use Generator.dio instead')
-  DART_DIO,
-
-  @Deprecated('Use Generator.dioAlt instead')
-  DART2_API,
-
-  @Deprecated('Use Generator.jaguar instead')
-  DART_JAGUAR,
-
   /// This generator uses the default http package that comes with dart
   /// corresponds to dart
   dart,
@@ -271,7 +259,7 @@ enum Generator {
   /// https://pub.flutter-io.cn/packages/dio
   dio,
 
-  /// This uses the generator provided by bluetrainsoftware which internally uses the dio packaget
+  /// This uses the generator provided by bluetrainsoftware which internally uses the dio package
   ///
   /// You can read more about it here https://github.com/dart-ogurets/dart-openapi-maven
   dioAlt,
diff --git a/openapi-generator-annotations/pubspec.yaml b/openapi-generator-annotations/pubspec.yaml
@@ -1,12 +1,12 @@
 name: openapi_generator_annotations
 description: Annotation package for openapi_generator https://pub.dev/packages/openapi_generator.
-version: 2.2.0
+version: 3.0.1
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 
 environment:
-  sdk: '>=2.12.0-133.2.beta <3.0.0'
+  sdk: '>=2.12.1 <3.0.0'
 
 dev_dependencies:
-  pedantic: ^1.10.0-nullsafety.3
-  test: ^1.16.0-nullsafety.13
+  pedantic: ^1.11.0
+  test: ^1.16.8
diff --git a/openapi-generator-cli/CHANGELOG.md b/openapi-generator-cli/CHANGELOG.md
@@ -1,6 +1,11 @@
+## 3.0.1
+- Bumped dart-ogurets generator to 4.2 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
+- Bumped official openapi generator to 5.0.1. See [change log](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.1)
+
 ## 2.2.0
 
 - Bumped dart-ogurets generator to 4.1 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
+
 ## 3.0.0-nullsafety.1
 
 - Bumped null safety version
diff --git a/openapi-generator-cli/README.md b/openapi-generator-cli/README.md
@@ -30,6 +30,26 @@ Pub installs executables into `{flutter sdk dir}/.pub-cache/bin`, which has to b
 
 You can use this package also using the openapi-generator dart plugin that helps you configure the appropriate commands. You can find it [here](https://pub.dev/packages/openapi_generator) 
 
+
+## Known Issues
+### Dependency issues/conflicts
+This is not an issue with this library but with flutter/dart in general. If you are having issues with dependencies, what
+you can do is make use of dependency overrides. This is added to the pubspec.yaml of the generated package and then the pubspec
+must be added to the .openapi-generator-ignore of the generated package.
+For example, let's assume you want to override the analyzer package for the generated source
+
+in generatedsource/pubspec.yaml add the following
+```yaml
+dependency_overrides:
+    analyzer: 1.0.0
+```
+Then in generatedsources/.openapi-generator-ignore, add the below so that the pubspec is not overwritten next time you run source gen
+```.gitignore
+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.
+
+
 ## Features and bugs
 
 Please file feature requests and bugs at the [issue tracker][tracker].
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>5.0.0</version>
+            <version>5.0.1</version>
         </dependency>
         
         <dependency>
             <groupId>com.bluetrainsoftware.maven</groupId>
             <artifactId>openapi-dart-generator</artifactId>
-            <version>4.1</version>
+            <version>4.2</version>
         </dependency>        
     </dependencies>
 </project>
diff --git a/openapi-generator-cli/pubspec.yaml b/openapi-generator-cli/pubspec.yaml
@@ -1,14 +1,14 @@
 name: openapi_generator_cli
 description: A dart wrapper around openapi-generator inspired by the node implementation.
-version: 2.2.0
+version: 3.0.1
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 environment:
-  sdk: '>=2.12.0-133.2.beta <3.0.0'
+  sdk: '>=2.12.1 <3.0.0'
 
 dev_dependencies:
-  pedantic: ^1.10.0-nullsafety.3
-  test: ^1.16.0-nullsafety.13
+  pedantic: ^1.11.0
+  test: ^1.16.8
 
 executables:
   openapi-generator: main
diff --git a/openapi-generator/CHANGELOG.md b/openapi-generator/CHANGELOG.md
@@ -1,7 +1,13 @@
+## 3.0.1
+
+- Bumped dart-ogurets generator to 4.2 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
+- Bumped official openapi generator to 5.0.1. See [change log](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.1)
+
 ## 2.2.0
 
 - Added support for flutter wrappers
 - Bumped dart-ogurets generator to 4.1 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
+
 ## 3.0.0-nullsafety.1
 
 - Bumped generator version to 5.0.0. This has some breaking changes. [Click here](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0) to view changes
diff --git a/openapi-generator/README.md b/openapi-generator/README.md
@@ -34,7 +34,7 @@ Annotate a dart class with @Openapi() annotation
     additionalProperties:
     AdditionalProperties(pubName: 'petstore_api', pubAuthor: 'Johnny dep'),
     inputSpecFile: 'example/openapi-spec.yaml',
-    generatorName: Generator.DART,
+    generatorName: Generator.dart,
     outputDirectory: 'api/petstore_api')
 class Example extends OpenapiGeneratorConfig {}
 ```
@@ -46,6 +46,24 @@ flutter pub run build_runner build --delete-conflicting-outputs
 
 The api sdk will be generated in the folder specified in the annotation. See examples for more details
 
+## Known Issues
+### Dependency issues/conflicts
+This is not an issue with this library but with flutter/dart in general. If you are having issues with dependencies, what
+you can do is make use of dependency overrides. This is added to the pubspec.yaml of the generated package and then the pubspec
+must be added to the .openapi-generator-ignore of the generated package.
+For example, let's assume you want to override the analyzer package for the generated source
+
+in generatedsource/pubspec.yaml add the following
+```yaml
+dependency_overrides:
+    analyzer: 1.0.0
+```
+Then in generatedsources/.openapi-generator-ignore, add the below so that the pubspec is not overwritten next time you run source gen
+```.gitignore
+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.
+
 ## Features and bugs
 
 Please file feature requests and bugs at the [issue tracker][tracker].
diff --git a/openapi-generator/example/example.dart b/openapi-generator/example/example.dart
@@ -4,6 +4,6 @@ import 'package:openapi_generator_annotations/openapi_generator_annotations.dart
     additionalProperties:
         AdditionalProperties(pubName: 'petstore_api', pubAuthor: 'Johnny dep'),
     inputSpecFile: 'example/openapi-spec.yaml',
-    generatorName: Generator.DART,
+    generatorName: Generator.dart,
     outputDirectory: 'api/petstore_api')
 class Example extends OpenapiGeneratorConfig {}
diff --git a/openapi-generator/example/pubspec.yaml b/openapi-generator/example/pubspec.yaml
@@ -23,13 +23,13 @@ dependency_overrides:
 dependencies:
   flutter:
     sdk: flutter
-  openapi_generator_annotations: ^1.1.0
-  cupertino_icons: ^0.1.3
+  openapi_generator_annotations: ^2.2.0
+  cupertino_icons: ^1.0.2
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  openapi_generator: ^1.1.0
+  openapi_generator: ^2.2.0
 
 
 # For information on the generic Dart part of this file, see the
diff --git a/openapi-generator/lib/src/extensions/type_methods.dart b/openapi-generator/lib/src/extensions/type_methods.dart
@@ -7,13 +7,13 @@ import 'package:source_gen/source_gen.dart' show ConstantReader;
 extension TypeMethods on ConstantReader {
   /// Returns `true` if `this` represents a constant expression
   /// with type `dynamic`.
-  bool get isDynamic => objectValue.type.isDynamic;
+  bool get isDynamic => objectValue.type?.isDynamic??false;
 
   /// Returns the static type of `this`.
-  DartType get type => objectValue.type;
+  DartType? get type => objectValue?.type;
 
   /// Returns a `List` of type arguments or the empty list.
-  List<DartType> get typeArgs => objectValue.type.typeArguments ?? <DartType>[];
+  List<DartType> get typeArgs => objectValue.type?.typeArguments ?? <DartType>[];
 
   /// Reads a instance of a Dart enumeration.
   ///
diff --git a/openapi-generator/lib/src/openapi_generator_runner.dart b/openapi-generator/lib/src/openapi_generator_runner.dart
@@ -121,17 +121,13 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
       if (exitCode == 0) {
         //run buildrunner to generate files
         switch (generatorName) {
-          case annots.Generator.DART:
           case annots.Generator.dart:
             print(
                 'OpenapiGenerator :: skipping source gen because generator does not need it ::');
             break;
-          case annots.Generator.DART_DIO:
           case annots.Generator.dio:
           case annots.Generator.jaguar:
-          case annots.Generator.DART2_API:
           case annots.Generator.dioAlt:
-          case annots.Generator.DART_JAGUAR:
             try {
               var runnerOutput =
                   await runSourceGen(annotation, outputDirectory);
@@ -208,29 +204,20 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
   String getGeneratorNameFromEnum(annots.Generator? generator) {
     var genName = 'dart';
     switch (generator) {
-      case annots.Generator.DART:
       case annots.Generator.dart:
         break;
-      case annots.Generator.DART_DIO:
       case annots.Generator.dio:
         genName = 'dart-dio';
         break;
-      case annots.Generator.DART2_API:
       case annots.Generator.dioAlt:
         genName = 'dart2-api';
         break;
-      case annots.Generator.DART_JAGUAR:
       case annots.Generator.jaguar:
         genName = 'dart-jaguar';
         break;
       default:
         throw InvalidGenerationSourceError(
-          'Generator name must be any of ${annots.Generator.values.where((value) => ![
-                annots.Generator.DART,
-                annots.Generator.DART_DIO,
-                annots.Generator.DART2_API,
-                annots.Generator.DART_JAGUAR
-              ].contains(value)).toList()}.',
+          'Generator name must be any of ${annots.Generator.values}.',
         );
     }
     return genName;
@@ -290,8 +277,8 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
     }
   }
 
-  String _readFieldValueAsString(ConstantReader annotation, String fieldName,
-      [String defaultValue]) {
+  String _readFieldValueAsString(
+      ConstantReader annotation, String fieldName, String defaultValue) {
     var reader = annotation.read(fieldName);
 
     return reader.isNull ? defaultValue : reader.stringValue ?? defaultValue;
diff --git a/openapi-generator/pubspec.yaml b/openapi-generator/pubspec.yaml
@@ -1,21 +1,21 @@
 name: openapi_generator
 description: Generator for openapi client sdk inspired by the npm implementation of openapi-generator-cli.
-version: 2.2.0
+version: 3.0.1
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 environment:
-  sdk: '>=2.12.0-133.2.beta <3.0.0'
+  sdk: '>=2.12.1 <3.0.0'
 
 dependencies:
-  build: '>=0.12.6 <2.0.0'
-  source_gen: ^0.9.10+1
-  path: ^1.7.0
-  openapi_generator_annotations: ^2.2.0
-  analyzer: '>=0.40.0 <=0.41.1'
-  openapi_generator_cli: ^2.2.0
+  build: '>=0.12.6 <=2.0.0'
+  source_gen: ^0.9.10+3
+  path: ^1.8.0
+  openapi_generator_annotations: ^3.0.1
+  analyzer: ^1.1.0
+  openapi_generator_cli: ^3.0.1
 
 dev_dependencies:
-  pedantic: ^1.10.0-nullsafety.3
+  pedantic: ^1.11.0
 #  build_config: ^0.4.5
 #  build_runner:
 #  test: ^1.15.7
