Merge pull request #316 from pontus-andersson/transmission-sync-option

Transmission type parameters for sync/async code generation

Author: timburks

README.md

@@ -97,6 +97,8 @@ separated from the output directory by a colon.
 | `Visibility` | `Internal`/`Public` | `Internal` | ACL of generated code |
 | `Server` |  `true`/`false` | `true` | Whether to generate server code |
 | `Client` |  `true`/`false` | `true` | Whether to generate client code |
+| `Async` |  `true`/`false` | `true` | Whether to generate asynchronous code |
+| `Sync` |  `true`/`false` | `true` | Whether to generate synchronous code |
 | `TestStubs` |  `true`/`false` | `false` | Whether to generate test stub code |
 
 Example:

Sources/protoc-gen-swiftgrpc/Generator-Client.swift

@@ -18,7 +18,8 @@ import SwiftProtobuf
 import SwiftProtobufPluginLibrary
 
 extension Generator {
-  internal func printClient() {
+  internal func printClient(asynchronousCode: Bool,
+                            synchronousCode: Bool) {
     for method in service.methods {
       self.method = method
       switch streamingType(method) {
@@ -33,9 +34,11 @@ extension Generator {
       }
     }
     println()
-    printServiceClientProtocol()
+    printServiceClientProtocol(asynchronousCode: asynchronousCode,
+                               synchronousCode: synchronousCode)
     println()
-    printServiceClientImplementation()
+    printServiceClientImplementation(asynchronousCode: asynchronousCode,
+                                     synchronousCode: synchronousCode)
     if options.generateTestStubs {
       println()
       printServiceClientTestStubs()
@@ -144,18 +147,23 @@ extension Generator {
     println()
   }
 
-  private func printServiceClientProtocol() {
+  private func printServiceClientProtocol(asynchronousCode: Bool,
+                                          synchronousCode: Bool) {
     println("/// Instantiate \(serviceClassName)Client, then call methods of this protocol to make API calls.")
     println("\(options.visibility.sourceSnippet) protocol \(serviceClassName): ServiceClient {")
     indent()
     for method in service.methods {
       self.method = method
       switch streamingType(method) {
       case .unary:
-        println("/// Synchronous. Unary.")
-        println("func \(methodFunctionName)(_ request: \(methodInputName)) throws -> \(methodOutputName)")
-        println("/// Asynchronous. Unary.")
-        println("func \(methodFunctionName)(_ request: \(methodInputName), completion: @escaping (\(methodOutputName)?, CallResult) -> Void) throws -> \(callName)")
+        if synchronousCode {
+          println("/// Synchronous. Unary.")
+          println("func \(methodFunctionName)(_ request: \(methodInputName)) throws -> \(methodOutputName)")
+        }
+        if asynchronousCode {
+          println("/// Asynchronous. Unary.")
+          println("func \(methodFunctionName)(_ request: \(methodInputName), completion: @escaping (\(methodOutputName)?, CallResult) -> Void) throws -> \(callName)")
+        }
       case .serverStreaming:
         println("/// Asynchronous. Server-streaming.")
         println("/// Send the initial message.")
@@ -178,31 +186,36 @@ extension Generator {
     println("}")
   }
 
-  private func printServiceClientImplementation() {
+  private func printServiceClientImplementation(asynchronousCode: Bool,
+                                                synchronousCode: Bool) {
     println("\(access) final class \(serviceClassName)Client: ServiceClientBase, \(serviceClassName) {")
     indent()
     for method in service.methods {
       self.method = method
       switch streamingType(method) {
       case .unary:
-        println("/// Synchronous. Unary.")
-        println("\(access) func \(methodFunctionName)(_ request: \(methodInputName)) throws -> \(methodOutputName) {")
-        indent()
-        println("return try \(callName)Base(channel)")
-        indent()
-        println(".run(request: request, metadata: metadata)")
-        outdent()
-        outdent()
-        println("}")
-        println("/// Asynchronous. Unary.")
-        println("\(access) func \(methodFunctionName)(_ request: \(methodInputName), completion: @escaping (\(methodOutputName)?, CallResult) -> Void) throws -> \(callName) {")
-        indent()
-        println("return try \(callName)Base(channel)")
-        indent()
-        println(".start(request: request, metadata: metadata, completion: completion)")
-        outdent()
-        outdent()
-        println("}")
+        if synchronousCode {
+          println("/// Synchronous. Unary.")
+          println("\(access) func \(methodFunctionName)(_ request: \(methodInputName)) throws -> \(methodOutputName) {")
+          indent()
+          println("return try \(callName)Base(channel)")
+          indent()
+          println(".run(request: request, metadata: metadata)")
+          outdent()
+          outdent()
+          println("}")
+        }
+        if asynchronousCode {
+          println("/// Asynchronous. Unary.")
+          println("\(access) func \(methodFunctionName)(_ request: \(methodInputName), completion: @escaping (\(methodOutputName)?, CallResult) -> Void) throws -> \(callName) {")
+          indent()
+          println("return try \(callName)Base(channel)")
+          indent()
+          println(".start(request: request, metadata: metadata, completion: completion)")
+          outdent()
+          outdent()
+          println("}")
+        }
       case .serverStreaming:
         println("/// Asynchronous. Server-streaming.")
         println("/// Send the initial message.")

Sources/protoc-gen-swiftgrpc/Generator.swift

@@ -81,7 +81,8 @@ class Generator {
     if options.generateClient {
       for service in file.services {
         self.service = service
-        printClient()
+        printClient(asynchronousCode: options.generateAsynchronous,
+                    synchronousCode: options.generateSynchronous)
       }
     }
     println()

Sources/protoc-gen-swiftgrpc/options.swift

@@ -49,6 +49,8 @@ final class GeneratorOptions {
   private(set) var visibility = Visibility.internal
   private(set) var generateServer = true
   private(set) var generateClient = true
+  private(set) var generateAsynchronous = true
+  private(set) var generateSynchronous = true
   private(set) var generateTestStubs = false
 
   init(parameter: String?) throws {
@@ -74,6 +76,20 @@ final class GeneratorOptions {
         } else {
           throw GenerationError.invalidParameterValue(name: pair.key, value: pair.value)
         }
+        
+      case "Async":
+        if let value = Bool(pair.value) {
+          generateAsynchronous = value
+        } else {
+          throw GenerationError.invalidParameterValue(name: pair.key, value: pair.value)
+        }
+        
+      case "Sync":
+        if let value = Bool(pair.value) {
+          generateSynchronous = value
+        } else {
+          throw GenerationError.invalidParameterValue(name: pair.key, value: pair.value)
+        }
 
       case "TestStubs":
         if let value = Bool(pair.value) {