Remove dynamic calls

protobuf/analysis_options.yaml

@@ -2,6 +2,7 @@ include: package:lints/recommended.yaml
 
 linter:
   rules:
+    - avoid_dynamic_calls
     - comment_references
     - directives_ordering
     - prefer_relative_imports

protobuf/benchmarks/common.dart

@@ -8,6 +8,10 @@
 /// both on the VM and when compiled to JavaScript.
 library common;
 
+// TODO(https://github.com/google/protobuf.dart/issues/578): Remove remaining
+// dynamic calls.
+// ignore_for_file: avoid_dynamic_calls
+
 import 'dart:typed_data';
 
 import 'package:benchmark_harness/benchmark_harness.dart';

protobuf/lib/protobuf.dart

@@ -6,7 +6,13 @@ library protobuf;
 
 import 'dart:collection' show ListBase, MapBase;
 import 'dart:convert'
-    show base64Decode, base64Encode, jsonEncode, jsonDecode, Utf8Codec;
+    show
+        base64Decode,
+        base64Encode,
+        jsonEncode,
+        jsonDecode,
+        Utf8Codec,
+        Utf8Encoder;
 import 'dart:math' as math;
 import 'dart:typed_data' show TypedData, Uint8List, ByteData, Endian;
 

protobuf/lib/src/protobuf/coded_buffer.dart

@@ -195,7 +195,7 @@ void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
 }
 
 void _readPackable(BuilderInfo meta, _FieldSet fs, CodedBufferReader input,
-    int wireType, FieldInfo fi, Function readFunc) {
+    int wireType, FieldInfo fi, Object Function() readFunc) {
   void readToList(List list) => list.add(readFunc());
   _readPackableToList(meta, fs, input, wireType, fi, readToList);
 }
@@ -222,8 +222,13 @@ void _readPackableToListEnum(
   _readPackableToList(meta, fs, input, wireType, fi, readToList);
 }
 
-void _readPackableToList(BuilderInfo meta, _FieldSet fs,
-    CodedBufferReader input, int wireType, FieldInfo fi, Function readToList) {
+void _readPackableToList(
+    BuilderInfo meta,
+    _FieldSet fs,
+    CodedBufferReader input,
+    int wireType,
+    FieldInfo fi,
+    void Function(List<Object?>) readToList) {
   var list = fs._ensureRepeatedField(meta, fi);
 
   if (wireType == WIRETYPE_LENGTH_DELIMITED) {

protobuf/lib/src/protobuf/coded_buffer_reader.dart

@@ -35,7 +35,7 @@ class CodedBufferReader {
 
   bool isAtEnd() => _bufferPos >= _currentLimit;
 
-  void _withLimit(int byteLimit, callback) {
+  void _withLimit(int byteLimit, void Function() callback) {
     if (byteLimit < 0) {
       throw ArgumentError(
           'CodedBufferReader encountered an embedded string or message'

protobuf/lib/src/protobuf/coded_buffer_writer.dart

@@ -64,14 +64,15 @@ class CodedBufferWriter {
     _commitChunk(true);
   }
 
-  void writeField(int fieldNumber, int fieldType, fieldValue) {
+  void writeField(int fieldNumber, int fieldType, Object? fieldValue) {
     final valueType = fieldType & ~0x07;
 
     if ((fieldType & PbFieldType._PACKED_BIT) != 0) {
-      if (!fieldValue.isEmpty) {
+      final listValue = fieldValue as List<Object?>;
+      if (listValue.isNotEmpty) {
         _writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
         final mark = _startLengthDelimited();
-        for (var value in fieldValue) {
+        for (var value in listValue) {
           _writeValueAs(valueType, value);
         }
         _endLengthDelimited(mark);
@@ -82,26 +83,27 @@ class CodedBufferWriter {
     final wireFormat = _wireTypes[_valueTypeIndex(valueType)];
 
     if ((fieldType & PbFieldType._MAP_BIT) != 0) {
-      final keyWireFormat =
-          _wireTypes[_valueTypeIndex(fieldValue.keyFieldType)];
+      final mapValue = fieldValue as PbMap<Object?, Object?>;
+      final keyWireFormat = _wireTypes[_valueTypeIndex(mapValue.keyFieldType!)];
       final valueWireFormat =
-          _wireTypes[_valueTypeIndex(fieldValue.valueFieldType)];
+          _wireTypes[_valueTypeIndex(mapValue.valueFieldType!)];
 
       fieldValue.forEach((key, value) {
         _writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
         final mark = _startLengthDelimited();
-        _writeValue(
-            PbMap._keyFieldNumber, fieldValue.keyFieldType, key, keyWireFormat);
-        _writeValue(PbMap._valueFieldNumber, fieldValue.valueFieldType, value,
+        _writeValue(PbMap._keyFieldNumber, fieldValue.keyFieldType!, key,
+            keyWireFormat);
+        _writeValue(PbMap._valueFieldNumber, fieldValue.valueFieldType!, value,
             valueWireFormat);
         _endLengthDelimited(mark);
       });
       return;
     }
 
     if ((fieldType & PbFieldType._REPEATED_BIT) != 0) {
-      for (var i = 0; i < fieldValue.length; i++) {
-        _writeValue(fieldNumber, valueType, fieldValue[i], wireFormat);
+      final listValue = fieldValue as List<Object?>;
+      for (var i = 0; i < listValue.length; i++) {
+        _writeValue(fieldNumber, valueType, listValue[i], wireFormat);
       }
       return;
     }
@@ -340,7 +342,7 @@ class CodedBufferWriter {
             value is TypedData ? value : Uint8List.fromList(value));
         break;
       case PbFieldType._STRING_BIT:
-        _writeBytesNoTag(_utf8.encode(value));
+        _writeBytesNoTag(const Utf8Encoder().convert(value));
         break;
       case PbFieldType._DOUBLE_BIT:
         _writeDouble(value);
@@ -349,10 +351,12 @@ class CodedBufferWriter {
         _writeFloat(value);
         break;
       case PbFieldType._ENUM_BIT:
-        _writeVarint32(value.value & 0xffffffff);
+        final enumValue = value as ProtobufEnum;
+        _writeVarint32(enumValue.value & 0xffffffff);
         break;
       case PbFieldType._GROUP_BIT:
-        value.writeToCodedBufferWriter(this);
+        final messageValue = value as GeneratedMessage;
+        messageValue.writeToCodedBufferWriter(this);
         break;
       case PbFieldType._INT32_BIT:
         _writeVarint64(Int64(value));
@@ -386,14 +390,15 @@ class CodedBufferWriter {
         break;
       case PbFieldType._MESSAGE_BIT:
         final mark = _startLengthDelimited();
-        value.writeToCodedBufferWriter(this);
+        final messageValue = value as GeneratedMessage;
+        messageValue.writeToCodedBufferWriter(this);
         _endLengthDelimited(mark);
         break;
     }
   }
 
-  void _writeBytesNoTag(dynamic value) {
-    writeInt32NoTag(value.length);
+  void _writeBytesNoTag(TypedData value) {
+    writeInt32NoTag((value as List).length);
     writeRawBytes(value);
   }
 

protobuf/lib/src/protobuf/extension_field_set.dart

@@ -172,11 +172,11 @@ class _ExtensionFieldSet {
     _isReadOnly = true;
     for (var field in _info.values) {
       if (field.isRepeated) {
-        final entries = _values[field.tagNumber];
+        final entries = _values[field.tagNumber] as PbList<Object>?;
         if (entries == null) continue;
         if (field.isGroupOrMessage) {
-          for (var subMessage in entries as List<GeneratedMessage>) {
-            subMessage.freeze();
+          for (var subMessage in entries) {
+            (subMessage as GeneratedMessage).freeze();
           }
         }
         _values[field.tagNumber] = entries.toFrozenPbList();

protobuf/lib/src/protobuf/extension_registry.dart

@@ -134,7 +134,7 @@ T _reparseMessage<T extends GeneratedMessage>(
         resultMap ??= ensureResult()._fieldSet._values[field.index!];
 
     if (field.isRepeated) {
-      final messageEntries = message._fieldSet._values[field.index!];
+      final messageEntries = message._fieldSet._values[field.index!] as List?;
       if (messageEntries == null) continue;
       if (field.isGroupOrMessage) {
         for (var i = 0; i < messageEntries.length; i++) {
@@ -146,7 +146,7 @@ T _reparseMessage<T extends GeneratedMessage>(
         }
       }
     } else if (field is MapFieldInfo) {
-      final messageMap = message._fieldSet._values[field.index!];
+      final messageMap = message._fieldSet._values[field.index!] as PbMap?;
       if (messageMap == null) continue;
       if (_isGroupOrMessage(field.valueFieldType!)) {
         for (var key in messageMap.keys) {

protobuf/lib/src/protobuf/field_set.dart

@@ -175,7 +175,7 @@ class _FieldSet {
     _frozenState = true;
     for (var field in _meta.sortedByTag) {
       if (field.isRepeated) {
-        final entries = _values[field.index!];
+        final entries = _values[field.index!] as PbList?;
         if (entries == null) continue;
         if (field.isGroupOrMessage) {
           for (var subMessage in entries as List<GeneratedMessage>) {
@@ -668,7 +668,9 @@ class _FieldSet {
       } else if (!_isEnum(fi.type)) {
         hash = _HashUtils._combine(hash, value.hashCode);
       } else if (fi.isRepeated) {
-        hash = _HashUtils._hashObjects(value.map((enm) => enm.value));
+        final listValue = value as List;
+        hash = _HashUtils._hashObjects(
+            listValue.map((enm) => (enm as ProtobufEnum).value));
       } else {
         ProtobufEnum enm = value;
         hash = _HashUtils._combine(hash, enm.value);
@@ -802,15 +804,16 @@ class _FieldSet {
     var mustClone = _isGroupOrMessage(otherFi.type);
 
     if (fi!.isMapField) {
+      final mapValue = fieldValue as Map;
       var f = fi as MapFieldInfo<dynamic, dynamic>;
       mustClone = _isGroupOrMessage(f.valueFieldType!);
       var map = f._ensureMapField(meta, this) as PbMap<dynamic, dynamic>;
       if (mustClone) {
-        for (MapEntry entry in fieldValue.entries) {
+        for (MapEntry entry in mapValue.entries) {
           map[entry.key] = (entry.value as GeneratedMessage).deepCopy();
         }
       } else {
-        map.addAll(fieldValue);
+        map.addAll(mapValue);
       }
       return;
     }
@@ -832,7 +835,7 @@ class _FieldSet {
     }
 
     if (otherFi.isGroupOrMessage) {
-      final currentFi = isExtension!
+      GeneratedMessage? currentFi = isExtension!
           ? _ensureExtensions()._getFieldOrNull(fi as Extension<dynamic>)
           : _values[fi.index!];
 

protobuf/lib/src/protobuf/json.dart

@@ -5,10 +5,11 @@
 part of protobuf;
 
 Map<String, dynamic> _writeToJsonMap(_FieldSet fs) {
-  dynamic convertToMap(dynamic fieldValue, int fieldType) {
+  dynamic convertToMap(Object? fieldValue, int fieldType) {
     var baseType = PbFieldType._baseType(fieldType);
 
     if (_isRepeated(fieldType)) {
+      fieldValue as List;
       return List.from(fieldValue.map((e) => convertToMap(e, baseType)));
     }
 
@@ -27,23 +28,26 @@ Map<String, dynamic> _writeToJsonMap(_FieldSet fs) {
         // Encode 'bytes' as a base64-encoded string.
         return base64Encode(fieldValue as List<int>);
       case PbFieldType._ENUM_BIT:
-        return fieldValue.value; // assume |value| < 2^52
+        final enumValue = fieldValue as ProtobufEnum;
+        return enumValue.value; // assume |value| < 2^52
       case PbFieldType._INT64_BIT:
       case PbFieldType._SINT64_BIT:
       case PbFieldType._SFIXED64_BIT:
         return fieldValue.toString();
       case PbFieldType._UINT64_BIT:
       case PbFieldType._FIXED64_BIT:
-        return fieldValue.toStringUnsigned();
+        final int64Value = fieldValue as Int64;
+        return int64Value.toStringUnsigned();
       case PbFieldType._GROUP_BIT:
       case PbFieldType._MESSAGE_BIT:
-        return fieldValue.writeToJsonMap();
+        final messageValue = fieldValue as GeneratedMessage;
+        return messageValue.writeToJsonMap();
       default:
         throw 'Unknown type $fieldType';
     }
   }
 
-  List _writeMap(dynamic fieldValue, MapFieldInfo fi) =>
+  List _writeMap(Map<Object?, Object?> fieldValue, MapFieldInfo fi) =>
       List.from(fieldValue.entries.map((MapEntry e) => {
             '${PbMap._keyFieldNumber}': convertToMap(e.key, fi.keyFieldType!),
             '${PbMap._valueFieldNumber}':

protobuf/lib/src/protobuf/utils.dart

@@ -31,7 +31,7 @@ bool _areMapsEqual(Map lhs, Map rhs) {
 }
 
 bool _areByteDataEqual(ByteData lhs, ByteData rhs) {
-  Uint8List asBytes(d) =>
+  Uint8List asBytes(ByteData d) =>
       Uint8List.view(d.buffer, d.offsetInBytes, d.lengthInBytes);
   return _areListsEqual(asBytes(lhs), asBytes(rhs));
 }

protobuf/test/json_test.dart

@@ -3,6 +3,10 @@
 // There are more JSON tests in the dart-protoc-plugin package.
 library json_test;
 
+// TODO(https://github.com/google/protobuf.dart/issues/578): Remove remaining
+// dynamic calls.
+// ignore_for_file: avoid_dynamic_calls
+
 import 'dart:convert';
 
 import 'package:fixnum/fixnum.dart' show Int64;

protobuf/test/list_test.dart

@@ -92,6 +92,9 @@ void main() {
 
   test('PbList validates items', () {
     expect(() {
+      // TODO(https://github.com/google/protobuf.dart/issues/578): Remove
+      // remaining dynamic calls.
+      // ignore: avoid_dynamic_calls
       (PbList<int>() as dynamic).add('hello');
     }, throwsA(TypeMatcher<TypeError>()));
   });

protobuf/test/map_mixin_test.dart

@@ -7,6 +7,10 @@
 // There are more tests in the dart-protoc-plugin package.
 library map_mixin_test;
 
+// TODO(https://github.com/google/protobuf.dart/issues/578): Remove remaining
+// dynamic calls.
+// ignore_for_file: avoid_dynamic_calls
+
 import 'dart:collection' show MapMixin;
 
 import 'package:protobuf/protobuf.dart';

protobuf/test/message_test.dart

@@ -22,6 +22,9 @@ class Rec extends MockMessage {
 Matcher throwsError(Type expectedType, String expectedMessage) =>
     throwsA(predicate((dynamic x) {
       expect(x.runtimeType, expectedType);
+      // TODO(https://github.com/google/protobuf.dart/issues/578): Remove
+      // remaining dynamic calls.
+      // ignore: avoid_dynamic_calls
       expect(x!.message, expectedMessage);
       return true;
     }));

protobuf/test/readonly_message_test.dart

@@ -18,6 +18,9 @@ import 'package:test/test.dart';
 Matcher throwsError(Type expectedType, Matcher expectedMessage) =>
     throwsA(predicate((dynamic x) {
       expect(x.runtimeType, expectedType);
+      // TODO(https://github.com/google/protobuf.dart/issues/578): Remove
+      // remaining dynamic calls.
+      // ignore: avoid_dynamic_calls
       expect(x!.message, expectedMessage);
       return true;
     }));