adjust implementation to always return default options

grpc · Apr 5, 2024 · 27d6087 · 27d6087
1 parent 99e8a06
commit 27d6087
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/proto-loader/src/index.ts b/packages/proto-loader/src/index.ts
@@ -249,10 +249,13 @@ function createSerializer(cls: Protobuf.Type): Serialize<object> {
   };
 }
 
-function mapMethodOptions(options: Partial<MethodOptions>[] | undefined): MethodOptions | undefined {
-  return Array.isArray(options) ?
-    options.reduce((obj: MethodOptions, item: Partial<MethodOptions>) => ({ ...obj, ...item  }), {}) :
-    undefined;
+function mapMethodOptions(options: Partial<MethodOptions>[] | undefined): MethodOptions {
+  return (options || []).reduce((obj: MethodOptions, item: Partial<MethodOptions>) => ({ ...obj, ...item  }),
+    {
+      deprecated: false,
+      idempotency_level: IdempotencyLevel.IDEMPOTENCY_UNKNOWN,
+      uninterpreted_option: []
+    });
 }
 
 function createMethodDefinition(

diff --git a/packages/proto-loader/test/descriptor_type_test.ts b/packages/proto-loader/test/descriptor_type_test.ts
@@ -160,6 +160,10 @@ describe('Descriptor types', () => {
       },
       '(google.api.method_signature)': 'bar'
     })
-    assert(service.HelloWithoutOptions.options === undefined)
+    assert.deepStrictEqual(service.HelloWithoutOptions.options, {
+      deprecated: false,
+      idempotency_level: 'IDEMPOTENCY_UNKNOWN',
+      uninterpreted_option: []
+    })
   })
 });