Update to latest source_gen

Author: natebosch

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

@@ -43,7 +43,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(
@@ -84,7 +84,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
@@ -94,7 +94,7 @@ class JsonSerializableGenerator
       }
     }
 
-    if (annotation.createToJson) {
+    if (annotation.read('createToJson').boolValue) {
       //
       // Generate the mixin class
       //

pubspec.yaml

@@ -16,3 +16,7 @@ dev_dependencies:
   build_test: ^0.6.0
   collection: ^1.14.0
   test: ^0.12.3
+
+dependency_overrides:
+  source_gen:
+    git: git@github.com:dart-lang/source_gen.git

test/json_serializable_test.dart

@@ -8,10 +8,10 @@ library json_serializable.test.json_generator_test;
 import 'dart:async';
 
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/string_source.dart';
 import 'package:json_serializable/json_serializable.dart';
 import 'package:path/path.dart' as p;
+import 'package:source_gen/source_gen.dart';
 import 'package:test/test.dart';
 
 import 'analysis_utils.dart';
@@ -21,42 +21,35 @@ import 'test_utils.dart';
 void main() {
   group('non-classes', () {
     test('const field', () async {
-      var element = await _getClassForCodeString('theAnswer');
-
       expect(
-          _generator.generate(element, null),
+          _runForElementNamed('theAnswer'),
           throwsInvalidGenerationSourceError(
               'Generator cannot target `const dynamic theAnswer`.',
               'Remove the JsonSerializable annotation from `const dynamic theAnswer`.'));
+      // TODO: validate the properties on the thrown error
     });
 
     test('method', () async {
-      var element = await _getClassForCodeString('annotatedMethod');
-
       expect(
-          _generator.generate(element, null),
+          _runForElementNamed('annotatedMethod'),
           throwsInvalidGenerationSourceError(
               'Generator cannot target `annotatedMethod`.',
               'Remove the JsonSerializable annotation from `annotatedMethod`.'));
+      // TODO: validate the properties on the thrown error
     });
   });
-
   group('unknown types', () {
     test('in constructor arguments', () async {
-      var element = await _getClassForCodeString('UnknownCtorParamType');
-
       expect(
-          _generator.generate(element, null),
+          _runForElementNamed('UnknownCtorParamType'),
           throwsInvalidGenerationSourceError(
               'At least one constructor argument has an invalid type: `number`.',
               'Check names and imports.'));
     });
 
     test('in fields', () async {
-      var element = await _getClassForCodeString('UnknownFieldType');
-
       expect(
-          _generator.generate(element, null),
+          _runForElementNamed('UnknownFieldType'),
           throwsInvalidGenerationSourceError(
               'At least one field has an invalid type: `number`.',
               'Check names and imports.'));
@@ -65,63 +58,46 @@ void main() {
 
   group('unserializable types', () {
     test('for toJson', () async {
-      var element = await _getClassForCodeString('NoSerializeFieldType');
-
       expect(
-          _generator.generate(element, null),
+          _runForElementNamed('NoSerializeFieldType'),
           throwsInvalidGenerationSourceError(
               'Could not generate `toJson` code for `Stopwatch watch`.',
               'Make sure all of the types are serializable.'));
     });
 
     test('for fromJson', () async {
-      var element = await _getClassForCodeString('NoDeserializeFieldType');
-
       expect(
-          _generator.generate(element, null),
+          _runForElementNamed('NoDeserializeFieldType'),
           throwsInvalidGenerationSourceError(
               'Could not generate fromJson code for `Stopwatch watch`.',
               'Make sure all of the types are serializable.'));
     });
 
     test('for toJson in Map key', () async {
-      var element = await _getClassForCodeString('NoSerializeBadKey');
-
       expect(
-          _generator.generate(element, null),
+          _runForElementNamed('NoSerializeBadKey'),
           throwsInvalidGenerationSourceError(
               'Could not generate `toJson` code for `Map<int, DateTime> intDateTimeMap`.',
               'Make sure all of the types are serializable.'));
     });
 
     test('for fromJson', () async {
-      var element = await _getClassForCodeString('NoDeserializeBadKey');
-
       expect(
-          _generator.generate(element, null),
+          _runForElementNamed('NoDeserializeBadKey'),
           throwsInvalidGenerationSourceError(
               'Could not generate fromJson code for `Map<int, DateTime> intDateTimeMap`.',
               'Make sure all of the types are serializable.'));
     });
   });
 
   test('class with final fields', () async {
-    var element = await _getClassForCodeString('FinalFields');
-    var generateResult = await _generator.generate(element, null);
+    var generateResult = await _runForElementNamed('FinalFields');
     expect(generateResult, contains("Map<String, dynamic> toJson()"));
   });
 
-  test('unannotated classes no-op', () async {
-    var element = await _getClassForCodeString('NoAnnotation');
-    var output = _generator.generate(element, null);
-
-    expect(output, isNull);
-  });
-
   group('valid inputs', () {
     test('class with no fields', () async {
-      var element = await _getClassForCodeString('Person');
-      var output = await _generator.generate(element, null);
+      var output = await _runForElementNamed('Person');
 
       expect(output, isNotNull);
 
@@ -130,50 +106,42 @@ void main() {
     });
 
     test('class with ctor params', () async {
-      var element = await _getClassForCodeString('Order');
-      var output = await _generator.generate(element, null);
-
+      var output = await _runForElementNamed('Order');
       expect(output, isNotNull);
 
       // TODO: test the actual output
       // print(output);
     });
 
     test('class with child json-able object', () async {
-      var element = await _getClassForCodeString('ParentObject');
-      var output = await _generator.generate(element, null);
+      var output = await _runForElementNamed('ParentObject');
 
       expect(output, contains('new ChildObject.fromJson'));
     });
 
     test('class with child list of json-able objects', () async {
-      var element = await _getClassForCodeString('ParentObjectWithChildren');
-      var output = await _generator.generate(element, null);
+      var output = await _runForElementNamed('ParentObjectWithChildren');
 
       expect(output, contains('.toList()'));
       expect(output, contains('new ChildObject.fromJson'));
     });
 
     test('class with child list of dynamic objects is left alone', () async {
-      var element =
-          await _getClassForCodeString('ParentObjectWithDynamicChildren');
-      var output = await _generator.generate(element, null);
+      var output = await _runForElementNamed('ParentObjectWithDynamicChildren');
 
       expect(output, contains('children = json[\'children\'] as List;'));
     });
 
     test('class with list of int is cast for strong mode', () async {
-      var element = await _getClassForCodeString('Person');
-      var output = await _generator.generate(element, null);
+      var output = await _runForElementNamed('Person');
 
       expect(output,
           contains("json['listOfInts'] as List)?.map((v0) => v0 as int)"));
     });
   });
 
   test('reads JsonKey annotations', () async {
-    var element = await _getClassForCodeString('Person');
-    var output = await _generator.generate(element, null);
+    var output = await _runForElementNamed('Person');
 
     expect(output, contains("'h': height,"));
     expect(output, contains("..height = json['h']"));
@@ -182,13 +150,15 @@ void main() {
 
 const _generator = const JsonSerializableGenerator();
 
-Future<Element> _getClassForCodeString(String name) async {
+Future<String> _runForElementNamed(String name) async {
   if (_compUnit == null) {
     _compUnit = await _getCompilationUnitForString(getPackagePath());
   }
-
-  return getElementsFromLibraryElement(_compUnit.element.library)
-      .singleWhere((e) => e.name == name);
+  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 {
@@ -234,9 +204,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/json_serializable.dart';
 import 'package:source_gen/source_gen.dart';
 
 final PhaseGroup phases = new PhaseGroup.singleAction(
-    new GeneratorBuilder(const [
+    new PartBuilder(const [
       const JsonSerializableGenerator(),
       const JsonLiteralGenerator()
     ]),