Skip to content

New protocol and generator options for asynchronous mutating traversal of messages #1762

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions PluginExamples/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,23 @@ let package = Package(
.plugin(name: "SwiftProtobufPlugin", package: "swift-protobuf")
]
),
.target(
name: "AsyncTraverse",
dependencies: [
.product(name: "SwiftProtobuf", package: "swift-protobuf")
],
plugins: [
.plugin(name: "SwiftProtobufPlugin", package: "swift-protobuf")
]
),
.testTarget(
name: "ExampleTests",
dependencies: [
.target(name: "Simple"),
.target(name: "Nested"),
.target(name: "Import"),
.target(name: "AccessLevelOnImport"),
.target(name: "AsyncTraverse"),
]
),
],
Expand Down
10 changes: 10 additions & 0 deletions PluginExamples/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ let package = Package(
.target(name: "Simple"),
.target(name: "Nested"),
.target(name: "Import"),
.target(name: "AsyncTraverse"),
]
),
.target(
Expand Down Expand Up @@ -43,5 +44,14 @@ let package = Package(
.plugin(name: "SwiftProtobufPlugin", package: "swift-protobuf")
]
),
.target(
name: "AsyncTraverse",
dependencies: [
.product(name: "SwiftProtobuf", package: "swift-protobuf")
],
plugins: [
.plugin(name: "SwiftProtobufPlugin", package: "swift-protobuf")
]
),
]
)
10 changes: 10 additions & 0 deletions PluginExamples/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,23 @@ let package = Package(
.plugin(name: "SwiftProtobufPlugin", package: "swift-protobuf")
]
),
.target(
name: "AsyncTraverse",
dependencies: [
.product(name: "SwiftProtobuf", package: "swift-protobuf")
],
plugins: [
.plugin(name: "SwiftProtobufPlugin", package: "swift-protobuf")
]
),
.testTarget(
name: "ExampleTests",
dependencies: [
.target(name: "Simple"),
.target(name: "Nested"),
.target(name: "Import"),
.target(name: "AccessLevelOnImport"),
.target(name: "AsyncTraverse"),
]
),
]
Expand Down
17 changes: 17 additions & 0 deletions PluginExamples/Sources/AsyncTraverse/AsyncTraverse.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
syntax = "proto3";

message AsyncTraverseMessage {
bytes data = 1;
Nested nested = 2;
repeated bytes repeated_data = 3;
repeated Nested repeated_nested = 4;
}

message Nested {
bytes data = 1;
NestedNested nestedNested = 2;
}

message NestedNested {
bytes data = 1;
}
3 changes: 3 additions & 0 deletions PluginExamples/Sources/AsyncTraverse/empty.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/// DO NOT DELETE.
///
/// We need to keep this file otherwise the plugin is not running.
11 changes: 11 additions & 0 deletions PluginExamples/Sources/AsyncTraverse/swift-protobuf-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"invocations": [
{
"protoFiles": [
"AsyncTraverse.proto",
],
"visibility": "public",
"asyncTraverse": true,
}
]
}
54 changes: 54 additions & 0 deletions PluginExamples/Sources/ExampleTests/AsyncTraverse.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import AsyncTraverse
import SwiftProtobuf
import XCTest

final class AsyncTraverseTests: XCTestCase {
func testAsyncTraverse() async throws {
var message = AsyncTraverseMessage.with {
$0.data = .init([UInt8(0)])
$0.nested = .with {
$0.data = .init([UInt8(1)])
$0.nestedNested = .with {
$0.data = .init([UInt8(2)])
}
}
$0.repeatedData = [.init([UInt8(3)]), .init([UInt8(4)])]
$0.repeatedNested = [
.with {
$0.data = .init([UInt8(5)])
$0.nestedNested = .with {
$0.data = .init([UInt8(6)])
}
}
]
}
var visitor = MyVisitor()
try await message.traverse(visitor: &visitor)
XCTAssertEqual(message.data, .init([UInt8(1)]))
XCTAssertEqual(message.nested.data, .init([UInt8(2)]))
XCTAssertEqual(message.nested.nestedNested.data, .init([UInt8(3)]))
XCTAssertEqual(message.repeatedData, [.init([UInt8(4)]), .init([UInt8(5)])])
XCTAssertEqual(message.repeatedNested[0].data, .init([UInt8(6)]))
XCTAssertEqual(message.repeatedNested[0].nestedNested.data, .init([UInt8(7)]))
}
}

struct MyVisitor: AsyncVisitor {
mutating func visitSingularMessageField(value: inout some Message, fieldNumber: Int) async throws {
try await value.traverse(visitor: &self)
}

mutating func visitRepeatedMessageField<M>(value: inout [M], fieldNumber: Int) async throws
where M: SwiftProtobuf.Message {
for index in value.indices {
try await value[index].traverse(visitor: &self)
}
}

mutating func visitSingularBytesField(value: inout Data, fieldNumber: Int) async throws {
value = Data([value.first! + UInt8(1)])
}
mutating func visitRepeatedBytesField(value: inout [Data], fieldNumber: Int) async throws {
value = value.map { Data([$0.first! + UInt8(1)]) }
}
}
6 changes: 6 additions & 0 deletions Plugins/SwiftProtobufPlugin/plugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ struct SwiftProtobufPlugin {
var implementationOnlyImports: Bool?
/// Whether import statements should be preceded with visibility.
var useAccessLevelOnImports: Bool?
/// Whether an async traverse method should be generated.
var asyncTraverse: Bool?
}

/// The path to the `protoc` binary.
Expand Down Expand Up @@ -197,6 +199,10 @@ struct SwiftProtobufPlugin {
protocArgs.append("--swift_opt=UseAccessLevelOnImports=\(useAccessLevelOnImports)")
}

if let asyncTraverse = invocation.asyncTraverse {
protocArgs.append("--swift_opt=AsyncTraverse=\(asyncTraverse)")
}

var inputFiles = [Path]()
var outputFiles = [Path]()

Expand Down
Loading
Loading