Functoid isolation

distage/distage-core-api/src/main/scala-2/izumi/distage/constructors/constructors.scala

@@ -1,6 +1,6 @@
 package izumi.distage.constructors
 
-import izumi.distage.constructors.macros.*
+import izumi.distage.reflection.macros.constructors.*
 import izumi.distage.model.definition.dsl.ModuleDefDSL
 import izumi.distage.model.exceptions.macros.{TraitInitializationFailedException, UnsupportedDefinitionException}
 import izumi.distage.model.providers.Functoid
@@ -105,12 +105,12 @@ object ZEnvConstructor {
   implicit def materialize[T]: ZEnvConstructor[T] = macro ZEnvConstructorMacro.mkZEnvConstructor[T]
 }
 
-private[constructors] sealed trait ClassConstructorOptionalMakeDSL[T] extends Any {
+private[distage] sealed trait ClassConstructorOptionalMakeDSL[T] extends Any {
   def provider: Functoid[T]
 }
 
 object ClassConstructorOptionalMakeDSL {
-  private[constructors] final class Impl[T](val provider: Functoid[T]) extends AnyVal with ClassConstructorOptionalMakeDSL[T]
+  private[distage] final class Impl[T](val provider: Functoid[T]) extends AnyVal with ClassConstructorOptionalMakeDSL[T]
 
   @inline def apply[T](functoid: Functoid[T]): ClassConstructorOptionalMakeDSL.Impl[T] = {
     new ClassConstructorOptionalMakeDSL.Impl[T](functoid)

distage/distage-core-api/src/main/scala-2/izumi/distage/model/definition/dsl/AbstractBindingDefDSLMacro.scala

@@ -1,9 +1,8 @@
 package izumi.distage.model.definition.dsl
 
-import izumi.distage.constructors.macros.MakeMacro
-
+import izumi.distage.reflection.macros.constructors.MakeMacro
 import scala.language.experimental.macros
 
 trait AbstractBindingDefDSLMacro[BindDSL[_]] {
-  final protected[this] def make[T]: BindDSL[T] = macro MakeMacro.make[BindDSL, T]
+  final protected def make[T]: BindDSL[T] = macro MakeMacro.make[BindDSL, T]
 }

distage/distage-core-api/src/main/scala-2/izumi/distage/model/definition/dsl/LifecycleTagMacro.scala

@@ -8,7 +8,7 @@ import scala.reflect.macros.blackbox
 object LifecycleTagMacro {
   def fakeResourceTagMacroIntellijWorkaroundImpl[R <: Lifecycle[Any, Any]: c.WeakTypeTag](c: blackbox.Context): c.Expr[Nothing] = {
     val tagMacro = new TagMacro(c)
-    tagMacro.makeTagImpl[R] // run the macro AGAIN, to get a fresh error message
+    val _ = tagMacro.makeWeakTag[R] // run the macro AGAIN, to get a fresh error message
     val tagTrace = tagMacro.getImplicitError()
 
     c.abort(c.enclosingPosition, s"could not find implicit ResourceTag for ${c.universe.weakTypeOf[R]}!\n$tagTrace")

distage/distage-core-api/src/main/scala-2/izumi/distage/model/exceptions/reflection/UnsupportedWiringException.scala

@@ -1,6 +1,6 @@
 package izumi.distage.model.exceptions.reflection
 
 import izumi.distage.model.exceptions.DIException
-import izumi.distage.model.reflection.universe.DIUniverse
+import izumi.distage.reflection.macros.universe.basicuniverse.MacroSafeType
 
-class UnsupportedWiringException(message: String, val tpe: DIUniverse#SafeType) extends DIException(message)
+class UnsupportedWiringException(message: String, val tpe: MacroSafeType) extends DIException(message)

distage/distage-core-api/src/main/scala-2/izumi/distage/reflection/macros/FunctoidMacro.scala

@@ -0,0 +1,12 @@
+package izumi.distage.reflection.macros
+
+import izumi.distage.model.providers.Functoid
+import izumi.distage.reflection.macros.universe.{DIAnnotationMeta, FunctoidMacroBase}
+
+import scala.reflect.macros.blackbox
+
+class FunctoidMacro(ctx: blackbox.Context) extends FunctoidMacroBase(ctx) {
+  override def tpe[A: c.WeakTypeTag]: c.Type = c.weakTypeOf[Functoid[A]]
+
+  override def idAnnotationFqn: String = new DIAnnotationMeta(ctx.universe).idAnnotationFqn
+}