google · kevmoo · Jun 4, 2025 · May 31, 2025 · Jun 2, 2025 · Jun 2, 2025
diff --git a/_test_yaml/test/src/build_config.g.dart b/_test_yaml/test/src/build_config.g.dart
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -29,4 +29,5 @@ linter:
     - unnecessary_breaks
     - unnecessary_ignore
     - use_full_hex_values_for_flutter_colors
+    - use_null_aware_elements
     - use_string_buffers
diff --git a/example/lib/example.g.dart b/example/lib/example.g.dart
diff --git a/json_serializable/CHANGELOG.md b/json_serializable/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 6.9.6-wip
 
 - Move `package:collection` to a dev dependency.
+- Use new `null-aware element` feature in generated code.
 - Require Dart 3.8
 
 ## 6.9.5

diff --git a/json_serializable/lib/src/encoder_helper.dart b/json_serializable/lib/src/encoder_helper.dart
@@ -6,7 +6,6 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:source_helper/source_helper.dart';
 
-import 'constants.dart';
 import 'enum_utils.dart';
 import 'helper_core.dart';
 import 'type_helpers/generic_factory_helper.dart';
@@ -109,10 +108,9 @@ mixin EncodeHelper implements HelperCore {
           final keyExpression = safeNameAccess(field);
           final valueExpression = _serializeField(field, access);
 
-          final keyValuePair = _canWriteJsonWithoutNullCheck(field)
-              ? '$keyExpression: $valueExpression'
-              : 'if ($valueExpression case final $generatedLocalVarName?) '
-                    '$keyExpression: $generatedLocalVarName';
+          final maybeQuestion = _canWriteJsonWithoutNullCheck(field) ? '' : '?';
+
+          final keyValuePair = '$keyExpression: $maybeQuestion$valueExpression';
           return '        $keyValuePair,\n';
         }),
       )

diff --git a/json_serializable/test/integration/converter_examples.g.dart b/json_serializable/test/integration/converter_examples.g.dart
diff --git a/json_serializable/test/integration/create_per_field_to_json_example.g.dart b/json_serializable/test/integration/create_per_field_to_json_example.g.dart
diff --git a/json_serializable/test/integration/json_enum_example.g.dart b/json_serializable/test/integration/json_enum_example.g.dart
diff --git a/json_serializable/test/integration/json_test_example.g.dart b/json_serializable/test/integration/json_test_example.g.dart
diff --git a/json_serializable/test/integration/json_test_example.g_any_map.g.dart b/json_serializable/test/integration/json_test_example.g_any_map.g.dart
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart
diff --git a/json_serializable/test/src/_json_serializable_test_input.dart b/json_serializable/test/src/_json_serializable_test_input.dart
@@ -199,10 +199,7 @@ class NoDeserializeBadKey {
 @ShouldGenerate(r'''
 Map<String, dynamic> _$IncludeIfNullOverrideToJson(
   IncludeIfNullOverride instance,
-) => <String, dynamic>{
-  'number': instance.number,
-  if (instance.str case final value?) 'str': value,
-};
+) => <String, dynamic>{'number': instance.number, 'str': ?instance.str};
 ''')
 @JsonSerializable(createFactory: false, includeIfNull: false)
 class IncludeIfNullOverride {

diff --git a/json_serializable/test/src/inheritance_test_input.dart b/json_serializable/test/src/inheritance_test_input.dart
@@ -13,8 +13,7 @@ SubType _$SubTypeFromJson(Map<String, dynamic> json) =>
 
 Map<String, dynamic> _$SubTypeToJson(SubType instance) => <String, dynamic>{
   'super-final-field': instance.superFinalField,
-  if (instance.superReadWriteField case final value?)
-    'superReadWriteField': value,
+  'superReadWriteField': ?instance.superReadWriteField,
   'subTypeViaCtor': instance.subTypeViaCtor,
   'subTypeReadWrite': instance.subTypeReadWrite,
 };
@@ -51,8 +50,7 @@ Map<String, dynamic> _$SubTypeWithAnnotatedFieldOverrideExtendsToJson(
   SubTypeWithAnnotatedFieldOverrideExtends instance,
 ) => <String, dynamic>{
   'super-final-field': instance.superFinalField,
-  if (instance.superReadWriteField case final value?)
-    'superReadWriteField': value,
+  'superReadWriteField': ?instance.superReadWriteField,
   'priceHalf': instance.priceHalf,
 };
 ''')

diff --git a/json_serializable/test/src/to_from_json_test_input.dart b/json_serializable/test/src/to_from_json_test_input.dart
@@ -166,9 +166,7 @@ String? _toStringNullOnEmpty(String input) => input.isEmpty ? null : input;
 @ShouldGenerate(r'''
 Map<String, dynamic> _$ToJsonNullableFalseIncludeIfNullFalseToJson(
   ToJsonNullableFalseIncludeIfNullFalse instance,
-) => <String, dynamic>{
-  if (_toStringNullOnEmpty(instance.field) case final value?) 'field': value,
-};
+) => <String, dynamic>{'field': ?_toStringNullOnEmpty(instance.field)};
 ''')
 @JsonSerializable(createFactory: false)
 class ToJsonNullableFalseIncludeIfNullFalse {