Merge pull request #4 from postmanlabs/feature/update-dependencies

chore: remove `useMapField` option and update dependencies

Author: appurva21

package-lock.json

@@ -8,10 +8,10 @@
     "@types/lodash.set": "^4.3.6",
     "google-protobuf": "^3.12.2",
     "lodash.set": "^4.3.2",
-    "@postman/protobufjs": "^7.3.2-postman.3"
+    "@postman/protobufjs": "^7.5.4-postman.1"
   },
   "devDependencies": {
-    "@postman/grpc-js": "1.10.8-postman.3",
+    "@postman/grpc-js": "1.14.0-postman.2",
     "@types/chai": "^4.2.11",
     "@types/mocha": "^7.0.2",
     "@types/node": "^13.11.1",

package.json

@@ -17,15 +17,11 @@ export class Client {
   metadata: Metadata;
   grpcClient: services.IServerReflectionClient;
   private fileDescriptorCache: Map<string, IFileDescriptorProto> = new Map();
-  private reflectionOptions?: {
-    useExperimentalMapFieldDecoding?: boolean;
-  };
   constructor(
     url: string,
     credentials: ChannelCredentials,
     options?: object,
-    metadata?: Metadata,
-    reflectionOptions?: Client['reflectionOptions']
+    metadata?: Metadata
   ) {
     this.fileDescriptorCache = new Map();
     this.metadata = metadata || new Metadata();
@@ -34,7 +30,6 @@ export class Client {
       credentials,
       options
     );
-    this.reflectionOptions = reflectionOptions;
   }
 
   listServices(): Promise<string[]> {
@@ -92,10 +87,7 @@ export class Client {
     );
     const fileDescriptorSet = FileDescriptorSet.create();
     set(fileDescriptorSet, 'file', Array.from(fileDescriptorMap.values()));
-    return getDescriptorRootFromDescriptorSet(
-      fileDescriptorSet,
-      this.reflectionOptions?.useExperimentalMapFieldDecoding
-    );
+    return getDescriptorRootFromDescriptorSet(fileDescriptorSet);
   }
 
   private async resolveDescriptorRecursive(

src/client.ts

@@ -11,30 +11,25 @@ const set = require('lodash.set');
  * Get Protobuf.js Root object from the serialized FileDescriptorProto messages
  * that gotten from reflection service.
  * @param {Array<Uint8Array|string>|undefined} file_descriptor_protos - Reflection descriptor protos
- * @param {boolean} [useMapField=false] - Use experimental map field decoding support of protobufjs
  * @return {Root} Protobuf.js Root object
  */
 // eslint-disable-next-line node/no-unsupported-features/es-syntax
-export function getDescriptorRoot(file_descriptor_protos, useMapField = false) {
+export function getDescriptorRoot(file_descriptor_protos) {
   const descriptorSet = Descriptor.FileDescriptorSet.create();
 
   file_descriptor_protos.forEach((descriptorByte, i) => {
     const descriptor = Descriptor.FileDescriptorProto.decode(descriptorByte);
     set(descriptorSet, 'file[' + i + ']', descriptor);
   });
-  return protobuf.Root.fromDescriptor(descriptorSet, {useMapField});
+  return protobuf.Root.fromDescriptor(descriptorSet);
 }
 
 /**
  * Get Protobuf.js Root object from FileDescriptorSet
  * @param {Message file_descriptor_set - File descriptor set
- * @param {boolean} [useMapField=false] - Use experimental map field decoding support of protobufjs
  * @return {Root} Protobuf.js Root object
  */
 // eslint-disable-next-line node/no-unsupported-features/es-syntax
-export function getDescriptorRootFromDescriptorSet(
-  file_descriptor_set,
-  useMapField = false
-) {
-  return protobuf.Root.fromDescriptor(file_descriptor_set, {useMapField});
+export function getDescriptorRootFromDescriptorSet(file_descriptor_set) {
+  return protobuf.Root.fromDescriptor(file_descriptor_set);
 }