Skip to content

proto-loader: Update protobufjs dependency to 8.x #3067

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

Open
slagiewka wants to merge 3 commits into
base: master
Choose a base branch
from
Open

proto-loader: Update protobufjs dependency to 8.x #3067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3daabe
proto-loader: Update protobufjs dependency to 8.x
slagiewka Jul 7, 2026
778e481
proto-loader: use pbjs TS declarations
slagiewka Jul 9, 2026
4f1da30
proto-loader: pass keepCase to Root.fromDescriptor
slagiewka Jul 9, 2026
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: 2 additions & 2 deletions packages/proto-loader/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@grpc/proto-loader",
"version": "0.8.1",
"version": "0.9.0",
"author": "Google Inc.",
"contributors": [
{
Expand Down Expand Up @@ -47,7 +47,7 @@
"dependencies": {
"lodash.camelcase": "^4.3.0",
"long": "^5.0.0",
"protobufjs": "^7.5.5",
"protobufjs": "^8.7.0",
"yargs": "^17.7.2"
},
"devDependencies": {
Expand Down
41 changes: 4 additions & 37 deletions packages/proto-loader/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,40 +59,6 @@ export function isAnyExtension(obj: object): obj is AnyExtension {
return ('@type' in obj) && (typeof (obj as AnyExtension)['@type'] === 'string');
}

declare module 'protobufjs' {
interface Type {
toDescriptor(
protoVersion: string
): Protobuf.Message<descriptor.IDescriptorProto> &
descriptor.IDescriptorProto;
}

interface RootConstructor {
new (options?: Options): Root;
fromDescriptor(
descriptorSet:
| descriptor.IFileDescriptorSet
| Protobuf.Reader
| Uint8Array
): Root;
fromJSON(json: Protobuf.INamespace, root?: Root): Root;
}

interface Root {
toDescriptor(
protoVersion: string
): Protobuf.Message<descriptor.IFileDescriptorSet> &
descriptor.IFileDescriptorSet;
}

interface Enum {
toDescriptor(
protoVersion: string
): Protobuf.Message<descriptor.IEnumDescriptorProto> &
descriptor.IEnumDescriptorProto;
}
}

export interface Serialize<T> {
(value: T): Buffer;
}
Expand Down Expand Up @@ -342,7 +308,7 @@ function createEnumDefinition(
): EnumTypeDefinition {
const enumDescriptor: protobuf.Message<
descriptor.IEnumDescriptorProto
> = enumType.toDescriptor('proto3');
> = enumType.toDescriptor();
return {
format: 'Protocol Buffer 3 EnumDescriptorProto',
type: enumDescriptor.$type.toObject(enumDescriptor, descriptorOptions),
Expand Down Expand Up @@ -398,8 +364,9 @@ function createPackageDefinitionFromDescriptorSet(
) {
options = options || {};

const root = (Protobuf.Root as Protobuf.RootConstructor).fromDescriptor(
decodedDescriptorSet
const root = Protobuf.Root.fromDescriptor(
decodedDescriptorSet,
{keepCase: options.keepCase}
);
root.resolveAll();
return createPackageDefinition(root, options);
Expand Down
Loading