Downgraded dart sdk version to 3.3.3 and corrected some style issues

Author: vkorencik

_test_yaml/pubspec.yaml

@@ -2,7 +2,7 @@ name: _test_yaml
 publish_to: none
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.3.3
 
 resolution: workspace
 
@@ -11,8 +11,8 @@ dev_dependencies:
     path: ../shared_test
   build_runner: ^2.2.1
   build_verify: ^3.0.0
-  checked_yaml: ^2.0.4-wip
-  json_annotation: ^4.8.1
+  checked_yaml: ^2.0.3
+  json_annotation: ^4.9.0
   json_serializable: ^6.8.0
   path: ^1.8.2
   test: ^1.21.6

checked_yaml/pubspec.yaml

@@ -6,14 +6,14 @@ description: >-
   package:json_serializable and package:yaml.
 repository: https://github.com/google/json_serializable.dart/tree/master/checked_yaml
 topics:
- - yaml
- - json
- - build-runner
- - json-serializable
- - codegen
+  - yaml
+  - json
+  - build-runner
+  - json-serializable
+  - codegen
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.3.3
 
 resolution: workspace
 

example/pubspec.yaml

@@ -2,12 +2,12 @@ name: example
 publish_to: none
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.3.3
 
 resolution: workspace
 
 dependencies:
-  json_annotation: ^4.8.1
+  json_annotation: ^4.9.0
 
 dev_dependencies:
   # Used by tests. Not required to use `json_serializable`.

json_annotation/lib/src/json_key.dart

@@ -147,6 +147,9 @@ class JsonKey {
   ///
   /// To use `null` for unknown values, use [JsonKey.nullForUndefinedEnumValue].
   /// This is only valid for nullable enum fields.
+  ///
+  /// To skip unknown values, use [JsonKey.skipForUndefinedEnumValue].
+  /// This will remove all `null` values, essentially making the enum non-nullable.
   final Enum? unknownEnumValue;
 
   /// Creates a new [JsonKey] instance.
@@ -176,8 +179,13 @@ class JsonKey {
   ///
   /// Read the documentation on [unknownEnumValue] for more details.
   static const Enum nullForUndefinedEnumValue = _NullAsDefault.value;
+
+  /// Sentinel value for use with [unknownEnumValue].
+  ///
+  /// Read the documentation on [unknownEnumValue] for more details.
   static const Enum skipForUndefinedEnumValue = _SkipAsDefault.value;
 }
 
 enum _NullAsDefault { value }
+
 enum _SkipAsDefault { value }

json_annotation/pubspec.yaml

@@ -1,5 +1,5 @@
 name: json_annotation
-version: 4.8.1
+version: 4.9.0
 description: >-
   Classes and helper functions that support JSON code generation via the
   `json_serializable` package.
@@ -11,7 +11,7 @@ topics:
   - codegen
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.3.3
 
 resolution: workspace
 

json_serializable/lib/src/decode_helper.dart

@@ -51,29 +51,23 @@ mixin DecodeHelper implements HelperCore {
 
     final fromJsonLines = <String>[];
 
-    String deserializeFun(String paramOrFieldName,
-            {ParameterElement? ctorParam}) =>
-        _deserializeForField(accessibleFields[paramOrFieldName]!,
-            ctorParam: ctorParam);
+    String deserializeFun(String paramOrFieldName, {ParameterElement? ctorParam}) =>
+        _deserializeForField(accessibleFields[paramOrFieldName]!, ctorParam: ctorParam);
 
     final data = _writeConstructorInvocation(
       element,
       config.constructor,
       accessibleFields.keys,
       accessibleFields.values
-          .where((fe) =>
-              element.augmented
-                  .lookUpSetter(name: fe.name, library: element.library) !=
-              null)
+          .where((fe) => element.lookUpSetter(fe.name, element.library) != null)
           .map((fe) => fe.name)
           .toList(),
       unavailableReasons,
       deserializeFun,
     );
 
     final checks = _checkKeys(
-      accessibleFields.values
-          .where((fe) => data.usedCtorParamsAndFields.contains(fe.name)),
+      accessibleFields.values.where((fe) => data.usedCtorParamsAndFields.contains(fe.name)),
     ).toList();
 
     if (config.checked) {
@@ -162,26 +156,22 @@ mixin DecodeHelper implements HelperCore {
   Iterable<String> _checkKeys(Iterable<FieldElement> accessibleFields) sync* {
     final args = <String>[];
 
-    String constantList(Iterable<FieldElement> things) =>
-        'const ${jsonLiteralAsDart(things.map(nameAccess).toList())}';
+    String constantList(Iterable<FieldElement> things) => 'const ${jsonLiteralAsDart(things.map(nameAccess).toList())}';
 
     if (config.disallowUnrecognizedKeys) {
       final allowKeysLiteral = constantList(accessibleFields);
 
       args.add('allowedKeys: $allowKeysLiteral');
     }
 
-    final requiredKeys =
-        accessibleFields.where((fe) => jsonKeyFor(fe).required).toList();
+    final requiredKeys = accessibleFields.where((fe) => jsonKeyFor(fe).required).toList();
     if (requiredKeys.isNotEmpty) {
       final requiredKeyLiteral = constantList(requiredKeys);
 
       args.add('requiredKeys: $requiredKeyLiteral');
     }
 
-    final disallowNullKeys = accessibleFields
-        .where((fe) => jsonKeyFor(fe).disallowNullValue)
-        .toList();
+    final disallowNullKeys = accessibleFields.where((fe) => jsonKeyFor(fe).disallowNullValue).toList();
     if (disallowNullKeys.isNotEmpty) {
       final disallowNullKeyLiteral = constantList(disallowNullKeys);
 
@@ -220,8 +210,7 @@ mixin DecodeHelper implements HelperCore {
       if (config.checked) {
         value = deserialize('v');
         if (!checkedProperty) {
-          final readValueBit =
-              readValueFunc == null ? '' : ',readValue: $readValueFunc,';
+          final readValueBit = readValueFunc == null ? '' : ',readValue: $readValueFunc,';
           value = '\$checkedConvert($jsonKeyName, (v) => $value$readValueBit)';
         }
       } else {
@@ -231,9 +220,7 @@ mixin DecodeHelper implements HelperCore {
         );
 
         value = deserialize(
-          readValueFunc == null
-              ? 'json[$jsonKeyName]'
-              : '$readValueFunc(json, $jsonKeyName)',
+          readValueFunc == null ? 'json[$jsonKeyName]' : '$readValueFunc(json, $jsonKeyName)',
         );
       }
     } on UnsupportedTypeError catch (e) // ignore: avoid_catching_errors
@@ -268,8 +255,7 @@ _ConstructorData _writeConstructorInvocation(
   Iterable<String> availableConstructorParameters,
   Iterable<String> writableFields,
   Map<String, String> unavailableReasons,
-  String Function(String paramOrFieldName, {ParameterElement ctorParam})
-      deserializeForField,
+  String Function(String paramOrFieldName, {ParameterElement ctorParam}) deserializeForField,
 ) {
   final className = classElement.name;
 
@@ -307,8 +293,7 @@ _ConstructorData _writeConstructorInvocation(
   }
 
   // fields that aren't already set by the constructor and that aren't final
-  final remainingFieldsForInvocationBody =
-      writableFields.toSet().difference(usedCtorParamsAndFields);
+  final remainingFieldsForInvocationBody = writableFields.toSet().difference(usedCtorParamsAndFields);
 
   final constructorExtra = constructorName.isEmpty ? '' : '.$constructorName';
 
@@ -322,17 +307,15 @@ _ConstructorData _writeConstructorInvocation(
     buffer
       ..writeln()
       ..writeAll(constructorArguments.map((paramElement) {
-        final content =
-            deserializeForField(paramElement.name, ctorParam: paramElement);
+        final content = deserializeForField(paramElement.name, ctorParam: paramElement);
         return '      $content,\n';
       }));
   }
   if (namedConstructorArguments.isNotEmpty) {
     buffer
       ..writeln()
       ..writeAll(namedConstructorArguments.map((paramElement) {
-        final value =
-            deserializeForField(paramElement.name, ctorParam: paramElement);
+        final value = deserializeForField(paramElement.name, ctorParam: paramElement);
         return '      ${paramElement.name}: $value,\n';
       }));
   }

json_serializable/lib/src/field_helpers.dart

@@ -18,8 +18,7 @@ class _FieldSet implements Comparable<_FieldSet> {
   final FieldElement field;
   final FieldElement sortField;
 
-  _FieldSet._(this.field, this.sortField)
-      : assert(field.name == sortField.name);
+  _FieldSet._(this.field, this.sortField) : assert(field.name == sortField.name);
 
   factory _FieldSet(FieldElement? classField, FieldElement? superField) {
     // At least one of these will != null, perhaps both.
@@ -30,8 +29,7 @@ class _FieldSet implements Comparable<_FieldSet> {
 
     // Prefer the field that's annotated with `JsonKey`, if any.
     // If not, use the class field.
-    final fieldHasJsonKey =
-        fields.firstWhere(hasJsonKeyAnnotation, orElse: () => fields.first);
+    final fieldHasJsonKey = fields.firstWhere(hasJsonKeyAnnotation, orElse: () => fields.first);
 
     return _FieldSet._(fieldHasJsonKey, sortField);
   }
@@ -52,8 +50,7 @@ class _FieldSet implements Comparable<_FieldSet> {
         return -1;
       }
 
-      final checkerB = TypeChecker.fromStatic(
-          (b.enclosingElement as InterfaceElement).thisType);
+      final checkerB = TypeChecker.fromStatic((b.enclosingElement as InterfaceElement).thisType);
 
       if (checkerB.isAssignableFrom(a.enclosingElement)) {
         return 1;
@@ -79,8 +76,8 @@ class _FieldSet implements Comparable<_FieldSet> {
 List<FieldElement> createSortedFieldSet(ClassElement element) {
   // Get all of the fields that need to be assigned
   // TODO: support overriding the field set with an annotation option
-  final elementInstanceFields = Map.fromEntries(
-      element.fields.where((e) => !e.isStatic).map((e) => MapEntry(e.name, e)));
+  final elementInstanceFields =
+      Map.fromEntries(element.fields.where((e) => !e.isStatic).map((e) => MapEntry(e.name, e)));
 
   final inheritedFields = <String, FieldElement>{};
   final manager = InheritanceManager3();
@@ -92,21 +89,17 @@ List<FieldElement> createSortedFieldSet(ClassElement element) {
     }
 
     if (v is PropertyAccessorElement && v.isGetter) {
-      assert(v.variable2 is FieldElement);
-      final variable = v.variable2 as FieldElement;
+      assert(v.variable is FieldElement);
+      final variable = v.variable as FieldElement;
       assert(!inheritedFields.containsKey(variable.name));
       inheritedFields[variable.name] = variable;
     }
   }
 
   // Get the list of all fields for `element`
-  final allFields =
-      elementInstanceFields.keys.toSet().union(inheritedFields.keys.toSet());
+  final allFields = elementInstanceFields.keys.toSet().union(inheritedFields.keys.toSet());
 
-  final fields = allFields
-      .map((e) => _FieldSet(elementInstanceFields[e], inheritedFields[e]))
-      .toList()
-    ..sort();
+  final fields = allFields.map((e) => _FieldSet(elementInstanceFields[e], inheritedFields[e])).toList()..sort();
 
   return fields.map((fs) => fs.field).toList(growable: false);
 }

json_serializable/lib/src/type_helpers/enum_helper.dart

@@ -29,8 +29,7 @@ class EnumHelper extends TypeHelper<TypeHelperContextWithConfig> {
 
     context.addMember(memberContent);
 
-    if (targetType.isNullableType ||
-        enumFieldWithNullInEncodeMap(targetType) == true) {
+    if (targetType.isNullableType || enumFieldWithNullInEncodeMap(targetType) == true) {
       return '${constMapName(targetType)}[$expression]';
     } else {
       return '${constMapName(targetType)}[$expression]!';
@@ -52,8 +51,7 @@ class EnumHelper extends TypeHelper<TypeHelperContextWithConfig> {
 
     final jsonKey = jsonKeyForField(context.fieldElement, context.config);
 
-    if (!targetType.isNullableType &&
-        jsonKey.unknownEnumValue == jsonKeyNullForUndefinedEnumValueFieldName) {
+    if (!targetType.isNullableType && jsonKey.unknownEnumValue == jsonKeyNullForUndefinedEnumValueFieldName) {
       // If the target is not nullable,
       throw InvalidGenerationSourceError(
         '`$jsonKeyNullForUndefinedEnumValueFieldName` cannot be used with '
@@ -65,6 +63,8 @@ class EnumHelper extends TypeHelper<TypeHelperContextWithConfig> {
     String functionName;
     if (targetType.isNullableType || defaultProvided) {
       functionName = r'$enumDecodeNullable';
+    } else if (jsonKey.unknownEnumValue == r'JsonKey.skipForUndefinedEnumValue') {
+      functionName = r'$enumDecodeNullable';
     } else {
       functionName = r'$enumDecode';
     }
@@ -74,8 +74,7 @@ class EnumHelper extends TypeHelper<TypeHelperContextWithConfig> {
     final args = [
       constMapName(targetType),
       expression,
-      if (jsonKey.unknownEnumValue != null)
-        'unknownValue: ${jsonKey.unknownEnumValue}',
+      if (jsonKey.unknownEnumValue != null) 'unknownValue: ${jsonKey.unknownEnumValue}',
     ];
 
     return '$functionName(${args.join(', ')})';

json_serializable/lib/src/type_helpers/iterable_helper.dart

@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/element/type.dart';
-import 'package:json_annotation/json_annotation.dart';
 import 'package:source_gen/source_gen.dart' show TypeChecker;
 import 'package:source_helper/source_helper.dart';
 
@@ -104,10 +103,9 @@ class IterableHelper extends TypeHelper<TypeHelperContextWithConfig> {
 
     if (_coreListChecker.isExactlyType(targetType)) {
       final jsonKey = jsonKeyForField(context.fieldElement, context.config);
-      final shouldRemoveNulls =
-          targetType.isDartCoreEnum && jsonKey.unknownEnumValue == JsonKey.skipForUndefinedEnumValue.name;
+      final shouldRemoveNulls = jsonKey.unknownEnumValue == jsonKeyNullForUndefinedEnumValueFieldName;
 
-      output += shouldRemoveNulls ? '$optionalQuestion.nonNulls.toList()' : '$optionalQuestion.toList()';
+      output += '$optionalQuestion${shouldRemoveNulls ? '.nonNulls' : ''}.toList()';
     } else if (_coreSetChecker.isExactlyType(targetType)) {
       output += '$optionalQuestion.toSet()';
     }