google · kevmoo · May 10, 2019 · Apr 10, 2019
diff --git a/json_annotation/CHANGELOG.md b/json_annotation/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - **BREAKING** Removed `JsonSerializable.useWrappers` and associated
   `$`-prefixed helpers.
+- **BREAKING** Removed `JsonSerializable.generateToJsonFunction`.
 
 ## 2.3.0
 

diff --git a/json_annotation/lib/src/json_serializable.dart b/json_annotation/lib/src/json_serializable.dart
@@ -62,32 +62,15 @@ class JsonSerializable {
   /// ```
   final bool createFactory;
 
-  /// If `true` (the default), code for encoding JSON is generated for this
-  /// class.
-  ///
-  /// If `json_serializable` is configured with
-  /// `generate_to_json_function: true` (the default), a top-level function is
-  /// created that you can reference from your class.
+  /// If `true` (the default), A top-level function is created that you can
+  /// reference from your class.
   ///
   /// ```dart
   /// @JsonSerializable()
   /// class Example {
   ///   Map<String, dynamic> toJson() => _$ExampleToJson(this);
   /// }
   /// ```
-  ///
-  /// If `json_serializable` is configured with
-  /// `generate_to_json_function: false`, a private `_$ClassNameMixin` class is
-  /// created in the generated part file which contains a `toJson` method.
-  ///
-  /// Mix in this class to the source class:
-  ///
-  /// ```dart
-  /// @JsonSerializable()
-  /// class Example extends Object with _$ExampleSerializerMixin {
-  ///   // ...
-  /// }
-  /// ```
   final bool createToJson;
 
   /// If `false` (the default), then the generated `FromJson` function will
@@ -144,32 +127,6 @@ class JsonSerializable {
   /// fields annotated with [JsonKey].
   final FieldRename fieldRename;
 
-  /// Controls how `toJson` functionality is generated for all types processed
-  /// by this generator.
-  ///
-  /// If `true` (the default), a top-level function is created.
-  ///
-  /// ```dart
-  /// @JsonSerializable()
-  /// class Example {
-  ///   // ...
-  ///   Map<String, dynamic> toJson() => _$ExampleToJson(this);
-  /// }
-  /// ```
-  ///
-  /// If `false`, a private `_$ClassNameSerializerMixin` class is
-  /// created in the generated part file which contains a `toJson` method.
-  ///
-  /// Mix in this class to the source class:
-  ///
-  /// ```dart
-  /// @JsonSerializable()
-  /// class Example extends Object with _$ExampleSerializerMixin {
-  ///   // ...
-  /// }
-  /// ```
-  final bool generateToJsonFunction;
-
   /// Whether the generator should include fields with `null` values in the
   /// serialized output.
   ///
@@ -200,7 +157,6 @@ class JsonSerializable {
     this.encodeEmptyCollection,
     this.explicitToJson,
     this.fieldRename,
-    this.generateToJsonFunction,
     this.includeIfNull,
     this.nullable,
   });
@@ -219,7 +175,6 @@ class JsonSerializable {
     encodeEmptyCollection: true,
     explicitToJson: false,
     fieldRename: FieldRename.none,
-    generateToJsonFunction: true,
     includeIfNull: true,
     nullable: true,
   );
@@ -240,8 +195,6 @@ class JsonSerializable {
           encodeEmptyCollection ?? defaults.encodeEmptyCollection,
       explicitToJson: explicitToJson ?? defaults.explicitToJson,
       fieldRename: fieldRename ?? defaults.fieldRename,
-      generateToJsonFunction:
-          generateToJsonFunction ?? defaults.generateToJsonFunction,
       includeIfNull: includeIfNull ?? defaults.includeIfNull,
       nullable: nullable ?? defaults.nullable);
 

diff --git a/json_annotation/lib/src/json_serializable.g.dart b/json_annotation/lib/src/json_serializable.g.dart
diff --git a/json_serializable/CHANGELOG.md b/json_serializable/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 3.0.0
 
 - **BREAKING** Removed support for `JsonSerializable.useWrappers`.
+- **BREAKING** Removed support for `JsonSerializable.generateToJsonFunction`.
 
 ## 2.3.0
 

diff --git a/json_serializable/README.md b/json_serializable/README.md
@@ -78,7 +78,6 @@ is generated:
 | disallow_unrecognized_keys | [JsonSerializable.disallowUnrecognizedKeys] |                                 |
 | explicit_to_json           | [JsonSerializable.explicitToJson]           |                                 |
 | field_rename               | [JsonSerializable.fieldRename]              |                                 |
-| generate_to_json_function  | [JsonSerializable.generateToJsonFunction]   |                                 |
 | encode_empty_collection    | [JsonSerializable.encodeEmptyCollection]    | [JsonKey.encodeEmptyCollection] |
 | include_if_null            | [JsonSerializable.includeIfNull]            | [JsonKey.includeIfNull]         |
 | nullable                   | [JsonSerializable.nullable]                 | [JsonKey.nullable]              |
@@ -97,7 +96,6 @@ is generated:
 [JsonSerializable.disallowUnrecognizedKeys]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/disallowUnrecognizedKeys.html
 [JsonSerializable.explicitToJson]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/explicitToJson.html
 [JsonSerializable.fieldRename]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/fieldRename.html
-[JsonSerializable.generateToJsonFunction]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/generateToJsonFunction.html
 [JsonSerializable.encodeEmptyCollection]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/encodeEmptyCollection.html
 [JsonKey.encodeEmptyCollection]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonKey/encodeEmptyCollection.html
 [JsonSerializable.includeIfNull]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/includeIfNull.html
@@ -146,7 +144,6 @@ targets:
           encode_empty_collection: true
           explicit_to_json: false
           field_rename: none
-          generate_to_json_function: true
           include_if_null: true
           nullable: true
 ```

diff --git a/json_serializable/doc/doc.md b/json_serializable/doc/doc.md
@@ -7,7 +7,6 @@
 | disallow_unrecognized_keys | [JsonSerializable.disallowUnrecognizedKeys] |                                 |
 | explicit_to_json           | [JsonSerializable.explicitToJson]           |                                 |
 | field_rename               | [JsonSerializable.fieldRename]              |                                 |
-| generate_to_json_function  | [JsonSerializable.generateToJsonFunction]   |                                 |
 | encode_empty_collection    | [JsonSerializable.encodeEmptyCollection]    | [JsonKey.encodeEmptyCollection] |
 | include_if_null            | [JsonSerializable.includeIfNull]            | [JsonKey.includeIfNull]         |
 | nullable                   | [JsonSerializable.nullable]                 | [JsonKey.nullable]              |
@@ -26,7 +25,6 @@
 [JsonSerializable.disallowUnrecognizedKeys]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/disallowUnrecognizedKeys.html
 [JsonSerializable.explicitToJson]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/explicitToJson.html
 [JsonSerializable.fieldRename]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/fieldRename.html
-[JsonSerializable.generateToJsonFunction]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/generateToJsonFunction.html
 [JsonSerializable.encodeEmptyCollection]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/encodeEmptyCollection.html
 [JsonKey.encodeEmptyCollection]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonKey/encodeEmptyCollection.html
 [JsonSerializable.includeIfNull]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable/includeIfNull.html

diff --git a/json_serializable/lib/src/encoder_helper.dart b/json_serializable/lib/src/encoder_helper.dart
@@ -11,41 +11,16 @@ import 'type_helper.dart';
 import 'type_helpers/json_converter_helper.dart';
 
 abstract class EncodeHelper implements HelperCore {
-  String _fieldAccess(FieldElement field) {
-    var fieldAccess = field.name;
-    if (config.generateToJsonFunction) {
-      fieldAccess = '$_toJsonParamName.$fieldAccess';
-    }
-    return fieldAccess;
-  }
-
-  String _mixinClassName(bool withConstraints) =>
-      '${prefix}SerializerMixin${genericClassArgumentsImpl(withConstraints)}';
+  String _fieldAccess(FieldElement field) => '$_toJsonParamName.${field.name}';
 
   Iterable<String> createToJson(Set<FieldElement> accessibleFields) sync* {
     assert(config.createToJson);
 
     final buffer = StringBuffer();
 
-    if (config.generateToJsonFunction) {
-      final functionName = '${prefix}ToJson${genericClassArgumentsImpl(true)}';
-      buffer.write('Map<String, dynamic> $functionName'
-          '($targetClassReference $_toJsonParamName) ');
-    } else {
-      //
-      // Generate the mixin class
-      //
-      buffer.writeln('abstract class ${_mixinClassName(true)} {');
-
-      // write copies of the fields - this allows the toJson method to access
-      // the fields of the target class
-      for (final field in accessibleFields) {
-        //TODO - handle aliased imports
-        buffer.writeln('  ${field.type} get ${field.name};');
-      }
-
-      buffer.write('  Map<String, dynamic> toJson() ');
-    }
+    final functionName = '${prefix}ToJson${genericClassArgumentsImpl(true)}';
+    buffer.write('Map<String, dynamic> $functionName'
+        '($targetClassReference $_toJsonParamName) ');
 
     final writeNaive = accessibleFields.every(_writeJsonValueNaive);
 
@@ -57,11 +32,6 @@ abstract class EncodeHelper implements HelperCore {
       _writeToJsonWithNullChecks(buffer, accessibleFields);
     }
 
-    if (!config.generateToJsonFunction) {
-      // end of the mixin class
-      buffer.writeln('}');
-    }
-
     yield buffer.toString();
   }
 
@@ -82,8 +52,6 @@ abstract class EncodeHelper implements HelperCore {
     buffer.writeln('};');
   }
 
-  /// Name of the parameter used when generating top-level `toJson` functions
-  /// if [JsonSerializable.generateToJsonFunction] is `true`.
   static const _toJsonParamName = 'instance';
 
   void _writeToJsonWithNullChecks(
@@ -106,8 +74,6 @@ abstract class EncodeHelper implements HelperCore {
       // access with `this.`.
       if (safeFieldAccess == generatedLocalVarName ||
           safeFieldAccess == toJsonMapHelperName) {
-        assert(!config.generateToJsonFunction,
-            'This code path should only be hit during the mixin codepath.');
         safeFieldAccess = 'this.$safeFieldAccess';
       }
 

diff --git a/json_serializable/lib/src/utils.dart b/json_serializable/lib/src/utils.dart
@@ -81,8 +81,6 @@ JsonSerializable _valueForAnnotation(ConstantReader reader) => JsonSerializable(
           reader.read('encodeEmptyCollection').literalValue as bool,
       explicitToJson: reader.read('explicitToJson').literalValue as bool,
       fieldRename: _fromDartObject(reader.read('fieldRename')),
-      generateToJsonFunction:
-          reader.read('generateToJsonFunction').literalValue as bool,
       includeIfNull: reader.read('includeIfNull').literalValue as bool,
       nullable: reader.read('nullable').literalValue as bool,
     );
@@ -106,8 +104,6 @@ JsonSerializable mergeConfig(JsonSerializable config, ConstantReader reader) {
         annotation.encodeEmptyCollection ?? config.encodeEmptyCollection,
     explicitToJson: annotation.explicitToJson ?? config.explicitToJson,
     fieldRename: annotation.fieldRename ?? config.fieldRename,
-    generateToJsonFunction:
-        annotation.generateToJsonFunction ?? config.generateToJsonFunction,
     includeIfNull: annotation.includeIfNull ?? config.includeIfNull,
     nullable: annotation.nullable ?? config.nullable,
   );

diff --git a/json_serializable/test/config_test.dart b/json_serializable/test/config_test.dart
@@ -138,7 +138,6 @@ const _invalidConfig = {
   'encode_empty_collection': 42,
   'explicit_to_json': 42,
   'field_rename': 42,
-  'generate_to_json_function': 42,
   'include_if_null': 42,
   'nullable': 42,
 };
diff --git a/json_serializable/test/json_serializable_test.dart b/json_serializable/test/json_serializable_test.dart
@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
-import 'package:json_annotation/json_annotation.dart';
 import 'package:json_serializable/json_serializable.dart';
 import 'package:path/path.dart' as p;
 import 'package:source_gen_test/source_gen_test.dart';
@@ -19,10 +18,6 @@ void main() async {
   testAnnotatedElements(
     reader,
     const JsonSerializableGenerator(),
-    additionalGenerators: const {
-      'mixin': JsonSerializableGenerator(
-          config: JsonSerializable(generateToJsonFunction: false)),
-    },
     expectedAnnotatedTests: _expectedAnnotatedTests,
   );
 }
@@ -58,10 +53,8 @@ const _expectedAnnotatedTests = [
   'FinalFieldsNotSetInCtor',
   'FromDynamicCollection',
   'GeneralTestClass1',
-  'GeneralTestClass1',
   'GeneralTestClass2',
   'GenericClass',
-  'GenericClass',
   'IgnoredFieldClass',
   'IgnoredFieldCtorClass',
   'IncludeIfNullDisallowNullClass',

diff --git a/json_serializable/test/kitchen_sink/simple_object.dart b/json_serializable/test/kitchen_sink/simple_object.dart
@@ -6,12 +6,13 @@ import 'package:json_annotation/json_annotation.dart';
 
 part 'simple_object.g.dart';
 
-@JsonSerializable(anyMap: true, generateToJsonFunction: false)
-class SimpleObject extends Object with _$SimpleObjectSerializerMixin {
-  @override
+@JsonSerializable(anyMap: true)
+class SimpleObject {
   final int value;
 
   SimpleObject(this.value);
 
   factory SimpleObject.fromJson(Map json) => _$SimpleObjectFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SimpleObjectToJson(this);
 }
diff --git a/json_serializable/test/kitchen_sink/simple_object.g.dart b/json_serializable/test/kitchen_sink/simple_object.g.dart
diff --git a/json_serializable/test/kitchen_sink/strict_keys_object.dart b/json_serializable/test/kitchen_sink/strict_keys_object.dart
@@ -6,19 +6,18 @@ import 'package:json_annotation/json_annotation.dart';
 
 part 'strict_keys_object.g.dart';
 
-@JsonSerializable(
-    disallowUnrecognizedKeys: true, anyMap: true, generateToJsonFunction: false)
-class StrictKeysObject extends Object with _$StrictKeysObjectSerializerMixin {
-  @override
+@JsonSerializable(disallowUnrecognizedKeys: true, anyMap: true)
+class StrictKeysObject {
   @JsonKey(required: true)
   final int value;
 
-  @override
   @JsonKey(name: 'custom_field', required: true)
   final String customField;
 
   StrictKeysObject(this.value, this.customField);
 
   factory StrictKeysObject.fromJson(Map json) =>
       _$StrictKeysObjectFromJson(json);
+
+  Map<String, dynamic> toJson() => _$StrictKeysObjectToJson(this);
 }
diff --git a/json_serializable/test/kitchen_sink/strict_keys_object.g.dart b/json_serializable/test/kitchen_sink/strict_keys_object.g.dart
diff --git a/json_serializable/test/shared_config.dart b/json_serializable/test/shared_config.dart
@@ -19,7 +19,6 @@ final generatorConfigNonDefaultJson =
   encodeEmptyCollection: false,
   explicitToJson: true,
   fieldRename: FieldRename.kebab,
-  generateToJsonFunction: false,
   includeIfNull: false,
   nullable: false,
 ).toJson());