Skip to content

Make PbFieldType members public #1027

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 17 commits into from
Jul 23, 2025
Merged

Make PbFieldType members public #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
649e1a1
Split protobuf package into libraries
osa1 Jul 18, 2025
35bb15a
Also make consts a lib
osa1 Jul 18, 2025
9a2207f
Make utils a lib
osa1 Jul 18, 2025
8b59a1d
Make PbFieldType stuff public
osa1 Jul 18, 2025
32911d8
Export ExtensionRegistry
osa1 Jul 18, 2025
e821977
Revert "Export ExtensionRegistry"
osa1 Jul 18, 2025
9cb7ca2
Merge remote-tracking branch 'origin/master' into split_into_libs
osa1 Jul 22, 2025
9a49d17
Merge branch 'split_into_libs' into field_type_public
osa1 Jul 22, 2025
be75e06
Revert some of the changes
osa1 Jul 22, 2025
1096ccc
Merge branch 'split_into_libs' into field_type_public
osa1 Jul 22, 2025
34afcf8
Revert renaming
osa1 Jul 22, 2025
f302178
Revert renaming
osa1 Jul 22, 2025
85b6747
Merge branch 'split_into_libs' into field_type_public
osa1 Jul 22, 2025
38e9653
Formatting
osa1 Jul 22, 2025
0184a4c
Merge branch 'split_into_libs' into field_type_public
osa1 Jul 23, 2025
994a891
Merge branch 'master' into field_type_public
osa1 Jul 23, 2025
af2aaa7
Update CHANGELOG
osa1 Jul 23, 2025
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
4 changes: 4 additions & 0 deletions protobuf/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
using different encoding/decoding libraries based on the target platform.
([#1026])

* Some of the private `PbFieldType` members are made public, to allow using
them in internal libraries. This type is for internal use only. ([#1027])

[#1026]: https://github.com/google/protobuf.dart/pull/1026
[#1027]: https://github.com/google/protobuf.dart/pull/1027

## 4.1.1

Expand Down
4 changes: 3 additions & 1 deletion protobuf/lib/protobuf.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ export 'src/protobuf/internal.dart'
FieldSet,
FieldSetInternalExtension,
GeneratedMessageInternalExtension,
MapFieldInfoInternalExtension;
MapFieldInfoInternalExtension,
mapKeyFieldNumber,
mapValueFieldNumber;
9 changes: 7 additions & 2 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 @@ -274,7 +274,10 @@ class BuilderInfo {

// Repeated, not a message, group, or enum.
void p<T>(int tagNumber, String name, int fieldType, {String? protoName}) {
assert(!_isGroupOrMessage(fieldType) && !_isEnum(fieldType));
assert(
!PbFieldType.isGroupOrMessage(fieldType) &&
!PbFieldType.isEnum(fieldType),
);
addRepeated<T>(
tagNumber,
name,
Expand All @@ -298,7 +301,9 @@ class BuilderInfo {
ProtobufEnum? defaultEnumValue,
String? protoName,
}) {
assert(_isGroupOrMessage(fieldType) || _isEnum(fieldType));
assert(
PbFieldType.isGroupOrMessage(fieldType) || PbFieldType.isEnum(fieldType),
);
addRepeated<T>(
tagNumber,
name,
Expand Down
76 changes: 38 additions & 38 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 @@ -54,24 +54,24 @@ void _mergeFromCodedBufferReader(

// Ignore required/optional packed/unpacked.
var fieldType = fi.type;
fieldType &= ~(PbFieldType._PACKED_BIT | PbFieldType._REQUIRED_BIT);
fieldType &= ~(PbFieldType.PACKED_BIT | PbFieldType.REQUIRED_BIT);
switch (fieldType) {
case PbFieldType._OPTIONAL_BOOL:
case PbFieldType.OPTIONAL_BOOL:
fs._setFieldUnchecked(meta, fi, input.readBool());
break;
case PbFieldType._OPTIONAL_BYTES:
case PbFieldType.OPTIONAL_BYTES:
fs._setFieldUnchecked(meta, fi, input.readBytes());
break;
case PbFieldType._OPTIONAL_STRING:
case PbFieldType.OPTIONAL_STRING:
fs._setFieldUnchecked(meta, fi, input.readString());
break;
case PbFieldType._OPTIONAL_FLOAT:
case PbFieldType.OPTIONAL_FLOAT:
fs._setFieldUnchecked(meta, fi, input.readFloat());
break;
case PbFieldType._OPTIONAL_DOUBLE:
case PbFieldType.OPTIONAL_DOUBLE:
fs._setFieldUnchecked(meta, fi, input.readDouble());
break;
case PbFieldType._OPTIONAL_ENUM:
case PbFieldType.OPTIONAL_ENUM:
final rawValue = input.readEnum();
final value = meta._decodeEnum(tagNumber, registry, rawValue);
if (value == null) {
Expand All @@ -81,7 +81,7 @@ void _mergeFromCodedBufferReader(
fs._setFieldUnchecked(meta, fi, value);
}
break;
case PbFieldType._OPTIONAL_GROUP:
case PbFieldType.OPTIONAL_GROUP:
final subMessage = meta._makeEmptyMessage(tagNumber, registry);
final oldValue = fs._getFieldOrNull(fi);
if (oldValue != null) {
Expand All @@ -90,37 +90,37 @@ void _mergeFromCodedBufferReader(
input.readGroup(tagNumber, subMessage, registry);
fs._setFieldUnchecked(meta, fi, subMessage);
break;
case PbFieldType._OPTIONAL_INT32:
case PbFieldType.OPTIONAL_INT32:
fs._setFieldUnchecked(meta, fi, input.readInt32());
break;
case PbFieldType._OPTIONAL_INT64:
case PbFieldType.OPTIONAL_INT64:
fs._setFieldUnchecked(meta, fi, input.readInt64());
break;
case PbFieldType._OPTIONAL_SINT32:
case PbFieldType.OPTIONAL_SINT32:
fs._setFieldUnchecked(meta, fi, input.readSint32());
break;
case PbFieldType._OPTIONAL_SINT64:
case PbFieldType.OPTIONAL_SINT64:
fs._setFieldUnchecked(meta, fi, input.readSint64());
break;
case PbFieldType._OPTIONAL_UINT32:
case PbFieldType.OPTIONAL_UINT32:
fs._setFieldUnchecked(meta, fi, input.readUint32());
break;
case PbFieldType._OPTIONAL_UINT64:
case PbFieldType.OPTIONAL_UINT64:
fs._setFieldUnchecked(meta, fi, input.readUint64());
break;
case PbFieldType._OPTIONAL_FIXED32:
case PbFieldType.OPTIONAL_FIXED32:
fs._setFieldUnchecked(meta, fi, input.readFixed32());
break;
case PbFieldType._OPTIONAL_FIXED64:
case PbFieldType.OPTIONAL_FIXED64:
fs._setFieldUnchecked(meta, fi, input.readFixed64());
break;
case PbFieldType._OPTIONAL_SFIXED32:
case PbFieldType.OPTIONAL_SFIXED32:
fs._setFieldUnchecked(meta, fi, input.readSfixed32());
break;
case PbFieldType._OPTIONAL_SFIXED64:
case PbFieldType.OPTIONAL_SFIXED64:
fs._setFieldUnchecked(meta, fi, input.readSfixed64());
break;
case PbFieldType._OPTIONAL_MESSAGE:
case PbFieldType.OPTIONAL_MESSAGE:
final GeneratedMessage? oldValue = fs._getFieldOrNull(fi);
if (oldValue != null) {
input.readMessage(oldValue, registry);
Expand All @@ -130,7 +130,7 @@ void _mergeFromCodedBufferReader(
fs._setFieldUnchecked(meta, fi, subMessage);
}
break;
case PbFieldType._REPEATED_BOOL:
case PbFieldType.REPEATED_BOOL:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -150,17 +150,17 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readBool());
}
break;
case PbFieldType._REPEATED_BYTES:
case PbFieldType.REPEATED_BYTES:
final list = fs._ensureRepeatedField(meta, fi);
list._checkModifiable('add');
list._addUnchecked(input.readBytes());
break;
case PbFieldType._REPEATED_STRING:
case PbFieldType.REPEATED_STRING:
final list = fs._ensureRepeatedField(meta, fi);
list._checkModifiable('add');
list._addUnchecked(input.readString());
break;
case PbFieldType._REPEATED_FLOAT:
case PbFieldType.REPEATED_FLOAT:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -177,7 +177,7 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readFloat());
}
break;
case PbFieldType._REPEATED_DOUBLE:
case PbFieldType.REPEATED_DOUBLE:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -194,7 +194,7 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readDouble());
}
break;
case PbFieldType._REPEATED_ENUM:
case PbFieldType.REPEATED_ENUM:
final list = fs._ensureRepeatedField(meta, fi);
_readPackableToListEnum(
list,
Expand All @@ -206,13 +206,13 @@ void _mergeFromCodedBufferReader(
registry,
);
break;
case PbFieldType._REPEATED_GROUP:
case PbFieldType.REPEATED_GROUP:
final subMessage = meta._makeEmptyMessage(tagNumber, registry);
input.readGroup(tagNumber, subMessage, registry);
final list = fs._ensureRepeatedField(meta, fi);
list.add(subMessage);
break;
case PbFieldType._REPEATED_INT32:
case PbFieldType.REPEATED_INT32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -229,7 +229,7 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readInt32());
}
break;
case PbFieldType._REPEATED_INT64:
case PbFieldType.REPEATED_INT64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -246,7 +246,7 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readInt64());
}
break;
case PbFieldType._REPEATED_SINT32:
case PbFieldType.REPEATED_SINT32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -263,7 +263,7 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readSint32());
}
break;
case PbFieldType._REPEATED_SINT64:
case PbFieldType.REPEATED_SINT64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -280,7 +280,7 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readSint64());
}
break;
case PbFieldType._REPEATED_UINT32:
case PbFieldType.REPEATED_UINT32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -297,7 +297,7 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readUint32());
}
break;
case PbFieldType._REPEATED_UINT64:
case PbFieldType.REPEATED_UINT64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -314,7 +314,7 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readUint64());
}
break;
case PbFieldType._REPEATED_FIXED32:
case PbFieldType.REPEATED_FIXED32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -331,7 +331,7 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readFixed32());
}
break;
case PbFieldType._REPEATED_FIXED64:
case PbFieldType.REPEATED_FIXED64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -348,7 +348,7 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readFixed64());
}
break;
case PbFieldType._REPEATED_SFIXED32:
case PbFieldType.REPEATED_SFIXED32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -365,7 +365,7 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readSfixed32());
}
break;
case PbFieldType._REPEATED_SFIXED64:
case PbFieldType.REPEATED_SFIXED64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
final limit = input.readInt32();
Expand All @@ -382,13 +382,13 @@ void _mergeFromCodedBufferReader(
list._addUnchecked(input.readSfixed64());
}
break;
case PbFieldType._REPEATED_MESSAGE:
case PbFieldType.REPEATED_MESSAGE:
final subMessage = meta._makeEmptyMessage(tagNumber, registry);
input.readMessage(subMessage, registry);
final list = fs._ensureRepeatedField(meta, fi);
list.add(subMessage);
break;
case PbFieldType._MAP:
case PbFieldType.MAP:
final mapFieldInfo = fi as MapFieldInfo;
final mapEntryMeta = mapFieldInfo.mapEntryBuilderInfo;
fs
Expand Down
Loading
Loading