Added Historical Data (#35)

Author: handstandsam

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/models/InvertPluginFileKey.kt

@@ -10,6 +10,7 @@ enum class InvertPluginFileKey(
 ) {
   DEPENDENCIES("dependencies.json", "Dependencies"),
   CONFIGURATIONS("configurations.json", "Configurations"),
+  HISTORICAL_DATA("historical_data.json", "Historical Data"),
   PLUGINS("plugins.json", "Plugins"),
   OWNERS("owners.json", "Owners"),
   METADATA("metadata.json", "Metadata"),

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/report/InvertReportWriter.kt

@@ -13,6 +13,7 @@ import com.squareup.invert.logging.InvertLogger
 import com.squareup.invert.models.DependencyId
 import com.squareup.invert.models.ModulePath
 import com.squareup.invert.models.js.CollectedStatTotalsJsReportModel
+import com.squareup.invert.models.js.HistoricalData
 import com.squareup.invert.models.js.MetadataJsReportModel
 import java.io.File
 
@@ -27,12 +28,13 @@ class InvertReportWriter(
     collectedDependencies: List<CollectedDependenciesForProject>,
     collectedConfigurations: List<CollectedConfigurationsForProject>,
     collectedPlugins: List<CollectedPluginsForProject>,
+    historicalData: List<HistoricalData>,
   ) {
     val collectedOwnershipInfo = InvertJsReportUtils.buildModuleToOwnerMap(collectedOwners)
     val allProjectsStatsData = InvertJsReportUtils.buildModuleToStatsMap(collectedStats)
     val directDependenciesJsReportModel = InvertJsReportUtils.toDirectDependenciesJsReportModel(collectedDependencies)
-    val invertedDependenciesJsReportModel = InvertJsReportUtils
-      .toInvertedDependenciesJsReportModel(collectedDependencies)
+    val invertedDependenciesJsReportModel =
+      InvertJsReportUtils.toInvertedDependenciesJsReportModel(collectedDependencies)
 
     assertModuleMatch(
       logger = invertLogger,
@@ -50,7 +52,8 @@ class InvertReportWriter(
       allProjectsStatsData = allProjectsStatsData,
       allPluginsData = collectedPlugins,
       allOwnersData = collectedOwners,
-      globalStats = globalStats
+      globalStats = globalStats,
+      historicalData = historicalData,
     )
 
     // HTML/JS Report
@@ -64,6 +67,7 @@ class InvertReportWriter(
       collectedOwnershipInfo = collectedOwnershipInfo,
       allProjectsConfigurationsData = collectedConfigurations,
       globalStatTotals = CollectedStatTotalsJsReportModel(globalStats),
+      historicalData = historicalData,
     )
   }
 

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/report/js/InvertJsReportWriter.kt

@@ -10,13 +10,15 @@ import com.squareup.invert.models.js.CollectedStatTotalsJsReportModel
 import com.squareup.invert.models.js.ConfigurationsJsReportModel
 import com.squareup.invert.models.js.DependenciesJsReportModel
 import com.squareup.invert.models.js.DirectDependenciesJsReportModel
+import com.squareup.invert.models.js.HistoricalData
 import com.squareup.invert.models.js.HomeJsReportModel
 import com.squareup.invert.models.js.JsReportFileKey
 import com.squareup.invert.models.js.MetadataJsReportModel
 import com.squareup.invert.models.js.OwnershipJsReportModel
 import com.squareup.invert.models.js.PluginsJsReportModel
 import com.squareup.invert.models.js.StatsJsReportModel
 import kotlinx.serialization.KSerializer
+import kotlinx.serialization.builtins.ListSerializer
 import java.io.File
 
 class InvertJsReportWriter(
@@ -35,6 +37,7 @@ class InvertJsReportWriter(
     collectedOwnershipInfo: OwnershipJsReportModel,
     globalStatTotals: CollectedStatTotalsJsReportModel,
     reportMetadata: MetadataJsReportModel,
+    historicalData: List<HistoricalData>,
   ) {
     val pluginsReport = InvertJsReportUtils.toCollectedPlugins(allPluginsData)
     val modulesList = allProjectsDependencyData.map { it.path }
@@ -51,6 +54,12 @@ class InvertJsReportWriter(
       value = reportMetadata
     )
 
+    writeJsFileInDir(
+      fileKey = JsReportFileKey.HISTORICAL_DATA,
+      serializer = ListSerializer(HistoricalData.serializer()),
+      value = historicalData
+    )
+
     writeJsFileInDir(
       fileKey = JsReportFileKey.OWNERS,
       serializer = OwnershipJsReportModel.serializer(),

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/report/json/InvertJsonReportWriter.kt

@@ -10,8 +10,8 @@ import com.squareup.invert.logging.InvertLogger
 import com.squareup.invert.logging.SystemOutInvertLogger
 import com.squareup.invert.models.InvertSerialization.InvertJson
 import com.squareup.invert.models.StatKey
-import com.squareup.invert.models.StatMetadata
 import com.squareup.invert.models.js.CollectedStatTotalsJsReportModel
+import com.squareup.invert.models.js.HistoricalData
 import com.squareup.invert.models.js.MetadataJsReportModel
 import com.squareup.invert.models.js.StatTotalAndMetadata
 import com.squareup.invert.models.js.StatsJsReportModel
@@ -32,6 +32,7 @@ class InvertJsonReportWriter(
     allOwnersData: List<CollectedOwnershipForProject>,
     globalStats: Map<StatKey, StatTotalAndMetadata>,
     reportMetadata: MetadataJsReportModel,
+    historicalData: List<HistoricalData>,
   ) {
     writeJsonFileInDir(
       jsonFileKey = InvertPluginFileKey.METADATA,
@@ -43,6 +44,11 @@ class InvertJsonReportWriter(
       serializer = ListSerializer(CollectedPluginsForProject.serializer()),
       value = allPluginsData
     )
+    writeJsonFileInDir(
+      jsonFileKey = InvertPluginFileKey.HISTORICAL_DATA,
+      serializer = ListSerializer(HistoricalData.serializer()),
+      value = historicalData
+    )
 
     writeJsonFileInDir(
       jsonFileKey = InvertPluginFileKey.STAT_TOTALS,

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/tasks/InvertTask.kt

@@ -96,6 +96,7 @@ abstract class InvertTask : DefaultTask() {
         collectedDependencies = allCollectedData.collectedDependencies,
         collectedConfigurations = allCollectedData.collectedConfigurations,
         collectedPlugins = allCollectedData.collectedPlugins,
+        historicalData = emptyList(),
       )
     }
   }

invert-models/src/commonMain/kotlin/com/squareup/invert/models/js/CollectedStatTotalsJsReportModel.kt

@@ -18,3 +18,9 @@ data class StatTotalAndMetadata(
   val totalByModule: Map<ModulePath, Int>,
   val totalByOwner: Map<OwnerName, Int>,
 )
+
+@Serializable
+data class HistoricalData(
+  val reportMetadata: MetadataJsReportModel,
+  val statTotalsAndMetadata: CollectedStatTotalsJsReportModel
+)

invert-models/src/commonMain/kotlin/com/squareup/invert/models/js/JsReportFileKey.kt

@@ -10,6 +10,7 @@ enum class JsReportFileKey(
 ) {
   DIRECT_DEPENDENCIES("direct_dependencies", "Direct Dependencies"),
   INVERTED_DEPENDENCIES("inverted_dependencies", "Inverted Dependencies"),
+  HISTORICAL_DATA("historical_stats", "Historical Stats"),
   HOME("home", "Home"),
   PLUGINS("plugins", "Plugins"),
   OWNERS("owners", "Owners"),

invert-report/src/jsMain/kotlin/com/squareup/invert/common/CollectedDataRepo.kt

@@ -4,6 +4,7 @@ import com.squareup.invert.models.js.CollectedStatTotalsJsReportModel
 import com.squareup.invert.models.js.ConfigurationsJsReportModel
 import com.squareup.invert.models.js.DependenciesJsReportModel
 import com.squareup.invert.models.js.DirectDependenciesJsReportModel
+import com.squareup.invert.models.js.HistoricalData
 import com.squareup.invert.models.js.HomeJsReportModel
 import com.squareup.invert.models.js.JsReportFileKey
 import com.squareup.invert.models.js.MetadataJsReportModel
@@ -13,6 +14,7 @@ import com.squareup.invert.models.js.StatsJsReportModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.withContext
 
@@ -50,6 +52,14 @@ class CollectedDataRepo(
     loadJsOfType(JsReportFileKey.INVERTED_DEPENDENCIES)
   }
 
+  private val _historicalData: MutableStateFlow<List<HistoricalData>?> =
+    MutableStateFlow(null)
+  val historicalData: Flow<List<HistoricalData>?> = _historicalData.onEach {
+    loadJsOfType(JsReportFileKey.HISTORICAL_DATA)
+  }.map {
+    it?.sortedBy { it.reportMetadata.currentTime }
+  }
+
   private val _directDependenciesData: MutableStateFlow<DirectDependenciesJsReportModel?> =
     MutableStateFlow(null)
   val directDependenciesData: Flow<DirectDependenciesJsReportModel?> = _directDependenciesData.onEach {
@@ -113,6 +123,10 @@ class CollectedDataRepo(
     this._statTotals.value = statTotals
   }
 
+  fun historicalDataUpdated(historicalData: List<HistoricalData>) {
+    this._historicalData.value = historicalData
+  }
+
   fun homeUpdated(data: HomeJsReportModel) {
     this._home.value = data
   }

invert-report/src/jsMain/kotlin/com/squareup/invert/common/ReportDataRepo.kt

@@ -13,6 +13,7 @@ import com.squareup.invert.models.Stat
 import com.squareup.invert.models.StatKey
 import com.squareup.invert.models.StatMetadata
 import com.squareup.invert.models.js.CollectedStatTotalsJsReportModel
+import com.squareup.invert.models.js.HistoricalData
 import com.squareup.invert.models.js.MetadataJsReportModel
 import com.squareup.invert.models.js.PluginsJsReportModel
 import com.squareup.invert.models.js.StatsJsReportModel
@@ -42,6 +43,8 @@ class ReportDataRepo(
 
   val statsData: Flow<StatsJsReportModel?> = collectedDataRepo.statsData
 
+  val historicalData: Flow<List<HistoricalData>?> = collectedDataRepo.historicalData.mapLatest { it }
+
   val statInfos: Flow<Collection<StatMetadata>?> = collectedDataRepo.statsData.mapLatest { it?.statInfos?.values }
 
   val statTotals: Flow<CollectedStatTotalsJsReportModel?> = collectedDataRepo.statTotals

invert-report/src/jsMain/kotlin/com/squareup/invert/common/charts/ChartsJs.kt

@@ -62,12 +62,18 @@ object ChartsJs {
     val data: ChartJsData,
     val options: ChartJsOptions,
   )
+  @Serializable
+  data class ChartJsLineChartParam(
+    val type: String,
+    val data: ChartJsData,
+    val options: ChartJsOptions,
+  )
 }
 
 @Composable
 private fun LineChartJsComposable(
   graphDomId: String,
-  chartData: ChartsJs.ChartJsParam,
+  chartData: ChartsJs.ChartJsLineChartParam,
   heightCssValue: CSSSizeValue<*>,
   onClick: (label: String, value: Int) -> Unit = { _, _ -> }
 ) {
@@ -83,12 +89,13 @@ private fun LineChartJsComposable(
       maxWidth(100.percent)
     }
   })
+  val dataAsJson = InvertSerialization.InvertJsonPrettyPrint.encodeToString(
+    ChartsJs.ChartJsLineChartParam.serializer(), chartData
+  )
   CoroutineScope(Dispatchers.Main).launch {
     renderLineChartJs(
       graphDomId,
-      InvertSerialization.InvertJson.encodeToString(
-        ChartsJs.ChartJsParam.serializer(), chartData
-      ),
+      dataAsJson,
       onClick = onClick
     )
   }
@@ -186,7 +193,7 @@ fun ChartJsLineChartComposable(
   LineChartJsComposable(
     graphDomId = domId,
     heightCssValue = height,
-    chartData = ChartsJs.ChartJsParam(
+    chartData = ChartsJs.ChartJsLineChartParam(
       type = "line",
       data = data,
       options = ChartsJs.ChartJsOptions(

invert-report/src/jsMain/kotlin/navigation/RemoteJsLoadingProgress.kt

@@ -8,6 +8,7 @@ import com.squareup.invert.models.js.CollectedStatTotalsJsReportModel
 import com.squareup.invert.models.js.ConfigurationsJsReportModel
 import com.squareup.invert.models.js.DependenciesJsReportModel
 import com.squareup.invert.models.js.DirectDependenciesJsReportModel
+import com.squareup.invert.models.js.HistoricalData
 import com.squareup.invert.models.js.HomeJsReportModel
 import com.squareup.invert.models.js.JsReportFileKey
 import com.squareup.invert.models.js.MetadataJsReportModel
@@ -17,6 +18,7 @@ import com.squareup.invert.models.js.StatsJsReportModel
 import externalLoadJavaScriptFile
 import kotlinx.browser.window
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.serialization.builtins.ListSerializer
 
 object RemoteJsLoadingProgress {
   val awaitingResults = MutableStateFlow<List<JsReportFileKey>>(listOf())
@@ -53,7 +55,7 @@ object RemoteJsLoadingProgress {
         JsReportFileKey.INVERTED_DEPENDENCIES -> {
           collectedDataRepo.reportDataUpdated(
             InvertJson.decodeFromString(DependenciesJsReportModel.serializer(), json)
-            )
+          )
         }
 
         JsReportFileKey.DIRECT_DEPENDENCIES -> {
@@ -103,6 +105,10 @@ object RemoteJsLoadingProgress {
             InvertJson.decodeFromString(CollectedStatTotalsJsReportModel.serializer(), json)
           )
         }
+
+        JsReportFileKey.HISTORICAL_DATA -> collectedDataRepo.historicalDataUpdated(
+          InvertJson.decodeFromString(ListSerializer(HistoricalData.serializer()), json)
+        )
       }
     }
 }