Merge branch 'master' into update_package_analysis

Author: devoncarew

.gitignore

@@ -4,17 +4,16 @@
 .packages
 .pub
 build/
-**/lib/generated/**
-packages
 pubspec.lock
-benchmarks/out
 doc/
 
 # `dart compile exe` outputs
 *.exe
 
 # `dart compile js` outputs
-*.js*
+*.js
+*.js.deps
+*.js.map
 
 # `dart compile wasm` outputs
 *.wasm

README.md

@@ -1,20 +1,18 @@
-[![CI status](https://github.com/google/protobuf.dart/workflows/Dart%20CI/badge.svg)](https://github.com/google/protobuf.dart/actions?query=workflow%3A%22Dart%22+branch%3Amaster)
-
 ## Protobuf support for Dart
 
 [Protocol Buffers](https://developers.google.com/protocol-buffers) (protobuf)
 are Google's language-neutral, platform-neutral, extensible mechanism for
 serializing structured data.
 
 This repository is home to packages related to
-[protobuf for Dart](https://pub.dev/documentation/protobuf/latest/).
+[protobuf support for Dart](https://pub.dev/documentation/protobuf/latest/).
 
-Package | Description | Published Version
---- | --- | ---
-[protobuf](protobuf/) | A support library for the generated code | [![pub package](https://img.shields.io/pub/v/protobuf.svg)](https://pub.dev/packages/protobuf)
-[protoc_plugin](protoc_plugin/) | A Dart back-end for the protoc compiler | [![pub package](https://img.shields.io/pub/v/protoc_plugin.svg)](https://pub.dev/packages/protoc_plugin)
-[api_benchmark](api_benchmark/) | Benchmarking for various API calls |
-[query_benchmark](query_benchmark/) | Benchmark for encoding and decoding of a "real-world" protobuf |
+| Package | Description | Published Version |
+| --- | --- | --- |
+| [protobuf](protobuf/) | Runtime library for protocol buffers support. | [![pub package](https://img.shields.io/pub/v/protobuf.svg)](https://pub.dev/packages/protobuf) |
+| [protoc_plugin](protoc_plugin/) | A protobuf protoc compiler plugin used to generate Dart code. | [![pub package] |(https://img.shields.io/pub/v/protoc_plugin.svg)](https://pub.dev/packages/protoc_plugin)
+| [api_benchmark](api_benchmark/) | Benchmarking a number of different api calls. | |
+| [benchmarks](benchmarks/) | Benchmarks for various protobuf functions. | |
 
 ## Publishing automation
 

api_benchmark/.gitignore

@@ -0,0 +1 @@
+lib/generated/**

benchmarks/.gitignore

@@ -0,0 +1,2 @@
+lib/generated/
+out/

benchmarks/pubspec.yaml

@@ -3,7 +3,7 @@
 # BSD-style license that can be found in the LICENSE file.
 
 name: protobuf_benchmarks
-description: Benchmarks various protobuf functions
+description: Benchmarks for various protobuf functions.
 publish_to: none
 
 environment:

protobuf/lib/src/protobuf/coded_buffer.dart

@@ -31,7 +31,6 @@ void _writeToCodedBufferWriter(_FieldSet fs, CodedBufferWriter out) {
 
 void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
     CodedBufferReader input, ExtensionRegistry registry) {
-  ArgumentError.checkNotNull(registry);
   fs._ensureWritable();
   while (true) {
     final tag = input.readTag();

protobuf/lib/src/protobuf/extension.dart

@@ -22,7 +22,7 @@ class Extension<T> extends FieldInfo<T> {
             protoName: protoName);
 
   Extension.repeated(this.extendee, String name, int tagNumber, int fieldType,
-      {CheckFunc<T>? check,
+      {required CheckFunc<T> check,
       CreateBuilderFunc? subBuilder,
       ValueOfFunc? valueOf,
       List<ProtobufEnum>? enumValues,

protobuf/lib/src/protobuf/field_info.dart

@@ -128,16 +128,12 @@ class FieldInfo<T> {
         subBuilder = null;
 
   FieldInfo.repeated(this.name, this.tagNumber, this.index, this.type,
-      this.check, this.subBuilder,
+      CheckFunc<T> this.check, this.subBuilder,
       {this.valueOf, this.enumValues, this.defaultEnumValue, String? protoName})
-      : makeDefault = (() => PbList<T>(check: check!)),
-        _protoName = protoName {
-    ArgumentError.checkNotNull(name, 'name');
-    ArgumentError.checkNotNull(tagNumber, 'tagNumber');
-    assert(_isRepeated(type));
-    assert(check != null);
-    assert(!_isEnum(type) || valueOf != null);
-  }
+      : makeDefault = (() => PbList<T>(check: check)),
+        _protoName = protoName,
+        assert(_isRepeated(type)),
+        assert(!_isEnum(type) || valueOf != null);
 
   static MakeDefaultFunc? findMakeDefault(int type, dynamic defaultOrMaker) {
     if (defaultOrMaker == null) return PbFieldType._defaultForType(type);
@@ -276,13 +272,11 @@ class MapFieldInfo<K, V> extends FieldInfo<PbMap<K, V>?> {
       this.valueCreator,
       {ProtobufEnum? defaultEnumValue,
       String? protoName})
-      : super(name, tagNumber, index, type,
+      : assert(_isMapField(type)),
+        super(name, tagNumber, index, type,
             defaultOrMaker: () => PbMap<K, V>(keyFieldType, valueFieldType),
             defaultEnumValue: defaultEnumValue,
             protoName: protoName) {
-    ArgumentError.checkNotNull(name, 'name');
-    ArgumentError.checkNotNull(tagNumber, 'tagNumber');
-    assert(_isMapField(type));
     assert(!_isEnum(type) || valueOf != null);
   }
 

protobuf/lib/src/protobuf/field_set.dart

@@ -258,8 +258,6 @@ class _FieldSet {
   /// Works for both extended and non-extended fields.
   /// Suitable for public API.
   void _setField(int tagNumber, Object value) {
-    ArgumentError.checkNotNull(value, 'value');
-
     final meta = _meta;
     final fi = _nonExtensionInfo(meta, tagNumber);
     if (fi == null) {
@@ -284,7 +282,6 @@ class _FieldSet {
   /// Works for both extended and non-extended fields.
   /// Suitable for decoders that do their own validation.
   void _setFieldUnchecked(BuilderInfo meta, FieldInfo fi, value) {
-    ArgumentError.checkNotNull(fi, 'fi');
     assert(!fi.isRepeated);
     if (fi.index == null) {
       _ensureExtensions()

protobuf/lib/src/protobuf/generated_message.dart

@@ -396,7 +396,6 @@ abstract class GeneratedMessage {
 
   /// Sets the value of a non-repeated extension field to [value].
   void setExtension(Extension extension, Object value) {
-    ArgumentError.checkNotNull(value, 'value');
     if (_isRepeated(extension.type)) {
       throw ArgumentError(_fieldSet._setFieldFailedMessage(
           extension, value, 'repeating field (use get + .add())'));
@@ -489,7 +488,6 @@ abstract class GeneratedMessage {
   /// For generated code only.
   /// @nodoc
   void $_setFloat(int index, double value) {
-    ArgumentError.checkNotNull(value, 'value');
     if (!_isFloat32(value)) {
       _fieldSet._$check(index, value);
     }
@@ -503,7 +501,6 @@ abstract class GeneratedMessage {
   /// For generated code only.
   /// @nodoc
   void $_setSignedInt32(int index, int value) {
-    ArgumentError.checkNotNull(value, 'value');
     if (!_isSigned32(value)) {
       _fieldSet._$check(index, value);
     }
@@ -513,7 +510,6 @@ abstract class GeneratedMessage {
   /// For generated code only.
   /// @nodoc
   void $_setUnsignedInt32(int index, int value) {
-    ArgumentError.checkNotNull(value, 'value');
     if (!_isUnsigned32(value)) {
       _fieldSet._$check(index, value);
     }

protoc_plugin/.gitignore

@@ -9,4 +9,4 @@ benchmark/data/pubspec.link.lock
 benchmark/data/hostname.txt
 benchmark/data/latest_vm.pb.json
 benchmark/lib/generated
-out
+out/

tool/setup.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
 
-wget -O protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protoc-3.17.3-linux-x86_64.zip
+wget -O protoc.zip \
+  https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protoc-3.17.3-linux-x86_64.zip
 unzip -d protoc protoc.zip
+
 if [[ -z "${GITHUB_ENV}" ]]; then
-  # Local mono_repo presubmit run
+  # Local run
   export PATH=$PWD/protoc/bin:$PATH
 else
   # GitHub Actions