Skip to content

Update to google protobuf v31.1 #1168

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 9 commits into from
Jul 1, 2025
Merged

Update to google protobuf v31.1 #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
092b323
Update to google protobuf v31.1
timostamm Jul 1, 2025
cd24747
Support new fields in boot.ts
timostamm Jul 1, 2025
138ccd5
Support new fields in embed.ts
timostamm Jul 1, 2025
4392023
npm run bootstrap:inject
timostamm Jul 1, 2025
6139799
npm run bootstrap:wkt
timostamm Jul 1, 2025
96fa177
Update boot.test.ts
timostamm Jul 1, 2025
2321f58
Generate conformance protos
timostamm Jul 1, 2025
70d44e4
Generate test protos
timostamm Jul 1, 2025
cd14dc8
Generate bundle size
timostamm Jul 1, 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
10 changes: 5 additions & 5 deletions packages/bundle-size/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ usually do. We repeat this for an increasing number of files.

| code generator | files | bundle size | minified | compressed |
| ------------------- | ----: | ----------: | --------: | ---------: |
| Protobuf-ES | 1 | 128,659 b | 66,739 b | 15,466 b |
| Protobuf-ES | 4 | 130,848 b | 68,249 b | 16,099 b |
| Protobuf-ES | 8 | 133,610 b | 70,020 b | 16,676 b |
| Protobuf-ES | 16 | 144,060 b | 78,001 b | 19,012 b |
| Protobuf-ES | 32 | 171,851 b | 100,017 b | 24,452 b |
| Protobuf-ES | 1 | 131,530 b | 68,233 b | 15,681 b |
| Protobuf-ES | 4 | 133,719 b | 69,743 b | 16,342 b |
| Protobuf-ES | 8 | 136,481 b | 71,514 b | 16,880 b |
| Protobuf-ES | 16 | 146,931 b | 79,495 b | 19,248 b |
| Protobuf-ES | 32 | 174,722 b | 101,511 b | 24,714 b |
| protobuf-javascript | 1 | 104,048 b | 70,320 b | 15,540 b |
| protobuf-javascript | 4 | 130,537 b | 85,672 b | 16,956 b |
| protobuf-javascript | 8 | 152,429 b | 98,044 b | 18,138 b |
Expand Down
12 changes: 6 additions & 6 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.
52 changes: 51 additions & 1 deletion packages/protobuf-conformance/src/gen/google/protobuf/test_messages_proto2_editions_pb.ts
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 51 additions & 1 deletion packages/protobuf-conformance/src/gen/google/protobuf/test_messages_proto2_pb.ts
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions packages/protobuf-conformance/src/gen/google/protobuf/test_messages_proto3_editions_pb.ts
View file
Open in desktop

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

1 change: 1 addition & 0 deletions packages/protobuf-conformance/src/gen/google/protobuf/test_messages_proto3_pb.ts
View file
Open in desktop

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

53 changes: 33 additions & 20 deletions packages/protobuf-test/src/codegenv1/boot.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { clearField, equals, fromBinary, toBinary } from "@bufbuild/protobuf";
import {
type DescriptorProto,
type FileDescriptorProto,
type EnumDescriptorProto,
DescriptorProtoSchema,
FileDescriptorProtoSchema,
FileDescriptorSetSchema,
Expand Down Expand Up @@ -88,26 +89,38 @@ describe("bootFileDescriptorProto()", () => {
const bootedBytes = toBinary(FileDescriptorProtoSchema, booted);
expect(bootedBytes).toStrictEqual(compiledBytes);
});
function stripLikeBoot(d: FileDescriptorProto | DescriptorProto): void {
if (d.$typeName == "google.protobuf.FileDescriptorProto") {
d.options = undefined;
d.messageType.forEach(stripLikeBoot);
return;
}
clearField(d, DescriptorProtoSchema.field.reservedRange);
clearField(d, DescriptorProtoSchema.field.reservedName);
for (const f of d.field) {
clearField(f, FieldDescriptorProtoSchema.field.jsonName);
if (f.options) {
clearField(f.options, FieldOptionsSchema.field.featureSupport);
}
}
for (const e of d.enumType) {
clearField(e, EnumDescriptorProtoSchema.field.reservedRange);
clearField(e, EnumDescriptorProtoSchema.field.reservedName);
}
for (const n of d.nestedType) {
stripLikeBoot(n);
function stripLikeBoot(
d: FileDescriptorProto | DescriptorProto | EnumDescriptorProto,
): void {
switch (d.$typeName) {
case "google.protobuf.FileDescriptorProto":
d.options = undefined;
d.optionDependency = [];
d.messageType.forEach(stripLikeBoot);
d.enumType.forEach(stripLikeBoot);
break;
case "google.protobuf.EnumDescriptorProto":
clearField(d, EnumDescriptorProtoSchema.field.visibility);
clearField(d, EnumDescriptorProtoSchema.field.reservedRange);
clearField(d, EnumDescriptorProtoSchema.field.reservedName);
break;
case "google.protobuf.DescriptorProto":
clearField(d, DescriptorProtoSchema.field.visibility);
clearField(d, DescriptorProtoSchema.field.reservedRange);
clearField(d, DescriptorProtoSchema.field.reservedName);
for (const f of d.field) {
clearField(f, FieldDescriptorProtoSchema.field.jsonName);
if (f.options) {
clearField(f.options, FieldOptionsSchema.field.featureSupport);
}
}
for (const e of d.enumType) {
stripLikeBoot(e);
}
for (const n of d.nestedType) {
stripLikeBoot(n);
}
break;
}
}
});
Expand Down
53 changes: 33 additions & 20 deletions packages/protobuf-test/src/codegenv2/boot.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { clearField, equals, fromBinary, toBinary } from "@bufbuild/protobuf";
import {
type DescriptorProto,
type FileDescriptorProto,
type EnumDescriptorProto,
DescriptorProtoSchema,
FileDescriptorProtoSchema,
FileDescriptorSetSchema,
Expand Down Expand Up @@ -88,26 +89,38 @@ describe("bootFileDescriptorProto()", () => {
const bootedBytes = toBinary(FileDescriptorProtoSchema, booted);
expect(bootedBytes).toStrictEqual(compiledBytes);
});
function stripLikeBoot(d: FileDescriptorProto | DescriptorProto): void {
if (d.$typeName == "google.protobuf.FileDescriptorProto") {
d.options = undefined;
d.messageType.forEach(stripLikeBoot);
return;
}
clearField(d, DescriptorProtoSchema.field.reservedRange);
clearField(d, DescriptorProtoSchema.field.reservedName);
for (const f of d.field) {
clearField(f, FieldDescriptorProtoSchema.field.jsonName);
if (f.options) {
clearField(f.options, FieldOptionsSchema.field.featureSupport);
}
}
for (const e of d.enumType) {
clearField(e, EnumDescriptorProtoSchema.field.reservedRange);
clearField(e, EnumDescriptorProtoSchema.field.reservedName);
}
for (const n of d.nestedType) {
stripLikeBoot(n);
function stripLikeBoot(
d: FileDescriptorProto | DescriptorProto | EnumDescriptorProto,
): void {
switch (d.$typeName) {
case "google.protobuf.FileDescriptorProto":
d.options = undefined;
d.optionDependency = [];
d.messageType.forEach(stripLikeBoot);
d.enumType.forEach(stripLikeBoot);
break;
case "google.protobuf.EnumDescriptorProto":
clearField(d, EnumDescriptorProtoSchema.field.visibility);
clearField(d, EnumDescriptorProtoSchema.field.reservedRange);
clearField(d, EnumDescriptorProtoSchema.field.reservedName);
break;
case "google.protobuf.DescriptorProto":
clearField(d, DescriptorProtoSchema.field.visibility);
clearField(d, DescriptorProtoSchema.field.reservedRange);
clearField(d, DescriptorProtoSchema.field.reservedName);
for (const f of d.field) {
clearField(f, FieldDescriptorProtoSchema.field.jsonName);
if (f.options) {
clearField(f.options, FieldOptionsSchema.field.featureSupport);
}
}
for (const e of d.enumType) {
stripLikeBoot(e);
}
for (const n of d.nestedType) {
stripLikeBoot(n);
}
break;
}
}
});
Expand Down
1 change: 1 addition & 0 deletions packages/protobuf-test/src/gen/js/editions/golden/test_messages_proto3_editions_pb.d.ts
View file
Open in desktop

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

48 changes: 48 additions & 0 deletions packages/protobuf-test/src/gen/js/google/protobuf/test_messages_proto2_pb.d.ts
View file
Open in desktop

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

15 changes: 14 additions & 1 deletion packages/protobuf-test/src/gen/js/google/protobuf/test_messages_proto2_pb.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions packages/protobuf-test/src/gen/js/google/protobuf/test_messages_proto3_pb.d.ts
View file
Open in desktop

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

Loading