release 3.1.0

Author: gibahjoe

openapi-generator/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.1
+- **BREAKING CHANGES**
+- Bumped dart-ogurets (_dioAlt_) generator to 5.0 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
+- Bumped official openapi generator to 5.1.0. See [change log](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.1.0)
 ## 3.1.0
 - **BREAKING CHANGES**
 - Bumped dart-ogurets (_dioAlt_) generator to 5.0 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)

openapi-generator/lib/src/extensions/type_methods.dart

@@ -3,17 +3,47 @@ import 'dart:mirrors';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:source_gen/source_gen.dart' show ConstantReader;
 
-/// Extension adding the method `isDynamic`
+/// Extension adding the type methods to `ConstantReader`.
 extension TypeMethods on ConstantReader {
   /// Returns `true` if `this` represents a constant expression
   /// with type `dynamic`.
-  bool get isDynamic => objectValue.type?.isDynamic??false;
+  bool get isDynamic => objectValue.type?.isDynamic ?? false;
+
+  /// Returns `true` is `this` represents a constant expression with
+  /// type exactly `Iterable`.
+  ///
+  /// Note: Returns `false` if the static type represents `List` or `Set`.
+  bool get isIterable => objectValue.type?.isDartCoreIterable ?? false;
+
+  /// Returns `true` if the static type represents a
+  /// `List`, `Set`, `Map`, or `Iterable`.
+  bool get isCollection => isList || isSet || isMap || isIterable;
+
+  /// Returns `true` if the static type *and* the static type argument
+  /// represent a `List`, `Set`, `Map`, or `Iterable`
+  bool get isRecursiveCollection {
+    if (isNotCollection) return false;
+    final typeArg = dartTypeArgs[0];
+    if (typeArg.isDartCoreIterable ||
+        typeArg.isDartCoreList ||
+        typeArg.isDartCoreSet ||
+        typeArg.isDartCoreMap) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  /// Returns `true` if the static type does not represent
+  /// `List`, `Set`, `Map`, or `Iterable`.
+  bool get isNotCollection => !isList && !isSet && !isMap && !isIterable;
 
   /// Returns the static type of `this`.
-  DartType? get type => objectValue?.type;
+  DartType? get dartType => objectValue.type;
 
   /// Returns a `List` of type arguments or the empty list.
-  List<DartType> get typeArgs => objectValue.type?.typeArguments ?? <DartType>[];
+  List<DartType> get dartTypeArgs =>
+      objectValue.type?.typeArguments ?? <DartType>[];
 
   /// Reads a instance of a Dart enumeration.
   ///

openapi-generator/lib/src/openapi_generator_runner.dart

@@ -32,8 +32,8 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
       command = appendTemplateDirCommandArgs(annotation, command, separator);
 
       var generatorName =
-          annotation.peek('generatorName').enumValue<annots.Generator>();
-      var generator = getGeneratorNameFromEnum(generatorName);
+          annotation.peek('generatorName')?.enumValue<annots.Generator>();
+      var generator = getGeneratorNameFromEnum(generatorName!);
       command = '$command$separator-g$separator$generator';
 
       var outputDirectory =
@@ -46,7 +46,7 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
               'OpenapiGenerator :: Codegen skipped because alwaysRun is set to [$alwaysRun] and $filePath already exists');
           return '';
         }
-        command = '$command$separator-o$separator${outputDirectory}';
+        command = '$command$separator-o$separator$outputDirectory';
       }
 
       command = appendTypeMappingCommandArgs(annotation, command, separator);
@@ -201,7 +201,7 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
     return command;
   }
 
-  String getGeneratorNameFromEnum(annots.Generator? generator) {
+  String getGeneratorNameFromEnum(annots.Generator generator) {
     var genName = 'dart';
     switch (generator) {
       case annots.Generator.dart:
@@ -263,9 +263,8 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
       String command, List<String> arguments, ConstantReader annotation) {
     final wrapper = annotation
             .read('additionalProperties')
-            ?.read('wrapper')
-            ?.enumValue<annots.Wrapper>() ??
-        annots.Wrapper.none;
+            .read('wrapper')
+            .enumValue<annots.Wrapper>();
     switch (wrapper) {
       case annots.Wrapper.flutterw:
         return Command('./flutterw', arguments);
@@ -281,21 +280,21 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
       ConstantReader annotation, String fieldName, String defaultValue) {
     var reader = annotation.read(fieldName);
 
-    return reader.isNull ? defaultValue : reader.stringValue ?? defaultValue;
+    return reader.isNull ? defaultValue : reader.stringValue;
   }
 
   Map? _readFieldValueAsMap(ConstantReader annotation, String fieldName,
       [Map? defaultValue]) {
     var reader = annotation.read(fieldName);
 
-    return reader.isNull ? defaultValue : reader.mapValue ?? defaultValue;
+    return reader.isNull ? defaultValue : reader.mapValue;
   }
 
   bool? _readFieldValueAsBool(ConstantReader annotation, String fieldName,
       [bool? defaultValue]) {
     var reader = annotation.read(fieldName);
 
-    return reader.isNull ? defaultValue : reader.boolValue ?? defaultValue;
+    return reader.isNull ? defaultValue : reader.boolValue;
   }
 }
 

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: 3.1.0
+version: 3.1.1
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 environment: