Skip to content

FieldMask: all_types fixtures #3649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
oldergod wants to merge 2 commits into
base: bquenaudon.2026-07-02.fieldmask_5
Choose a base branch
from
Draft

FieldMask: all_types fixtures #3649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adca887
FieldMask: all_types fixtures
oldergod Jul 2, 2026
5a09f9d
Fix CI
oldergod Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions wire-tests-swift/no-manifest/src/main/swift/AllTypes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,14 @@ public struct AllTypes {
storage.opt_nested_message = newValue
}
}
public var opt_field_mask: FieldMask? {
get {
storage.opt_field_mask
}
set {
storage.opt_field_mask = newValue
}
}
public var req_int32: Int32 {
get {
storage.req_int32
Expand Down Expand Up @@ -427,6 +435,14 @@ public struct AllTypes {
storage.rep_nested_message = newValue
}
}
public var rep_field_mask: [FieldMask] {
get {
storage.rep_field_mask
}
set {
storage.rep_field_mask = newValue
}
}
public var pack_int32: [Int32] {
get {
storage.pack_int32
Expand Down Expand Up @@ -699,6 +715,14 @@ public struct AllTypes {
storage.map_string_enum = newValue
}
}
public var map_int32_field_mask: [Int32 : FieldMask] {
get {
storage.map_int32_field_mask
}
set {
storage.map_int32_field_mask = newValue
}
}
public var array_int32: [Int32] {
get {
storage.array_int32
Expand Down Expand Up @@ -2080,6 +2104,7 @@ extension AllTypes {
public var opt_nested_enum: AllTypes.NestedEnum?
@ProtoDefaulted
public var opt_nested_message: AllTypes.NestedMessage?
public var opt_field_mask: FieldMask?
public var req_int32: Int32
public var req_uint32: UInt32
public var req_sint32: Int32
Expand Down Expand Up @@ -2114,6 +2139,7 @@ extension AllTypes {
public var rep_bytes: [Foundation.Data] = []
public var rep_nested_enum: [AllTypes.NestedEnum] = []
public var rep_nested_message: [AllTypes.NestedMessage] = []
public var rep_field_mask: [FieldMask] = []
public var pack_int32: [Int32] = []
public var pack_uint32: [UInt32] = []
public var pack_sint32: [Int32] = []
Expand Down Expand Up @@ -2164,6 +2190,7 @@ extension AllTypes {
public var map_string_string: [String : String] = [:]
public var map_string_message: [String : AllTypes.NestedMessage] = [:]
public var map_string_enum: [String : AllTypes.NestedEnum] = [:]
public var map_int32_field_mask: [Int32 : FieldMask] = [:]
public var array_int32: [Int32] = []
public var array_uint32: [UInt32] = []
public var array_sint32: [Int32] = []
Expand Down Expand Up @@ -2263,6 +2290,7 @@ extension AllTypes.Storage : Proto2Codable {
var opt_bytes: Foundation.Data? = nil
var opt_nested_enum: AllTypes.NestedEnum? = nil
var opt_nested_message: AllTypes.NestedMessage? = nil
var opt_field_mask: FieldMask? = nil
var req_int32: Int32? = nil
var req_uint32: UInt32? = nil
var req_sint32: Int32? = nil
Expand Down Expand Up @@ -2297,6 +2325,7 @@ extension AllTypes.Storage : Proto2Codable {
var rep_bytes: [Foundation.Data] = []
var rep_nested_enum: [AllTypes.NestedEnum] = []
var rep_nested_message: [AllTypes.NestedMessage] = []
var rep_field_mask: [FieldMask] = []
var pack_int32: [Int32] = []
var pack_uint32: [UInt32] = []
var pack_sint32: [Int32] = []
Expand Down Expand Up @@ -2331,6 +2360,7 @@ extension AllTypes.Storage : Proto2Codable {
var map_string_string: [String : String] = [:]
var map_string_message: [String : AllTypes.NestedMessage] = [:]
var map_string_enum: [String : AllTypes.NestedEnum] = [:]
var map_int32_field_mask: [Int32 : FieldMask] = [:]
var array_int32: [Int32] = []
var array_uint32: [UInt32] = []
var array_sint32: [Int32] = []
Expand Down Expand Up @@ -2364,6 +2394,7 @@ extension AllTypes.Storage : Proto2Codable {
case 15: opt_bytes = try protoReader.decode(Foundation.Data.self)
case 16: opt_nested_enum = try protoReader.decode(AllTypes.NestedEnum.self)
case 17: opt_nested_message = try protoReader.decode(AllTypes.NestedMessage.self)
case 18: opt_field_mask = try protoReader.decode(FieldMask.self)
case 101: req_int32 = try protoReader.decode(Int32.self, encoding: .variable)
case 102: req_uint32 = try protoReader.decode(UInt32.self, encoding: .variable)
case 103: req_sint32 = try protoReader.decode(Int32.self, encoding: .signed)
Expand Down Expand Up @@ -2398,6 +2429,7 @@ extension AllTypes.Storage : Proto2Codable {
case 215: try protoReader.decode(into: &rep_bytes)
case 216: try protoReader.decode(into: &rep_nested_enum)
case 217: try protoReader.decode(into: &rep_nested_message)
case 218: try protoReader.decode(into: &rep_field_mask)
case 301: try protoReader.decode(into: &pack_int32, encoding: .variable)
case 302: try protoReader.decode(into: &pack_uint32, encoding: .variable)
case 303: try protoReader.decode(into: &pack_sint32, encoding: .signed)
Expand Down Expand Up @@ -2432,6 +2464,7 @@ extension AllTypes.Storage : Proto2Codable {
case 502: try protoReader.decode(into: &map_string_string)
case 503: try protoReader.decode(into: &map_string_message)
case 504: try protoReader.decode(into: &map_string_enum)
case 505: try protoReader.decode(into: &map_int32_field_mask, keyEncoding: .variable)
case 601: try protoReader.decode(into: &array_int32, encoding: .variable)
case 602: try protoReader.decode(into: &array_uint32, encoding: .variable)
case 603: try protoReader.decode(into: &array_sint32, encoding: .signed)
Expand Down Expand Up @@ -2466,6 +2499,7 @@ extension AllTypes.Storage : Proto2Codable {
self._opt_bytes.wrappedValue = opt_bytes
self.opt_nested_enum = opt_nested_enum
self._opt_nested_message.wrappedValue = opt_nested_message
self.opt_field_mask = opt_field_mask
self.req_int32 = try AllTypes.checkIfMissing(req_int32, "req_int32")
self.req_uint32 = try AllTypes.checkIfMissing(req_uint32, "req_uint32")
self.req_sint32 = try AllTypes.checkIfMissing(req_sint32, "req_sint32")
Expand Down Expand Up @@ -2500,6 +2534,7 @@ extension AllTypes.Storage : Proto2Codable {
self.rep_bytes = rep_bytes
self.rep_nested_enum = rep_nested_enum
self.rep_nested_message = rep_nested_message
self.rep_field_mask = rep_field_mask
self.pack_int32 = pack_int32
self.pack_uint32 = pack_uint32
self.pack_sint32 = pack_sint32
Expand Down Expand Up @@ -2534,6 +2569,7 @@ extension AllTypes.Storage : Proto2Codable {
self.map_string_string = map_string_string
self.map_string_message = map_string_message
self.map_string_enum = map_string_enum
self.map_int32_field_mask = map_int32_field_mask
self.array_int32 = array_int32
self.array_uint32 = array_uint32
self.array_sint32 = array_sint32
Expand Down Expand Up @@ -2566,6 +2602,7 @@ extension AllTypes.Storage : Proto2Codable {
try protoWriter.encode(tag: 15, value: self.opt_bytes)
try protoWriter.encode(tag: 16, value: self.opt_nested_enum)
try protoWriter.encode(tag: 17, value: self.opt_nested_message)
try protoWriter.encode(tag: 18, value: self.opt_field_mask)
try protoWriter.encode(tag: 101, value: self.req_int32, encoding: .variable)
try protoWriter.encode(tag: 102, value: self.req_uint32, encoding: .variable)
try protoWriter.encode(tag: 103, value: self.req_sint32, encoding: .signed)
Expand Down Expand Up @@ -2600,6 +2637,7 @@ extension AllTypes.Storage : Proto2Codable {
try protoWriter.encode(tag: 215, value: self.rep_bytes)
try protoWriter.encode(tag: 216, value: self.rep_nested_enum)
try protoWriter.encode(tag: 217, value: self.rep_nested_message)
try protoWriter.encode(tag: 218, value: self.rep_field_mask)
try protoWriter.encode(tag: 301, value: self.pack_int32, encoding: .variable, packed: true)
try protoWriter.encode(tag: 302, value: self.pack_uint32, encoding: .variable, packed: true)
try protoWriter.encode(tag: 303, value: self.pack_sint32, encoding: .signed, packed: true)
Expand Down Expand Up @@ -2634,6 +2672,7 @@ extension AllTypes.Storage : Proto2Codable {
try protoWriter.encode(tag: 502, value: self.map_string_string)
try protoWriter.encode(tag: 503, value: self.map_string_message)
try protoWriter.encode(tag: 504, value: self.map_string_enum)
try protoWriter.encode(tag: 505, value: self.map_int32_field_mask, keyEncoding: .variable)
try protoWriter.encode(tag: 601, value: self.array_int32, encoding: .variable, packed: true)
try protoWriter.encode(tag: 602, value: self.array_uint32, encoding: .variable, packed: true)
try protoWriter.encode(tag: 603, value: self.array_sint32, encoding: .signed, packed: true)
Expand Down Expand Up @@ -2673,6 +2712,7 @@ extension AllTypes.Storage : Codable {
self._opt_bytes.wrappedValue = try container.decodeIfPresent(stringEncoded: Foundation.Data.self, firstOfKeys: "optBytes", "opt_bytes")
self.opt_nested_enum = try container.decodeIfPresent(AllTypes.NestedEnum.self, firstOfKeys: "optNestedEnum", "opt_nested_enum")
self._opt_nested_message.wrappedValue = try container.decodeIfPresent(AllTypes.NestedMessage.self, firstOfKeys: "optNestedMessage", "opt_nested_message")
self.opt_field_mask = try container.decodeIfPresent(FieldMask.self, firstOfKeys: "optFieldMask", "opt_field_mask")
self.req_int32 = try container.decode(Int32.self, firstOfKeys: "reqInt32", "req_int32")
self.req_uint32 = try container.decode(UInt32.self, firstOfKeys: "reqUint32", "req_uint32")
self.req_sint32 = try container.decode(Int32.self, firstOfKeys: "reqSint32", "req_sint32")
Expand Down Expand Up @@ -2707,6 +2747,7 @@ extension AllTypes.Storage : Codable {
self.rep_bytes = try container.decodeProtoArray(Foundation.Data.self, firstOfKeys: "repBytes", "rep_bytes")
self.rep_nested_enum = try container.decodeProtoArray(AllTypes.NestedEnum.self, firstOfKeys: "repNestedEnum", "rep_nested_enum")
self.rep_nested_message = try container.decodeProtoArray(AllTypes.NestedMessage.self, firstOfKeys: "repNestedMessage", "rep_nested_message")
self.rep_field_mask = try container.decodeProtoArray(FieldMask.self, firstOfKeys: "repFieldMask", "rep_field_mask")
self.pack_int32 = try container.decodeProtoArray(Int32.self, firstOfKeys: "packInt32", "pack_int32")
self.pack_uint32 = try container.decodeProtoArray(UInt32.self, firstOfKeys: "packUint32", "pack_uint32")
self.pack_sint32 = try container.decodeProtoArray(Int32.self, firstOfKeys: "packSint32", "pack_sint32")
Expand Down Expand Up @@ -2741,6 +2782,7 @@ extension AllTypes.Storage : Codable {
self.map_string_string = try container.decodeProtoMap([String : String].self, firstOfKeys: "mapStringString", "map_string_string")
self.map_string_message = try container.decodeProtoMap([String : AllTypes.NestedMessage].self, firstOfKeys: "mapStringMessage", "map_string_message")
self.map_string_enum = try container.decodeProtoMap([String : AllTypes.NestedEnum].self, firstOfKeys: "mapStringEnum", "map_string_enum")
self.map_int32_field_mask = try container.decodeProtoMap([Int32 : FieldMask].self, firstOfKeys: "mapInt32FieldMask", "map_int32_field_mask")
self.array_int32 = try container.decodeProtoArray(Int32.self, firstOfKeys: "arrayInt32", "array_int32")
self.array_uint32 = try container.decodeProtoArray(UInt32.self, firstOfKeys: "arrayUint32", "array_uint32")
self.array_sint32 = try container.decodeProtoArray(Int32.self, firstOfKeys: "arraySint32", "array_sint32")
Expand Down Expand Up @@ -2777,6 +2819,7 @@ extension AllTypes.Storage : Codable {
try container.encodeIfPresent(stringEncoded: self.opt_bytes, forKey: preferCamelCase ? "optBytes" : "opt_bytes")
try container.encodeIfPresent(self.opt_nested_enum, forKey: preferCamelCase ? "optNestedEnum" : "opt_nested_enum")
try container.encodeIfPresent(self.opt_nested_message, forKey: preferCamelCase ? "optNestedMessage" : "opt_nested_message")
try container.encodeIfPresent(self.opt_field_mask, forKey: preferCamelCase ? "optFieldMask" : "opt_field_mask")
if includeDefaults || self.req_int32 != 0 {
try container.encode(self.req_int32, forKey: preferCamelCase ? "reqInt32" : "req_int32")
}
Expand Down Expand Up @@ -2877,6 +2920,9 @@ extension AllTypes.Storage : Codable {
if includeDefaults || !self.rep_nested_message.isEmpty {
try container.encodeProtoArray(self.rep_nested_message, forKey: preferCamelCase ? "repNestedMessage" : "rep_nested_message")
}
if includeDefaults || !self.rep_field_mask.isEmpty {
try container.encodeProtoArray(self.rep_field_mask, forKey: preferCamelCase ? "repFieldMask" : "rep_field_mask")
}
if includeDefaults || !self.pack_int32.isEmpty {
try container.encodeProtoArray(self.pack_int32, forKey: preferCamelCase ? "packInt32" : "pack_int32")
}
Expand Down Expand Up @@ -2947,6 +2993,9 @@ extension AllTypes.Storage : Codable {
if includeDefaults || !self.map_string_enum.isEmpty {
try container.encodeProtoMap(self.map_string_enum, forKey: preferCamelCase ? "mapStringEnum" : "map_string_enum")
}
if includeDefaults || !self.map_int32_field_mask.isEmpty {
try container.encodeProtoMap(self.map_int32_field_mask, forKey: preferCamelCase ? "mapInt32FieldMask" : "map_int32_field_mask")
}
if includeDefaults || !self.array_int32.isEmpty {
try container.encodeProtoArray(self.array_int32, forKey: preferCamelCase ? "arrayInt32" : "array_int32")
}
Expand Down
4 changes: 4 additions & 0 deletions wire-tests/fixtures/proto/kotlin/all_types.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package squareup.protos.kotlin.alltypes;

import "google/protobuf/field_mask.proto";
import "wire/extensions.proto";

option java_package = "com.squareup.wire.protos.kotlin.alltypes";
Expand Down Expand Up @@ -50,6 +51,7 @@ message AllTypes {
optional bytes opt_bytes = 15;
optional NestedEnum opt_nested_enum = 16;
optional NestedMessage opt_nested_message = 17;
optional google.protobuf.FieldMask opt_field_mask = 18;

required int32 req_int32 = 101;
required uint32 req_uint32 = 102;
Expand Down Expand Up @@ -86,6 +88,7 @@ message AllTypes {
repeated bytes rep_bytes = 215;
repeated NestedEnum rep_nested_enum = 216;
repeated NestedMessage rep_nested_message = 217;
repeated google.protobuf.FieldMask rep_field_mask = 218;

repeated int32 pack_int32 = 301 [packed = true];
repeated uint32 pack_uint32 = 302 [packed = true];
Expand Down Expand Up @@ -123,6 +126,7 @@ message AllTypes {
map<string, string> map_string_string = 502;
map<string, NestedMessage> map_string_message = 503;
map<string, NestedEnum> map_string_enum = 504;
map<int32, google.protobuf.FieldMask> map_int32_field_mask = 505;

repeated int32 array_int32 = 601 [packed = true, (wire.use_array) = true];
repeated uint32 array_uint32 = 602 [packed = true, (wire.use_array) = true];
Expand Down
16 changes: 16 additions & 0 deletions wire-tests/multiplatform/src/commonTest/kotlin/com/squareup/wire/TestAllTypes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,22 @@ class TestAllTypes {
assertThat(parsed).isEqualTo(allTypes)
}

@Test fun testFieldMaskFields() {
val fieldMask = FieldMask(listOf("user.display_name", "photo"))
val otherFieldMask = FieldMask(listOf("updated_at.seconds"))
val allTypes = allTypes.copy(
opt_field_mask = fieldMask,
rep_field_mask = listOf(fieldMask, otherFieldMask),
map_int32_field_mask = mapOf(1 to fieldMask, 2 to otherFieldMask),
)

val parsed = adapter.decode(adapter.encode(allTypes))

assertThat(parsed.opt_field_mask).isEqualTo(fieldMask)
assertThat(parsed.rep_field_mask).isEqualTo(listOf(fieldMask, otherFieldMask))
assertThat(parsed.map_int32_field_mask).isEqualTo(mapOf(1 to fieldMask, 2 to otherFieldMask))
}

@Test fun testReadNonPacked() {
val parsed = adapter.decode(Buffer().write(TestAllTypesData.nonPacked))
assertThat(parsed).isEqualTo(allTypes)
Expand Down
4 changes: 4 additions & 0 deletions wire-tests/multiplatform/src/commonTest/proto/kotlin/all_types.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import "wire/extensions.proto";
import "google/protobuf/any.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto";
import "google/protobuf/struct.proto";
import "google/protobuf/timestamp.proto";

Expand Down Expand Up @@ -55,6 +56,7 @@ message AllTypes {
optional bytes opt_bytes = 15;
optional NestedEnum opt_nested_enum = 16;
optional NestedMessage opt_nested_message = 17;
optional google.protobuf.FieldMask opt_field_mask = 18;

required int32 req_int32 = 101;
required uint32 req_uint32 = 102;
Expand Down Expand Up @@ -91,6 +93,7 @@ message AllTypes {
repeated bytes rep_bytes = 215;
repeated NestedEnum rep_nested_enum = 216;
repeated NestedMessage rep_nested_message = 217;
repeated google.protobuf.FieldMask rep_field_mask = 218;

repeated int32 pack_int32 = 301 [packed = true];
repeated uint32 pack_uint32 = 302 [packed = true];
Expand Down Expand Up @@ -128,6 +131,7 @@ message AllTypes {
map<string, string> map_string_string = 502;
map<string, NestedMessage> map_string_message = 503;
map<string, NestedEnum> map_string_enum = 504;
map<int32, google.protobuf.FieldMask> map_int32_field_mask = 505;

repeated int32 array_int32 = 601 [packed = true, (wire.use_array) = true];
repeated uint32 array_uint32 = 602 [packed = true, (wire.use_array) = true];
Expand Down
Loading