1340: Changing RenderContext from an inner class to a nested class with its own generics

benchmarks/performance-poetry/complex-poetry/src/main/java/com/squareup/benchmarks/performance/complex/poetry/MaybeLoadingGatekeeperWorkflow.kt

@@ -27,7 +27,7 @@ class MaybeLoadingGatekeeperWorkflow<T : Any>(
   override fun render(
     renderProps: Unit,
     renderState: IsLoading,
-    context: RenderContext
+    context: RenderContext<Unit, IsLoading, Unit>
   ): MayBeLoadingScreen {
     context.runningWorker(isLoading.asTraceableWorker("GatekeeperLoading")) {
       action("GatekeeperLoading") {

benchmarks/performance-poetry/complex-poetry/src/main/java/com/squareup/benchmarks/performance/complex/poetry/PerformancePoemWorkflow.kt

@@ -96,7 +96,7 @@ class PerformancePoemWorkflow(
   override fun render(
     renderProps: Poem,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Poem, State, ClosePoem>
   ): OverviewDetailScreen<*> {
     if (simulatedPerfConfig.simultaneousActions > 0) {
       repeat(simulatedPerfConfig.simultaneousActions) { index ->

benchmarks/performance-poetry/complex-poetry/src/main/java/com/squareup/benchmarks/performance/complex/poetry/PerformancePoemsBrowserWorkflow.kt

@@ -86,7 +86,7 @@ class PerformancePoemsBrowserWorkflow(
   override fun render(
     renderProps: ConfigAndPoems,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<ConfigAndPoems, State, Unit>
   ): OverviewDetailScreen<*> {
     when (renderState) {
       is Recurse -> {

design-docs/compose-based-workflows-design.md

@@ -282,7 +282,7 @@ A more interesting, comprehensive example that ties this in with the First Primi
 ```kotlin
 class IdentityWorkflow(
   private val child: Workflow<Props, Output, Rendering>
-) : StatelessWorkflow<Props, Output, Rendering {
+) : StatelessWorkflow<Props, Output, Rendering> {
   override fun render(props: Props, context: RenderContext): Rendering {
     return context.renderComposable {
       renderWorkflow(child, props, onOutput = { output ->
@@ -379,8 +379,7 @@ public abstract class ComposeWorkflow<
 To implement the `Workflow` interface, we need to have a function that returns a `StatefulWorkflow` with the actual implementation. That's trivial: we just return a really simple workflow that does nothing but call `renderComposable` from above in its render method:
 
 ```kotlin
-  private inner class ComposeWorkflowWrapper :
-    StatefulWorkflow<PropsT, Unit, OutputT, RenderingT>() {
+  inner class ComposeWorkflowWrapper : StatefulWorkflow<PropsT, Unit, OutputT, RenderingT>() {
 
     override fun initialState(
       props: PropsT,
@@ -392,7 +391,7 @@ To implement the `Workflow` interface, we need to have a function that returns a
     override fun render(
       renderProps: PropsT,
       renderState: Unit,
-      context: RenderContext
+      context: StatefulWorkflow.RenderContext<PropsT,Unit,OutputT>
     ): RenderingT = context.renderComposable {
       // Explicitly remember the output function since we know that actionSink
       // is stable even though Compose might not know that.

samples/compose-samples/src/main/java/com/squareup/sample/compose/hellocompose/HelloComposeWorkflow.kt

@@ -32,7 +32,7 @@ object HelloComposeWorkflow : StatefulWorkflow<Unit, State, Nothing, HelloCompos
   override fun render(
     renderProps: Unit,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Unit, State, Nothing>
   ): HelloComposeScreen = HelloComposeScreen(
     message = renderState.name,
     onClick = { context.actionSink.send(helloAction) }

samples/compose-samples/src/main/java/com/squareup/sample/compose/hellocomposebinding/HelloWorkflow.kt

@@ -39,7 +39,7 @@ object HelloWorkflow : StatefulWorkflow<Unit, State, Nothing, Rendering>() {
   override fun render(
     renderProps: Unit,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Unit, State, Nothing>
   ): Rendering {
     return Rendering(
       message = renderState.name,

samples/compose-samples/src/main/java/com/squareup/sample/compose/hellocomposeworkflow/ComposeWorkflowImpl.kt

@@ -59,7 +59,7 @@ internal class ComposeWorkflowImpl<PropsT, OutputT : Any>(
   override fun render(
     renderProps: PropsT,
     renderState: State<PropsT, OutputT>,
-    context: RenderContext
+    context: RenderContext<PropsT, State<PropsT, OutputT>, OutputT>
   ): ComposeScreen {
     // The first render pass needs to cache the sink. The sink is reusable, so we can just pass the
     // same one every time.

samples/compose-samples/src/main/java/com/squareup/sample/compose/hellocomposeworkflow/HelloWorkflow.kt

@@ -37,7 +37,7 @@ object HelloWorkflow : StatefulWorkflow<Unit, State, Nothing, ComposeScreen>() {
   override fun render(
     renderProps: Unit,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Unit, State, Nothing>
   ): ComposeScreen =
     context.renderChild(HelloComposeWorkflow, renderState.name) { helloAction }
 

samples/compose-samples/src/main/java/com/squareup/sample/compose/inlinerendering/InlineRenderingWorkflow.kt

@@ -35,7 +35,7 @@ object InlineRenderingWorkflow : StatefulWorkflow<Unit, Int, Nothing, Screen>()
   override fun render(
     renderProps: Unit,
     renderState: Int,
-    context: RenderContext
+    context: RenderContext<Unit, Int, Nothing>
   ): ComposeScreen {
     val onClick = context.eventHandler("increment") { state += 1 }
     return ComposeScreen {

samples/compose-samples/src/main/java/com/squareup/sample/compose/nestedrenderings/RecursiveWorkflow.kt

@@ -57,7 +57,7 @@ object RecursiveWorkflow : StatefulWorkflow<Unit, State, Nothing, Screen>() {
   override fun render(
     renderProps: Unit,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Unit, State, Nothing>
   ): Rendering {
     return Rendering(
       children = List(renderState.children) { i ->

samples/compose-samples/src/main/java/com/squareup/sample/compose/textinput/TextInputWorkflow.kt

@@ -33,7 +33,7 @@ object TextInputWorkflow : StatefulWorkflow<Unit, State, Nothing, Rendering>() {
   override fun render(
     renderProps: Unit,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Unit, State, Nothing>
   ): Rendering = Rendering(
     textController = if (renderState.showingTextA) renderState.textA else renderState.textB,
     onSwapText = { context.actionSink.send(swapText) }

samples/containers/hello-back-button/src/main/java/com/squareup/sample/hellobackbutton/AreYouSureWorkflow.kt

@@ -30,8 +30,7 @@ import kotlinx.parcelize.Parcelize
  * Wraps [HelloBackButtonWorkflow] to (sometimes) pop a confirmation alert when the back
  * button is pressed.
  */
-object AreYouSureWorkflow :
-  StatefulWorkflow<Unit, State, Finished, Rendering>() {
+object AreYouSureWorkflow : StatefulWorkflow<Unit, State, Finished, Rendering>() {
   override fun initialState(
     props: Unit,
     snapshot: Snapshot?
@@ -64,7 +63,7 @@ object AreYouSureWorkflow :
   override fun render(
     renderProps: Unit,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Unit, State, Finished>
   ): Rendering {
     val ableBakerCharlie = context.renderChild(HelloBackButtonWorkflow, Unit) { noAction() }
 

samples/containers/hello-back-button/src/main/java/com/squareup/sample/hellobackbutton/HelloBackButtonWorkflow.kt

@@ -28,7 +28,7 @@ object HelloBackButtonWorkflow : StatefulWorkflow<Unit, State, Nothing, HelloBac
   override fun render(
     renderProps: Unit,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Unit, State, Nothing>
   ): HelloBackButtonScreen {
     return HelloBackButtonScreen(
       message = "$renderState",

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/PoemListWorkflow.kt

@@ -16,7 +16,7 @@ object PoemListWorkflow : StatelessWorkflow<Props, Int, PoemListScreen>() {
 
   override fun render(
     renderProps: Props,
-    context: RenderContext
+    context: RenderContext<Props, Int>
   ): PoemListScreen {
     return PoemListScreen(
       poems = renderProps.poems,

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/RealPoemWorkflow.kt

@@ -38,7 +38,7 @@ class RealPoemWorkflow : PoemWorkflow,
   override fun render(
     renderProps: Poem,
     renderState: SelectedStanza,
-    context: RenderContext
+    context: RenderContext<Poem, SelectedStanza, ClosePoem>
   ): OverviewDetailScreen<*> {
     val previousStanzas: List<StanzaScreen> =
       if (renderState == NO_SELECTED_STANZA) {

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/RealPoemsBrowserWorkflow.kt

@@ -37,7 +37,7 @@ class RealPoemsBrowserWorkflow(
   override fun render(
     renderProps: ConfigAndPoems,
     renderState: SelectedPoem,
-    context: RenderContext
+    context: RenderContext<ConfigAndPoems, SelectedPoem, Unit>
   ): OverviewDetailScreen<*> {
     val poems =
       context.renderChild(PoemListWorkflow, Props(poems = renderProps.second)) { selected ->

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/StanzaListWorkflow.kt

@@ -22,7 +22,7 @@ object StanzaListWorkflow : StatelessWorkflow<Props, SelectedStanza, StanzaListS
 
   override fun render(
     renderProps: Props,
-    context: RenderContext
+    context: RenderContext<Props, SelectedStanza>
   ): StanzaListScreen {
     val poem = renderProps.poem
     return StanzaListScreen(

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/StanzaWorkflow.kt

@@ -23,7 +23,7 @@ object StanzaWorkflow : StatelessWorkflow<Props, Output, StanzaScreen>() {
 
   override fun render(
     renderProps: Props,
-    context: RenderContext
+    context: RenderContext<Props, Output>
   ): StanzaScreen {
     with(renderProps) {
       val onGoBack: (() -> Unit)? = when (index) {

samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/DungeonAppWorkflow.kt

@@ -41,7 +41,7 @@ class DungeonAppWorkflow(
   override fun render(
     renderProps: Props,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Props, State, Nothing>
   ): BodyAndOverlaysScreen<Screen, Overlay> = when (renderState) {
     LoadingBoardList -> {
       context.runningWorker(boardLoader.loadAvailableBoards()) { displayBoards(it) }

samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/GameSessionWorkflow.kt

@@ -51,7 +51,7 @@ class GameSessionWorkflow(
   override fun render(
     renderProps: Props,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Props, State, Nothing>
   ): BodyAndOverlaysScreen<Screen, Overlay> = when (renderState) {
     Loading -> {
       context.runningWorker(boardLoader.loadBoard(renderProps.boardPath)) { StartRunning(it) }

samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/TimeMachineAppWorkflow.kt

@@ -30,7 +30,7 @@ class TimeMachineAppWorkflow(
 
   override fun render(
     renderProps: BoardPath,
-    context: RenderContext
+    context: RenderContext<BoardPath, Nothing>
   ): ShakeableTimeMachineScreen {
     val propsFactory = PropsFactory { recording ->
       Props(paused = !recording)

samples/dungeon/common/src/main/java/com/squareup/sample/dungeon/AiWorkflow.kt

@@ -54,7 +54,7 @@ class AiWorkflow(
   override fun render(
     renderProps: ActorProps,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<ActorProps, State, Nothing>
   ): ActorRendering {
     context.runningWorker(renderState.directionTicker) { updateDirection }
 

samples/dungeon/common/src/main/java/com/squareup/sample/dungeon/GameWorkflow.kt

@@ -93,7 +93,7 @@ class GameWorkflow(
   override fun render(
     renderProps: Props,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Props, State, Output>
   ): GameRendering {
     val running = !renderProps.paused && !renderState.game.isPlayerEaten
     // Stop actors from ticking if the game is paused or finished.

samples/dungeon/common/src/main/java/com/squareup/sample/dungeon/PlayerWorkflow.kt

@@ -47,7 +47,7 @@ class PlayerWorkflow(
   override fun render(
     renderProps: ActorProps,
     renderState: Movement,
-    context: RenderContext
+    context: RenderContext<ActorProps, Movement, Nothing>
   ): Rendering = Rendering(
     actorRendering = ActorRendering(avatar = avatar, movement = renderState),
     onStartMoving = { context.actionSink.send(StartMoving(it)) },

samples/dungeon/timemachine-shakeable/src/main/java/com/squareup/sample/timemachine/shakeable/ShakeableTimeMachineWorkflow.kt

@@ -54,7 +54,7 @@ class ShakeableTimeMachineWorkflow<P, O : Any, out R : Screen>(
   override fun render(
     renderProps: PropsFactory<P>,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<PropsFactory<P>, State, O>
   ): ShakeableTimeMachineScreen {
     // Only listen to shakes when recording.
     if (renderState === Recording) context.runningWorker(shakeWorker) { onShake }

samples/dungeon/timemachine/src/main/java/com/squareup/sample/timemachine/RecorderWorkflow.kt

@@ -76,7 +76,7 @@ internal class RecorderWorkflow<T>(
   override fun render(
     renderProps: RecorderProps<T>,
     renderState: Recording<T>,
-    context: RenderContext
+    context: RenderContext<RecorderProps<T>, Recording<T>, Nothing>
   ): TimeMachineRendering<T> {
     val value = when (renderProps) {
       is RecordValue -> renderProps.value

samples/dungeon/timemachine/src/main/java/com/squareup/sample/timemachine/TimeMachineWorkflow.kt

@@ -68,7 +68,7 @@ class TimeMachineWorkflow<P, O : Any, out R>(
 
   override fun render(
     renderProps: TimeMachineProps<P>,
-    context: RenderContext
+    context: RenderContext<TimeMachineProps<P>, O>
   ): TimeMachineRendering<R> {
     // Always render the delegate, even if in playback mode, to keep it alive.
     val delegateRendering =

samples/hello-terminal/hello-terminal-app/src/main/java/com/squareup/sample/helloterminal/BlinkingCursorWorkflow.kt

@@ -35,7 +35,7 @@ class BlinkingCursorWorkflow(
   override fun render(
     renderProps: Unit,
     renderState: Boolean,
-    context: RenderContext
+    context: RenderContext<Unit, Boolean, Nothing>
   ): String {
     context.runningWorker(intervalWorker) { setCursorShowing(it) }
     return if (renderState) cursorString else ""

samples/hello-terminal/hello-terminal-app/src/main/java/com/squareup/sample/helloterminal/HelloTerminalWorkflow.kt

@@ -37,7 +37,7 @@ class HelloTerminalWorkflow : TerminalWorkflow,
   override fun render(
     renderProps: TerminalProps,
     renderState: State,
-    context: RenderContext
+    context: StatefulWorkflow.RenderContext<TerminalProps, State, ExitCode>
   ): TerminalRendering {
     val (rows, columns) = renderProps.size
     val header = """

samples/hello-terminal/todo-terminal-app/src/main/java/com/squareup/sample/hellotodo/EditTextWorkflow.kt

@@ -49,7 +49,7 @@ class EditTextWorkflow : StatefulWorkflow<EditTextProps, EditTextState, String,
   override fun render(
     renderProps: EditTextProps,
     renderState: EditTextState,
-    context: RenderContext
+    context: StatefulWorkflow.RenderContext<EditTextProps, EditTextState, String>
   ): String {
     context.runningWorker(
       renderProps.terminalProps.keyStrokes

samples/hello-terminal/todo-terminal-app/src/main/java/com/squareup/sample/hellotodo/TodoWorkflow.kt

@@ -63,7 +63,7 @@ class TodoWorkflow : TerminalWorkflow,
   override fun render(
     renderProps: TerminalProps,
     renderState: TodoList,
-    context: RenderContext
+    context: StatefulWorkflow.RenderContext<TerminalProps, TodoList, ExitCode>
   ): TerminalRendering {
     context.runningWorker(renderProps.keyStrokes) { onKeystroke(it) }
 

samples/hello-workflow-fragment/src/main/java/com/squareup/sample/helloworkflowfragment/HelloWorkflow.kt

@@ -23,7 +23,7 @@ object HelloWorkflow : StatefulWorkflow<Unit, State, Nothing, HelloRendering>()
   override fun render(
     renderProps: Unit,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Unit, State, Nothing>
   ): HelloRendering {
     return HelloRendering(
       message = renderState.name,

samples/hello-workflow/src/main/java/com/squareup/sample/helloworkflow/HelloWorkflow.kt

@@ -23,7 +23,7 @@ object HelloWorkflow : StatefulWorkflow<Unit, State, Nothing, HelloRendering>()
   override fun render(
     renderProps: Unit,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Unit, State, Nothing>
   ): HelloRendering {
     return HelloRendering(
       message = renderState.name,

samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt

@@ -25,7 +25,7 @@ object NestedOverlaysWorkflow : StatefulWorkflow<Unit, State, Nothing, Screen>()
   override fun render(
     renderProps: Unit,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Unit, State, Nothing>
   ): Screen {
     if (renderState.nuked) {
       return ButtonBar(Button(R.string.reset, context.eventHandler("reset") { state = State() }))
@@ -126,7 +126,7 @@ object NestedOverlaysWorkflow : StatefulWorkflow<Unit, State, Nothing, Screen>()
 
   override fun snapshotState(state: State) = null
 
-  private fun RenderContext.topBottomBar(
+  private fun RenderContext<Unit, State, Nothing>.topBottomBar(
     top: Boolean,
     renderState: State
   ): ButtonBar {
@@ -145,7 +145,7 @@ object NestedOverlaysWorkflow : StatefulWorkflow<Unit, State, Nothing, Screen>()
     )
   }
 
-  private fun RenderContext.toggleInnerSheetButton(
+  private fun RenderContext<Unit, State, Nothing>.toggleInnerSheetButton(
     name: String,
     renderState: State
   ) =

samples/stub-visibility/src/main/java/com/squareup/sample/stubvisibility/StubVisibilityWorkflow.kt

@@ -25,7 +25,7 @@ object StubVisibilityWorkflow : StatefulWorkflow<Unit, State, Nothing, OuterRend
   override fun render(
     renderProps: Unit,
     renderState: State,
-    context: RenderContext
+    context: RenderContext<Unit, State, Nothing>
   ): OuterRendering = when (renderState) {
     HideBottom -> OuterRendering(
       top = ClickyTextRendering(message = "Click to show footer") {

samples/tictactoe/common/src/main/java/com/squareup/sample/authworkflow/AuthWorkflow.kt

@@ -68,7 +68,7 @@ class RealAuthWorkflow(private val authService: AuthService) : AuthWorkflow,
   override fun render(
     renderProps: Unit,
     renderState: AuthState,
-    context: RenderContext
+    context: RenderContext<Unit, AuthState, AuthResult>
   ): BackStackScreen<*> = when (renderState) {
     is LoginPrompt -> {
       BackStackScreen(

samples/tictactoe/common/src/main/java/com/squareup/sample/gameworkflow/RunGameWorkflow.kt

@@ -73,7 +73,7 @@ class RealRunGameWorkflow(
   override fun render(
     renderProps: Unit,
     renderState: RunGameState,
-    context: RenderContext
+    context: RenderContext<Unit, RunGameState, RunGameResult>
   ): RunGameRendering =
     when (renderState) {
       is NewGame -> {
@@ -189,12 +189,14 @@ class RealRunGameWorkflow(
       }
     }
 
-  private fun RenderContext.playAgain() = safeEventHandler<GameOver>("playAgain") { oldState ->
+  private fun RenderContext<Unit, RunGameState, RunGameResult>.playAgain() = safeEventHandler<GameOver>(
+    "playAgain"
+  ) { oldState ->
     val (x, o) = oldState.playerInfo
     state = NewGame(x, o)
   }
 
-  private fun RenderContext.trySaveAgain() =
+  private fun RenderContext<Unit, RunGameState, RunGameResult>.trySaveAgain() =
     safeEventHandler<GameOver>("trySaveAgain") { oldState ->
       check(oldState.syncState == SAVE_FAILED) {
         "Should only fire trySaveAgain in syncState $SAVE_FAILED, " +