From effeba7e78d73032ca35597a084d6ad3db170b1a Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Tue, 11 Dec 2018 10:53:47 -0800 Subject: [PATCH] Native: Protobuf.js 6: use nested again --- packages/grpc-native-core/src/protobuf_js_6_common.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/grpc-native-core/src/protobuf_js_6_common.js b/packages/grpc-native-core/src/protobuf_js_6_common.js index bbc392ad..6fbeeeff 100644 --- a/packages/grpc-native-core/src/protobuf_js_6_common.js +++ b/packages/grpc-native-core/src/protobuf_js_6_common.js @@ -135,11 +135,13 @@ exports.loadObject = function loadObject(value, options) { return client.makeClientConstructor(service_attrs); } - if (value.hasOwnProperty('nestedArray')) { + if (value.hasOwnProperty('nested')) { // It's a namespace or root object - value.nestedArray.forEach(nested => { - result[nested.name] = loadObject(nested, options); - }); + if (value.nested !== null && value.nested !== undefined) { + Object.values(value.nested).forEach(nested => { + result[nested.name] = loadObject(nested, options); + }); + } return result; }