Change RenderContext from inner class to nested class

Author: steve-the-edwards

workflow-core/src/commonMain/kotlin/com/squareup/workflow1/StatefulWorkflow.kt

@@ -5,8 +5,6 @@
 package com.squareup.workflow1
 
 import com.squareup.workflow1.RuntimeConfigOptions.STABLE_EVENT_HANDLERS
-import com.squareup.workflow1.StatefulWorkflow.RenderContext
-import com.squareup.workflow1.WorkflowAction.Companion.toString
 import kotlinx.coroutines.CoroutineScope
 import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName
@@ -75,7 +73,7 @@ public abstract class StatefulWorkflow<
   out RenderingT
   > : Workflow<PropsT, OutputT, RenderingT>, IdCacheable {
 
-  public inner class RenderContext internal constructor(
+  public class RenderContext<PropsT, StateT, OutputT> internal constructor(
     baseContext: BaseRenderContext<PropsT, StateT, OutputT>
   ) : BaseRenderContext<PropsT, StateT, OutputT> by baseContext {
     @PublishedApi
@@ -748,15 +746,6 @@ public abstract class StatefulWorkflow<
       ?: onFailedCast(name, CurrentStateT::class, state)
   }
 
-  @PublishedApi
-  internal fun defaultOnFailedCast(
-    name: String,
-    expectedType: KClass<*>,
-    state: StateT
-  ) {
-    println("$name expected state of type ${expectedType.simpleName}, got $state")
-  }
-
   /**
    * Called from [RenderContext.renderChild] when the state machine is first started, to get the
    * initial state.
@@ -829,7 +818,7 @@ public abstract class StatefulWorkflow<
   public abstract fun render(
     renderProps: PropsT,
     renderState: StateT,
-    context: RenderContext
+    context: RenderContext<PropsT, StateT, OutputT>
   ): RenderingT
 
   /**
@@ -861,6 +850,18 @@ public abstract class StatefulWorkflow<
    */
   final override fun asStatefulWorkflow(): StatefulWorkflow<PropsT, StateT, OutputT, RenderingT> =
     this
+
+  companion object {
+
+    @PublishedApi
+    internal fun <StateT> defaultOnFailedCast(
+      name: String,
+      expectedType: KClass<*>,
+      state: StateT
+    ) {
+      println("$name expected state of type ${expectedType.simpleName}, got $state")
+    }
+  }
 }
 
 /**
@@ -870,21 +871,16 @@ public abstract class StatefulWorkflow<
 public fun <PropsT, StateT, OutputT, RenderingT> RenderContext(
   baseContext: BaseRenderContext<PropsT, StateT, OutputT>,
   workflow: StatefulWorkflow<PropsT, StateT, OutputT, RenderingT>
-): StatefulWorkflow<PropsT, StateT, OutputT, RenderingT>.RenderContext =
-  (baseContext as? StatefulWorkflow<PropsT, StateT, OutputT, RenderingT>.RenderContext)
-    ?: workflow.RenderContext(baseContext)
+): StatefulWorkflow.RenderContext<PropsT, StateT, OutputT> =
+  (baseContext as? StatefulWorkflow.RenderContext<PropsT, StateT, OutputT>)
+    ?: StatefulWorkflow.RenderContext<PropsT, StateT, OutputT>(baseContext)
 
 /**
  * Returns a stateful [Workflow] implemented via the given functions.
  */
 public inline fun <PropsT, StateT, OutputT, RenderingT> Workflow.Companion.stateful(
   crossinline initialState: (PropsT, Snapshot?) -> StateT,
-  crossinline render: StatefulWorkflow<
-    PropsT,
-    StateT,
-    OutputT,
-    *
-    >.RenderContext.(
+  crossinline render: StatefulWorkflow.RenderContext<PropsT, StateT, OutputT>.(
     props: PropsT,
     state: StateT
   ) -> RenderingT,
@@ -910,7 +906,7 @@ public inline fun <PropsT, StateT, OutputT, RenderingT> Workflow.Companion.state
     override fun render(
       renderProps: PropsT,
       renderState: StateT,
-      context: RenderContext
+      context: RenderContext<PropsT, StateT, OutputT>
     ): RenderingT = render(context, renderProps, renderState)
 
     override fun snapshotState(state: StateT) = snapshot(state)
@@ -921,12 +917,7 @@ public inline fun <PropsT, StateT, OutputT, RenderingT> Workflow.Companion.state
  */
 public inline fun <StateT, OutputT, RenderingT> Workflow.Companion.stateful(
   crossinline initialState: (Snapshot?) -> StateT,
-  crossinline render: StatefulWorkflow<
-    Unit,
-    StateT,
-    OutputT,
-    *
-    >.RenderContext.(state: StateT) -> RenderingT,
+  crossinline render: StatefulWorkflow.RenderContext<Unit, StateT, OutputT>.(state: StateT) -> RenderingT,
   crossinline snapshot: (StateT) -> Snapshot?
 ): StatefulWorkflow<Unit, StateT, OutputT, RenderingT> = stateful(
   { _, initialSnapshot -> initialState(initialSnapshot) },
@@ -941,7 +932,7 @@ public inline fun <StateT, OutputT, RenderingT> Workflow.Companion.stateful(
  */
 public inline fun <PropsT, StateT, OutputT, RenderingT> Workflow.Companion.stateful(
   crossinline initialState: (PropsT) -> StateT,
-  crossinline render: StatefulWorkflow<PropsT, StateT, OutputT, *>.RenderContext.(
+  crossinline render: StatefulWorkflow.RenderContext<PropsT, StateT, OutputT>.(
     props: PropsT,
     state: StateT
   ) -> RenderingT,
@@ -964,12 +955,9 @@ public inline fun <PropsT, StateT, OutputT, RenderingT> Workflow.Companion.state
  */
 public inline fun <StateT, OutputT, RenderingT> Workflow.Companion.stateful(
   initialState: StateT,
-  crossinline render: StatefulWorkflow<
-    Unit,
+  crossinline render: StatefulWorkflow.RenderContext<Unit,
     StateT,
-    OutputT,
-    *
-    >.RenderContext.(state: StateT) -> RenderingT
+    OutputT>.(state: StateT) -> RenderingT
 ): StatefulWorkflow<Unit, StateT, OutputT, RenderingT> = stateful(
   { initialState },
   { _, state -> render(state) }

workflow-core/src/commonMain/kotlin/com/squareup/workflow1/StatelessWorkflow.kt

@@ -29,7 +29,7 @@ public abstract class StatelessWorkflow<PropsT, OutputT, out RenderingT> :
   Workflow<PropsT, OutputT, RenderingT>, IdCacheable {
 
   @Suppress("UNCHECKED_CAST")
-  public inner class RenderContext internal constructor(
+  public class RenderContext<PropsT, OutputT> internal constructor(
     baseContext: BaseRenderContext<PropsT, *, OutputT>
   ) : BaseRenderContext<PropsT, Nothing, OutputT> by
   baseContext as BaseRenderContext<PropsT, Nothing, OutputT> {
@@ -235,14 +235,14 @@ public abstract class StatelessWorkflow<PropsT, OutputT, out RenderingT> :
      * render() is called.
      */
     private var cachedStatelessRenderContext:
-      StatelessWorkflow<PropsT, OutputT, RenderingT>.RenderContext? = null
+      StatelessWorkflow.RenderContext<PropsT, OutputT>? = null
 
     /**
      * We must know if the RenderContext we are passed (which is a StatefulWorkflow.RenderContext)
      * has changed, so keep track of it.
      */
     private var canonicalStatefulRenderContext:
-      StatefulWorkflow<PropsT, Unit, OutputT, RenderingT>.RenderContext? = null
+      StatefulWorkflow.RenderContext<PropsT, Unit, OutputT>? = null
 
     override fun initialState(
       props: PropsT,
@@ -252,7 +252,7 @@ public abstract class StatelessWorkflow<PropsT, OutputT, out RenderingT> :
     override fun render(
       renderProps: PropsT,
       renderState: Unit,
-      context: RenderContext
+      context: RenderContext<PropsT, Unit, OutputT>
     ): RenderingT {
       // The `RenderContext` used *might* change - primarily in the case of our tests. E.g., The
       // `RenderTester` uses a special NoOp context to render twice to test for idempotency.
@@ -306,7 +306,7 @@ public abstract class StatelessWorkflow<PropsT, OutputT, out RenderingT> :
    */
   public abstract fun render(
     renderProps: PropsT,
-    context: RenderContext
+    context: RenderContext<PropsT, OutputT>
   ): RenderingT
 
   /**
@@ -332,9 +332,9 @@ public abstract class StatelessWorkflow<PropsT, OutputT, out RenderingT> :
 public fun <PropsT, OutputT, RenderingT> RenderContext(
   baseContext: BaseRenderContext<PropsT, *, OutputT>,
   workflow: StatelessWorkflow<PropsT, OutputT, RenderingT>
-): StatelessWorkflow<PropsT, OutputT, RenderingT>.RenderContext =
-  (baseContext as? StatelessWorkflow<PropsT, OutputT, RenderingT>.RenderContext)
-    ?: workflow.RenderContext(baseContext)
+): StatelessWorkflow.RenderContext<PropsT, OutputT> =
+  (baseContext as? StatelessWorkflow.RenderContext<PropsT, OutputT>)
+    ?: StatelessWorkflow.RenderContext<PropsT, OutputT>(baseContext)
 
 /**
  * Returns a stateless [Workflow] via the given [render] function.
@@ -344,16 +344,12 @@ public fun <PropsT, OutputT, RenderingT> RenderContext(
  * their own internal state.
  */
 public inline fun <PropsT, OutputT, RenderingT> Workflow.Companion.stateless(
-  crossinline render: StatelessWorkflow<
-    PropsT,
-    OutputT,
-    RenderingT
-    >.RenderContext.(props: PropsT) -> RenderingT
+  crossinline render: StatelessWorkflow.RenderContext<PropsT, OutputT>.(props: PropsT) -> RenderingT
 ): Workflow<PropsT, OutputT, RenderingT> =
   object : StatelessWorkflow<PropsT, OutputT, RenderingT>() {
     override fun render(
       renderProps: PropsT,
-      context: RenderContext
+      context: RenderContext<PropsT, OutputT>
     ): RenderingT = render(context, renderProps)
   }