Skip to content

Move PbList to its own library #1063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 21, 2025
Merged

Move PbList to its own library #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions protobuf/lib/protobuf.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export 'src/protobuf/internal.dart'
FieldSetInternalExtension,
GeneratedMessageInternalExtension,
MapFieldInfoInternalExtension,
checkNotNull,
mapKeyFieldNumber,
mapValueFieldNumber,
mergeFromProto3JsonAny,
Expand Down
6 changes: 3 additions & 3 deletions protobuf/lib/src/protobuf/builder_info.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ class BuilderInfo {
tagNumber,
name,
fieldType,
_checkNotNull,
checkNotNull,
subBuilder,
valueOf,
enumValues,
Expand All @@ -398,7 +398,7 @@ class BuilderInfo {
tagNumber,
name,
fieldType,
_checkNotNull,
checkNotNull,
null,
valueOf,
enumValues,
Expand Down Expand Up @@ -456,7 +456,7 @@ class BuilderInfo {
tagNumber,
name,
PbFieldType.PM,
_checkNotNull,
checkNotNull,
subBuilder,
null,
null,
Expand Down
112 changes: 56 additions & 56 deletions protobuf/lib/src/protobuf/coded_buffer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,59 +117,59 @@ void _mergeFromCodedBufferReader(
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
// No need to check the element as for `bool` fields we only need to
// check that the value is not null, and we know in `add` below that
// the value isn't null (`readBool` doesn't return `null`).
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readBool());
list.addUnchecked(input.readBool());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readBool());
list.checkModifiable('add');
list.addUnchecked(input.readBool());
}
case PbFieldType.REPEATED_BYTES:
final list = fs._ensureRepeatedField(meta, fi);
list._checkModifiable('add');
list._addUnchecked(input.readBytes());
list.checkModifiable('add');
list.addUnchecked(input.readBytes());
case PbFieldType.REPEATED_STRING:
final list = fs._ensureRepeatedField(meta, fi);
list._checkModifiable('add');
list._addUnchecked(input.readString());
list.checkModifiable('add');
list.addUnchecked(input.readString());
case PbFieldType.REPEATED_FLOAT:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readFloat());
list.addUnchecked(input.readFloat());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readFloat());
list.checkModifiable('add');
list.addUnchecked(input.readFloat());
}
case PbFieldType.REPEATED_DOUBLE:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readDouble());
list.addUnchecked(input.readDouble());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readDouble());
list.checkModifiable('add');
list.addUnchecked(input.readDouble());
}
case PbFieldType.REPEATED_ENUM:
final list = fs._ensureRepeatedField(meta, fi);
Expand All @@ -192,160 +192,160 @@ void _mergeFromCodedBufferReader(
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readInt32());
list.addUnchecked(input.readInt32());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readInt32());
list.checkModifiable('add');
list.addUnchecked(input.readInt32());
}
case PbFieldType.REPEATED_INT64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readInt64());
list.addUnchecked(input.readInt64());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readInt64());
list.checkModifiable('add');
list.addUnchecked(input.readInt64());
}
case PbFieldType.REPEATED_SINT32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readSint32());
list.addUnchecked(input.readSint32());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readSint32());
list.checkModifiable('add');
list.addUnchecked(input.readSint32());
}
case PbFieldType.REPEATED_SINT64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readSint64());
list.addUnchecked(input.readSint64());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readSint64());
list.checkModifiable('add');
list.addUnchecked(input.readSint64());
}
case PbFieldType.REPEATED_UINT32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readUint32());
list.addUnchecked(input.readUint32());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readUint32());
list.checkModifiable('add');
list.addUnchecked(input.readUint32());
}
case PbFieldType.REPEATED_UINT64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readUint64());
list.addUnchecked(input.readUint64());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readUint64());
list.checkModifiable('add');
list.addUnchecked(input.readUint64());
}
case PbFieldType.REPEATED_FIXED32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readFixed32());
list.addUnchecked(input.readFixed32());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readFixed32());
list.checkModifiable('add');
list.addUnchecked(input.readFixed32());
}
case PbFieldType.REPEATED_FIXED64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readFixed64());
list.addUnchecked(input.readFixed64());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readFixed64());
list.checkModifiable('add');
list.addUnchecked(input.readFixed64());
}
case PbFieldType.REPEATED_SFIXED32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readSfixed32());
list.addUnchecked(input.readSfixed32());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readSfixed32());
list.checkModifiable('add');
list.addUnchecked(input.readSfixed32());
}
case PbFieldType.REPEATED_SFIXED64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
list.checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readSfixed64());
list.addUnchecked(input.readSfixed64());
}
});
}
} else {
list._checkModifiable('add');
list._addUnchecked(input.readSfixed64());
list.checkModifiable('add');
list.addUnchecked(input.readSfixed64());
}
case PbFieldType.REPEATED_MESSAGE:
final subMessage = meta._makeEmptyMessage(tagNumber, registry);
Expand Down
2 changes: 1 addition & 1 deletion protobuf/lib/src/protobuf/extension_field_set.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class ExtensionFieldSet {
newValues[tag] = map?._deepCopy();
} else if (fieldInfo.isRepeated) {
final PbList? list = value;
newValues[tag] = list?._deepCopy();
newValues[tag] = list?.deepCopy();
} else if (fieldInfo.isGroupOrMessage) {
final GeneratedMessage? message = value;
newValues[tag] = message?.deepCopy();
Expand Down
4 changes: 2 additions & 2 deletions protobuf/lib/src/protobuf/field_error.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ CheckFunc getCheckFunction(int fieldType) {
// We always use the full range of the same Dart type.
// It's up to the caller to treat the Int64 as signed or unsigned.
// See: https://github.com/google/protobuf.dart/issues/44
return _checkNotNull;
return checkNotNull;

case PbFieldType.FLOAT_BIT:
return _checkFloat;
Expand All @@ -108,7 +108,7 @@ CheckFunc getCheckFunction(int fieldType) {

// check functions for repeated fields

void _checkNotNull(Object? val) {
void checkNotNull(Object? val) {
if (val == null) {
throw ArgumentError("Can't add a null to a repeated field");
}
Expand Down
2 changes: 1 addition & 1 deletion protobuf/lib/src/protobuf/field_set.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ class FieldSet {
} else if (fieldInfo.isRepeated) {
final PbList? originalList = original._values[index];
if (originalList == null) continue;
_values[index] = originalList._deepCopy();
_values[index] = originalList.deepCopy();
} else if (fieldInfo.isGroupOrMessage) {
final GeneratedMessage? message = original._values[index];
_values[index] = message?.deepCopy();
Expand Down
5 changes: 3 additions & 2 deletions protobuf/lib/src/protobuf/internal.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// [1]: https://developers.google.com/protocol-buffers
library;

import 'dart:collection' show ListBase, MapBase;
import 'dart:collection' show MapBase;
import 'dart:convert' show Utf8Decoder, Utf8Encoder, base64Decode, base64Encode;
import 'dart:math' as math;
import 'dart:typed_data' show ByteData, Endian, Uint8List;
Expand All @@ -20,10 +20,12 @@ import 'consts.dart';
import 'json/json.dart' as json_lib;
import 'json_parsing_context.dart';
import 'mixins/well_known.dart';
import 'pb_list.dart';
import 'permissive_compare.dart';
import 'type_registry.dart';
import 'utils.dart';

export 'pb_list.dart' show PbList;
export 'type_registry.dart' show TypeRegistry;

part 'annotations.dart';
Expand All @@ -42,7 +44,6 @@ part 'field_type.dart';
part 'generated_message.dart';
part 'generated_service.dart';
part 'message_set.dart';
part 'pb_list.dart';
part 'pb_map.dart';
part 'proto3_json.dart';
part 'protobuf_enum.dart';
Expand Down
Loading