Upgrade source_gen to 0.7.0

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1
+
+* Upgrade to `package:source_gen` v0.7.0
+
 ## 0.2.0+1
 
 * When serializing classes that implement their own `fromJson` constructor,

lib/src/json_literal_generator.dart

@@ -17,15 +17,15 @@ class JsonLiteralGenerator extends GeneratorForAnnotation<JsonLiteral> {
 
   @override
   Future<String> generateForAnnotatedElement(
-      Element element, JsonLiteral annotation, BuildStep buildStep) async {
-    if (p.isAbsolute(annotation.path)) {
+      Element element, ConstantReader annotation, BuildStep buildStep) async {
+    if (p.isAbsolute(annotation.read('path').stringValue)) {
       throw new ArgumentError(
           '`annotation.path` must be relative path to the source file.');
     }
 
     var sourcePathDir = p.dirname(buildStep.inputId.path);
-    var fileId = new AssetId(
-        buildStep.inputId.package, p.join(sourcePathDir, annotation.path));
+    var fileId = new AssetId(buildStep.inputId.package,
+        p.join(sourcePathDir, annotation.read('path').stringValue));
     var content = JSON.decode(await buildStep.readAsString(fileId));
 
     var thing = JSON.encode(content);

lib/src/json_serializable_generator.dart

@@ -53,7 +53,7 @@ class JsonSerializableGenerator
 
   @override
   Future<String> generateForAnnotatedElement(
-      Element element, JsonSerializable annotation, _) async {
+      Element element, ConstantReader annotation, _) async {
     if (element is! ClassElement) {
       var friendlyName = friendlyNameForElement(element);
       throw new InvalidGenerationSourceError(
@@ -104,7 +104,7 @@ class JsonSerializableGenerator
 
     var buffer = new StringBuffer();
 
-    if (annotation.createFactory) {
+    if (annotation.read('createFactory').boolValue) {
       var toSkip = _writeFactory(buffer, classElement, fields, prefix);
 
       // If there are fields that are final – that are not set via the generated
@@ -114,7 +114,7 @@ class JsonSerializableGenerator
       }
     }
 
-    if (annotation.createToJson) {
+    if (annotation.read('createToJson').boolValue) {
       //
       // Generate the mixin class
       //
@@ -127,14 +127,15 @@ class JsonSerializableGenerator
         buffer.writeln('  ${field.type} get $name;');
       });
 
+      var includeIfNull = annotation.read('includeIfNull').boolValue;
+
       buffer.writeln('  Map<String, dynamic> toJson() ');
-      if (fieldsList
-          .every((e) => _includeIfNull(e, annotation.includeIfNull))) {
+      if (fieldsList.every((e) => _includeIfNull(e, includeIfNull))) {
         // write simple `toJson` method that includes all keys...
         _writeToJsonSimple(buffer, fields);
       } else {
         // At least one field should be excluded if null
-        _writeToJsonWithNullChecks(buffer, fields, annotation.includeIfNull);
+        _writeToJsonWithNullChecks(buffer, fields, includeIfNull);
       }
 
       // end of the mixin class

pubspec.yaml

@@ -1,5 +1,5 @@
 name: json_serializable
-version: 0.2.0+1
+version: 0.2.1
 author: Dart Team <misc@dartlang.org>
 description: Generates utilities to aid in serializing to/from JSON.
 homepage: https://github.com/dart-lang/json_serializable
@@ -10,7 +10,7 @@ dependencies:
   build: ^0.9.0
   cli_util: ^0.1.0
   path: ^1.3.2
-  source_gen: ^0.6.1+1
+  source_gen: ^0.7.0
 dev_dependencies:
   build_runner: ^0.3.2
   build_test: ^0.6.0

test/json_serializable_test.dart

@@ -12,6 +12,7 @@ import 'package:analyzer/src/string_source.dart';
 import 'package:json_serializable/generators.dart';
 import 'package:json_serializable/src/utils.dart';
 import 'package:path/path.dart' as p;
+import 'package:source_gen/source_gen.dart';
 import 'package:test/test.dart';
 
 import 'analysis_utils.dart';
@@ -97,12 +98,6 @@ void main() {
     expect(generateResult, contains("Map<String, dynamic> toJson()"));
   });
 
-  test('unannotated classes no-op', () async {
-    var output = await _runForElementNamed('NoAnnotation');
-
-    expect(output, isNull);
-  });
-
   group('valid inputs', () {
     test('class with no fields', () async {
       var output = await _runForElementNamed('Person');
@@ -172,11 +167,12 @@ void main() {
 
 const _generator = const JsonSerializableGenerator();
 
-Future<String> _runForElementNamed(String name) {
-  var library = _compUnit.element.library;
-  var element =
-      getElementsFromLibraryElement(library).singleWhere((e) => e.name == name);
-  return _generator.generate(element, null);
+Future<String> _runForElementNamed(String name) async {
+  var library = new LibraryReader(_compUnit.element.library);
+  var element = library.allElements.singleWhere((e) => e.name == name);
+  var annotation = _generator.typeChecker.firstAnnotationOf(element);
+  return _generator.generateForAnnotatedElement(
+      element, new ConstantReader(annotation), null);
 }
 
 Future<CompilationUnit> _getCompilationUnitForString(String projectPath) async {
@@ -222,9 +218,6 @@ class Order {
   Order(this.height, String firstName, [this.lastName]);
 }
 
-class NoAnnotation {
-}
-
 @JsonSerializable()
 class FinalFields {
   final int a;

tool/phases.dart

@@ -7,7 +7,7 @@ import 'package:json_serializable/generators.dart';
 import 'package:source_gen/source_gen.dart';
 
 final PhaseGroup phases = new PhaseGroup.singleAction(
-    new GeneratorBuilder(const [
+    new PartBuilder(const [
       const JsonSerializableGenerator(),
       const JsonLiteralGenerator()
     ]),