Fix enum support for upcoming enhanced enums in Dart 2.17 (#1111)

kevmoo · web-flow · commit 74e6d0162bed · 2022-03-07T11:12:56.000-08:00
Fixes #1110 Prepare v6.1.5 release
diff --git a/json_serializable/CHANGELOG.md b/json_serializable/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.1.5
+
+- Fix enum support for upcoming enhanced enums in Dart 2.17.
+
 ## 6.1.4
 
 - Fix issues with latest `package:analyzer` related to enums and annotations.
diff --git a/json_serializable/lib/src/utils.dart b/json_serializable/lib/src/utils.dart
@@ -156,7 +156,7 @@ ConstructorElement constructorByName(ClassElement classElement, String name) {
 /// Otherwise, `null`.
 Iterable<FieldElement>? iterateEnumFields(DartType targetType) {
   if (targetType is InterfaceType && targetType.element.isEnum) {
-    return targetType.element.fields.where((element) => !element.isSynthetic);
+    return targetType.element.fields.where((element) => element.isEnumConstant);
   }
   return null;
 }
diff --git a/json_serializable/pubspec.yaml b/json_serializable/pubspec.yaml
@@ -1,5 +1,5 @@
 name: json_serializable
-version: 6.1.4
+version: 6.1.5
 description: >-
   Automatically generate code for converting to and from JSON by annotating
   Dart classes.

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ ConstructorElement constructorByName(ClassElement classElement, String name) {`
`156`	`156`	/// Otherwise, `null`.
`157`	`157`	`Iterable<FieldElement>? iterateEnumFields(DartType targetType) {`
`158`	`158`	`if (targetType is InterfaceType && targetType.element.isEnum) {`
`159`		`- return targetType.element.fields.where((element) => !element.isSynthetic);`
	`159`	`+ return targetType.element.fields.where((element) => element.isEnumConstant);`
`160`	`160`	`}`
`161`	`161`	`return null;`
`162`	`162`	`}`