use protocompile (#644)

* pass unit test * unit test and CLI E2E tests passed * REPL E2E tests are passed * fix tests * delete unnecessary files * add a test for fully-qualified service name * add a test for fully-qualified message name * tweak code/comments
ktr0731 · Mar 4, 2023 · 117e47a · 117e47a
1 parent 5de4a96
commit 117e47a
Show file tree

Hide file tree

Showing 57 changed files with 1,075 additions and 1,194 deletions.
diff --git a/e2e/repl_test.go b/e2e/repl_test.go
@@ -75,6 +75,10 @@ func TestE2E_REPL(t *testing.T) {
 			commonFlags: "--proto testdata/test.proto",
 			input:       []interface{}{"service Example", "call Unary", "kaguya"},
 		},
+		"call Unary by selecting only fully-qualified service": {
+			commonFlags: "--proto testdata/test.proto",
+			input:       []interface{}{"service api.Example", "call Unary", "kaguya"},
+		},
 		"call Unary by selecting only service (empty package)": {
 			registerEmptyPackageService: true,
 			commonFlags:                 "--proto testdata/empty_package.proto",
@@ -308,6 +312,10 @@ func TestE2E_REPL(t *testing.T) {
 			commonFlags: "--proto testdata/test.proto",
 			input:       []interface{}{"desc SimpleRequest"},
 		},
+		"desc a fully-qualified message": {
+			commonFlags: "--proto testdata/test.proto",
+			input:       []interface{}{"desc api.SimpleRequest"},
+		},
 		"desc simple message in empty package": {
 			commonFlags: "--proto testdata/empty_package.proto",
 			input:       []interface{}{"desc SimpleRequest"},

diff --git a/e2e/testdata/fixtures/teste2e_oldrepl-desc_a_map.golden b/e2e/testdata/fixtures/teste2e_oldrepl-desc_a_map.golden
@@ -1,7 +1,6 @@
-+-------+--------------------------------+----------+
-| FIELD |              TYPE              | REPEATED |
-+-------+--------------------------------+----------+
-| kvs   | map<TYPE_STRING, TYPE_MESSAGE  | false    |
-|       | (Name)>                        |          |
-+-------+--------------------------------+----------+
++-------+-----------------------------+----------+
+| FIELD |            TYPE             | REPEATED |
++-------+-----------------------------+----------+
+| kvs   | map<string, message (Name)> | false    |
++-------+-----------------------------+----------+
 
diff --git a/e2e/testdata/fixtures/teste2e_oldrepl-desc_a_repeated_message.golden b/e2e/testdata/fixtures/teste2e_oldrepl-desc_a_repeated_message.golden
@@ -1,6 +1,6 @@
-+-------+---------------------+----------+
-| FIELD |        TYPE         | REPEATED |
-+-------+---------------------+----------+
-| name  | TYPE_MESSAGE (Name) | true     |
-+-------+---------------------+----------+
++-------+----------------+----------+
+| FIELD |      TYPE      | REPEATED |
++-------+----------------+----------+
+| name  | message (Name) | true     |
++-------+----------------+----------+
 
diff --git a/e2e/testdata/fixtures/teste2e_oldrepl-desc_simple_message.golden b/e2e/testdata/fixtures/teste2e_oldrepl-desc_simple_message.golden
@@ -1,6 +1,6 @@
-+-------+-------------+----------+
-| FIELD |    TYPE     | REPEATED |
-+-------+-------------+----------+
-| name  | TYPE_STRING | false    |
-+-------+-------------+----------+
++-------+--------+----------+
+| FIELD |  TYPE  | REPEATED |
++-------+--------+----------+
+| name  | string | false    |
++-------+--------+----------+
 
diff --git a/e2e/testdata/fixtures/teste2e_oldrepl-show_service.golden b/e2e/testdata/fixtures/teste2e_oldrepl-show_service.golden
@@ -1,24 +1,6 @@
-+---------+---------------------------+-----------------------------+----------------+
-| SERVICE |            RPC            |        REQUEST TYPE         | RESPONSE TYPE  |
-+---------+---------------------------+-----------------------------+----------------+
-| Example | Unary                     | SimpleRequest               | SimpleResponse |
-| Example | UnaryMessage              | UnaryMessageRequest         | SimpleResponse |
-| Example | UnaryRepeated             | UnaryRepeatedRequest        | SimpleResponse |
-| Example | UnaryRepeatedMessage      | UnaryRepeatedMessageRequest | SimpleResponse |
-| Example | UnaryRepeatedEnum         | UnaryRepeatedEnumRequest    | SimpleResponse |
-| Example | UnarySelf                 | UnarySelfRequest            | SimpleResponse |
-| Example | UnaryMap                  | UnaryMapRequest             | SimpleResponse |
-| Example | UnaryMapMessage           | UnaryMapMessageRequest      | SimpleResponse |
-| Example | UnaryOneof                | UnaryOneofRequest           | SimpleResponse |
-| Example | UnaryEnum                 | UnaryEnumRequest            | SimpleResponse |
-| Example | UnaryBytes                | UnaryBytesRequest           | SimpleResponse |
-| Example | UnaryHeader               | UnaryHeaderRequest          | SimpleResponse |
-| Example | UnaryHeaderTrailer        | SimpleRequest               | SimpleResponse |
-| Example | UnaryHeaderTrailerFailure | SimpleRequest               | SimpleResponse |
-| Example | UnaryWithMapResponse      | SimpleRequest               | MapResponse    |
-| Example | UnaryEcho                 | UnaryMessageRequest         | SimpleResponse |
-| Example | ClientStreaming           | SimpleRequest               | SimpleResponse |
-| Example | ServerStreaming           | SimpleRequest               | SimpleResponse |
-| Example | BidiStreaming             | SimpleRequest               | SimpleResponse |
-+---------+---------------------------+-----------------------------+----------------+
++-------------+
+|    NAME     |
++-------------+
+| api.Example |
++-------------+
 
diff --git a/...estdata/fixtures/teste2e_repl-call_unary_by_selecting_only_fully-qualified_service.golden b/...estdata/fixtures/teste2e_repl-call_unary_by_selecting_only_fully-qualified_service.golden
@@ -0,0 +1,5 @@
+
+{
+  "message": "kaguya"
+}
+
diff --git a/e2e/testdata/fixtures/teste2e_repl-desc_a_fully-qualified_message.golden b/e2e/testdata/fixtures/teste2e_repl-desc_a_fully-qualified_message.golden
@@ -0,0 +1,6 @@
++-------+--------+----------+
+| FIELD |  TYPE  | REPEATED |
++-------+--------+----------+
+| name  | string | false    |
++-------+--------+----------+
+
diff --git a/e2e/testdata/fixtures/teste2e_repl-desc_a_map.golden b/e2e/testdata/fixtures/teste2e_repl-desc_a_map.golden
@@ -1,7 +1,6 @@
-+-------+--------------------------------+----------+
-| FIELD |              TYPE              | REPEATED |
-+-------+--------------------------------+----------+
-| kvs   | map<TYPE_STRING, TYPE_MESSAGE  | false    |
-|       | (Name)>                        |          |
-+-------+--------------------------------+----------+
++-------+-----------------------------+----------+
+| FIELD |            TYPE             | REPEATED |
++-------+-----------------------------+----------+
+| kvs   | map<string, message (Name)> | false    |
++-------+-----------------------------+----------+
 
diff --git a/e2e/testdata/fixtures/teste2e_repl-desc_a_repeated_message.golden b/e2e/testdata/fixtures/teste2e_repl-desc_a_repeated_message.golden
@@ -1,6 +1,6 @@
-+-------+---------------------+----------+
-| FIELD |        TYPE         | REPEATED |
-+-------+---------------------+----------+
-| name  | TYPE_MESSAGE (Name) | true     |
-+-------+---------------------+----------+
++-------+----------------+----------+
+| FIELD |      TYPE      | REPEATED |
++-------+----------------+----------+
+| name  | message (Name) | true     |
++-------+----------------+----------+
 
diff --git a/e2e/testdata/fixtures/teste2e_repl-desc_simple_message.golden b/e2e/testdata/fixtures/teste2e_repl-desc_simple_message.golden
@@ -1,6 +1,6 @@
-+-------+-------------+----------+
-| FIELD |    TYPE     | REPEATED |
-+-------+-------------+----------+
-| name  | TYPE_STRING | false    |
-+-------+-------------+----------+
++-------+--------+----------+
+| FIELD |  TYPE  | REPEATED |
++-------+--------+----------+
+| name  | string | false    |
++-------+--------+----------+
 
diff --git a/e2e/testdata/fixtures/teste2e_repl-desc_simple_message_in_empty_package.golden b/e2e/testdata/fixtures/teste2e_repl-desc_simple_message_in_empty_package.golden
@@ -1,6 +1,6 @@
-+-------+-------------+----------+
-| FIELD |    TYPE     | REPEATED |
-+-------+-------------+----------+
-| name  | TYPE_STRING | false    |
-+-------+-------------+----------+
++-------+--------+----------+
+| FIELD |  TYPE  | REPEATED |
++-------+--------+----------+
+| name  | string | false    |
++-------+--------+----------+
 
diff --git a/e2e/testdata/fixtures/teste2e_repl-show_service.golden b/e2e/testdata/fixtures/teste2e_repl-show_service.golden
@@ -1,24 +1,6 @@
-+---------+---------------------------+-----------------------------+----------------+
-| SERVICE |            RPC            |        REQUEST TYPE         | RESPONSE TYPE  |
-+---------+---------------------------+-----------------------------+----------------+
-| Example | Unary                     | SimpleRequest               | SimpleResponse |
-| Example | UnaryMessage              | UnaryMessageRequest         | SimpleResponse |
-| Example | UnaryRepeated             | UnaryRepeatedRequest        | SimpleResponse |
-| Example | UnaryRepeatedMessage      | UnaryRepeatedMessageRequest | SimpleResponse |
-| Example | UnaryRepeatedEnum         | UnaryRepeatedEnumRequest    | SimpleResponse |
-| Example | UnarySelf                 | UnarySelfRequest            | SimpleResponse |
-| Example | UnaryMap                  | UnaryMapRequest             | SimpleResponse |
-| Example | UnaryMapMessage           | UnaryMapMessageRequest      | SimpleResponse |
-| Example | UnaryOneof                | UnaryOneofRequest           | SimpleResponse |
-| Example | UnaryEnum                 | UnaryEnumRequest            | SimpleResponse |
-| Example | UnaryBytes                | UnaryBytesRequest           | SimpleResponse |
-| Example | UnaryHeader               | UnaryHeaderRequest          | SimpleResponse |
-| Example | UnaryHeaderTrailer        | SimpleRequest               | SimpleResponse |
-| Example | UnaryHeaderTrailerFailure | SimpleRequest               | SimpleResponse |
-| Example | UnaryWithMapResponse      | SimpleRequest               | MapResponse    |
-| Example | UnaryEcho                 | UnaryMessageRequest         | SimpleResponse |
-| Example | ClientStreaming           | SimpleRequest               | SimpleResponse |
-| Example | ServerStreaming           | SimpleRequest               | SimpleResponse |
-| Example | BidiStreaming             | SimpleRequest               | SimpleResponse |
-+---------+---------------------------+-----------------------------+----------------+
++-------------+
+|    NAME     |
++-------------+
+| api.Example |
++-------------+
 
diff --git a/fill/filler.go b/fill/filler.go
@@ -1,7 +1,11 @@
 // Package fill provides fillers that fills each field with a value.
 package fill
 
-import "errors"
+import (
+	"errors"
+
+	"google.golang.org/protobuf/types/dynamicpb"
+)
 
 var (
 	ErrCodecMismatch = errors.New("unsupported codec (could be invalid JSON format)")
@@ -15,7 +19,7 @@ type Filler interface {
 	//   - io.EOF: At the end of input.
 	//   - ErrCodecMismatch: If v isn't a supported type.
 	//
-	Fill(v interface{}) error
+	Fill(v *dynamicpb.Message) error
 }
 
 // InteractiveFillerOpts represents options for InteractiveFiller.
@@ -41,5 +45,5 @@ type InteractiveFiller interface {
 	//   - io.EOF: At the end of input.
 	//   - ErrCodecMismatch: If v isn't a supported type.
 	//
-	Fill(v interface{}, opts InteractiveFillerOpts) error
+	Fill(v *dynamicpb.Message, opts InteractiveFillerOpts) error
 }
diff --git a/fill/proto/convert.go b/fill/proto/convert.go