Skip to content
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

Fix ext fromDescriptor not handling map fields bug #1478

Closed
wants to merge 6 commits into from
Closed

Fix ext fromDescriptor not handling map fields bug #1478

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6fb456b
Update index.js
dkishere Aug 14, 2020
5a34e20
Update index.js
dkishere Aug 14, 2020
6aeac9e
Update index.js
dkishere Aug 14, 2020
cd2f46a
Update index.js
dkishere Aug 14, 2020
44e59ed
Update index.js
dkishere Aug 17, 2020
fb16157
Update index.js
dkishere Aug 17, 2020
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
41 changes: 30 additions & 11 deletions ext/descriptor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,30 +203,43 @@ Type.fromDescriptor = function fromDescriptor(descriptor, syntax) {
// Decode the descriptor message if specified as a buffer:
if (typeof descriptor.length === "number")
descriptor = exports.DescriptorProto.decode(descriptor);

// record mapTypes for map fields
var mapTypes = {};
// Create the message type
var type = new Type(descriptor.name.length ? descriptor.name : "Type" + unnamedMessageIndex++, fromDescriptorOptions(descriptor.options, exports.MessageOptions)),
i;

/* Oneofs */ if (descriptor.oneofDecl)
for (i = 0; i < descriptor.oneofDecl.length; ++i)
type.add(OneOf.fromDescriptor(descriptor.oneofDecl[i]));
/* Nested types */ if (descriptor.nestedType)
for (i = 0; i < descriptor.nestedType.length; ++i) {
if (descriptor.nestedType[i].options && descriptor.nestedType[i].options.mapEntry && descriptor.nestedType[i].field.length === 2){
mapTypes[descriptor.nestedType[i].name] = [fromDescriptorType(descriptor.nestedType[i].field[0].type), descriptor.nestedType[i].field[1].typeName ? descriptor.nestedType[i].field[1].typeName : fromDescriptorType(descriptor.nestedType[i].field[1].type)];
}else{
type.add(Type.fromDescriptor(descriptor.nestedType[i], syntax));
}
}
/* Fields */ if (descriptor.field)
for (i = 0; i < descriptor.field.length; ++i) {
var field = Field.fromDescriptor(descriptor.field[i], syntax);
var field = null;
while(!field) {
if(descriptor.field[i].typeName) {
var nameParts = descriptor.field[i].typeName.split("."+type.name+".");
if(nameParts.length===2 && mapTypes[nameParts[1]]) {
field = Field.fromDescriptor(descriptor.field[i], syntax, mapTypes[nameParts[1]]);
break;
}
}
field = Field.fromDescriptor(descriptor.field[i], syntax);
}
type.add(field);
if (descriptor.field[i].hasOwnProperty("oneofIndex")) // eslint-disable-line no-prototype-builtins
type.oneofsArray[descriptor.field[i].oneofIndex].add(field);
}
/* Extension fields */ if (descriptor.extension)
for (i = 0; i < descriptor.extension.length; ++i)
type.add(Field.fromDescriptor(descriptor.extension[i], syntax));
/* Nested types */ if (descriptor.nestedType)
for (i = 0; i < descriptor.nestedType.length; ++i) {
type.add(Type.fromDescriptor(descriptor.nestedType[i], syntax));
if (descriptor.nestedType[i].options && descriptor.nestedType[i].options.mapEntry)
type.setOption("map_entry", true);
}
/* Nested enums */ if (descriptor.enumType)
for (i = 0; i < descriptor.enumType.length; ++i)
type.add(Enum.fromDescriptor(descriptor.enumType[i]));
Expand Down Expand Up @@ -375,9 +388,10 @@ var numberRe = /^(?![eE])[0-9]*(?:\.[0-9]*)?(?:[eE][+-]?[0-9]+)?$/;
* Creates a field from a descriptor.
* @param {IFieldDescriptorProto|Reader|Uint8Array} descriptor Descriptor
* @param {string} [syntax="proto2"] Syntax
* @returns {Field} Field instance
* @param {string[]} mapKv Key & value types for map field
* @returns {Field|MapField} Field instance
*/
Field.fromDescriptor = function fromDescriptor(descriptor, syntax) {
Field.fromDescriptor = function fromDescriptor(descriptor, syntax, mapKv) {

// Decode the descriptor message if specified as a buffer:
if (typeof descriptor.length === "number")
Expand Down Expand Up @@ -407,7 +421,12 @@ Field.fromDescriptor = function fromDescriptor(descriptor, syntax) {
if (descriptor.extendee !== undefined) {
extendee = extendee.length ? extendee : undefined;
}
var field = new Field(
var field = mapKv ? new MapField(
descriptor.name.length ? descriptor.name : "field" + descriptor.number,
descriptor.number,
mapKv[0],
mapKv[1]
) : new Field(
descriptor.name.length ? descriptor.name : "field" + descriptor.number,
descriptor.number,
fieldType,
Expand Down