Merge pull request #74 from atoka93/master

Fix enum value retrieval error

Author: gibahjoe

openapi-generator/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.3.2
+
+- Fix the enum value retrieval error
+
 ## 3.3.1
 
 - Update the _analyzer_ constraint

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

@@ -1,7 +1,7 @@
 import 'dart:mirrors';
 
 import 'package:analyzer/dart/element/type.dart';
-import 'package:source_gen/source_gen.dart' show ConstantReader;
+import 'package:source_gen/source_gen.dart' show ConstantReader, TypeChecker;
 
 /// Extension adding the type methods to `ConstantReader`.
 extension TypeMethods on ConstantReader {
@@ -54,26 +54,20 @@ extension TypeMethods on ConstantReader {
     }
 
     final classMirror = reflectClass(T);
-    final typeMirror = reflectType(T);
     if (!classMirror.isEnum) {
       throw Exception(
           'Could not read constant via enumValue<$T>(). $T is not a Dart enum.');
     }
-    final varMirrors = <VariableMirror>[];
-    for (final item in classMirror.declarations.values) {
-      if (item is VariableMirror && item.type == typeMirror) {
-        varMirrors.add(item);
-      }
+
+    if (!instanceOf(TypeChecker.fromRuntime(T))) {
+      throw Exception('Not an instance of $T.');
     }
+
     // Access enum field 'values'.
     final values = classMirror.getField(const Symbol('values')).reflectee;
-    for (final varMirror in varMirrors) {
-      final name = MirrorSystem.getName(varMirror.simpleName);
-      final index = peek(name)?.intValue;
-      if (index != null) {
-        return values[index];
-      }
-    }
-    throw Exception('Could not read enum instance of type $T.');
+    // Get enum field 'index'.
+    final enumIndex = objectValue.getField('index')!.toIntValue();
+
+    return values[enumIndex];
   }
 }

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