Supports inner imports within @service macro. (#101)

* Releases a new patch version -> 0.5.1

rpc/src/main/scala/internal/service/service.scala

@@ -53,7 +53,7 @@ object serviceImpl {
   def serviceExtras(name: Type.Name, alg: Defn): Term.Block = {
     import utils._
     val serviceAlg = ServiceAlg(alg)
-    Term.Block(Seq(alg) ++ Seq(mkCompanion(name, enrich(serviceAlg, Nil))))
+    Term.Block(Seq(alg) ++ Seq(mkCompanion(name, enrich(serviceAlg, serviceAlg.innerImports))))
   }
 
   def enrich(serviceAlg: TaglessServiceAlg, companion: Object): Object = companion match {
@@ -84,8 +84,18 @@ trait RPCService {
     case t: Trait => (t.name, t.templ)
   }
 
-  val requests: List[RPCRequest] =
-    buildRequests(algName, typeParam, template.stats.toList.flatten)
+  val allServiceStats: List[Stat] = template.stats.toList.flatten
+
+  val rpcMethods: List[Stat] = allServiceStats.filter { s =>
+    s match {
+      case q"import ..$_" => false
+      case _              => true
+    }
+  }
+
+  val innerImports: List[Stat] = (allServiceStats.toSet -- rpcMethods).toList
+
+  val requests: List[RPCRequest] = buildRequests(algName, typeParam, rpcMethods)
 
   val methodDescriptors: Seq[Defn.Val] = requests.map(_.methodDescriptor)
 

rpc/src/test/scala/Utils.scala

@@ -31,6 +31,8 @@ object Utils extends CommonUtils {
     @service
     trait RPCService[F[_]] {
 
+      import ExternalScope._
+
       @rpc(Protobuf) def notAllowed(b: Boolean): F[C]
 
       @rpc(Avro) def unary(a: A): F[C]
@@ -58,6 +60,9 @@ object Utils extends CommonUtils {
       @rpc(Avro)
       @stream[BidirectionalStreaming.type]
       def biStreaming(oe: Observable[E]): F[Observable[E]]
+
+      @rpc(Protobuf)
+      def scope(empty: Empty.type): F[External]
     }
 
   }
@@ -114,6 +119,10 @@ object Utils extends CommonUtils {
           }
 
         def save(e: E) = e // do something else with e?
+
+        import ExternalScope._
+
+        override def scope(empty: protocol.Empty.type): F[External] = C.capture(External(e1))
       }
 
     }

rpc/src/test/scala/models.scala

@@ -25,3 +25,7 @@ case class C(foo: String, a: A)
 case class D(bar: Int)
 
 case class E(a: A, foo: String)
+
+object ExternalScope {
+  case class External(e: E)
+}

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "0.5.1-SNAPSHOT"
+version in ThisBuild := "0.5.1"