Skip to content

Update to google protobuf v27.0 #854

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
timostamm merged 2 commits into from
May 24, 2024
Merged

Update to google protobuf v27.0 #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5bddff
Update to google protobuf v27.0
timostamm May 23, 2024
447ecff
Use maximum_edition PROTO3 for conformance_test_runner
timostamm May 23, 2024
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
2 changes: 1 addition & 1 deletion packages/bundle-size/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ usually do. We repeat this for an increasing number of files.
| protobuf-es | 4 | 92,563 b | 37,277 b | 10,113 b |
| protobuf-es | 8 | 101,904 b | 41,775 b | 10,824 b |
| protobuf-es | 16 | 165,584 b | 67,020 b | 13,312 b |
| protobuf-es | 32 | 343,363 b | 147,051 b | 20,063 b |
| protobuf-es | 32 | 344,962 b | 147,972 b | 20,177 b |
| protobuf-javascript | 1 | 339,613 b | 255,820 b | 42,481 b |
| protobuf-javascript | 4 | 366,281 b | 271,092 b | 43,912 b |
| protobuf-javascript | 8 | 388,324 b | 283,409 b | 45,038 b |
Expand Down
4 changes: 2 additions & 2 deletions packages/bundle-size/chart.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions packages/protobuf-conformance/failing_tests_text_format.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,12 @@ Required.Proto3.TextFormatInput.Uint32FieldTooLarge
Required.Proto3.TextFormatInput.Uint64FieldMaxValue.ProtobufOutput
Required.Proto3.TextFormatInput.Uint64FieldMaxValue.TextFormatOutput
Required.Proto3.TextFormatInput.Uint64FieldTooLarge
Required.Proto2.TextFormatInput.GroupFieldExtension.ProtobufOutput
Required.Proto2.TextFormatInput.GroupFieldExtension.TextFormatOutput
Required.Proto2.TextFormatInput.GroupFieldExtensionGroupName
Required.Proto2.TextFormatInput.GroupFieldLowercased.ProtobufOutput
Required.Proto2.TextFormatInput.GroupFieldLowercased.TextFormatOutput
Required.Proto2.TextFormatInput.GroupFieldLowercasedMultiWord.ProtobufOutput
Required.Proto2.TextFormatInput.GroupFieldLowercasedMultiWord.TextFormatOutput
Required.Proto2.TextFormatInput.GroupFieldMultiWord.ProtobufOutput
Required.Proto2.TextFormatInput.GroupFieldMultiWord.TextFormatOutput
6 changes: 3 additions & 3 deletions packages/protobuf-conformance/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"build": "npm run build:esm+types",
"build:esm+types": "../../node_modules/typescript/bin/tsc --project tsconfig.json --outDir ./dist/esm --declaration --declarationDir ./dist/types",
"pregenerate": "rm -rf src/gen/*",
"generate": "protoc --es_out=src/gen --es_opt=ts_nocheck=false,target=ts --proto_path=$(upstream-include conformance) $(upstream-files conformance)",
"generate": "protoc --es_out=src/gen --es_opt=ts_nocheck=false,target=ts --proto_path=$(upstream-include conformance) conformance/conformance.proto google/protobuf/test_messages_proto2.proto google/protobuf/test_messages_proto3.proto",
"postgenerate": "license-header src/gen",
"test": "npm run test:bigint && npm run test:string",
"test:bigint": "BUF_BIGINT_DISABLE=0 conformance_test_runner --enforce_recommended --failure_list failing_tests_with_bigint.txt --text_format_failure_list failing_tests_text_format.txt bin/conformance_esm.js",
"test:string": "BUF_BIGINT_DISABLE=1 conformance_test_runner --enforce_recommended --failure_list failing_tests_without_bigint.txt --text_format_failure_list failing_tests_text_format.txt bin/conformance_esm.js"
"test:bigint": "BUF_BIGINT_DISABLE=0 conformance_test_runner --maximum_edition PROTO3 --enforce_recommended --failure_list failing_tests_with_bigint.txt --text_format_failure_list failing_tests_text_format.txt bin/conformance_esm.js",
"test:string": "BUF_BIGINT_DISABLE=1 conformance_test_runner --maximum_edition PROTO3 --enforce_recommended --failure_list failing_tests_without_bigint.txt --text_format_failure_list failing_tests_text_format.txt bin/conformance_esm.js"
},
"type": "module",
"types": "./dist/types/index.d.ts",
Expand Down
101 changes: 101 additions & 0 deletions packages/protobuf-conformance/src/gen/google/protobuf/test_messages_proto2_pb.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/protobuf-test/extra/deprecation-implicit.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ service ImplicitlyDeprecatedService {
}

extend google.protobuf.FieldOptions {
int32 implicitly_deprecated_option = 2001;
int32 implicitly_deprecated_option = 2002;
}
4 changes: 2 additions & 2 deletions packages/protobuf-test/extra/extensions-proto3.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import "google/protobuf/descriptor.proto";

// In proto3, we can only extend options.
extend google.protobuf.FileOptions {
uint32 uint32_ext = 1001;
optional uint32 optional_uint32_ext = 1002;
uint32 uint32_ext = 7001;
optional uint32 optional_uint32_ext = 7002;
repeated uint32 packed_uint32_ext = 7003;
repeated uint32 unpacked_uint32_ext = 7004 [packed = false];
}
7 changes: 4 additions & 3 deletions packages/protobuf-test/src/descriptor-set.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import {
TestNestedExtension,
} from "./gen/ts/google/protobuf/unittest_pb.js";
import {
EnumFeature,
test as test_ext,
TestFeatures,
} from "./gen/ts/google/protobuf/unittest_features_pb.js";
Expand Down Expand Up @@ -323,7 +324,7 @@ describe("DescriptorSet", () => {
expect(file).toBeDefined();
if (file !== undefined) {
const tf = getTestFeatures(file);
expect(tf.intFileFeature).toBe(1);
expect(tf.fileFeature).toBe(EnumFeature.VALUE3);
Copy link
Member Author

@timostamm timostamm May 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

google/protobuf/unittest_features.proto has changed. Just updating here for this change, the behavior remains the same.

}
});
test("overrides can be read from unknown fields of getFeatures()", async () => {
Expand All @@ -334,7 +335,7 @@ describe("DescriptorSet", () => {
edition = "2023";
package protobuf_unittest;
import "google/protobuf/unittest_features.proto";
option features.(pb.test).int_file_feature = 8;
option features.(pb.test).file_feature = VALUE8;
`,
},
{ includeImports: true },
Expand All @@ -344,7 +345,7 @@ describe("DescriptorSet", () => {
expect(file).toBeDefined();
if (file !== undefined) {
const tf = getTestFeatures(file);
expect(tf.intFileFeature).toBe(8);
expect(tf.fileFeature).toBe(EnumFeature.VALUE8);
}
});

Expand Down
Loading