encoding/protobuf: implement time type conversions
Adheres to protobuf JSON mapping.
Also fixes a bug where a filed could mask the short
name of the import time packag.
Change-Id: Ib5e71023a4d68492e35da02e997c47f4e09e3dd5
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/2722
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
diff --git a/encoding/protobuf/types.go b/encoding/protobuf/types.go
index f54708e..5fff043 100644
--- a/encoding/protobuf/types.go
+++ b/encoding/protobuf/types.go
@@ -52,6 +52,11 @@
p.scope[0][from] = mapping{to, "", pkg}
}
+var (
+ pkgTime = &protoConverter{goPkgPath: "time"}
+ pkgStruct = &protoConverter{goPkgPath: "struct"}
+)
+
func (p *protoConverter) mapBuiltinPackage(pos scanner.Position, file string, required bool) (generate bool) {
// Map some builtin types to their JSON/CUE mappings.
switch file {
@@ -67,16 +72,22 @@
p.setBuiltin("google.protobuf.NumberValue", "number", nil)
return false
- // TODO: consider mapping the following:
+ case "google/protobuf/empty.proto":
+ p.setBuiltin("google.protobuf.Empty", "struct.MaxFields(0)", pkgStruct)
+ return false
- // case "google/protobuf/duration.proto":
- // p.setBuiltin("google.protobuf.Duration", "time.Duration", "time")
+ case "google/protobuf/duration.proto":
+ p.setBuiltin("google.protobuf.Duration", "time.Duration", pkgTime)
+ return false
- // case "google/protobuf/timestamp.proto":
- // p.setBuiltin("google.protobuf.Timestamp", "time.Time", "time")
+ case "google/protobuf/timestamp.proto":
+ p.setBuiltin("google.protobuf.Timestamp", "time.Time", pkgTime)
+ return false
- // case "google/protobuf/empty.proto":
- // p.setBuiltin("google.protobuf.Empty", "struct.MaxFields(0)", nil)
+ // case "google/protobuf/field_mask.proto":
+ // p.setBuiltin("google.protobuf.FieldMask", "protobuf.FieldMask", nil)
+
+ // protobuf.Any
default:
if required {
