Final tweaks (#186)

* Refine anyValue to only represent values that are identical to the input value
* Prepare for 0.5.9 release

Author: kevmoo

lib/src/annotation.dart

@@ -51,28 +51,13 @@ dynamic instantiateAnnotation(ElementAnnotation annotation) {
 dynamic _getValue(DartObject object) {
   var reader = new ConstantReader(object);
 
-  if (reader.isNull) {
-    return null;
-  }
-
-  if (reader.isBool) {
-    return reader.boolValue;
-  }
-
-  if (reader.isInt) {
-    return reader.intValue;
-  }
-
-  if (reader.isString) {
-    return reader.stringValue;
-  }
-
-  if (reader.isDouble) {
-    return reader.doubleValue;
-  }
-
-  if (reader.isSymbol) {
-    return reader.symbolValue;
+  if (reader.isNull ||
+      reader.isBool ||
+      reader.isInt ||
+      reader.isString ||
+      reader.isDouble ||
+      reader.isSymbol) {
+    return reader.anyValue;
   }
 
   if (reader.isType) {

lib/src/constants.dart

@@ -53,6 +53,10 @@ abstract class ConstantReader {
       _isNull(object) ? const _NullConstant() : new _Constant(object);
 
   /// Constant as any supported literal value.
+  ///
+  /// Throws [FormatException] if a valid literal value cannot be returned. This
+  /// is the case if the constant is not a literal or if the literal value
+  /// is represented at least partially with [DartObject] instances.
   dynamic get anyValue;
 
   /// Returns whether this constant represents a `bool` literal.
@@ -76,6 +80,9 @@ abstract class ConstantReader {
 
   /// Returns this constant as a `List` value.
   ///
+  /// Note: the list values are instances of [DartObject] which represent the
+  /// original values.
+  ///
   /// Throws [FormatException] if [isList] is `false`.
   List<DartObject> get listValue;
 
@@ -86,6 +93,9 @@ abstract class ConstantReader {
 
   /// Returns this constant as a `Map` value.
   ///
+  /// Note: the map keys and values are instances of [DartObject] which
+  /// represent the original values.
+  ///
   /// Throws [FormatException] if [isMap] is `false`.
   Map<DartObject, DartObject> get mapValue;
 
@@ -146,15 +156,12 @@ abstract class ConstantReader {
   Revivable revive();
 }
 
-dynamic _throw(String expected, [dynamic object]) => throw new FormatException(
-    'Not an instance of $expected.', object == null ? null : '$object');
-
 /// Implements a [ConstantReader] representing a `null` value.
 class _NullConstant implements ConstantReader {
   const _NullConstant();
 
   @override
-  dynamic get anyValue => _throw('dynamic');
+  dynamic get anyValue => null;
 
   @override
   bool get boolValue => _throw('bool');
@@ -215,6 +222,9 @@ class _NullConstant implements ConstantReader {
 
   @override
   Revivable revive() => throw new UnsupportedError('Null');
+
+  dynamic _throw(String expected) =>
+      throw new FormatException('Not an instance of $expected.');
 }
 
 /// Default implementation of [ConstantReader].
@@ -230,28 +240,25 @@ class _Constant implements ConstantReader {
       _object.toStringValue() ??
       _object.toDoubleValue() ??
       (isSymbol ? this.symbolValue : null) ??
-      _object.toTypeValue() ??
-      _object.toListValue() ??
-      _object.toMapValue();
+      _throw('bool, int, double, String or Symbol');
 
   @override
-  bool get boolValue =>
-      isBool ? _object.toBoolValue() : _throw('bool', _object);
+  bool get boolValue => isBool ? _object.toBoolValue() : _throw('bool');
 
   @override
-  int get intValue => isInt ? _object.toIntValue() : _throw('int', _object);
+  int get intValue => isInt ? _object.toIntValue() : _throw('int');
 
   @override
   String get stringValue =>
-      isString ? _object.toStringValue() : _throw('String', _object);
+      isString ? _object.toStringValue() : _throw('String');
 
   @override
   List<DartObject> get listValue =>
-      isList ? _object.toListValue() : _throw('List', _object);
+      isList ? _object.toListValue() : _throw('List');
 
   @override
   Map<DartObject, DartObject> get mapValue =>
-      isMap ? _object.toMapValue() : _throw('Map', _object);
+      isMap ? _object.toMapValue() : _throw('Map');
 
   @override
   bool get isBool => _object.toBoolValue() != null;
@@ -276,22 +283,20 @@ class _Constant implements ConstantReader {
 
   @override
   double get doubleValue =>
-      isDouble ? _object.toDoubleValue() : _throw('double', _object);
+      isDouble ? _object.toDoubleValue() : _throw('double');
 
   @override
   bool get isSymbol => _object.toSymbolValue() != null;
 
   @override
-  Symbol get symbolValue => isSymbol
-      ? new Symbol(_object.toSymbolValue())
-      : _throw('Symbol', _object);
+  Symbol get symbolValue =>
+      isSymbol ? new Symbol(_object.toSymbolValue()) : _throw('Symbol');
 
   @override
   bool get isType => _object.toTypeValue() != null;
 
   @override
-  DartType get typeValue =>
-      isType ? _object.toTypeValue() : _throw("Type", _object);
+  DartType get typeValue => isType ? _object.toTypeValue() : _throw("Type");
 
   @override
   bool instanceOf(TypeChecker checker) =>
@@ -311,4 +316,7 @@ class _Constant implements ConstantReader {
 
   @override
   String toString() => 'ConstantReader ${_object}';
+
+  dynamic _throw(String expected) =>
+      throw new FormatException('Not an instance of $expected.', _object);
 }

pubspec.yaml

@@ -1,5 +1,5 @@
 name: source_gen
-version: 0.5.9-dev
+version: 0.5.9
 author: Dart Team <[email protected]>
 description: Automated source code generation for Dart.
 homepage: https://github.com/dart-lang/source_gen

test/constants_test.dart

@@ -68,24 +68,31 @@ void main() {
     test('should read a String', () {
       expect(constants[0].isString, isTrue);
       expect(constants[0].stringValue, 'Hello');
+      expect(constants[0].anyValue, 'Hello');
     });
 
     test('should read an Int', () {
       expect(constants[1].isInt, isTrue);
       expect(constants[1].intValue, 1234);
+      expect(constants[1].anyValue, 1234);
     });
 
     test('should read a Bool', () {
       expect(constants[2].isBool, isTrue);
-      expect(constants[2].boolValue, true);
+      expect(constants[2].boolValue, isTrue);
+      expect(constants[2].anyValue, isTrue);
     });
 
     test('should read a Null', () {
       expect(constants[3].isNull, isTrue);
+      expect(constants[3].anyValue, isNull);
     });
 
     test('should read an arbitrary object', () {
       final constant = constants[4];
+
+      expect(() => constant.anyValue, throwsFormatException);
+
       expect(constant.read('aString').stringValue, 'Hello');
       expect(constant.read('aInt').intValue, 1234);
       expect(constant.read('aBool').boolValue, true);
@@ -106,6 +113,7 @@ void main() {
       expect(constants[6].isList, isTrue, reason: '${constants[6]}');
       expect(constants[6].listValue.map((c) => new ConstantReader(c).intValue),
           [1, 2, 3]);
+      expect(() => constants[6].anyValue, throwsFormatException);
     });
 
     test('should read a map', () {
@@ -115,6 +123,7 @@ void main() {
               key: (k, _) => new ConstantReader(k).intValue,
               value: (_, v) => new ConstantReader(v).stringValue),
           {1: 'A', 2: 'B'});
+      expect(() => constants[7].anyValue, throwsFormatException);
     });
 
     test('should read a double', () {
@@ -132,7 +141,7 @@ void main() {
     test('should read a Type', () {
       expect(constants[11].isType, isTrue);
       expect(constants[11].typeValue.name, 'DateTime');
-      expect(constants[11].anyValue.toString(), 'DateTime');
+      expect(() => constants[11].anyValue, throwsFormatException);
     });
 
     test('should fail reading from `null`', () {