Skip to content

Commit 4c842a7

Browse files
osa1osa1
authored
Make PbFieldType members public (#1027)
To be able to have JSON decoders as libraries that are conditionally imported based on the compilation target, this makes `PbFieldType` members public.
1 parent 7f7d776 commit 4c842a7

16 files changed

Lines changed: 486 additions & 467 deletions

‎protobuf/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
using different encoding/decoding libraries based on the target platform.
66
([#1026])
77

8+
* Some of the private `PbFieldType` members are made public, to allow using
9+
them in internal libraries. This type is for internal use only. ([#1027])
10+
811
[#1026]: https://github.com/google/protobuf.dart/pull/1026
12+
[#1027]: https://github.com/google/protobuf.dart/pull/1027
913

1014
## 4.1.1
1115

‎protobuf/lib/protobuf.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ export 'src/protobuf/internal.dart'
1616
FieldSet,
1717
FieldSetInternalExtension,
1818
GeneratedMessageInternalExtension,
19-
MapFieldInfoInternalExtension;
19+
MapFieldInfoInternalExtension,
20+
mapKeyFieldNumber,
21+
mapValueFieldNumber;

‎protobuf/lib/src/protobuf/builder_info.dart‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,10 @@ class BuilderInfo {
274274

275275
// Repeated, not a message, group, or enum.
276276
void p<T>(int tagNumber, String name, int fieldType, {String? protoName}) {
277-
assert(!_isGroupOrMessage(fieldType) && !_isEnum(fieldType));
277+
assert(
278+
!PbFieldType.isGroupOrMessage(fieldType) &&
279+
!PbFieldType.isEnum(fieldType),
280+
);
278281
addRepeated<T>(
279282
tagNumber,
280283
name,
@@ -298,7 +301,9 @@ class BuilderInfo {
298301
ProtobufEnum? defaultEnumValue,
299302
String? protoName,
300303
}) {
301-
assert(_isGroupOrMessage(fieldType) || _isEnum(fieldType));
304+
assert(
305+
PbFieldType.isGroupOrMessage(fieldType) || PbFieldType.isEnum(fieldType),
306+
);
302307
addRepeated<T>(
303308
tagNumber,
304309
name,

‎protobuf/lib/src/protobuf/coded_buffer.dart‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,24 @@ void _mergeFromCodedBufferReader(
5454

5555
// Ignore required/optional packed/unpacked.
5656
var fieldType = fi.type;
57-
fieldType &= ~(PbFieldType._PACKED_BIT | PbFieldType._REQUIRED_BIT);
57+
fieldType &= ~(PbFieldType.PACKED_BIT | PbFieldType.REQUIRED_BIT);
5858
switch (fieldType) {
59-
case PbFieldType._OPTIONAL_BOOL:
59+
case PbFieldType.OPTIONAL_BOOL:
6060
fs._setFieldUnchecked(meta, fi, input.readBool());
6161
break;
62-
case PbFieldType._OPTIONAL_BYTES:
62+
case PbFieldType.OPTIONAL_BYTES:
6363
fs._setFieldUnchecked(meta, fi, input.readBytes());
6464
break;
65-
case PbFieldType._OPTIONAL_STRING:
65+
case PbFieldType.OPTIONAL_STRING:
6666
fs._setFieldUnchecked(meta, fi, input.readString());
6767
break;
68-
case PbFieldType._OPTIONAL_FLOAT:
68+
case PbFieldType.OPTIONAL_FLOAT:
6969
fs._setFieldUnchecked(meta, fi, input.readFloat());
7070
break;
71-
case PbFieldType._OPTIONAL_DOUBLE:
71+
case PbFieldType.OPTIONAL_DOUBLE:
7272
fs._setFieldUnchecked(meta, fi, input.readDouble());
7373
break;
74-
case PbFieldType._OPTIONAL_ENUM:
74+
case PbFieldType.OPTIONAL_ENUM:
7575
final rawValue = input.readEnum();
7676
final value = meta._decodeEnum(tagNumber, registry, rawValue);
7777
if (value == null) {
@@ -81,7 +81,7 @@ void _mergeFromCodedBufferReader(
8181
fs._setFieldUnchecked(meta, fi, value);
8282
}
8383
break;
84-
case PbFieldType._OPTIONAL_GROUP:
84+
case PbFieldType.OPTIONAL_GROUP:
8585
final subMessage = meta._makeEmptyMessage(tagNumber, registry);
8686
final oldValue = fs._getFieldOrNull(fi);
8787
if (oldValue != null) {
@@ -90,37 +90,37 @@ void _mergeFromCodedBufferReader(
9090
input.readGroup(tagNumber, subMessage, registry);
9191
fs._setFieldUnchecked(meta, fi, subMessage);
9292
break;
93-
case PbFieldType._OPTIONAL_INT32:
93+
case PbFieldType.OPTIONAL_INT32:
9494
fs._setFieldUnchecked(meta, fi, input.readInt32());
9595
break;
96-
case PbFieldType._OPTIONAL_INT64:
96+
case PbFieldType.OPTIONAL_INT64:
9797
fs._setFieldUnchecked(meta, fi, input.readInt64());
9898
break;
99-
case PbFieldType._OPTIONAL_SINT32:
99+
case PbFieldType.OPTIONAL_SINT32:
100100
fs._setFieldUnchecked(meta, fi, input.readSint32());
101101
break;
102-
case PbFieldType._OPTIONAL_SINT64:
102+
case PbFieldType.OPTIONAL_SINT64:
103103
fs._setFieldUnchecked(meta, fi, input.readSint64());
104104
break;
105-
case PbFieldType._OPTIONAL_UINT32:
105+
case PbFieldType.OPTIONAL_UINT32:
106106
fs._setFieldUnchecked(meta, fi, input.readUint32());
107107
break;
108-
case PbFieldType._OPTIONAL_UINT64:
108+
case PbFieldType.OPTIONAL_UINT64:
109109
fs._setFieldUnchecked(meta, fi, input.readUint64());
110110
break;
111-
case PbFieldType._OPTIONAL_FIXED32:
111+
case PbFieldType.OPTIONAL_FIXED32:
112112
fs._setFieldUnchecked(meta, fi, input.readFixed32());
113113
break;
114-
case PbFieldType._OPTIONAL_FIXED64:
114+
case PbFieldType.OPTIONAL_FIXED64:
115115
fs._setFieldUnchecked(meta, fi, input.readFixed64());
116116
break;
117-
case PbFieldType._OPTIONAL_SFIXED32:
117+
case PbFieldType.OPTIONAL_SFIXED32:
118118
fs._setFieldUnchecked(meta, fi, input.readSfixed32());
119119
break;
120-
case PbFieldType._OPTIONAL_SFIXED64:
120+
case PbFieldType.OPTIONAL_SFIXED64:
121121
fs._setFieldUnchecked(meta, fi, input.readSfixed64());
122122
break;
123-
case PbFieldType._OPTIONAL_MESSAGE:
123+
case PbFieldType.OPTIONAL_MESSAGE:
124124
final GeneratedMessage? oldValue = fs._getFieldOrNull(fi);
125125
if (oldValue != null) {
126126
input.readMessage(oldValue, registry);
@@ -130,7 +130,7 @@ void _mergeFromCodedBufferReader(
130130
fs._setFieldUnchecked(meta, fi, subMessage);
131131
}
132132
break;
133-
case PbFieldType._REPEATED_BOOL:
133+
case PbFieldType.REPEATED_BOOL:
134134
final list = fs._ensureRepeatedField(meta, fi);
135135
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
136136
final limit = input.readInt32();
@@ -150,17 +150,17 @@ void _mergeFromCodedBufferReader(
150150
list._addUnchecked(input.readBool());
151151
}
152152
break;
153-
case PbFieldType._REPEATED_BYTES:
153+
case PbFieldType.REPEATED_BYTES:
154154
final list = fs._ensureRepeatedField(meta, fi);
155155
list._checkModifiable('add');
156156
list._addUnchecked(input.readBytes());
157157
break;
158-
case PbFieldType._REPEATED_STRING:
158+
case PbFieldType.REPEATED_STRING:
159159
final list = fs._ensureRepeatedField(meta, fi);
160160
list._checkModifiable('add');
161161
list._addUnchecked(input.readString());
162162
break;
163-
case PbFieldType._REPEATED_FLOAT:
163+
case PbFieldType.REPEATED_FLOAT:
164164
final list = fs._ensureRepeatedField(meta, fi);
165165
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
166166
final limit = input.readInt32();
@@ -177,7 +177,7 @@ void _mergeFromCodedBufferReader(
177177
list._addUnchecked(input.readFloat());
178178
}
179179
break;
180-
case PbFieldType._REPEATED_DOUBLE:
180+
case PbFieldType.REPEATED_DOUBLE:
181181
final list = fs._ensureRepeatedField(meta, fi);
182182
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
183183
final limit = input.readInt32();
@@ -194,7 +194,7 @@ void _mergeFromCodedBufferReader(
194194
list._addUnchecked(input.readDouble());
195195
}
196196
break;
197-
case PbFieldType._REPEATED_ENUM:
197+
case PbFieldType.REPEATED_ENUM:
198198
final list = fs._ensureRepeatedField(meta, fi);
199199
_readPackableToListEnum(
200200
list,
@@ -206,13 +206,13 @@ void _mergeFromCodedBufferReader(
206206
registry,
207207
);
208208
break;
209-
case PbFieldType._REPEATED_GROUP:
209+
case PbFieldType.REPEATED_GROUP:
210210
final subMessage = meta._makeEmptyMessage(tagNumber, registry);
211211
input.readGroup(tagNumber, subMessage, registry);
212212
final list = fs._ensureRepeatedField(meta, fi);
213213
list.add(subMessage);
214214
break;
215-
case PbFieldType._REPEATED_INT32:
215+
case PbFieldType.REPEATED_INT32:
216216
final list = fs._ensureRepeatedField(meta, fi);
217217
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
218218
final limit = input.readInt32();
@@ -229,7 +229,7 @@ void _mergeFromCodedBufferReader(
229229
list._addUnchecked(input.readInt32());
230230
}
231231
break;
232-
case PbFieldType._REPEATED_INT64:
232+
case PbFieldType.REPEATED_INT64:
233233
final list = fs._ensureRepeatedField(meta, fi);
234234
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
235235
final limit = input.readInt32();
@@ -246,7 +246,7 @@ void _mergeFromCodedBufferReader(
246246
list._addUnchecked(input.readInt64());
247247
}
248248
break;
249-
case PbFieldType._REPEATED_SINT32:
249+
case PbFieldType.REPEATED_SINT32:
250250
final list = fs._ensureRepeatedField(meta, fi);
251251
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
252252
final limit = input.readInt32();
@@ -263,7 +263,7 @@ void _mergeFromCodedBufferReader(
263263
list._addUnchecked(input.readSint32());
264264
}
265265
break;
266-
case PbFieldType._REPEATED_SINT64:
266+
case PbFieldType.REPEATED_SINT64:
267267
final list = fs._ensureRepeatedField(meta, fi);
268268
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
269269
final limit = input.readInt32();
@@ -280,7 +280,7 @@ void _mergeFromCodedBufferReader(
280280
list._addUnchecked(input.readSint64());
281281
}
282282
break;
283-
case PbFieldType._REPEATED_UINT32:
283+
case PbFieldType.REPEATED_UINT32:
284284
final list = fs._ensureRepeatedField(meta, fi);
285285
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
286286
final limit = input.readInt32();
@@ -297,7 +297,7 @@ void _mergeFromCodedBufferReader(
297297
list._addUnchecked(input.readUint32());
298298
}
299299
break;
300-
case PbFieldType._REPEATED_UINT64:
300+
case PbFieldType.REPEATED_UINT64:
301301
final list = fs._ensureRepeatedField(meta, fi);
302302
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
303303
final limit = input.readInt32();
@@ -314,7 +314,7 @@ void _mergeFromCodedBufferReader(
314314
list._addUnchecked(input.readUint64());
315315
}
316316
break;
317-
case PbFieldType._REPEATED_FIXED32:
317+
case PbFieldType.REPEATED_FIXED32:
318318
final list = fs._ensureRepeatedField(meta, fi);
319319
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
320320
final limit = input.readInt32();
@@ -331,7 +331,7 @@ void _mergeFromCodedBufferReader(
331331
list._addUnchecked(input.readFixed32());
332332
}
333333
break;
334-
case PbFieldType._REPEATED_FIXED64:
334+
case PbFieldType.REPEATED_FIXED64:
335335
final list = fs._ensureRepeatedField(meta, fi);
336336
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
337337
final limit = input.readInt32();
@@ -348,7 +348,7 @@ void _mergeFromCodedBufferReader(
348348
list._addUnchecked(input.readFixed64());
349349
}
350350
break;
351-
case PbFieldType._REPEATED_SFIXED32:
351+
case PbFieldType.REPEATED_SFIXED32:
352352
final list = fs._ensureRepeatedField(meta, fi);
353353
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
354354
final limit = input.readInt32();
@@ -365,7 +365,7 @@ void _mergeFromCodedBufferReader(
365365
list._addUnchecked(input.readSfixed32());
366366
}
367367
break;
368-
case PbFieldType._REPEATED_SFIXED64:
368+
case PbFieldType.REPEATED_SFIXED64:
369369
final list = fs._ensureRepeatedField(meta, fi);
370370
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
371371
final limit = input.readInt32();
@@ -382,13 +382,13 @@ void _mergeFromCodedBufferReader(
382382
list._addUnchecked(input.readSfixed64());
383383
}
384384
break;
385-
case PbFieldType._REPEATED_MESSAGE:
385+
case PbFieldType.REPEATED_MESSAGE:
386386
final subMessage = meta._makeEmptyMessage(tagNumber, registry);
387387
input.readMessage(subMessage, registry);
388388
final list = fs._ensureRepeatedField(meta, fi);
389389
list.add(subMessage);
390390
break;
391-
case PbFieldType._MAP:
391+
case PbFieldType.MAP:
392392
final mapFieldInfo = fi as MapFieldInfo;
393393
final mapEntryMeta = mapFieldInfo.mapEntryBuilderInfo;
394394
fs

0 commit comments

Comments
 (0)