condence subcommand (#465)

Co-authored-by: Ash Davies <[email protected]>
ashdavies · Aug 12, 2023 · 1c311de · 1c311de
1 parent 3029d96
commit 1c311de
Showing 1 changed file with 7 additions and 15 deletions.
diff --git a/compose-cli/src/commonMain/kotlin/io/ashdavies/notion/Subcommand.kt b/compose-cli/src/commonMain/kotlin/io/ashdavies/notion/Subcommand.kt
@@ -18,10 +18,14 @@ public fun ArgParser.Subcommand(
     onExecute: suspend CoroutineScope.() -> Unit = { },
     content: @Composable () -> Unit = { },
 ) {
-    val coroutineScope: CoroutineScope = rememberCoroutineScope()
+    val coroutineScope = rememberCoroutineScope()
 
-    val subcommand: Subcommand = rememberSubcommand(name, actionDescription) {
-        coroutineScope.launch { onExecute() }
+    val subcommand = remember(name, actionDescription) {
+        object : Subcommand(name, actionDescription) {
+            override fun execute() {
+                coroutineScope.launch { onExecute() }
+            }
+        }
     }
 
     LaunchedEffect(subcommand) {
@@ -30,15 +34,3 @@ public fun ArgParser.Subcommand(
 
     content()
 }
-
-@Composable
-@ExperimentalCli
-private fun rememberSubcommand(
-    name: String,
-    actionDescription: String,
-    block: (Subcommand) -> Unit,
-): Subcommand = remember(name, actionDescription) {
-    object : Subcommand(name, actionDescription) {
-        override fun execute() = block(this)
-    }
-}