#9 Support importing wellknown types Value and ListValue

boukeversteegh · boukeversteegh · commit 67a628907e40 · 2020-05-28T09:23:27.000+02:00
diff --git a/betterproto/plugin.py b/betterproto/plugin.py
@@ -49,6 +49,8 @@
 WELLKNOWN_TYPES: Dict[str, Optional[Type]] = defaultdict(lambda: None, {
     'google.protobuf.Empty': google.protobuf.empty_pb2.Empty,
     'google.protobuf.Struct': google.protobuf.struct_pb2.Struct,
+    'google.protobuf.Value': google.protobuf.struct_pb2.Value,
+    'google.protobuf.ListValue': google.protobuf.struct_pb2.ListValue,
 })
 
 
diff --git a/betterproto/tests/inputs/config.py b/betterproto/tests/inputs/config.py
@@ -10,7 +10,7 @@
     "oneof_enum",  # 63
     "casing_message_field_uppercase",  # 11
     "namespace_keywords",  # 70
-    "namespace_builtin_types"  # 53
+    "namespace_builtin_types",  # 53
 }
 
 services = {
diff --git a/betterproto/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto b/betterproto/tests/inputs/googletypes_service_returns_googletype/googletypes_service_returns_googletype.proto
@@ -6,6 +6,8 @@ import "google/protobuf/struct.proto";
 service Test {
     rpc GetEmpty (RequestMessage) returns (google.protobuf.Empty);
     rpc GetStruct (RequestMessage) returns (google.protobuf.Struct);
+    rpc GetListValue (RequestMessage) returns (google.protobuf.ListValue);
+    rpc GetValue (RequestMessage) returns (google.protobuf.Value);
 }
 
 message RequestMessage {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"oneof_enum", # 63`
`11`	`11`	`"casing_message_field_uppercase", # 11`
`12`	`12`	`"namespace_keywords", # 70`
`13`		`- "namespace_builtin_types" # 53`
	`13`	`+ "namespace_builtin_types", # 53`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`services = {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ import "google/protobuf/struct.proto";`
`6`	`6`	`service Test {`
`7`	`7`	`rpc GetEmpty (RequestMessage) returns (google.protobuf.Empty);`
`8`	`8`	`rpc GetStruct (RequestMessage) returns (google.protobuf.Struct);`
	`9`	`+ rpc GetListValue (RequestMessage) returns (google.protobuf.ListValue);`
	`10`	`+ rpc GetValue (RequestMessage) returns (google.protobuf.Value);`
`9`	`11`	`}`
`10`	`12`
`11`	`13`	`message RequestMessage {`