Removed Dependency Injection and Hotwire Pages from the "common" repo…

…rt as they do not make sense here.
square · Nov 7, 2024 · bc32635 · bc32635
1 parent 4fa4374
commit bc32635
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 521 deletions.
diff --git a/invert-models/src/commonMain/kotlin/com/squareup/invert/models/DiContribution.kt b/invert-models/src/commonMain/kotlin/com/squareup/invert/models/DiContribution.kt
diff --git a/invert-report/src/jsMain/kotlin/com/squareup/invert/common/InvertReport.kt b/invert-report/src/jsMain/kotlin/com/squareup/invert/common/InvertReport.kt
@@ -15,12 +15,10 @@ import com.squareup.invert.common.pages.CodeReferencesReportPage
 import com.squareup.invert.common.pages.ConfigurationDetailReportPage
 import com.squareup.invert.common.pages.ConfigurationsReportPage
 import com.squareup.invert.common.pages.DependencyDiffReportPage
-import com.squareup.invert.common.pages.DependencyInjectionReportPage
 import com.squareup.invert.common.pages.GitHubMarkdownReportPage
 import com.squareup.invert.common.pages.GradlePluginsReportPage
 import com.squareup.invert.common.pages.GradleRepositoriesReportPage
 import com.squareup.invert.common.pages.HomeReportPage
-import com.squareup.invert.common.pages.HotwireReportPage
 import com.squareup.invert.common.pages.InvertedDependenciesReportPage
 import com.squareup.invert.common.pages.KotlinCompilerPluginsReportPage
 import com.squareup.invert.common.pages.LeafModulesReportPage
@@ -114,11 +112,9 @@ class InvertReport(
       CodeReferencesReportPage,
       ConfigurationDetailReportPage,
       ConfigurationsReportPage,
-      DependencyInjectionReportPage,
       DependencyDiffReportPage,
       ModuleDependencyGraphReportPage,
       HomeReportPage,
-      HotwireReportPage,
       KotlinCompilerPluginsReportPage,
       LeafModulesReportPage,
       ModuleDetailReportPage,

diff --git a/invert-report/src/jsMain/kotlin/com/squareup/invert/common/ReportDataRepo.kt b/invert-report/src/jsMain/kotlin/com/squareup/invert/common/ReportDataRepo.kt
@@ -42,80 +42,6 @@ class ReportDataRepo(
 
   val statsData: Flow<StatsJsReportModel?> = collectedDataRepo.statsData
 
-  val diProvidesAndInjects: Flow<List<DiProvidesAndInjectsItem>> =
-    statsData.mapLatest { statsData: StatsJsReportModel? ->
-      val STAT_KEY = "DiProvidesAndInjects"
-      val diRowDataRows = mutableListOf<DiProvidesAndInjectsItem>()
-      val statsByModule: Map<ModulePath, Map<StatKey, Stat>>? = statsData?.statsByModule
-      statsByModule?.forEach { (moduleGradlePath, statsDataForModule) ->
-        val stat = statsDataForModule[STAT_KEY]
-        if (stat is Stat.DiProvidesAndInjectsStat) {
-          stat.value.forEach { providesAndInjects ->
-            if (providesAndInjects.contributions.isNotEmpty()) {
-              providesAndInjects.contributions.forEach { contribution ->
-                diRowDataRows.add(
-                  DiProvidesAndInjectsItem.Provides(
-                    module = moduleGradlePath,
-                    filePath = providesAndInjects.filePath,
-                    startLine = providesAndInjects.startLine,
-                    endLine = providesAndInjects.endLine,
-                    type = contribution.boundType,
-                    implementationType = contribution.boundImplementation,
-                    scope = null,
-                    qualifiers = listOf()
-                  )
-                )
-              }
-            }
-
-            if (providesAndInjects.consumptions.isNotEmpty()) {
-              providesAndInjects.consumptions.forEach { consumption ->
-                diRowDataRows.add(
-                  DiProvidesAndInjectsItem.Injects(
-                    module = moduleGradlePath,
-                    filePath = providesAndInjects.filePath,
-                    startLine = consumption.startLine,
-                    endLine = consumption.endLine,
-                    type = consumption.type,
-                    qualifiers = consumption.qualifierAnnotations,
-                  )
-                )
-              }
-            }
-          }
-        }
-      }
-      diRowDataRows
-    }
-
-
-  fun diProvidesAndInjects(
-    moduleModulePaths: List<ModulePath>? = null,
-  ): Flow<List<DiProvidesAndInjectsItem>> =
-    diProvidesAndInjects.mapLatest { diProvidesAndInjects: List<DiProvidesAndInjectsItem> ->
-      diProvidesAndInjects.filter {
-        when (it) {
-          is DiProvidesAndInjectsItem.Injects -> moduleModulePaths?.contains(it.module) ?: true
-          is DiProvidesAndInjectsItem.Provides -> moduleModulePaths?.contains(it.module) ?: true
-        }
-      }
-    }
-
-  fun diInjects(moduleModulePaths: List<ModulePath>): Flow<List<DiProvidesAndInjectsItem.Injects>> =
-    diProvidesAndInjects(moduleModulePaths).mapLatest {
-      it.filterIsInstance<DiProvidesAndInjectsItem.Injects>().sortedBy { it.type }
-    }
-
-  fun diProvides(): Flow<List<DiProvidesAndInjectsItem.Provides>> =
-    diProvidesAndInjects.mapLatest {
-      it.filterIsInstance<DiProvidesAndInjectsItem.Provides>().sortedBy { it.type }
-    }
-
-
-  fun diProvides(diKey: DiKey): Flow<List<DiProvidesAndInjectsItem.Provides>> = diProvides().mapLatest { providesList ->
-    providesList.filter { it.key == diKey }
-  }
-
   val statInfos: Flow<Collection<StatMetadata>?> = collectedDataRepo.statsData.mapLatest { it?.statInfos?.values }
 
   val statTotals: Flow<CollectedStatTotalsJsReportModel?> = collectedDataRepo.statTotals

diff --git a/invert-report/src/jsMain/kotlin/com/squareup/invert/common/navigation/NavGroupsRepo.kt b/invert-report/src/jsMain/kotlin/com/squareup/invert/common/navigation/NavGroupsRepo.kt
@@ -12,9 +12,6 @@ import com.squareup.invert.common.pages.CodeReferencesReportPage
 import com.squareup.invert.common.pages.ConfigurationDetailNavRoute
 import com.squareup.invert.common.pages.ConfigurationsNavRoute
 import com.squareup.invert.common.pages.DependencyDiffReportPage
-import com.squareup.invert.common.pages.DependencyInjectionReportPage
-import com.squareup.invert.common.pages.GitHubMarkdownReportPage
-import com.squareup.invert.common.pages.GithubReadMeNavRoute
 import com.squareup.invert.common.pages.GradlePluginsNavRoute
 import com.squareup.invert.common.pages.GradlePluginsReportPage
 import com.squareup.invert.common.pages.GradleRepositoriesReportPage
@@ -54,16 +51,6 @@ class NavGroupsRepo(additionalGroups: Set<NavPageGroup>) {
 
 object DefaultNavItems {
 
-  private fun gitHubContentNavItem(title: String, destinationNavRoute: NavRoute): NavItem {
-    return NavItem(
-      navPage = GitHubMarkdownReportPage.navPage,
-      itemTitle = title,
-      navIconSlug = "github",
-      destinationNavRoute = destinationNavRoute,
-      matchesCurrentNavRoute = { it == destinationNavRoute }
-    )
-  }
-
   val ROOT_NAV_ITEMS
     get() = listOf(
       NavPageGroup(
@@ -120,29 +107,10 @@ object DefaultNavItems {
       NavPageGroup(
         "Explore", setOf(
           InvertedDependenciesReportPage.navPage.toNavItem(),
-          DependencyInjectionReportPage.navPage.toNavItem(),
           DependencyDiffReportPage.navPage.toNavItem(),
           ModuleDependencyGraphReportPage.navPage.toNavItem(),
         )
-      ),
-//      NavPageGroup(
-//        "GitHub", setOf(
-//          gitHubContentNavItem(
-//            title = "README.md",
-//            destinationNavRoute = GithubReadMeNavRoute(
-//              "square/okhttp",
-//              "README.md"
-//            )
-//          ),
-//          gitHubContentNavItem(
-//            title = "OkHttp.kt",
-//            destinationNavRoute = GithubReadMeNavRoute(
-//              "square/okhttp",
-//              "okhttp/src/main/kotlin/okhttp3/OkHttp.kt"
-//            )
-//          ),
-//        )
-//      )
+      )
     )
 }
 

diff --git a/...eport/src/jsMain/kotlin/com/squareup/invert/common/pages/DependencyInjectionReportPage.kt b/...eport/src/jsMain/kotlin/com/squareup/invert/common/pages/DependencyInjectionReportPage.kt
diff --git a/invert-report/src/jsMain/kotlin/com/squareup/invert/common/pages/GitHubMarkdownReportPage.kt b/invert-report/src/jsMain/kotlin/com/squareup/invert/common/pages/GitHubMarkdownReportPage.kt
@@ -5,6 +5,8 @@ import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.key
 import com.squareup.invert.common.InvertReportPage
 import com.squareup.invert.common.navigation.NavPage
+import com.squareup.invert.common.navigation.NavPage.NavItem
+import com.squareup.invert.common.navigation.NavRoute
 import com.squareup.invert.common.navigation.routes.BaseNavRoute
 import com.squareup.invert.common.pages.GitHubMarkdownReportPage.navPage
 import com.squareup.invert.common.pages.GithubReadMeNavRoute.Companion.FILE_KEY
@@ -37,6 +39,17 @@ data class GithubReadMeNavRoute(
 }
 
 object GitHubMarkdownReportPage : InvertReportPage<GithubReadMeNavRoute> {
+
+    fun gitHubContentNavItem(title: String, destinationNavRoute: NavRoute): NavItem {
+        return NavItem(
+            navPage = GitHubMarkdownReportPage.navPage,
+            itemTitle = title,
+            navIconSlug = "github",
+            destinationNavRoute = destinationNavRoute,
+            matchesCurrentNavRoute = { it == destinationNavRoute }
+        )
+    }
+
     override val navPage: NavPage = NavPage(
         pageId = "github_readme",
         displayName = "ReadMe on GitHub",