Skip to content

Relax restriction on .modify call after .from in ModuleDef DSL, allow widening implementation type. Apply .namedByImpl after modifications, not before #2221

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.

Sign up for GitHub

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

Draft
neko-kai wants to merge 4 commits into
base: develop
Choose a base branch
from
+12 −12
Draft

Relax restriction on .modify call after .from in ModuleDef DSL, allow widening implementation type. Apply .namedByImpl after modifications, not before #2221

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65c4051
Relax restriction on .modify call after .from in ModuleDef DSL, allow…
neko-kai Nov 29, 2024
9648c97
Merge branch 'develop' into feature/relax-functoid-modify
neko-kai Mar 26, 2025
33cdfaf
Update AbstractBindingDefDSL.scala
neko-kai Mar 26, 2025
1f1b1c0
Update AbstractBindingDefDSL.scala
neko-kai Mar 26, 2025
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
24 changes: 12 additions & 12 deletions ...ge-core-api/src/main/scala/izumi/distage/model/definition/dsl/AbstractBindingDefDSL.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import izumi.distage.model.definition.dsl.AbstractBindingDefDSL.SetInstruction.{
import izumi.distage.model.definition.dsl.AbstractBindingDefDSL.SingletonInstruction.*
import izumi.distage.model.exceptions.dsl.InvalidFunctoidModifier
import izumi.distage.model.providers.Functoid
import izumi.distage.model.reflection.{DIKey, MultiSetImplId, SetKeyMeta}
import izumi.distage.model.reflection.{DIKey, MultiSetImplId, SafeType, SetKeyMeta}
import izumi.fundamentals.platform.language.{CodePositionMaterializer, SourceFilePosition}
import izumi.reflect.Tag

Expand Down Expand Up @@ -390,8 +390,8 @@ object AbstractBindingDefDSL {
case _: SetImpl => 0
case _: AddTags => 0
case _: SetId => 0
case _: SetIdFromImplName => 1
case _: Modify[?] => 2
case _: Modify[?] => 1
case _: SetIdFromImplName => 2
case _: AddDependencies => 3
case _: AliasTo => 4
}
Expand All @@ -408,11 +408,11 @@ object AbstractBindingDefDSL {
case Modify(functoidModifier: (Functoid[t] => Functoid[u])) =>
b = b.withImplDef(b.implementation match {
case implDef: ImplDef.ProviderImpl =>
applyFunctoidModifier(implDef, functoidModifier)
applyFunctoidModifier(b.key.tpe, implDef, functoidModifier)
case ImplDef.ResourceImpl(implType, effectHKTypeCtor, resourceImpl: ImplDef.ProviderImpl) =>
ImplDef.ResourceImpl(implType, effectHKTypeCtor, applyFunctoidModifier(resourceImpl, functoidModifier))
ImplDef.ResourceImpl(implType, effectHKTypeCtor, applyFunctoidModifier(b.key.tpe, resourceImpl, functoidModifier))
case ImplDef.EffectImpl(implType, effectHKTypeCtor, effectImpl: ImplDef.ProviderImpl) =>
ImplDef.EffectImpl(implType, effectHKTypeCtor, applyFunctoidModifier(effectImpl, functoidModifier))
ImplDef.EffectImpl(implType, effectHKTypeCtor, applyFunctoidModifier(b.key.tpe, effectImpl, functoidModifier))
case _ =>
throw new InvalidFunctoidModifier(
s"""Cannot apply Functoid modifier $functoidModifier to binding $b - Functoid is inaccessible in binding implementation. Expected `ImplDef.ProviderImpl`, but got `ImplDef.${b.implementation.productPrefix}`
Expand All @@ -423,11 +423,11 @@ object AbstractBindingDefDSL {
val functoidModifier = (_: Functoid[Any]).addDependencies(dependencies)
b.implementation match {
case providerImpl: ImplDef.ProviderImpl =>
b = b.withImplDef(applyFunctoidModifier(providerImpl, functoidModifier))
b = b.withImplDef(applyFunctoidModifier(b.key.tpe, providerImpl, functoidModifier))
case ImplDef.ResourceImpl(implType, effectHKTypeCtor, resourceImpl: ImplDef.ProviderImpl) =>
b = b.withImplDef(ImplDef.ResourceImpl(implType, effectHKTypeCtor, applyFunctoidModifier(resourceImpl, functoidModifier)))
b = b.withImplDef(ImplDef.ResourceImpl(implType, effectHKTypeCtor, applyFunctoidModifier(b.key.tpe, resourceImpl, functoidModifier)))
case ImplDef.EffectImpl(implType, effectHKTypeCtor, effectImpl: ImplDef.ProviderImpl) =>
b = b.withImplDef(ImplDef.EffectImpl(implType, effectHKTypeCtor, applyFunctoidModifier(effectImpl, functoidModifier)))
b = b.withImplDef(ImplDef.EffectImpl(implType, effectHKTypeCtor, applyFunctoidModifier(b.key.tpe, effectImpl, functoidModifier)))
case _ =>
// add an independent mutator instead of modifying the original functoid, if no original functoid is available
// this is ok for `addDependencies` because we don't need to access/modify arguments of the original functoid,
Expand All @@ -454,14 +454,14 @@ object AbstractBindingDefDSL {
this
}

private def applyFunctoidModifier[A, B](implDef: ImplDef.ProviderImpl, functoidModifier: Functoid[A] => Functoid[B]): ImplDef.ProviderImpl = {
private def applyFunctoidModifier[A, B](keyType: SafeType, implDef: ImplDef.ProviderImpl, functoidModifier: Functoid[A] => Functoid[B]): ImplDef.ProviderImpl = {
val ImplDef.ProviderImpl(implType, function) = implDef
val newProvider = functoidModifier(Functoid(function)).get
if (newProvider.ret <:< implType) {
if (newProvider.ret <:< keyType) {
ImplDef.ProviderImpl(implType, newProvider)
} else {
throw new InvalidFunctoidModifier(
s"Cannot apply invalid Functoid modifier $functoidModifier, new return type `${newProvider.ret}` is not a subtype of the old return type `${function.ret}` (${initial.origin})"
s"Cannot apply invalid Functoid modifier $functoidModifier, new return type `${newProvider.ret}` is not a subtype of the key type `$keyType` (${initial.origin})"
)
}
}
Expand Down