@@ -88,6 +88,7 @@ func TestFieldAnnotations(t *testing.T) {
8888 FQMessageName : "crate::model::TestMessage" ,
8989 FieldType : "std::string::String" ,
9090 PrimitiveFieldType : "std::string::String" ,
91+ ProstType : "std::string::String" ,
9192 AddQueryParameter : `let builder = builder.query(&[("singularField", &req.singular_field)]);` ,
9293 }
9394 if diff := cmp .Diff (wantField , singularField .Codec ); diff != "" {
@@ -108,6 +109,7 @@ func TestFieldAnnotations(t *testing.T) {
108109 FQMessageName : "crate::model::TestMessage" ,
109110 FieldType : "std::vec::Vec<std::string::String>" ,
110111 PrimitiveFieldType : "std::string::String" ,
112+ ProstType : "std::string::String" ,
111113 AddQueryParameter : `let builder = req.repeated_field.iter().fold(builder, |builder, p| builder.query(&[("repeatedField", p)]));` ,
112114 }
113115 if diff := cmp .Diff (wantField , repeatedField .Codec ); diff != "" {
@@ -155,6 +157,7 @@ func TestFieldAnnotations(t *testing.T) {
155157 FieldType : "std::option::Option<std::boxed::Box<crate::model::TestMessage>>" ,
156158 MessageType : message ,
157159 PrimitiveFieldType : "crate::model::TestMessage" ,
160+ ProstType : "TestMessage" ,
158161 AddQueryParameter : `let builder = req.boxed_field.as_ref().map(|p| serde_json::to_value(p).map_err(Error::ser) ).transpose()?.into_iter().fold(builder, |builder, v| { use gaxi::query_parameter::QueryParameter; v.add(builder, "boxedField") });` ,
159162 IsBoxed : true ,
160163 MapToBoxed : true ,
@@ -255,6 +258,7 @@ func TestRecursiveFieldAnnotations(t *testing.T) {
255258 FieldType : "std::boxed::Box<crate::model::TestMessage>" ,
256259 MessageType : message ,
257260 PrimitiveFieldType : "crate::model::TestMessage" ,
261+ ProstType : "TestMessage" ,
258262 AddQueryParameter : `let builder = req.oneof_field().map(|p| serde_json::to_value(p).map_err(Error::ser) ).transpose()?.into_iter().fold(builder, |builder, p| { use gaxi::query_parameter::QueryParameter; p.add(builder, "oneofField") });` ,
259263 IsBoxed : true ,
260264 MapToBoxed : true ,
@@ -281,6 +285,7 @@ func TestRecursiveFieldAnnotations(t *testing.T) {
281285 FieldType : "std::vec::Vec<crate::model::TestMessage>" ,
282286 MessageType : message ,
283287 PrimitiveFieldType : "crate::model::TestMessage" ,
288+ ProstType : "TestMessage" ,
284289 AddQueryParameter : `let builder = req.repeated_field.as_ref().map(|p| serde_json::to_value(p).map_err(Error::ser) ).transpose()?.into_iter().fold(builder, |builder, v| { use gaxi::query_parameter::QueryParameter; v.add(builder, "repeatedField") });` ,
285290 IsBoxed : true ,
286291 MapToBoxed : false ,
@@ -306,6 +311,7 @@ func TestRecursiveFieldAnnotations(t *testing.T) {
306311 FieldType : "std::boxed::Box<crate::model::TestMessage>" ,
307312 MessageType : message ,
308313 PrimitiveFieldType : "crate::model::TestMessage" ,
314+ ProstType : "TestMessage" ,
309315 AddQueryParameter : `let builder = { use gaxi::query_parameter::QueryParameter; serde_json::to_value(&req.message_field).map_err(Error::ser)?.add(builder, "messageField") };` ,
310316 IsBoxed : true ,
311317 MapToBoxed : true ,
@@ -410,6 +416,7 @@ func TestSameTypeNameFieldAnnotations(t *testing.T) {
410416 FieldType : "std::boxed::Box<rusty_test_inner_v1::model::TestMessage>" ,
411417 MessageType : innerMessage ,
412418 PrimitiveFieldType : "rusty_test_inner_v1::model::TestMessage" ,
419+ ProstType : "crate::test::v1::inner::TestMessage" ,
413420 AddQueryParameter : `let builder = req.oneof_field().map(|p| serde_json::to_value(p).map_err(Error::ser) ).transpose()?.into_iter().fold(builder, |builder, p| { use gaxi::query_parameter::QueryParameter; p.add(builder, "oneofField") });` ,
414421 IsBoxed : true ,
415422 MapToBoxed : false ,
@@ -436,6 +443,7 @@ func TestSameTypeNameFieldAnnotations(t *testing.T) {
436443 FieldType : "std::vec::Vec<rusty_test_inner_v1::model::TestMessage>" ,
437444 MessageType : innerMessage ,
438445 PrimitiveFieldType : "rusty_test_inner_v1::model::TestMessage" ,
446+ ProstType : "crate::test::v1::inner::TestMessage" ,
439447 AddQueryParameter : `let builder = req.repeated_field.as_ref().map(|p| serde_json::to_value(p).map_err(Error::ser) ).transpose()?.into_iter().fold(builder, |builder, v| { use gaxi::query_parameter::QueryParameter; v.add(builder, "repeatedField") });` ,
440448 SkipIfIsDefault : true ,
441449 AliasInExamples : "RepeatedField" ,
@@ -459,6 +467,7 @@ func TestSameTypeNameFieldAnnotations(t *testing.T) {
459467 FieldType : "rusty_test_inner_v1::model::TestMessage" ,
460468 MessageType : innerMessage ,
461469 PrimitiveFieldType : "rusty_test_inner_v1::model::TestMessage" ,
470+ ProstType : "crate::test::v1::inner::TestMessage" ,
462471 AddQueryParameter : `let builder = { use gaxi::query_parameter::QueryParameter; serde_json::to_value(&req.message_field).map_err(Error::ser)?.add(builder, "messageField") };` ,
463472 SkipIfIsDefault : true ,
464473 AliasInExamples : "MessageField" ,
@@ -513,6 +522,7 @@ func TestPrimitiveFieldAnnotations(t *testing.T) {
513522 FQMessageName : "crate::model::TestMessage" ,
514523 FieldType : test .wantType ,
515524 PrimitiveFieldType : test .wantType ,
525+ ProstType : test .wantType ,
516526 SerdeAs : test .wantSerdeAs ,
517527 AddQueryParameter : `let builder = builder.query(&[("singularField", &req.singular_field)]);` ,
518528 SkipIfIsDefault : true ,
@@ -554,6 +564,7 @@ func TestBytesAnnotations(t *testing.T) {
554564 FQMessageName : "crate::model::TestMessage" ,
555565 FieldType : test .wantType ,
556566 PrimitiveFieldType : test .wantType ,
567+ ProstType : test .wantType ,
557568 SerdeAs : test .wantSerdeAs ,
558569 AddQueryParameter : `let builder = builder.query(&[("singularField", &req.singular_field)]);` ,
559570 }
@@ -566,18 +577,21 @@ func TestBytesAnnotations(t *testing.T) {
566577
567578func TestWrapperFieldAnnotations (t * testing.T ) {
568579 for _ , test := range []struct {
569- wantType string
570- wantSerdeAs string
571- name string
580+ wantType string
581+ wantProstType string
582+ wantSerdeAs string
583+ name string
572584 }{
573- {"wkt::BytesValue" , "serde_with::base64::Base64" , "BytesValue" },
574- {"wkt::UInt64Value" , "wkt::internal::U64" , "UInt64Value" },
575- {"wkt::Int64Value" , "wkt::internal::I64" , "Int64Value" },
576- {"wkt::UInt32Value" , "wkt::internal::U32" , "UInt32Value" },
577- {"wkt::Int32Value" , "wkt::internal::I32" , "Int32Value" },
578- {"wkt::FloatValue" , "wkt::internal::F32" , "FloatValue" },
579- {"wkt::DoubleValue" , "wkt::internal::F64" , "DoubleValue" },
580- {"wkt::BoolValue" , "" , "BoolValue" },
585+ {"wkt::BytesValue" , "::bytes::Bytes" , "serde_with::base64::Base64" , "BytesValue" },
586+ {"wkt::UInt64Value" , "u64" , "wkt::internal::U64" , "UInt64Value" },
587+ {"wkt::Int64Value" , "i64" , "wkt::internal::I64" , "Int64Value" },
588+ {"wkt::UInt32Value" , "u32" , "wkt::internal::U32" , "UInt32Value" },
589+ {"wkt::Int32Value" , "i32" , "wkt::internal::I32" , "Int32Value" },
590+ {"wkt::FloatValue" , "f32" , "wkt::internal::F32" , "FloatValue" },
591+ {"wkt::DoubleValue" , "f64" , "wkt::internal::F64" , "DoubleValue" },
592+ {"wkt::BoolValue" , "bool" , "" , "BoolValue" },
593+ {"wkt::StringValue" , "std::string::String" , "" , "StringValue" },
594+ {"wkt::Empty" , "gaxi::prost::Empty" , "" , "Empty" },
581595 } {
582596 t .Run (test .name , func (t * testing.T ) {
583597 wkt := api .NewTestMessage (test .name ).WithPackage ("google.protobuf" )
@@ -588,10 +602,14 @@ func TestWrapperFieldAnnotations(t *testing.T) {
588602 WithFields (singularField ).
589603 WithDocumentation ("A test message." )
590604 model := api .NewTestAPI ([]* api.Message {message }, nil , nil )
591- api .CrossReference (model )
605+ if err := api .CrossReference (model ); err != nil {
606+ t .Fatal (err )
607+ }
592608 api .LabelRecursiveFields (model )
593609 codec := createRustCodec ()
594- annotateModel (model , codec )
610+ if _ , err := annotateModel (model , codec ); err != nil {
611+ t .Fatal (err )
612+ }
595613
596614 wantField := & fieldAnnotations {
597615 FieldName : "singular_field" ,
@@ -601,6 +619,7 @@ func TestWrapperFieldAnnotations(t *testing.T) {
601619 FQMessageName : "crate::model::TestMessage" ,
602620 FieldType : fmt .Sprintf ("std::option::Option<%s>" , test .wantType ),
603621 PrimitiveFieldType : test .wantType ,
622+ ProstType : test .wantProstType ,
604623 SerdeAs : test .wantSerdeAs ,
605624 SkipIfIsDefault : true ,
606625 }
@@ -677,6 +696,7 @@ func TestEnumFieldAnnotations(t *testing.T) {
677696 FQMessageName : "crate::model::TestMessage" ,
678697 FieldType : "crate::model::TestEnum" ,
679698 PrimitiveFieldType : "crate::model::TestEnum" ,
699+ ProstType : "TestEnum" ,
680700 AddQueryParameter : `let builder = builder.query(&[("singularField", &req.singular_field)]);` ,
681701 SkipIfIsDefault : true ,
682702 }
@@ -692,6 +712,7 @@ func TestEnumFieldAnnotations(t *testing.T) {
692712 FQMessageName : "crate::model::TestMessage" ,
693713 FieldType : "std::vec::Vec<crate::model::TestEnum>" ,
694714 PrimitiveFieldType : "crate::model::TestEnum" ,
715+ ProstType : "TestEnum" ,
695716 AddQueryParameter : `let builder = req.repeated_field.iter().fold(builder, |builder, p| builder.query(&[("repeatedField", p)]));` ,
696717 SkipIfIsDefault : true ,
697718 }
@@ -707,6 +728,7 @@ func TestEnumFieldAnnotations(t *testing.T) {
707728 FQMessageName : "crate::model::TestMessage" ,
708729 FieldType : "std::option::Option<crate::model::TestEnum>" ,
709730 PrimitiveFieldType : "crate::model::TestEnum" ,
731+ ProstType : "TestEnum" ,
710732 AddQueryParameter : `let builder = req.optional_field.iter().fold(builder, |builder, p| builder.query(&[("optionalField", p)]));` ,
711733 SkipIfIsDefault : true ,
712734 }
@@ -724,6 +746,7 @@ func TestEnumFieldAnnotations(t *testing.T) {
724746 FQMessageName : "crate::model::TestMessage" ,
725747 FieldType : "wkt::NullValue" ,
726748 PrimitiveFieldType : "wkt::NullValue" ,
749+ ProstType : "prost_types::NullValue" ,
727750 AddQueryParameter : `let builder = builder.query(&[("nullValueField", &req.null_value_field)]);` ,
728751 SkipIfIsDefault : true ,
729752 IsWktNullValue : true ,
@@ -848,6 +871,7 @@ func TestJsonNameAnnotations(t *testing.T) {
848871 DocLines : nil ,
849872 FieldType : "std::string::String" ,
850873 PrimitiveFieldType : "std::string::String" ,
874+ ProstType : "std::string::String" ,
851875 AddQueryParameter : `let builder = builder.query(&[("parent", &req.parent)]);` ,
852876 KeyType : "" ,
853877 ValueType : "" ,
@@ -865,6 +889,7 @@ func TestJsonNameAnnotations(t *testing.T) {
865889 DocLines : nil ,
866890 FieldType : "std::string::String" ,
867891 PrimitiveFieldType : "std::string::String" ,
892+ ProstType : "std::string::String" ,
868893 AddQueryParameter : `let builder = builder.query(&[("public_key", &req.custom_key)]);` ,
869894 KeyType : "" ,
870895 ValueType : "" ,
@@ -882,6 +907,7 @@ func TestJsonNameAnnotations(t *testing.T) {
882907 DocLines : nil ,
883908 FieldType : "i32" ,
884909 PrimitiveFieldType : "i32" ,
910+ ProstType : "i32" ,
885911 AddQueryParameter : `let builder = builder.query(&[("readTime", &req.read_time)]);` ,
886912 SerdeAs : "wkt::internal::I32" ,
887913 SkipIfIsDefault : true ,
@@ -899,6 +925,7 @@ func TestJsonNameAnnotations(t *testing.T) {
899925 DocLines : nil ,
900926 FieldType : "std::option::Option<i32>" ,
901927 PrimitiveFieldType : "i32" ,
928+ ProstType : "i32" ,
902929 AddQueryParameter : `let builder = req.optional.iter().fold(builder, |builder, p| builder.query(&[("optional", p)]));` ,
903930 SerdeAs : "wkt::internal::I32" ,
904931 SkipIfIsDefault : true ,
@@ -916,6 +943,7 @@ func TestJsonNameAnnotations(t *testing.T) {
916943 DocLines : nil ,
917944 FieldType : "std::vec::Vec<i32>" ,
918945 PrimitiveFieldType : "i32" ,
946+ ProstType : "i32" ,
919947 AddQueryParameter : `let builder = req.repeated.iter().fold(builder, |builder, p| builder.query(&[("repeated", p)]));` ,
920948 SerdeAs : "wkt::internal::I32" ,
921949 SkipIfIsDefault : true ,
@@ -994,6 +1022,7 @@ func TestAnnotateField_ReservedRawIdentifiers(t *testing.T) {
9941022 FQMessageName : "crate::model::Message" ,
9951023 FieldType : "bool" ,
9961024 PrimitiveFieldType : "bool" ,
1025+ ProstType : "bool" ,
9971026 AddQueryParameter : `let builder = builder.query(&[("self", &req.self_)]);` ,
9981027 SkipIfIsDefault : true ,
9991028 }
@@ -1011,6 +1040,7 @@ func TestAnnotateField_ReservedRawIdentifiers(t *testing.T) {
10111040 FQMessageName : "crate::model::Message" ,
10121041 FieldType : "std::string::String" ,
10131042 PrimitiveFieldType : "std::string::String" ,
1043+ ProstType : "std::string::String" ,
10141044 AddQueryParameter : `let builder = builder.query(&[("crate", &req.crate_)]);` ,
10151045 }
10161046 t .Run ("crate" , func (t * testing.T ) {
@@ -1027,6 +1057,7 @@ func TestAnnotateField_ReservedRawIdentifiers(t *testing.T) {
10271057 FQMessageName : "crate::model::Message" ,
10281058 FieldType : "i32" ,
10291059 PrimitiveFieldType : "i32" ,
1060+ ProstType : "i32" ,
10301061 AddQueryParameter : `let builder = builder.query(&[("super", &req.super_)]);` ,
10311062 SerdeAs : "wkt::internal::I32" ,
10321063 SkipIfIsDefault : true ,
0 commit comments