fix(dart): Use BigInt for unsigned 64-bit integer types (#3173)

Author: brianquinlan

internal/sidekick/dart/annotate.go

@@ -42,7 +42,7 @@ var defaultValues = map[api.Typez]struct {
 	api.BYTES_TYPE:    {"Uint8List(0)", false},
 	api.DOUBLE_TYPE:   {"0", true},
 	api.FIXED32_TYPE:  {"0", true},
-	api.FIXED64_TYPE:  {"0", true},
+	api.FIXED64_TYPE:  {"BigInt.zero", false},
 	api.FLOAT_TYPE:    {"0", true},
 	api.INT32_TYPE:    {"0", true},
 	api.INT64_TYPE:    {"0", true},
@@ -52,7 +52,7 @@ var defaultValues = map[api.Typez]struct {
 	api.SINT64_TYPE:   {"0", true},
 	api.STRING_TYPE:   {"''", true},
 	api.UINT32_TYPE:   {"0", true},
-	api.UINT64_TYPE:   {"0", true},
+	api.UINT64_TYPE:   {"BigInt.zero", false},
 }
 
 type modelAnnotations struct {
@@ -805,11 +805,12 @@ func (annotate *annotateModel) annotateField(field *api.Field) {
 func (annotate *annotateModel) decoder(typez api.Typez, typeid string, state *api.APIState) string {
 	switch typez {
 	case api.INT64_TYPE,
-		api.UINT64_TYPE,
 		api.SINT64_TYPE,
-		api.FIXED64_TYPE,
 		api.SFIXED64_TYPE:
 		return "decodeInt64"
+	case api.FIXED64_TYPE,
+		api.UINT64_TYPE:
+		return "decodeUint64"
 	case api.FLOAT_TYPE,
 		api.DOUBLE_TYPE:
 		return "decodeDouble"
@@ -922,10 +923,11 @@ func createToJsonLine(field *api.Field, state *api.APIState, required bool) stri
 		return fmt.Sprintf("%s%s.toJson()", name, bang)
 	case field.Typez == api.BYTES_TYPE:
 		return fmt.Sprintf("encodeBytes(%s)", name)
-	case field.Typez == api.INT64_TYPE ||
-		field.Typez == api.UINT64_TYPE || field.Typez == api.SINT64_TYPE ||
-		field.Typez == api.FIXED64_TYPE || field.Typez == api.SFIXED64_TYPE:
+	case field.Typez == api.INT64_TYPE || field.Typez == api.SINT64_TYPE ||
+		field.Typez == api.SFIXED64_TYPE:
 		return fmt.Sprintf("encodeInt64(%s)", name)
+	case field.Typez == api.FIXED64_TYPE || field.Typez == api.UINT64_TYPE:
+		return fmt.Sprintf("encodeUint64(%s)", name)
 	case field.Typez == api.FLOAT_TYPE || field.Typez == api.DOUBLE_TYPE:
 		return fmt.Sprintf("encodeDouble(%s)", name)
 	default:
@@ -1064,9 +1066,10 @@ func (annotate *annotateModel) fieldType(f *api.Field) string {
 	case api.INT32_TYPE, api.UINT32_TYPE, api.SINT32_TYPE,
 		api.FIXED32_TYPE, api.SFIXED32_TYPE:
 		out = "int"
-	case api.INT64_TYPE, api.UINT64_TYPE, api.SINT64_TYPE,
-		api.FIXED64_TYPE, api.SFIXED64_TYPE:
+	case api.INT64_TYPE, api.SINT64_TYPE, api.SFIXED64_TYPE:
 		out = "int"
+	case api.FIXED64_TYPE, api.UINT64_TYPE:
+		out = "BigInt"
 	case api.FLOAT_TYPE, api.DOUBLE_TYPE:
 		out = "double"
 	case api.STRING_TYPE:

internal/sidekick/dart/annotate_test.go

@@ -864,7 +864,7 @@ func TestCreateFromJsonLine(t *testing.T) {
 			"switch (json['fixed32']) { null => 0, Object $1 => decodeInt($1)}",
 		}, {
 			&api.Field{Name: "fixed64", JSONName: "fixed64", Typez: api.FIXED64_TYPE},
-			"switch (json['fixed64']) { null => 0, Object $1 => decodeInt64($1)}",
+			"switch (json['fixed64']) { null => BigInt.zero, Object $1 => decodeUint64($1)}",
 		}, {
 			&api.Field{Name: "float", JSONName: "float", Typez: api.FLOAT_TYPE},
 			"switch (json['float']) { null => 0, Object $1 => decodeDouble($1)}",
@@ -891,7 +891,7 @@ func TestCreateFromJsonLine(t *testing.T) {
 			"switch (json['uint32']) { null => 0, Object $1 => decodeInt($1)}",
 		}, {
 			&api.Field{Name: "uint64", JSONName: "uint64", Typez: api.UINT64_TYPE},
-			"switch (json['uint64']) { null => 0, Object $1 => decodeInt64($1)}",
+			"switch (json['uint64']) { null => BigInt.zero, Object $1 => decodeUint64($1)}",
 		},
 
 		// optional primitives
@@ -906,7 +906,7 @@ func TestCreateFromJsonLine(t *testing.T) {
 			"switch (json['double']) { null => null, Object $1 => decodeDouble($1)}",
 		}, {
 			&api.Field{Name: "fixed64_opt", JSONName: "fixed64", Typez: api.FIXED64_TYPE, Optional: true},
-			"switch (json['fixed64']) { null => null, Object $1 => decodeInt64($1)}",
+			"switch (json['fixed64']) { null => null, Object $1 => decodeUint64($1)}",
 		}, {
 			&api.Field{Name: "float_opt", JSONName: "float", Typez: api.FLOAT_TYPE, Optional: true},
 			"switch (json['float']) { null => null, Object $1 => decodeDouble($1)}",
@@ -933,7 +933,7 @@ func TestCreateFromJsonLine(t *testing.T) {
 			"switch (json['uint32']) { null => null, Object $1 => decodeInt($1)}",
 		}, {
 			&api.Field{Name: "uint64_opt", JSONName: "uint64", Typez: api.UINT64_TYPE, Optional: true},
-			"switch (json['uint64']) { null => null, Object $1 => decodeInt64($1)}",
+			"switch (json['uint64']) { null => null, Object $1 => decodeUint64($1)}",
 		},
 
 		// one ofs

internal/sidekick/dart/dart_test.go

@@ -310,8 +310,8 @@ func TestFieldType(t *testing.T) {
 		{api.FIXED32_TYPE, "int"},
 		{api.SFIXED32_TYPE, "int"},
 		{api.INT64_TYPE, "int"},
-		{api.UINT64_TYPE, "int"},
-		{api.FIXED64_TYPE, "int"},
+		{api.UINT64_TYPE, "BigInt"},
+		{api.FIXED64_TYPE, "BigInt"},
 		{api.SFIXED64_TYPE, "int"},
 		{api.FLOAT_TYPE, "double"},
 		{api.DOUBLE_TYPE, "double"},
@@ -455,8 +455,8 @@ func TestFieldType_Repeated(t *testing.T) {
 		{api.FIXED32_TYPE, "List<int>"},
 		{api.SFIXED32_TYPE, "List<int>"},
 		{api.INT64_TYPE, "List<int>"},
-		{api.UINT64_TYPE, "List<int>"},
-		{api.FIXED64_TYPE, "List<int>"},
+		{api.UINT64_TYPE, "List<BigInt>"},
+		{api.FIXED64_TYPE, "List<BigInt>"},
 		{api.SFIXED64_TYPE, "List<int>"},
 		{api.FLOAT_TYPE, "List<double>"},
 		{api.DOUBLE_TYPE, "List<double>"},