WIP

Author: wenli-cai

workflow-trace-viewer/api/workflow-trace-viewer.api

@@ -14,33 +14,14 @@ public final class com/squareup/workflow1/traceviewer/MainKt {
 	public static synthetic fun main ([Ljava/lang/String;)V
 }
 
-public final class com/squareup/workflow1/traceviewer/model/Node {
+public final class com/squareup/workflow1/traceviewer/SandboxState {
 	public static final field $stable I
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getChildren ()Ljava/util/List;
-	public final fun getId ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getParent ()Ljava/lang/String;
-	public final fun getParentId ()Ljava/lang/String;
-	public final fun getProps ()Ljava/lang/Object;
-	public final fun getRenderings ()Ljava/lang/Object;
-	public final fun getState ()Ljava/lang/Object;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/squareup/workflow1/traceviewer/ui/FrameSelectTabKt {
-	public static final fun FrameSelectTab (Ljava/util/List;ILkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
-}
-
-public final class com/squareup/workflow1/traceviewer/ui/WorkflowInfoPanelKt {
-	public static final fun RightInfoPanel (Lcom/squareup/workflow1/traceviewer/model/Node;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
-}
-
-public final class com/squareup/workflow1/traceviewer/ui/WorkflowTreeKt {
-	public static final fun RenderDiagram (Lio/github/vinceglb/filekit/PlatformFile;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
+	public fun <init> ()V
+	public final fun getOffset-F1C5BW0 ()J
+	public final fun getScale ()F
+	public final fun reset ()V
+	public final fun setOffset-k-4lQ0M (J)V
+	public final fun setScale (F)V
 }
 
 public final class com/squareup/workflow1/traceviewer/util/ComposableSingletons$UploadFileKt {
@@ -50,28 +31,8 @@ public final class com/squareup/workflow1/traceviewer/util/ComposableSingletons$
 	public final fun getLambda-1$wf1_workflow_trace_viewer ()Lkotlin/jvm/functions/Function3;
 }
 
-public final class com/squareup/workflow1/traceviewer/util/JsonParserKt {
-	public static final field ROOT_ID Ljava/lang/String;
-	public static final fun parseTrace (Lio/github/vinceglb/filekit/PlatformFile;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class com/squareup/workflow1/traceviewer/util/ParseResult {
-}
-
-public final class com/squareup/workflow1/traceviewer/util/ParseResult$Failure : com/squareup/workflow1/traceviewer/util/ParseResult {
-	public static final field $stable I
-	public fun <init> (Ljava/lang/Throwable;)V
-	public final fun getError ()Ljava/lang/Throwable;
-}
-
-public final class com/squareup/workflow1/traceviewer/util/ParseResult$Success : com/squareup/workflow1/traceviewer/util/ParseResult {
-	public static final field $stable I
-	public fun <init> (Ljava/util/List;)V
-	public final fun getTrace ()Ljava/util/List;
-}
-
 public final class com/squareup/workflow1/traceviewer/util/SandboxBackgroundKt {
-	public static final fun SandboxBackground (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
+	public static final fun SandboxBackground (Lcom/squareup/workflow1/traceviewer/SandboxState;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
 }
 
 public final class com/squareup/workflow1/traceviewer/util/UploadFileKt {

workflow-trace-viewer/build.gradle.kts

@@ -27,6 +27,14 @@ kotlin {
         implementation(libs.filekit.dialogs.compose)
       }
     }
+    
+    jvmTest {
+      dependencies {
+        implementation(kotlin("test"))
+        implementation(kotlin("test-junit5"))
+        implementation("org.junit.jupiter:junit-jupiter:5.9.2")
+      }
+    }
   }
 }
 
@@ -50,3 +58,10 @@ compose {
     }
   }
 }
+
+tasks.named<Test>("jvmTest") {
+    useJUnitPlatform()
+    testLogging {
+        events("passed", "skipped", "failed")
+    }
+}

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/App.kt

@@ -79,7 +79,7 @@ public fun App(
   }
 }
 
-class SandboxState {
+internal class SandboxState {
   var offset by mutableStateOf(Offset.Zero)
   var scale by mutableStateOf(1f)
 

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/model/Node.kt

@@ -7,25 +7,27 @@ package com.squareup.workflow1.traceviewer.model
  *
  * TBD what more metadata should be involved with each node, e.g. (props, states, # of render passes)
  */
-public class Node(
+internal data class Node(
   val name: String,
+  val id: String,
   val parent: String,
-  val props: Any? = null,
-  val state: Any? = null,
-  val renderings: Any? = null,
-  val children: MutableList<Node>,
-  val id: String
+  val parentId: String,
+  val props: String,
+  val state: String,
+  val rendering: String = "",
+  val children: List<Node>,
 ) {
 
   fun copy(): Node {
     return Node(
       name = name,
+      id = id,
       parent = parent,
+      parentId = parentId,
       props = props,
       state = state,
       rendering = rendering,
-      children = children.map { it.copy() }.toMutableList(),
-      id = id
+      children = children,
     )
   }
 
@@ -43,3 +45,11 @@ public class Node(
     return id.hashCode()
   }
 }
+
+internal fun Node.addChild(child: Node): Node {
+  return copy( children = this.children + child )
+}
+
+internal fun Node.replaceChild(child: Node): Node {
+  return copy(children = this.children.map { if (it.id == child.id) child else it })
+}

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/FrameSelectTab.kt

@@ -18,7 +18,7 @@ import com.squareup.workflow1.traceviewer.model.Node
  * A trace tab selector that allows devs to switch between different states within the provided trace.
  */
 @Composable
-public fun FrameSelectTab(
+internal fun FrameSelectTab(
   frames: List<Node>,
   currentIndex: Int,
   onIndexChange: (Int) -> Unit,

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/WorkflowInfoPanel.kt

@@ -36,7 +36,7 @@ import com.squareup.workflow1.traceviewer.model.Node
  * @param selectedNode The currently selected workflow node, or null if no node is selected.
  */
 @Composable
-public fun RightInfoPanel(
+internal fun RightInfoPanel(
   selectedNode: Node?,
   modifier: Modifier = Modifier
 ) {

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/WorkflowTree.kt

@@ -29,7 +29,7 @@ import io.github.vinceglb.filekit.PlatformFile
  * tabs. This will also all errors related to errors parsing a given trace JSON file.
  */
 @Composable
-public fun RenderDiagram(
+internal fun RenderDiagram(
   traceFile: PlatformFile,
   frameInd: Int,
   onFileParse: (List<Node>) -> Unit,
@@ -51,7 +51,7 @@ public fun RenderDiagram(
       is ParseResult.Success -> {
         val parsedFrames = parseResult.trace ?: emptyList()
         frames = parsedFrames
-        mainTree = parseResult.mainTree
+        mainTree = parseResult.trees.first()
         onFileParse(parsedFrames)
         isLoading = false
       }

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/JsonParser.kt

@@ -5,6 +5,8 @@ import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import com.squareup.workflow1.traceviewer.model.Node
+import com.squareup.workflow1.traceviewer.model.addChild
+import com.squareup.workflow1.traceviewer.model.replaceChild
 import io.github.vinceglb.filekit.PlatformFile
 import io.github.vinceglb.filekit.readString
 
@@ -21,34 +23,50 @@ const val ROOT_ID: String = "-1"
  * @return A [ParseResult] representing result of parsing, either an error related to the
  * format of the JSON, or a success and a parsed trace.
  */
-public suspend fun parseTrace(
+internal suspend fun parseTrace(
   file: PlatformFile,
 ): ParseResult {
-  return try {
-    val jsonString = file.readString()
-    val workflowAdapter = createMoshiAdapter()
-    val parsedRenderPasses = workflowAdapter.fromJson(jsonString)
-
-    var mainWorkflowTree: Node? = null
-    val parsedFrame = mutableListOf<Node>()
-    parsedRenderPasses?.forEach { renderPass ->
-      val parsed = getFrameFromRenderPass(renderPass)
-      if (mainWorkflowTree == null) {
-        mainWorkflowTree = parsed
-      } else {
-        mergeFrameIntoMainTree(parsed, mainWorkflowTree!!)
-      }
-      parsedFrame.add(parsed)
-    }
+  val jsonString = file.readString()
+  val workflowAdapter = createMoshiAdapter()
+  val parsedRenderPasses = try {
+    workflowAdapter.fromJson(jsonString) ?: return ParseResult.Failure(
+      IllegalArgumentException("The provided file does not contain a valid trace.")
+    )
     /*
       this parsing method can never be called without a provided file, so we can assume that there
       will always be at least one render pass in the trace. If not, then Moshi would catch any
       malformed JSON and throw an error beforehand.
      */
-    ParseResult.Success(parsedFrame, mainWorkflowTree!!)
   } catch (e: Exception) {
-    ParseResult.Failure(e)
+    return ParseResult.Failure(e)
+  }
+
+  var mainWorkflowTree: Node? = null
+  // var parsedTrace = mutableListOf<Node>()
+  val frameTrees = mutableListOf<Node>()
+  // unParsedTrace.forEach { renderPass ->
+  //   val parsed = getFrameFromRenderPass(renderPass)
+  //   if (mainWorkflowTree == null) {
+  //     mainWorkflowTree = parsed
+  //   } else {
+  //     mergeFrameIntoMainTree(parsed, mainWorkflowTree!!)
+  //   }
+  //   parsedTrace.add(parsed)
+  //   frameTrees.add(mainWorkflowTree!!.copy())
+  // }
+
+  val parsedTrace = parsedRenderPasses.map { renderPass -> getFrameFromRenderPass(renderPass)}
+
+  parsedTrace.fold(parsedTrace[0]) { tree, frame ->
+    // We assume that the first render pass is the main workflow tree.
+    // val parsedFrame = getFrameFromRenderPass(unParsedRenderPass)
+    val mergedTree = mergeFrameIntoMainTree(frame, tree)
+    // parsedTrace.add(parsedFrame)
+    frameTrees.add(mergedTree)
+    mergedTree
   }
+
+  return ParseResult.Success(parsedTrace, frameTrees)
 }
 
 /**
@@ -97,21 +115,30 @@ private fun buildTree(node: Node, childrenByParent: Map<String, List<Node>>): No
  * Every new frame starts with the same roots as the main tree, so we can do a simple traversal to
  * add any missing child nodes from the frame.
  */
-private fun mergeFrameIntoMainTree(
+internal fun mergeFrameIntoMainTree(
   frame: Node,
   main: Node
-) {
-  val children = frame.children
-  children.forEach { child ->
-    if (child in main.children) {
-      mergeFrameIntoMainTree(child, main.children.find { it.id == child.id }!!)
-    } else {
-      main.children.add(child)
-    }
+) : Node {
+  if (frame.id != main.id) {
+    throw IllegalArgumentException("Frame root ID does not match main tree root ID.")
+  }
+
+  return frame.children.fold(main) { mergedTree, child ->
+    // println(mergedTree)
+      val parent = mergedTree.children.singleOrNull() { it.id == child.id }
+
+      if (parent != null) {
+        // println("Merging child ${child.id} into parent ${parent.id}")
+        mergedTree.replaceChild(mergeFrameIntoMainTree(child, parent))
+      } else {
+        // println("Adding child ${child.id} to merged tree ${mergedTree.id}")
+        mergedTree.addChild(child)
+      }
   }
+    // println("Merged tree: $it")}
 }
 
-sealed interface ParseResult {
-  class Success(val trace: List<Node>?, val mainTree: Node) : ParseResult
+internal sealed interface ParseResult {
+  class Success(val trace: List<Node>?, val trees: List<Node>) : ParseResult
   class Failure(val error: Throwable) : ParseResult
 }

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/SandboxBackground.kt

@@ -27,7 +27,7 @@ import com.squareup.workflow1.traceviewer.SandboxState
  *
  */
 @Composable
-public fun SandboxBackground(
+internal fun SandboxBackground(
   sandboxState: SandboxState,
   modifier: Modifier = Modifier,
   content: @Composable () -> Unit,