Merge pull request #418 from typelevel/wip-move-code-gen-to-companion…

…-trait codegen: move `serviceCompanion` to `GeneratedCompanion` trait.
typelevel · Oct 10, 2021 · 6b87b7a · 6b87b7a
2 parents 906a3ab + 29ac22b
commit 6b87b7a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/codegen/src/main/scala/Fs2GrpcServicePrinter.scala b/codegen/src/main/scala/Fs2GrpcServicePrinter.scala
@@ -104,18 +104,13 @@ class Fs2GrpcServicePrinter(service: ServiceDescriptor, serviceSuffix: String, d
 
   private[this] def serviceObject: PrinterEndo =
     _.add(s"object $serviceNameFs2 extends $Companion[$serviceNameFs2] {").indent.newline
-      .call(serviceCompanion)
-      .newline
       .call(serviceClient)
       .newline
       .call(serviceBinding)
       .outdent
       .newline
       .add("}")
 
-  private[this] def serviceCompanion: PrinterEndo =
-    _.add(s"implicit def serviceCompanion: $Companion[$serviceNameFs2] = this")
-
   private[this] def serviceClient: PrinterEndo = {
     _.add(
       s"def client[F[_]: $Async, $Ctx](dispatcher: $Dispatcher[F], channel: $Channel, mkMetadata: $Ctx => $Metadata, clientOptions: $ClientOptions): $serviceNameFs2[F, $Ctx] = new $serviceNameFs2[F, $Ctx] {"

diff --git a/e2e/src/test/resources/TestServiceFs2Grpc.scala.txt b/e2e/src/test/resources/TestServiceFs2Grpc.scala.txt
@@ -11,8 +11,6 @@ trait TestServiceFs2Grpc[F[_], A] {
 
 object TestServiceFs2Grpc extends _root_.fs2.grpc.GeneratedCompanion[TestServiceFs2Grpc] {
 
-  implicit def serviceCompanion: _root_.fs2.grpc.GeneratedCompanion[TestServiceFs2Grpc] = this
-
   def client[F[_]: _root_.cats.effect.Async, A](dispatcher: _root_.cats.effect.std.Dispatcher[F], channel: _root_.io.grpc.Channel, mkMetadata: A => _root_.io.grpc.Metadata, clientOptions: _root_.fs2.grpc.client.ClientOptions): TestServiceFs2Grpc[F, A] = new TestServiceFs2Grpc[F, A] {
     def noStreaming(request: hello.world.TestMessage, ctx: A): F[hello.world.TestMessage] = {
       _root_.fs2.grpc.client.Fs2ClientCall[F](channel, hello.world.TestServiceGrpc.METHOD_NO_STREAMING, dispatcher, clientOptions).flatMap(_.unaryToUnaryCall(request, mkMetadata(ctx)))

diff --git a/e2e/src/test/scala/fs2/grpc/e2e/CodegenSpec.scala b/e2e/src/test/scala/fs2/grpc/e2e/CodegenSpec.scala
@@ -26,6 +26,7 @@ package e2e
 import java.io.File
 import scala.io.Source
 import buildinfo.BuildInfo.sourceManaged
+import hello.world._
 
 class Fs2CodeGeneratorSpec extends munit.FunSuite {
 
@@ -41,4 +42,8 @@ class Fs2CodeGeneratorSpec extends munit.FunSuite {
 
   }
 
+  test("implicit of companion resolves") {
+    implicitly[GeneratedCompanion[TestServiceFs2Grpc]]
+  }
+
 }
diff --git a/runtime/src/main/scala/GeneratedCompanion.scala b/runtime/src/main/scala/GeneratedCompanion.scala
@@ -31,6 +31,8 @@ import fs2.grpc.server.ServerOptions
 
 trait GeneratedCompanion[Service[*[_], _]] {
 
+  implicit final def serviceCompanion: GeneratedCompanion[Service] = this
+
 ///=== Client ==========================================================================================================
 
   def client[F[_]: Async, A](