fix(grpc): config generation for optional fields (#2042)

src/core/generator/from_proto.rs

@@ -104,7 +104,8 @@ impl Context {
 
                 let label = field.label().as_str_name().to_lowercase();
                 cfg_field.list = label.contains("repeated");
-                cfg_field.required = label.contains("required") || cfg_field.list;
+                // required only applicable for proto2
+                cfg_field.required = label.contains("required");
 
                 if let Some(type_name) = &field.type_name {
                     // check that current field is map.
@@ -396,4 +397,12 @@ mod test {
         insta::assert_snapshot!(config);
         Ok(())
     }
+
+    #[test]
+    fn test_optional_fields() -> Result<()> {
+        let set = compile_protobuf(&[protobuf::OPTIONAL])?;
+        let config = from_proto(&[set], "Query")?.to_sdl();
+        insta::assert_snapshot!(config);
+        Ok(())
+    }
 }

src/core/generator/snapshots/tailcall__core__generator__from_proto__test__from_proto.snap

@@ -15,7 +15,7 @@ input greetings_a__b__HelloRequest @tag(id: "greetings_a.b.HelloRequest") {
 }
 
 input news__MultipleNewsId @tag(id: "news.MultipleNewsId") {
-  ids: [news__NewsId]!
+  ids: [news__NewsId]
 }
 
 input news__NewsId @tag(id: "news.NewsId") {
@@ -64,5 +64,5 @@ type news__News @tag(id: "news.News") {
 }
 
 type news__NewsList @tag(id: "news.NewsList") {
-  news: [news__News]!
+  news: [news__News]
 }

src/core/generator/snapshots/tailcall__core__generator__from_proto__test__from_proto_no_pkg_file.snap

@@ -14,7 +14,7 @@ type News @tag(id: "News") {
 }
 
 type NewsList @tag(id: "NewsList") {
-  news: [News]!
+  news: [News]
 }
 
 type Query {

src/core/generator/snapshots/tailcall__core__generator__from_proto__test__map_types.snap

@@ -7,13 +7,13 @@ schema @server @upstream {
 }
 
 input map__MapRequest @tag(id: "map.MapRequest") {
-  map: JSON!
+  map: JSON
 }
 
 type Query {
   map__MapService__GetMap(mapRequest: map__MapRequest!): map__MapResponse! @grpc(body: "{{.args.mapRequest}}", method: "map.MapService.GetMap")
 }
 
 type map__MapResponse @tag(id: "map.MapResponse") {
-  map: JSON!
+  map: JSON
 }

src/core/generator/snapshots/tailcall__core__generator__from_proto__test__movies.snap

@@ -25,7 +25,7 @@ input google__protobuf__TimestampInput @tag(id: "google.protobuf.Timestamp") {
 }
 
 input movies__MovieInput @tag(id: "movies.Movie") {
-  cast: [String]!
+  cast: [String]
   duration: google__protobuf__DurationInput
   genre: movies__GenreInput
   name: String
@@ -70,7 +70,7 @@ type google__protobuf__Timestamp @tag(id: "google.protobuf.Timestamp") {
 }
 
 type movies__Movie @tag(id: "movies.Movie") {
-  cast: [String]!
+  cast: [String]
   duration: google__protobuf__Duration
   genre: movies__Genre
   name: String
@@ -80,5 +80,5 @@ type movies__Movie @tag(id: "movies.Movie") {
 }
 
 type movies__MoviesResult @tag(id: "movies.MoviesResult") {
-  result: [movies__Movie]!
+  result: [movies__Movie]
 }

src/core/generator/snapshots/tailcall__core__generator__from_proto__test__optional_fields.snap

@@ -0,0 +1,36 @@
+---
+source: src/core/generator/from_proto.rs
+expression: config
+---
+schema @server @upstream {
+  query: Query
+}
+
+input type__Type @tag(id: "type.Type") {
+  id: Int
+  idOpt: Int
+  nested: type__Type__Nested
+  nestedOpt: type__Type__Nested
+  nestedRep: [type__Type__Nested]
+  num: [Float]
+  str: String
+  strOpt: String
+}
+
+input type__Type__Nested @tag(id: "type.Type.Nested") {
+  id: Int
+  idOpt: Int
+  num: [Float]
+  str: String
+  strOpt: String
+}
+
+enum type__Status {
+  FIRST
+  SECOND
+  UNSPECIFIED
+}
+
+type Query {
+  type__TypeService__Get(type: type__Type!): type__Type! @grpc(body: "{{.args.type}}", method: "type.TypeService.Get")
+}

src/core/generator/snapshots/tailcall__core__generator__from_proto__test__required_types.snap

@@ -14,8 +14,8 @@ type person__Person @tag(id: "person.Person") {
   email: String
   id: Int!
   name: String!
-  phone: [person__PhoneNumber]!
-  stringMap: JSON!
+  phone: [person__PhoneNumber]
+  stringMap: JSON
 }
 
 type person__PhoneNumber @tag(id: "person.PhoneNumber") {

src/core/grpc/protobuf.rs

@@ -458,4 +458,37 @@ pub mod tests {
 
         Ok(())
     }
+
+    #[tokio::test]
+    async fn optional_proto_file() -> Result<()> {
+        let grpc_method = GrpcMethod::try_from("type.TypeService.Get").unwrap();
+
+        let file = ProtobufSet::from_proto_file(get_proto_file(protobuf::OPTIONAL).await?)?;
+        let service = file.find_service(&grpc_method)?;
+        let operation = service.find_operation(&grpc_method)?;
+
+        let input = operation.convert_input(r#"{ }"#)?;
+
+        assert_eq!(input, b"\0\0\0\0\0");
+
+        let output = b"\0\0\0\0\0";
+
+        let parsed = operation.convert_output::<serde_json::Value>(output)?;
+
+        assert_eq!(
+            serde_json::to_value(parsed)?,
+            json!({"id": 0, "str": "", "num": [], "nestedRep": []})
+        );
+
+        let output = b"\0\0\0\0\x03\x92\x03\0";
+
+        let parsed = operation.convert_output::<serde_json::Value>(output)?;
+
+        assert_eq!(
+            serde_json::to_value(parsed)?,
+            json!({"id": 0, "str": "", "num": [], "nestedRep": [], "nested": {"id": 0, "str": "", "num": []}})
+        );
+
+        Ok(())
+    }
 }

tailcall-fixtures/fixtures/protobuf/optional.proto

@@ -0,0 +1,32 @@
+syntax = "proto3";
+
+package type;
+
+enum Status {
+  UNSPECIFIED = 0;
+  FIRST = 1;
+  SECOND = 2;
+}
+
+message Type {
+  message Nested {
+    int32 id = 1;
+    string str = 2;
+    optional int32 id_opt = 3;
+    optional string str_opt = 4;
+    repeated float num = 5;
+  }
+
+  int32 id = 1;
+  string str = 2;
+  optional int32 id_opt = 3;
+  optional string str_opt = 4;
+  repeated float num = 5;
+  Nested nested = 50;
+  optional Nested nested_opt = 51;
+  repeated Nested nested_rep = 52;
+}
+
+service TypeService {
+  rpc Get(Type) returns (Type) {}
+}