Skip to content

fix: descriptor extensions handling post-editions #2075

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 6 commits into from
May 28, 2025
Merged

fix: descriptor extensions handling post-editions #2075

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1fafc43
Fix error message on parse failure
mkruskal-google May 24, 2025
94fd0e0
Fix root-less type caching bug
mkruskal-google May 27, 2025
6053235
Add basic support for editions descriptors + test coverage
mkruskal-google May 27, 2025
11b29b5
lint fixes
mkruskal-google May 27, 2025
a48bd5b
update descriptor.proto to latest version
mkruskal-google May 27, 2025
f39bb00
Handle repeated options properly
mkruskal-google May 27, 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
Prev Previous commit
Next Next commit
lint fixes
  • Loading branch information
@mkruskal-google
mkruskal-google committed May 27, 2025
commit 11b29b5da55b26d0a48b68462dcce1ac57e727cf
14 changes: 7 additions & 7 deletions ext/descriptor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ var unnamedMessageIndex = 0;

/**
* Creates a type from a descriptor.
*
*
* Warning: this is not safe to use with editions protos, since it discards relevant file context.
*
*
* @param {IDescriptorProto|Reader|Uint8Array} descriptor Descriptor
* @param {string} [edition="proto2"] The syntax or edition to use
* @param {boolean} [nested=false] Whether or not this is a nested object
Expand Down Expand Up @@ -400,7 +400,7 @@ var numberRe = /^(?![eE])[0-9]*(?:\.[0-9]*)?(?:[eE][+-]?[0-9]+)?$/;
* Creates a field from a descriptor.
*
* Warning: this is not safe to use with editions protos, since it discards relevant file context.
*
*
* @param {IFieldDescriptorProto|Reader|Uint8Array} descriptor Descriptor
* @param {string} [edition="proto2"] The syntax or edition to use
* @param {boolean} [nested=false] Whether or not this is a top-level object
Expand Down Expand Up @@ -571,7 +571,7 @@ var unnamedEnumIndex = 0;
* Creates an enum from a descriptor.
*
* Warning: this is not safe to use with editions protos, since it discards relevant file context.
*
*
* @param {IEnumDescriptorProto|Reader|Uint8Array} descriptor Descriptor
* @param {string} [edition="proto2"] The syntax or edition to use
* @param {boolean} [nested=false] Whether or not this is a top-level object
Expand Down Expand Up @@ -637,7 +637,7 @@ var unnamedOneofIndex = 0;
* Creates a oneof from a descriptor.
*
* Warning: this is not safe to use with editions protos, since it discards relevant file context.
*
*
* @param {IOneofDescriptorProto|Reader|Uint8Array} descriptor Descriptor
* @returns {OneOf} OneOf instance
*/
Expand Down Expand Up @@ -687,7 +687,7 @@ var unnamedServiceIndex = 0;
* Creates a service from a descriptor.
*
* Warning: this is not safe to use with editions protos, since it discards relevant file context.
*
*
* @param {IServiceDescriptorProto|Reader|Uint8Array} descriptor Descriptor
* @param {string} [edition="proto2"] The syntax or edition to use
* @param {boolean} [nested=false] Whether or not this is a top-level object
Expand Down Expand Up @@ -744,7 +744,7 @@ Service.prototype.toDescriptor = function toDescriptor() {
* Properties of a MethodOptions message.
*
* Warning: this is not safe to use with editions protos, since it discards relevant file context.
*
*
* @interface IMethodOptions
* @property {boolean} [deprecated]
*/
Expand Down