feature: no longer generate new, const

Prepare to release json_serializable 1.0.1
Fixes #275

Author: kevmoo

.travis.yml

@@ -19,8 +19,8 @@ jobs:
       env: PKG="example"
       dart: dev
     - stage: analyzer_and_format
-      name: "SDK: dev - DIR: example - TASKS: dartanalyzer --fatal-infos --fatal-warnings ."
-      script: ./tool/travis.sh dartanalyzer
+      name: "SDK: dev - DIR: example - TASKS: dartanalyzer --fatal-warnings ."
+      script: ./tool/travis.sh dartanalyzer_0
       env: PKG="example"
       dart: dev
     - stage: unit_test
@@ -35,7 +35,7 @@ jobs:
       dart: dev
     - stage: analyzer_and_format
       name: "SDK: dev - DIR: json_annotation - TASKS: dartanalyzer --fatal-infos --fatal-warnings ."
-      script: ./tool/travis.sh dartanalyzer
+      script: ./tool/travis.sh dartanalyzer_1
       env: PKG="json_annotation"
       dart: dev
     - stage: analyzer_and_format
@@ -45,7 +45,7 @@ jobs:
       dart: dev
     - stage: analyzer_and_format
       name: "SDK: dev - DIR: json_serializable - TASKS: dartanalyzer --fatal-infos --fatal-warnings ."
-      script: ./tool/travis.sh dartanalyzer
+      script: ./tool/travis.sh dartanalyzer_1
       env: PKG="json_serializable"
       dart: dev
     - stage: unit_test
@@ -70,7 +70,7 @@ stages:
 
 # Only building master means that we don't run two builds for each pull request.
 branches:
-  only: [master,0_5_x]
+  only: [master]
 
 cache:
   directories:

analysis_options.yaml

@@ -69,8 +69,10 @@ linter:
     - type_init_formals
     - unawaited_futures
     - unnecessary_brace_in_string_interps
+    - unnecessary_const
     - unnecessary_getters_setters
     - unnecessary_lambdas
+    - unnecessary_new
     - unnecessary_null_aware_assignments
     - unnecessary_statements
     - unnecessary_this

example/.mono_repo.yml

@@ -5,7 +5,9 @@ dart:
 stages:
   - analyzer_and_format:
     - dartfmt
-    - dartanalyzer: --fatal-infos --fatal-warnings .
+    # Skipping --fatal-infos  until we can regenerate this package with publish
+    # json_serializable
+    - dartanalyzer: --fatal-warnings .
   - unit_test:
     # Run the tests -- include the default-skipped presubmit tests
     - test: --run-skipped

example/lib/example.dart

@@ -54,11 +54,11 @@ class Order {
 }
 
 Duration _durationFromMillseconds(int milliseconds) =>
-    new Duration(milliseconds: milliseconds);
+    Duration(milliseconds: milliseconds);
 int _durationToMilliseconds(Duration duration) => duration.inMilliseconds;
 
 DateTime _dateTimeFromEpochUs(int us) =>
-    new DateTime.fromMicrosecondsSinceEpoch(us);
+    DateTime.fromMicrosecondsSinceEpoch(us);
 int _dateTimeToEpochUs(DateTime dateTime) => dateTime.microsecondsSinceEpoch;
 
 @JsonSerializable()

example/test/ensure_build_test.dart

@@ -4,7 +4,7 @@
 
 // TODO(kevmoo): replace with a common utility
 //               https://github.com/dart-lang/build/issues/716
-@Tags(const ['presubmit-only'])
+@Tags(['presubmit-only'])
 
 import 'dart:convert';
 import 'dart:io';
@@ -20,7 +20,7 @@ void main() {
     var currentDir = Directory.current.resolveSymbolicLinksSync();
 
     if (!p.equals(p.join(pkgRoot, 'example'), currentDir)) {
-      throw new StateError('Expected the git root ($pkgRoot) '
+      throw StateError('Expected the git root ($pkgRoot) '
           'to match the current directory ($currentDir).');
     }
   });
@@ -33,14 +33,14 @@ void main() {
     var result = _runProc('pub',
         ['run', 'build_runner', 'build', '--delete-conflicting-outputs']);
     expect(result,
-        contains(new RegExp(r'\[INFO\] Succeeded after \S+ with \d+ outputs')));
+        contains(RegExp(r'\[INFO\] Succeeded after \S+ with \d+ outputs')));
 
     // 3 - get a list of modified `.g.dart` files - should still be empty
     expect(_changedGeneratedFiles(), isEmpty);
   });
 }
 
-final _whitespace = new RegExp(r'\s');
+final _whitespace = RegExp(r'\s');
 
 Set<String> _changedGeneratedFiles() {
   var output = _runProc('git', ['status', '--porcelain']);
@@ -55,7 +55,7 @@ String _runProc(String proc, List<String> args) {
   var result = Process.runSync(proc, args);
 
   if (result.exitCode != 0) {
-    throw new ProcessException(
+    throw ProcessException(
         proc, args, result.stderr as String, result.exitCode);
   }
 

example/test/example_test.dart

@@ -9,15 +9,13 @@ import 'package:test/test.dart';
 
 void main() {
   test('JsonSerializable', () {
-    final person = new Person('Inigo', 'Montoya', new DateTime(1560, 5, 5))
-      ..orders = [
-        new Order(new DateTime.now())..item = (new Item()..count = 42)
-      ];
+    final person = Person('Inigo', 'Montoya', DateTime(1560, 5, 5))
+      ..orders = [Order(DateTime.now())..item = (Item()..count = 42)];
 
     final personJson = _encode(person);
 
     final person2 =
-        new Person.fromJson(json.decode(personJson) as Map<String, dynamic>);
+        Person.fromJson(json.decode(personJson) as Map<String, dynamic>);
 
     expect(person.firstName, person2.firstName);
     expect(person.lastName, person2.lastName);

example/test/readme_test.dart

@@ -13,7 +13,7 @@ void main() {
 
 void _expect(String fileName) {
   test(fileName, () {
-    final file = new File(fileName);
+    final file = File(fileName);
     expect(file.readAsStringSync(), contains(_pubspecContent));
   });
 }

json_annotation/lib/src/allowed_keys_helpers.dart

@@ -15,14 +15,14 @@ void $checkKeys(Map map,
     var invalidKeys =
         map.keys.cast<String>().where((k) => !allowedKeys.contains(k)).toList();
     if (invalidKeys.isNotEmpty) {
-      throw new UnrecognizedKeysException(invalidKeys, map, allowedKeys);
+      throw UnrecognizedKeysException(invalidKeys, map, allowedKeys);
     }
   }
 
   if (requiredKeys != null) {
     var missingKeys = requiredKeys.where((k) => !map.keys.contains(k)).toList();
     if (missingKeys.isNotEmpty) {
-      throw new MissingRequiredKeysException(missingKeys, map);
+      throw MissingRequiredKeysException(missingKeys, map);
     }
   }
 
@@ -34,7 +34,7 @@ void $checkKeys(Map map,
         .toList();
 
     if (nullValuedKeys.isNotEmpty) {
-      throw new DisallowedNullValueException(nullValuedKeys, map);
+      throw DisallowedNullValueException(nullValuedKeys, map);
     }
   }
 }

json_annotation/lib/src/checked_helpers.dart

@@ -28,7 +28,7 @@ T $checkedNew<T>(String className, Map map, T constructor(),
     } else if (error is DisallowedNullValueException) {
       key = error.keysWithNullValues.first;
     }
-    throw new CheckedFromJsonException._(error, stack, map, key,
+    throw CheckedFromJsonException._(error, stack, map, key,
         className: className);
   }
 }
@@ -43,7 +43,7 @@ T $checkedConvert<T>(Map map, String key, T castFunc(Object value)) {
   } on CheckedFromJsonException {
     rethrow;
   } catch (error, stack) {
-    throw new CheckedFromJsonException._(error, stack, map, key);
+    throw CheckedFromJsonException._(error, stack, map, key);
   }
 }
 

json_annotation/lib/src/wrapper_helpers.dart

@@ -16,30 +16,30 @@ abstract class $JsonMapWrapper extends UnmodifiableMapBase<String, dynamic> {}
 /// Should not be used directly.
 Map<String, dynamic> $wrapMap<K, V>(
         Map<K, V> source, dynamic converter(V key)) =>
-    new _MappingMap(source, converter);
+    _MappingMap(source, converter);
 
 /// Helper function used in generated code when
 /// `JsonSerializableGenerator.useWrappers` is `true`.
 ///
 /// Should not be used directly.
 Map<String, dynamic> $wrapMapHandleNull<K, V>(
         Map<K, V> source, dynamic converter(V key)) =>
-    source == null ? null : new _MappingMap(source, converter);
+    source == null ? null : _MappingMap(source, converter);
 
 /// Helper function used in generated code when
 /// `JsonSerializableGenerator.useWrappers` is `true`.
 ///
 /// Should not be used directly.
 List<dynamic> $wrapList<T>(List<T> source, dynamic converter(T key)) =>
-    new _MappingList(source, converter);
+    _MappingList(source, converter);
 
 /// Helper function used in generated code when
 /// `JsonSerializableGenerator.useWrappers` is `true`.
 ///
 /// Should not be used directly.
 List<dynamic> $wrapListHandleNull<T>(
         List<T> source, dynamic converter(T key)) =>
-    source == null ? null : new _MappingList(source, converter);
+    source == null ? null : _MappingList(source, converter);
 
 typedef dynamic _Convert<S>(S value);
 
@@ -53,13 +53,13 @@ class _MappingList<S> extends ListBase<dynamic> {
   dynamic operator [](int index) => _converter(_source[index]);
 
   @override
-  operator []=(int index, dynamic value) => throw new UnsupportedError('');
+  operator []=(int index, dynamic value) => throw UnsupportedError('');
 
   @override
   int get length => _source.length;
 
   @override
-  set length(int value) => throw new UnsupportedError('');
+  set length(int value) => throw UnsupportedError('');
 }
 
 class _MappingMap<K, V> extends UnmodifiableMapBase<String, dynamic> {

json_annotation/pubspec.yaml

@@ -1,5 +1,5 @@
 name: json_annotation
-version: 1.0.0
+version: 1.0.1-dev
 description: >-
   Classes and helper functions that support JSON code generation via the
   `json_serializable` package.

json_serializable/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.0
+
+* Explicit `new` and `const` are no longer generated.
+
 ## 1.0.0
 
 * **BREAKING** By default, code generated to support `toJson` now creates

json_serializable/example/example.g.dart

@@ -23,7 +23,7 @@ import 'src/json_part_builder.dart';
 Builder jsonSerializable(BuilderOptions options) {
   // Paranoid copy of options.config - don't assume it's mutable or needed
   // elsewhere.
-  var optionsMap = new Map<String, dynamic>.from(options.config);
+  var optionsMap = Map<String, dynamic>.from(options.config);
 
   var builder = jsonPartBuilder(
     useWrappers: optionsMap.remove('use_wrappers') as bool,
@@ -36,7 +36,7 @@ Builder jsonSerializable(BuilderOptions options) {
 
   if (optionsMap.isNotEmpty) {
     if (log == null) {
-      throw new StateError('Upgrade `build_runner` to at least 0.8.2.');
+      throw StateError('Upgrade `build_runner` to at least 0.8.2.');
     } else {
       log.warning('These options were ignored: `$optionsMap`.');
     }

json_serializable/lib/builder.dart

@@ -11,7 +11,7 @@ import 'type_helper.dart';
 import 'utils.dart';
 
 abstract class DecodeHelper implements HelperCore {
-  final StringBuffer _buffer = new StringBuffer();
+  final StringBuffer _buffer = StringBuffer();
 
   String createFactory(Map<String, FieldElement> accessibleFields,
       Map<String, String> unavailableReasons) {
@@ -68,15 +68,15 @@ abstract class DecodeHelper implements HelperCore {
       _buffer.write('''\n    return val;
   }''');
 
-      var fieldKeyMap = new Map.fromEntries(fieldsSetByFactory
-          .map((k) => new MapEntry(k, nameAccess(accessibleFields[k])))
+      var fieldKeyMap = Map.fromEntries(fieldsSetByFactory
+          .map((k) => MapEntry(k, nameAccess(accessibleFields[k])))
           .where((me) => me.key != me.value));
 
       String fieldKeyMapArg;
       if (fieldKeyMap.isEmpty) {
         fieldKeyMapArg = '';
       } else {
-        var mapLiteral = jsonMapAsDart(fieldKeyMap, true);
+        var mapLiteral = jsonMapAsDart(fieldKeyMap);
         fieldKeyMapArg = ', fieldKeyMap: $mapLiteral';
       }
 
@@ -122,8 +122,8 @@ abstract class DecodeHelper implements HelperCore {
     var args = <String>[];
 
     if (classAnnotation.disallowUnrecognizedKeys) {
-      var allowKeysLiteral = jsonLiteralAsDart(
-          accessibleFields.values.map(nameAccess).toList(), true);
+      var allowKeysLiteral =
+          jsonLiteralAsDart(accessibleFields.values.map(nameAccess).toList());
 
       args.add('allowedKeys: $allowKeysLiteral');
     }
@@ -132,7 +132,7 @@ abstract class DecodeHelper implements HelperCore {
         accessibleFields.values.where((fe) => jsonKeyFor(fe).required).toList();
     if (requiredKeys.isNotEmpty) {
       var requiredKeyLiteral =
-          jsonLiteralAsDart(requiredKeys.map(nameAccess).toList(), true);
+          jsonLiteralAsDart(requiredKeys.map(nameAccess).toList());
 
       args.add('requiredKeys: $requiredKeyLiteral');
     }
@@ -142,7 +142,7 @@ abstract class DecodeHelper implements HelperCore {
         .toList();
     if (disallowNullKeys.isNotEmpty) {
       var dissallowNullKeyLiteral =
-          jsonLiteralAsDart(disallowNullKeys.map(nameAccess).toList(), true);
+          jsonLiteralAsDart(disallowNullKeys.map(nameAccess).toList());
 
       args.add('disallowNullValues: $dissallowNullKeyLiteral');
     }
@@ -211,11 +211,11 @@ _ConstructorData _writeConstructorInvocation(
   var ctor = classElement.unnamedConstructor;
   if (ctor == null) {
     // TODO(kevmoo): support using another ctor - dart-lang/json_serializable#50
-    throw new UnsupportedError(
+    throw UnsupportedError(
         'The class `$className` has no default constructor.');
   }
 
-  var usedCtorParamsAndFields = new Set<String>();
+  var usedCtorParamsAndFields = Set<String>();
   var constructorArguments = <ParameterElement>[];
   var namedConstructorArguments = <ParameterElement>[];
 
@@ -231,7 +231,7 @@ _ConstructorData _writeConstructorInvocation(
           msg = '$msg $additionalInfo';
         }
 
-        throw new UnsupportedError(msg);
+        throw UnsupportedError(msg);
       }
 
       continue;
@@ -253,8 +253,8 @@ _ConstructorData _writeConstructorInvocation(
   var remainingFieldsForInvocationBody =
       writeableFields.toSet().difference(usedCtorParamsAndFields);
 
-  var buffer = new StringBuffer();
-  buffer.write('new $className${genericClassArguments(classElement, false)}(');
+  var buffer = StringBuffer();
+  buffer.write('$className${genericClassArguments(classElement, false)}(');
   if (constructorArguments.isNotEmpty) {
     buffer.writeln();
     buffer.writeAll(constructorArguments.map((paramElement) {
@@ -279,8 +279,8 @@ _ConstructorData _writeConstructorInvocation(
 
   usedCtorParamsAndFields.addAll(remainingFieldsForInvocationBody);
 
-  return new _ConstructorData(buffer.toString(),
-      remainingFieldsForInvocationBody, usedCtorParamsAndFields);
+  return _ConstructorData(buffer.toString(), remainingFieldsForInvocationBody,
+      usedCtorParamsAndFields);
 }
 
 class _ConstructorData {