fix: review fixes

Author: O-Hannonen

_test_yaml/test/src/build_config.dart

@@ -85,7 +85,7 @@ class Builder {
   Map<String, dynamic> toJson() => _$BuilderToJson(this);
 }
 
-@JsonEnum(fieldRename: FieldRename.snake)
+@JsonEnum(fieldRename: RenameType.snake)
 enum AutoApply { none, dependents, allPackages, rootPackage }
 
 enum BuildTo { cache, source }

example/lib/complex_sealed_class_examples.dart

@@ -2,9 +2,7 @@ import 'package:json_annotation/json_annotation.dart';
 
 part 'complex_sealed_class_examples.g.dart';
 
-@JsonSerializable(
-  unionDiscriminator: 'organization',
-)
+@JsonSerializable(unionDiscriminator: 'organization')
 sealed class Organization {
   final String name;
 
@@ -16,16 +14,11 @@ sealed class Organization {
   Map<String, dynamic> toJson() => _$OrganizationToJson(this);
 }
 
-@JsonSerializable(
-  unionDiscriminator: 'department',
-)
+@JsonSerializable(unionDiscriminator: 'department')
 sealed class Department extends Organization {
   final String departmentHead;
 
-  Department({
-    required this.departmentHead,
-    required super.name,
-  });
+  Department({required this.departmentHead, required super.name});
 
   factory Department.fromJson(Map<String, dynamic> json) =>
       _$DepartmentFromJson(json);

example/lib/sealed_class_example.dart

@@ -4,7 +4,7 @@ part 'sealed_class_example.g.dart';
 
 @JsonSerializable(
   unionDiscriminator: 'vehicle_type',
-  unionRename: UnionRename.snake,
+  unionRename: RenameType.snake,
 )
 sealed class Vehicle {
   final String vehicleID;
@@ -21,18 +21,12 @@ sealed class Vehicle {
 class Car extends Vehicle {
   final int numberOfDoors;
 
-  Car({
-    required this.numberOfDoors,
-    required super.vehicleID,
-  });
+  Car({required this.numberOfDoors, required super.vehicleID});
 }
 
 @JsonSerializable()
 class Bicycle extends Vehicle {
   final bool hasBell;
 
-  Bicycle({
-    required this.hasBell,
-    required super.vehicleID,
-  });
+  Bicycle({required this.hasBell, required super.vehicleID});
 }

json_annotation/lib/src/allowed_keys_helpers.dart

@@ -89,11 +89,12 @@ class UnrecognizedUnionTypeException extends BadKeyException {
   final Type unionType;
 
   @override
-  String get message => 'Unrecognized type: $unrecognizedType '
+  String get message =>
+      'Unrecognized type: $unrecognizedType '
       'for union: $unionType.';
 
   UnrecognizedUnionTypeException(this.unrecognizedType, this.unionType, Map map)
-      : super._(map);
+    : super._(map);
 }
 
 /// Exception thrown if there are missing required keys in a JSON map that was

json_annotation/lib/src/json_enum.dart

@@ -12,7 +12,7 @@ import 'json_value.dart';
 class JsonEnum {
   const JsonEnum({
     this.alwaysCreate = false,
-    this.fieldRename = FieldRename.none,
+    this.fieldRename = RenameType.none,
     this.valueField,
   });
 
@@ -27,14 +27,14 @@ class JsonEnum {
   /// Defines the naming strategy when converting enum entry names to JSON
   /// values.
   ///
-  /// With a value [FieldRename.none] (the default), the name of the enum entry
+  /// With a value [RenameType.none] (the default), the name of the enum entry
   /// is used without modification.
   ///
-  /// See [FieldRename] for details on the other options.
+  /// See [RenameType] for details on the other options.
   ///
   /// Note: the value for [JsonValue.value] takes precedence over this option
   /// for entries annotated with [JsonValue].
-  final FieldRename fieldRename;
+  final RenameType fieldRename;
 
   /// Specifies the field within an "enhanced enum" to use as the value
   /// to use for serialization.

json_annotation/lib/src/json_serializable.dart

@@ -12,8 +12,12 @@ import 'json_key.dart';
 
 part 'json_serializable.g.dart';
 
+// TODO: Remove typedef
+@Deprecated('Use RenameType instead')
+typedef FieldRename = RenameType;
+
 /// Values for the automatic field renaming behavior for [JsonSerializable].
-enum FieldRename {
+enum RenameType {
   /// Use the field name without changes.
   none,
 
@@ -31,31 +35,11 @@ enum FieldRename {
   screamingSnake,
 }
 
-/// Values for the automatic class renaming behavior for [JsonSerializable]
-/// with sealed classes.
-enum UnionRename {
-  /// Use the union class name without changes.
-  none,
-
-  /// Encodes union class named `KebabCase` with a JSON key `kebab-case`.
-  kebab,
-
-  /// Encodes union class named `SnakeCase` with a JSON key `snake_case`.
-  snake,
-
-  /// Encodes union class named `PascalCase` with a JSON key `PascalCase`.
-  pascal,
-
-  /// Encodes union class named `ScreamingSnakeCase` with a JSON key
-  /// `SCREAMING_SNAKE_CASE`
-  screamingSnake,
-}
-
 /// An annotation used to specify a class to generate code for.
 @JsonSerializable(
   checked: true,
   disallowUnrecognizedKeys: true,
-  fieldRename: FieldRename.snake,
+  fieldRename: RenameType.snake,
 )
 @Target({TargetKind.classType})
 class JsonSerializable {
@@ -173,14 +157,14 @@ class JsonSerializable {
   /// Defines the automatic naming strategy when converting class field names
   /// into JSON map keys.
   ///
-  /// With a value [FieldRename.none] (the default), the name of the field is
+  /// With a value [RenameType.none] (the default), the name of the field is
   /// used without modification.
   ///
-  /// See [FieldRename] for details on the other options.
+  /// See [RenameType] for details on the other options.
   ///
   /// Note: the value for [JsonKey.name] takes precedence over this option for
   /// fields annotated with [JsonKey].
-  final FieldRename? fieldRename;
+  final RenameType? fieldRename;
 
   /// When `true` on classes with type parameters (generic types), extra
   /// "helper" parameters will be generated for `fromJson` and/or `toJson` to
@@ -252,11 +236,11 @@ class JsonSerializable {
   /// Defines the automatic naming strategy when converting class names
   /// to union type names.
   ///
-  /// With a value [UnionRename.none] (the default), the name of the class is
+  /// With a value [RenameType.none] (the default), the name of the class is
   /// used without modification.
   ///
-  /// See [UnionRename] for details on the other options.
-  final UnionRename? unionRename;
+  /// See [RenameType] for details on the other options.
+  final RenameType? unionRename;
 
   /// A list of [JsonConverter] to apply to this class.
   ///
@@ -328,12 +312,12 @@ class JsonSerializable {
     createToJson: true,
     disallowUnrecognizedKeys: false,
     explicitToJson: false,
-    fieldRename: FieldRename.none,
+    fieldRename: RenameType.none,
     ignoreUnannotated: false,
     includeIfNull: true,
     genericArgumentFactories: false,
     unionDiscriminator: 'type',
-    unionRename: UnionRename.none,
+    unionRename: RenameType.none,
   );
 
   /// Returns a new [JsonSerializable] instance with fields equal to the

json_annotation/lib/src/json_serializable.g.dart

@@ -16,16 +16,12 @@ sealed class SealedBase {
 class SealedSub1 extends SealedBase {
   final String exampleField1;
 
-  SealedSub1({
-    required this.exampleField1,
-  });
+  SealedSub1({required this.exampleField1});
 }
 
 @JsonSerializable()
 class SealedSub2 extends SealedBase {
   final String exampleField2;
 
-  SealedSub2({
-    required this.exampleField2,
-  });
+  SealedSub2({required this.exampleField2});
 }

json_serializable/example/sealed_example.dart

@@ -153,7 +153,7 @@ mixin DecodeHelper implements HelperCore {
     final discriminator = config.unionDiscriminator;
 
     String buildSingleImpl(ClassElement2 impl) {
-      final unionName = encodedUnionName(config.unionRename, impl.name3!);
+      final unionName = encodedName(config.unionRename, impl.name3!);
 
       return "'$unionName' => ${classPrefix(impl)}FromJson(json),";
     }

json_serializable/lib/src/decode_helper.dart

@@ -148,7 +148,7 @@ mixin EncodeHelper implements HelperCore {
     String buildSingleImpl(ClassElement2 impl) {
       final originalName = impl.name3!;
 
-      final unionName = encodedUnionName(config.unionRename, originalName);
+      final unionName = encodedName(config.unionRename, originalName);
 
       return '''
   final $originalName instance => {