Dart 2 fixes. (#106)

* Breaking change: Generated RpcClient stubs use the generic invoke method. Requires package:protobuf version 0.8.0 or newer.
* Dart 2 fixes.

.travis.yml

@@ -5,9 +5,9 @@ sudo: false
 # them against each Dart version.
 matrix:
   include:
-  - dart: stable
+  - dart: dev
     dart_task: dartfmt
-  - dart: stable
+  - dart: dev
     env: PROTOC_VERSION=3.0.0
     install: ./tool/travis/setup.sh
     script: ./tool/travis/test.sh

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.0 - 2018-05-17
+
+* Breaking change: Generated RpcClient stubs use the generic invoke method.
+  Requires package:protobuf version 0.8.0 or newer.
+* Dart 2 fixes.
+
 ## 0.7.11 - 2018-04-09
 
 * Dart 2 fix.

benchmark/lib/report.dart

@@ -4,7 +4,7 @@
 
 library protoc.benchmark.report;
 
-import 'dart:convert' show JSON;
+import 'dart:convert' show jsonEncode;
 
 import 'generated/benchmark.pb.dart' as pb;
 
@@ -159,15 +159,15 @@ String _stringifyMap(StringBuffer out, Map json, String indent) {
 
     var value = json[key];
     out.write(childIndent);
-    out.write(JSON.encode(key));
+    out.write(jsonEncode(key));
     out.write(": ");
 
     if (value is List) {
       _stringifyList(out, value, childIndent);
     } else if (value is Map && indent.length < 4) {
       _stringifyMap(out, value, childIndent);
     } else {
-      out.write(JSON.encode(value));
+      out.write(jsonEncode(value));
     }
   }
   out.write("\n$indent}");
@@ -182,7 +182,7 @@ void _stringifyList(StringBuffer out, List json, String indent) {
     if (!first) out.write(",\n");
     first = false;
     out.write(childIndent);
-    out.write(JSON.encode(item));
+    out.write(jsonEncode(item));
   }
   out.write("\n$indent]");
 }

lib/base_type.dart

@@ -70,7 +70,7 @@ class BaseType {
             "double", r"$_setDouble", null);
       case FieldDescriptorProto_Type.TYPE_INT32:
         return const BaseType._raw(FieldDescriptorProto_Type.TYPE_INT32, "3",
-            "int", r"$_setUnsignedInt32", null);
+            "int", r"$_setSignedInt32", null);
       case FieldDescriptorProto_Type.TYPE_UINT32:
         return const BaseType._raw(FieldDescriptorProto_Type.TYPE_UINT32, "U3",
             "int", r"$_setUnsignedInt32", null);

lib/client_generator.dart

@@ -37,7 +37,8 @@ class ClientApiGenerator {
         'ClientContext ctx, $inputType request) {',
         '}', () {
       out.println('var emptyResponse = new $outputType();');
-      out.println('return _client.invoke(ctx, \'${service._descriptor.name}\', '
+      out.println(
+          'return _client.invoke<$outputType>(ctx, \'${service._descriptor.name}\', '
           '\'${m.name}\', request, emptyResponse);');
     });
   }

lib/protobuf_field.dart

@@ -203,11 +203,11 @@ class ProtobufField {
             '0' == descriptor.defaultValue) {
           return null;
         } else if (descriptor.defaultValue == 'inf') {
-          return 'double.INFINITY';
+          return 'double.infinity';
         } else if (descriptor.defaultValue == '-inf') {
-          return 'double.NEGATIVE_INFINITY';
+          return 'double.negativeInfinity';
         } else if (descriptor.defaultValue == 'nan') {
-          return 'double.NAN';
+          return 'double.nan';
         } else if (HEX_LITERAL_REGEX.hasMatch(descriptor.defaultValue)) {
           return '(${descriptor.defaultValue}).toDouble()';
         } else if (INTEGER_LITERAL_REGEX.hasMatch(descriptor.defaultValue)) {

lib/src/descriptor.pb.dart

@@ -186,15 +186,15 @@ class DescriptorProto_ExtensionRange extends GeneratedMessage {
 
   int get start => $_get(0, 0);
   set start(int v) {
-    $_setUnsignedInt32(0, v);
+    $_setSignedInt32(0, v);
   }
 
   bool hasStart() => $_has(0);
   void clearStart() => clearField(1);
 
   int get end => $_get(1, 0);
   set end(int v) {
-    $_setUnsignedInt32(1, v);
+    $_setSignedInt32(1, v);
   }
 
   bool hasEnd() => $_has(1);
@@ -238,15 +238,15 @@ class DescriptorProto_ReservedRange extends GeneratedMessage {
 
   int get start => $_get(0, 0);
   set start(int v) {
-    $_setUnsignedInt32(0, v);
+    $_setSignedInt32(0, v);
   }
 
   bool hasStart() => $_has(0);
   void clearStart() => clearField(1);
 
   int get end => $_get(1, 0);
   set end(int v) {
-    $_setUnsignedInt32(1, v);
+    $_setSignedInt32(1, v);
   }
 
   bool hasEnd() => $_has(1);
@@ -412,7 +412,7 @@ class FieldDescriptorProto extends GeneratedMessage {
 
   int get number => $_get(2, 0);
   set number(int v) {
-    $_setUnsignedInt32(2, v);
+    $_setSignedInt32(2, v);
   }
 
   bool hasNumber() => $_has(2);
@@ -460,7 +460,7 @@ class FieldDescriptorProto extends GeneratedMessage {
 
   int get oneofIndex => $_get(8, 0);
   set oneofIndex(int v) {
-    $_setUnsignedInt32(8, v);
+    $_setSignedInt32(8, v);
   }
 
   bool hasOneofIndex() => $_has(8);
@@ -624,7 +624,7 @@ class EnumValueDescriptorProto extends GeneratedMessage {
 
   int get number => $_get(1, 0);
   set number(int v) {
-    $_setUnsignedInt32(1, v);
+    $_setSignedInt32(1, v);
   }
 
   bool hasNumber() => $_has(1);
@@ -1658,15 +1658,15 @@ class GeneratedCodeInfo_Annotation extends GeneratedMessage {
 
   int get begin => $_get(2, 0);
   set begin(int v) {
-    $_setUnsignedInt32(2, v);
+    $_setSignedInt32(2, v);
   }
 
   bool hasBegin() => $_has(2);
   void clearBegin() => clearField(3);
 
   int get end => $_get(3, 0);
   set end(int v) {
-    $_setUnsignedInt32(3, v);
+    $_setSignedInt32(3, v);
   }
 
   bool hasEnd() => $_has(3);

lib/src/plugin.pb.dart

@@ -41,23 +41,23 @@ class Version extends GeneratedMessage {
 
   int get major => $_get(0, 0);
   set major(int v) {
-    $_setUnsignedInt32(0, v);
+    $_setSignedInt32(0, v);
   }
 
   bool hasMajor() => $_has(0);
   void clearMajor() => clearField(1);
 
   int get minor => $_get(1, 0);
   set minor(int v) {
-    $_setUnsignedInt32(1, v);
+    $_setSignedInt32(1, v);
   }
 
   bool hasMinor() => $_has(1);
   void clearMinor() => clearField(2);
 
   int get patch => $_get(2, 0);
   set patch(int v) {
-    $_setUnsignedInt32(2, v);
+    $_setSignedInt32(2, v);
   }
 
   bool hasPatch() => $_has(2);

pubspec.yaml

@@ -1,5 +1,5 @@
 name: protoc_plugin
-version: 0.7.11
+version: 0.8.0
 author: Dart Team <misc@dartlang.org>
 description: Protoc compiler plugin to generate Dart code
 homepage: https://github.com/dart-lang/dart-protoc-plugin
@@ -8,7 +8,7 @@ environment:
 dependencies:
   fixnum: ^0.10.5
   path: ^1.0.0
-  protobuf: ^0.7.1
+  protobuf: ^0.8.0
   dart_style: ^1.0.6
 dev_dependencies:
   browser: any

test/client_generator_test.dart

@@ -21,11 +21,11 @@ class TestApi {
 
   Future<SomeReply> aMethod(ClientContext ctx, SomeRequest request) {
     var emptyResponse = new SomeReply();
-    return _client.invoke(ctx, 'Test', 'AMethod', request, emptyResponse);
+    return _client.invoke<SomeReply>(ctx, 'Test', 'AMethod', request, emptyResponse);
   }
   Future<$foo$bar.AnotherReply> anotherMethod(ClientContext ctx, $foo$bar.EmptyMessage request) {
     var emptyResponse = new $foo$bar.AnotherReply();
-    return _client.invoke(ctx, 'Test', 'AnotherMethod', request, emptyResponse);
+    return _client.invoke<$foo$bar.AnotherReply>(ctx, 'Test', 'AnotherMethod', request, emptyResponse);
   }
 }
 

test/file_generator_test.dart

@@ -113,7 +113,7 @@ class PhoneNumber extends GeneratedMessage {
   void clearNumber() => clearField(1);
 
   int get type => $_get(1, 0);
-  set type(int v) { $_setUnsignedInt32(1, v); }
+  set type(int v) { $_setSignedInt32(1, v); }
   bool hasType() => $_has(1);
   void clearType() => clearField(2);
 
@@ -362,7 +362,7 @@ class TestApi {
 
   Future<Empty> ping(ClientContext ctx, Empty request) {
     var emptyResponse = new Empty();
-    return _client.invoke(ctx, 'Test', 'Ping', request, emptyResponse);
+    return _client.invoke<Empty>(ctx, 'Test', 'Ping', request, emptyResponse);
   }
 }
 

test/repeated_field_test.dart

@@ -5,6 +5,7 @@
 
 library repeated_field_test;
 
+import 'package:protobuf/protobuf.dart';
 import 'package:test/test.dart';
 
 import '../out/protos/google/protobuf/unittest.pb.dart';
@@ -47,13 +48,22 @@ void main() {
 
   test("check properties are initialized for repeated fields", () {
     var msg = new TestAllTypes();
-    expect(msg.info_.byName["repeatedNestedMessage"].check,
+    expect(
+        (msg.info_.byName["repeatedNestedMessage"]
+                as FieldInfo<TestAllTypes_NestedMessage>)
+            .check,
         same(TestAllTypes_NestedMessage.$checkItem));
 
-    expect(msg.info_.byName["repeatedGroup"].check,
+    expect(
+        (msg.info_.byName["repeatedGroup"]
+                as FieldInfo<TestAllTypes_RepeatedGroup>)
+            .check,
         same(TestAllTypes_RepeatedGroup.$checkItem));
 
-    expect(msg.info_.byName["repeatedNestedEnum"].check,
+    expect(
+        (msg.info_.byName["repeatedNestedEnum"]
+                as FieldInfo<TestAllTypes_NestedEnum>)
+            .check,
         same(TestAllTypes_NestedEnum.$checkItem));
   });
 }

test/service_test.dart

@@ -57,12 +57,12 @@ class FakeJsonClient implements RpcClient {
 
   FakeJsonClient(this.server);
 
-  Future<GeneratedMessage> invoke(
+  Future<T> invoke<T extends GeneratedMessage>(
       ClientContext ctx,
       String serviceName,
       String methodName,
       GeneratedMessage request,
-      GeneratedMessage response) async {
+      T response) async {
     String requestJson = request.writeToJson();
     String replyJson =
         await server.messageHandler(serviceName, methodName, requestJson);