From 4c185fa2e6b5e7db961d73d211bfc48522beb367 Mon Sep 17 00:00:00 2001
From: hiepthai <thaichanhiep@gmail.com>
Date: Thu, 27 Oct 2022 07:59:26 +0700
Subject: [PATCH] grpc-loader: update interfaces & add new test

---
 packages/proto-loader/src/index.ts            | 19 +++++++------------
 .../proto-loader/test/descriptor_type_test.ts |  1 +
 .../test_protos/method_options.proto          |  1 +
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/proto-loader/src/index.ts b/packages/proto-loader/src/index.ts
index 55008f83..74704c71 100644
--- a/packages/proto-loader/src/index.ts
+++ b/packages/proto-loader/src/index.ts
@@ -116,9 +116,9 @@ export interface EnumTypeDefinition extends ProtobufTypeDefinition {
 }
 
 export enum IdempotencyLevel {
-  IDEMPOTENCY_UNKNOWN = 0,
-  NO_SIDE_EFFECTS = 1,
-  IDEMPOTENT = 2
+  IDEMPOTENCY_UNKNOWN = 'IDEMPOTENCY_UNKNOWN',
+  NO_SIDE_EFFECTS = 'NO_SIDE_EFFECTS',
+  IDEMPOTENT = 'IDEMPOTENT'
 }
 
 export interface NamePart {
@@ -136,16 +136,11 @@ export interface UninterpretedOption {
   aggregate_value?: string;
 }
 
-export interface CustomHttpPattern {
-  kind?: string;
-  path?: string;
-}
-
 export interface MethodOptions {
-  deprecated?: (boolean|null);
-  idempotency_level?: (IdempotencyLevel|keyof typeof IdempotencyLevel|null);
-  uninterpreted_option?: (UninterpretedOption[]|null);
-  [k: string]: unknown
+  deprecated?: boolean;
+  idempotency_level?: IdempotencyLevel|keyof typeof IdempotencyLevel;
+  uninterpreted_option?: UninterpretedOption;
+  [k: string]: unknown;
 }
 
 export interface MethodDefinition<RequestType, ResponseType, OutputRequestType=RequestType, OutputResponseType=ResponseType> {
diff --git a/packages/proto-loader/test/descriptor_type_test.ts b/packages/proto-loader/test/descriptor_type_test.ts
index 7d799710..292a0f7e 100644
--- a/packages/proto-loader/test/descriptor_type_test.ts
+++ b/packages/proto-loader/test/descriptor_type_test.ts
@@ -160,5 +160,6 @@ describe('Descriptor types', () => {
       },
       '(google.api.method_signature)': 'bar'
     })
+    assert(service.HelloWithoutOptions.options === undefined)
   })
 });
diff --git a/packages/proto-loader/test_protos/method_options.proto b/packages/proto-loader/test_protos/method_options.proto
index 4256002b..e3eff7c4 100644
--- a/packages/proto-loader/test_protos/method_options.proto
+++ b/packages/proto-loader/test_protos/method_options.proto
@@ -34,4 +34,5 @@ service Hello {
     };
     option (google.api.method_signature) = 'bar';
   }
+  rpc HelloWithoutOptions (Empty) returns (Empty) {}
 }