[Architecture] introduce nodeBuilder concept

app/src/main/kotlin/io/element/android/x/di/AppBindings.kt

@@ -17,7 +17,7 @@
 package io.element.android.x.di
 
 import com.squareup.anvil.annotations.ContributesTo
-import io.element.android.appnav.MatrixClientsHolder
+import io.element.android.appnav.di.MatrixClientsHolder
 import io.element.android.libraries.di.AppScope
 
 @ContributesTo(AppScope::class)

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -42,8 +42,7 @@ import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.architecture.nodeInputs
+import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.architecture.nodeInputsProvider
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.MatrixClient
@@ -80,7 +79,7 @@ class LoggedInFlowNode @AssistedInject constructor(
         val matrixClient: MatrixClient
     ) : NodeInputs
 
-    private val inputs: Inputs by nodeInputs()
+    private val inputs: Inputs = inputs()
 
     override fun onBuilt() {
         super.onBuilt()
@@ -122,7 +121,10 @@ class LoggedInFlowNode @AssistedInject constructor(
                         backstack.push(NavTarget.Settings)
                     }
                 }
-                roomListEntryPoint.node(this, buildContext, plugins = listOf(callback))
+                roomListEntryPoint
+                    .nodeBuilder(this, buildContext)
+                    .callback(callback)
+                    .build()
             }
             is NavTarget.Room -> {
                 val room = inputs.matrixClient.getRoom(roomId = navTarget.roomId)
@@ -135,8 +137,8 @@ class LoggedInFlowNode @AssistedInject constructor(
                     }
                 } else {
                     val nodeLifecycleCallbacks = plugins<NodeLifecycleCallback>()
-                    val inputsProvider = nodeInputsProvider(RoomFlowNode.Inputs(room))
+                    val inputs = RoomFlowNode.Inputs(room)
-                    createNode<RoomFlowNode>(buildContext, plugins = listOf(inputsProvider) + nodeLifecycleCallbacks)
+                    createNode<RoomFlowNode>(buildContext, plugins = listOf(inputs) + nodeLifecycleCallbacks)
                 }
             }
             NavTarget.Settings -> {
@@ -145,7 +147,9 @@ class LoggedInFlowNode @AssistedInject constructor(
                         plugins<Callback>().forEach { it.onOpenBugReport() }
                     }
                 }
-                preferencesEntryPoint.node(this, buildContext, plugins = listOf(callback))
+                preferencesEntryPoint.nodeBuilder(this, buildContext)
+                    .callback(callback)
+                    .build()
             }
         }
     }

appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt

@@ -78,10 +78,13 @@ class NotLoggedInFlowNode @AssistedInject constructor(
                         backstack.push(NavTarget.LoginFlow)
                     }
                 }
-                onBoardingEntryPoint.node(this, buildContext, plugins = listOf(callback))
+                onBoardingEntryPoint
+                    .nodeBuilder(this, buildContext)
+                    .callback(callback)
+                    .build()
             }
             NavTarget.LoginFlow -> {
-                loginEntryPoint.node(this, buildContext)
+                loginEntryPoint.createNode(this, buildContext)
             }
         }
     }

appnav/src/main/kotlin/io/element/android/appnav/RoomFlowNode.kt

@@ -32,7 +32,7 @@ import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.NodeInputs
-import io.element.android.libraries.architecture.nodeInputs
+import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import kotlinx.parcelize.Parcelize
@@ -61,7 +61,7 @@ class RoomFlowNode @AssistedInject constructor(
         val room: MatrixRoom,
     ) : NodeInputs
 
-    private val inputs: Inputs by nodeInputs()
+    private val inputs: Inputs = inputs()
 
     init {
         lifecycle.subscribe(
@@ -79,7 +79,7 @@ class RoomFlowNode @AssistedInject constructor(
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             NavTarget.Messages -> {
-                messagesEntryPoint.node(this, buildContext)
+                messagesEntryPoint.createNode(this, buildContext)
             }
         }
     }

appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt

@@ -39,13 +39,13 @@ import com.bumble.appyx.navmodel.backstack.operation.push
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
+import io.element.android.appnav.di.MatrixClientsHolder
 import io.element.android.appnav.root.RootPresenter
 import io.element.android.appnav.root.RootView
 import io.element.android.features.rageshake.bugreport.BugReportEntryPoint
 import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.architecture.nodeInputsProvider
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.ApplicationContext
@@ -179,14 +179,14 @@ class RootFlowNode @AssistedInject constructor(
                     Timber.w("Couldn't find any session, go through SplashScreen")
                     backstack.newRoot(NavTarget.SplashScreen)
                 }
-                val inputsProvider = nodeInputsProvider(LoggedInFlowNode.Inputs(matrixClient))
+                val inputs = LoggedInFlowNode.Inputs(matrixClient)
                 val callback = object : LoggedInFlowNode.Callback {
                     override fun onOpenBugReport() {
                         backstack.push(NavTarget.BugReport)
                     }
                 }
                 val nodeLifecycleCallbacks = plugins<NodeLifecycleCallback>()
-                createNode<LoggedInFlowNode>(buildContext, plugins = listOf(inputsProvider, callback) + nodeLifecycleCallbacks)
+                createNode<LoggedInFlowNode>(buildContext, plugins = listOf(inputs, callback) + nodeLifecycleCallbacks)
             }
             NavTarget.NotLoggedInFlow -> createNode<NotLoggedInFlowNode>(buildContext)
             NavTarget.SplashScreen -> splashNode(buildContext)
@@ -196,7 +196,10 @@ class RootFlowNode @AssistedInject constructor(
                         backstack.pop()
                     }
                 }
-                bugReportEntryPoint.node(this, buildContext, plugins = listOf(callback))
+                bugReportEntryPoint
+                    .nodeBuilder(this, buildContext)
+                    .callback(callback)
+                    .build()
             }
         }
     }

appnav/src/main/kotlin/io/element/android/appnav/di/MatrixClientsHolder.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.appnav
+package io.element.android.appnav.di
 
 import android.os.Bundle
 import io.element.android.libraries.di.AppScope

features/login/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt

@@ -16,6 +16,6 @@
 
 package io.element.android.features.login.api
 
-import io.element.android.libraries.architecture.FeatureEntryPoint
+import io.element.android.libraries.architecture.SimpleFeatureEntryPoint
 
-interface LoginEntryPoint : FeatureEntryPoint
+interface LoginEntryPoint : SimpleFeatureEntryPoint

features/login/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt

@@ -18,7 +18,6 @@ package io.element.android.features.login.impl
 
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.features.login.api.LoginEntryPoint
 import io.element.android.libraries.architecture.createNode
@@ -27,7 +26,7 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class DefaultLoginEntryPoint @Inject constructor() : LoginEntryPoint {
-    override fun node(parentNode: Node, buildContext: BuildContext, plugins: List<Plugin>): Node {
+    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
-        return parentNode.createNode<LoginFlowNode>(buildContext, plugins)
+        return parentNode.createNode<LoginFlowNode>(buildContext)
     }
 }

features/login/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt

@@ -22,7 +22,6 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.composable.Children
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.push

features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt

@@ -16,6 +16,6 @@
 
 package io.element.android.features.messages.api
 
-import io.element.android.libraries.architecture.FeatureEntryPoint
+import io.element.android.libraries.architecture.SimpleFeatureEntryPoint
 
-interface MessagesEntryPoint : FeatureEntryPoint
+interface MessagesEntryPoint : SimpleFeatureEntryPoint

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPoint.kt

@@ -18,7 +18,6 @@ package io.element.android.features.messages.impl
 
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.libraries.architecture.createNode
@@ -27,7 +26,7 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class DefaultMessagesEntryPoint @Inject constructor() : MessagesEntryPoint {
-    override fun node(parentNode: Node, buildContext: BuildContext, plugins: List<Plugin>): Node {
+    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
-        return parentNode.createNode<MessagesNode>(buildContext, plugins)
+        return parentNode.createNode<MessagesNode>(buildContext)
     }
 }

features/onboarding/src/main/kotlin/io/element/android/features/onboarding/api/OnBoardingEntryPoint.kt

@@ -16,10 +16,20 @@
 
 package io.element.android.features.onboarding.api
 
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface OnBoardingEntryPoint : FeatureEntryPoint {
+
+    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+
+    interface NodeBuilder {
+        fun callback(callback: Callback): NodeBuilder
+        fun build(): Node
+    }
+
     interface Callback : Plugin {
         fun onSignUp()
         fun onSignIn()

features/onboarding/src/main/kotlin/io/element/android/features/onboarding/impl/DefaultOnBoardingEntryPoint.kt

@@ -27,7 +27,19 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class DefaultOnBoardingEntryPoint @Inject constructor() : OnBoardingEntryPoint {
-    override fun node(parentNode: Node, buildContext: BuildContext, plugins: List<Plugin>): Node {
+    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): OnBoardingEntryPoint.NodeBuilder {
-        return parentNode.createNode<OnBoardingNode>(buildContext, plugins)
+        return object : OnBoardingEntryPoint.NodeBuilder {
+
+            val plugins = ArrayList<Plugin>()
+
+            override fun callback(callback: OnBoardingEntryPoint.Callback): OnBoardingEntryPoint.NodeBuilder {
+                plugins += callback
+                return this
+            }
+
+            override fun build(): Node {
+                return parentNode.createNode<OnBoardingNode>(buildContext, plugins)
+            }
+        }
     }
 }

features/preferences/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt

@@ -16,10 +16,20 @@
 
 package io.element.android.features.preferences.api
 
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
-interface PreferencesEntryPoint: FeatureEntryPoint {
+interface PreferencesEntryPoint : FeatureEntryPoint {
+
+    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+
+    interface NodeBuilder {
+        fun callback(callback: Callback): NodeBuilder
+        fun build(): Node
+    }
+
     interface Callback : Plugin {
         fun onOpenBugReport()
     }

features/preferences/src/main/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPoint.kt

@@ -27,7 +27,17 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class DefaultPreferencesEntryPoint @Inject constructor() : PreferencesEntryPoint {
-    override fun node(parentNode: Node, buildContext: BuildContext, plugins: List<Plugin>): Node {
+    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): PreferencesEntryPoint.NodeBuilder {
-        return parentNode.createNode<PreferencesFlowNode>(buildContext, plugins)
+        return object : PreferencesEntryPoint.NodeBuilder {
+            val plugins = ArrayList<Plugin>()
+            override fun callback(callback: PreferencesEntryPoint.Callback): PreferencesEntryPoint.NodeBuilder {
+                plugins += callback
+                return this
+            }
+
+            override fun build(): Node {
+                return parentNode.createNode<PreferencesFlowNode>(buildContext)
+            }
+        }
     }
 }

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportEntryPoint.kt

@@ -16,10 +16,20 @@
 
 package io.element.android.features.rageshake.bugreport
 
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface BugReportEntryPoint : FeatureEntryPoint {
+
+    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+
+    interface NodeBuilder {
+        fun callback(callback: Callback): NodeBuilder
+        fun build(): Node
+    }
+
     interface Callback : Plugin {
         fun onBugReportSent()
     }

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/DefaultBugReportEntryPoint.kt

@@ -26,7 +26,19 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class DefaultBugReportEntryPoint @Inject constructor() : BugReportEntryPoint {
-    override fun node(parentNode: Node, buildContext: BuildContext, plugins: List<Plugin>): Node {
+    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): BugReportEntryPoint.NodeBuilder {
-        return parentNode.createNode<BugReportNode>(buildContext, plugins)
+
+        val plugins = ArrayList<Plugin>()
+
+        return object : BugReportEntryPoint.NodeBuilder {
+            override fun callback(callback: BugReportEntryPoint.Callback): BugReportEntryPoint.NodeBuilder {
+                plugins += callback
+                return this
+            }
+
+            override fun build(): Node {
+                return parentNode.createNode<BugReportNode>(buildContext)
+            }
+        }
     }
 }

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt

@@ -16,13 +16,23 @@
 
 package io.element.android.features.roomlist.api
 
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
 
 interface RoomListEntryPoint : FeatureEntryPoint {
+
+    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+    interface NodeBuilder {
+        fun callback(callback: Callback): NodeBuilder
+        fun build(): Node
+    }
+
     interface Callback : Plugin {
         fun onRoomClicked(roomId: RoomId)
         fun onSettingsClicked()
     }
 }
+

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/impl/DefaultRoomListEntryPoint.kt

@@ -27,7 +27,22 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class DefaultRoomListEntryPoint @Inject constructor() : RoomListEntryPoint {
-    override fun node(parentNode: Node, buildContext: BuildContext, plugins: List<Plugin>): Node {
+
-        return parentNode.createNode<RoomListNode>(buildContext, plugins)
+    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomListEntryPoint.NodeBuilder {
+
+        val plugins = ArrayList<Plugin>()
+
+        return object : RoomListEntryPoint.NodeBuilder {
+
+            override fun callback(callback: RoomListEntryPoint.Callback): RoomListEntryPoint.NodeBuilder {
+                plugins += callback
+                return this
+            }
+
+            override fun build(): Node {
+                return parentNode.createNode<RoomListNode>(buildContext, plugins)
+            }
+        }
     }
 }
+

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt

@@ -25,6 +25,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummaryPlaceholders
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.parallelMap
 import io.element.android.libraries.dateformatter.api.LastMessageFormatter

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt

@@ -17,6 +17,7 @@
 package io.element.android.features.roomlist.impl
 
 import androidx.compose.runtime.Immutable
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.libraries.matrix.ui.model.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt

@@ -17,6 +17,8 @@
 package io.element.android.features.roomlist.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummaryPlaceholders
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.ui.model.MatrixUser

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt

@@ -36,6 +36,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.Velocity
 import io.element.android.features.roomlist.impl.components.RoomListTopBar
 import io.element.android.features.roomlist.impl.components.RoomSummaryRow
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.components.Scaffold

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt

@@ -53,8 +53,8 @@ import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.google.accompanist.placeholder.material.placeholder
-import io.element.android.features.roomlist.impl.RoomListRoomSummary
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
-import io.element.android.features.roomlist.impl.RoomListRoomSummaryProvider
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummaryProvider
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummary.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.roomlist.impl
+package io.element.android.features.roomlist.impl.model
 
 import androidx.compose.runtime.Immutable
 import io.element.android.libraries.designsystem.components.avatar.AvatarData

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryPlaceholders.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.roomlist.impl
+package io.element.android.features.roomlist.impl.model
 
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.roomlist.impl
+package io.element.android.features.roomlist.impl.model
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.designsystem.components.avatar.AvatarData

features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt

@@ -24,7 +24,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.roomlist.impl.RoomListEvents
 import io.element.android.features.roomlist.impl.RoomListPresenter
-import io.element.android.features.roomlist.impl.RoomListRoomSummary
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.libraries.dateformatter.api.LastMessageFormatter
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL

libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/FeatureEntryPoint.kt

@@ -18,8 +18,9 @@ package io.element.android.libraries.architecture
 
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
 
-interface FeatureEntryPoint {
+interface FeatureEntryPoint
-    fun node(parentNode: Node, buildContext: BuildContext, plugins: List<Plugin> = emptyList()): Node
+
+interface SimpleFeatureEntryPoint : FeatureEntryPoint {
+    fun createNode(parentNode: Node, buildContext: BuildContext): Node
 }

libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeInputs.kt

@@ -19,18 +19,9 @@ package io.element.android.libraries.architecture
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
-import kotlin.properties.ReadOnlyProperty
 
-interface NodeInputs
+interface NodeInputs : Plugin
 
-interface NodeInputsProvider<I : NodeInputs> : Plugin {
+inline fun <reified I : NodeInputs> Node.inputs(): I {
-    fun inputs(): I
+    return plugins<I>().firstOrNull() ?: throw RuntimeException("Make sure to actually pass NodeInputs plugin to your node")
-}
-
-inline fun <reified I : NodeInputs> nodeInputsProvider(inputs: I) = object : NodeInputsProvider<I> {
-    override fun inputs() = inputs
-}
-
-fun <I : NodeInputs> nodeInputs() = ReadOnlyProperty<Node, I> { thisRef, _ ->
-    thisRef.plugins<NodeInputsProvider<I>>().first().inputs()
 }