return uninterpreted options as an array

grpc · Apr 5, 2024 · e6ac1a4 · e6ac1a4
1 parent 6e441a8
commit e6ac1a4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/packages/proto-loader/src/index.ts b/packages/proto-loader/src/index.ts
@@ -250,7 +250,18 @@ function createSerializer(cls: Protobuf.Type): Serialize<object> {
 }
 
 function mapMethodOptions(options: Partial<MethodOptions>[] | undefined): MethodOptions {
-  return (options || []).reduce((obj: MethodOptions, item: Partial<MethodOptions>) => ({ ...obj, ...item  }),
+  return (options || []).reduce((obj: MethodOptions, item: Partial<MethodOptions>) => {
+    for (const [key, value] of Object.entries(item)) {
+      switch (key) {
+        case 'uninterpreted_option' :
+          obj.uninterpreted_option.push(item.uninterpreted_option as UninterpretedOption);
+          break;
+        default:
+          obj[key] = value
+      }
+    }
+    return obj
+  },
     {
       deprecated: false,
       idempotency_level: IdempotencyLevel.IDEMPOTENCY_UNKNOWN,

diff --git a/packages/proto-loader/test/descriptor_type_test.ts b/packages/proto-loader/test/descriptor_type_test.ts
@@ -140,18 +140,18 @@ describe('Descriptor types', () => {
     assert.deepStrictEqual(service.Hello.options, {
       deprecated: true,
       idempotency_level: 'NO_SIDE_EFFECTS',
-      uninterpreted_option: {
+      uninterpreted_option: [{
         name: {
           name_part: 'foo',
-          is_extension:  false,
+          is_extension: false,
         },
         identifier_value: 'bar',
         positive_int_value: 9007199254740991,
         negative_int_value: -9007199254740991,
         double_value: 1.2345,
         string_value: 'foobar',
         aggregate_value: 'foobar'
-      },
+      }],
       '(google.api.http)': {
         post: '/hello',
         body: '*',