♻️ Cleanup

Author: savannahostrowski

src/appDiscovery.ts

@@ -10,11 +10,7 @@ import type { Parser } from "./core/parser"
 import { findProjectRoot, uriPath } from "./core/pathUtils"
 import { buildRouterGraph } from "./core/routerResolver"
 import { routerNodeToAppDefinition } from "./core/transformer"
-import {
-  collectAllRoutes,
-  countRouters,
-  countRoutesInRouter,
-} from "./core/treeUtils"
+import { collectRoutes, countRouters } from "./core/treeUtils"
 import type { AppDefinition } from "./core/types"
 import { vscodeFileSystem } from "./providers/vscodeFileSystem"
 import { log } from "./utils/logger"
@@ -176,9 +172,7 @@ export async function discoverFastAPIApps(
 
       if (routerNode) {
         const app = routerNodeToAppDefinition(routerNode, folder.uri.fsPath)
-        const totalRoutes =
-          app.routes.length +
-          app.routers.reduce((sum, r) => sum + countRoutesInRouter(r), 0)
+        const totalRoutes = collectRoutes([app]).length
         log(
           `Found FastAPI app "${app.name}" with ${totalRoutes} route(s) in ${app.routers.length} router(s)`,
         )
@@ -193,7 +187,7 @@ export async function discoverFastAPIApps(
       duration_ms: folderTimer(),
       method: detectionMethod,
       success: folderApps.length > 0,
-      routes_count: collectAllRoutes(folderApps).length,
+      routes_count: collectRoutes(folderApps).length,
       routers_count: countRouters(folderApps),
     })
   }

src/core/index.ts

@@ -11,12 +11,7 @@ export { Parser } from "./parser"
 export { findProjectRoot } from "./pathUtils"
 export { buildRouterGraph, type RouterNode } from "./routerResolver"
 export { routerNodeToAppDefinition } from "./transformer"
-export {
-  collectAllRoutes,
-  countRouters,
-  countRoutesInRouter,
-  findRouter,
-} from "./treeUtils"
+export { collectRoutes, countRouters, findRouter } from "./treeUtils"
 export type {
   AppDefinition,
   HTTPMethod,

src/core/treeUtils.ts

@@ -57,23 +57,13 @@ function collectRoutesFromRouters(
 /**
  * Collects all routes from all apps, including nested router routes.
  */
-export function collectAllRoutes(apps: AppDefinition[]): RouteDefinition[] {
+export function collectRoutes(apps: AppDefinition[]): RouteDefinition[] {
   return apps.flatMap((app) => [
     ...app.routes,
     ...collectRoutesFromRouters(app.routers),
   ])
 }
 
-/**
- * Counts total routes in a router tree (including nested children).
- */
-export function countRoutesInRouter(router: RouterDefinition): number {
-  return (
-    router.routes.length +
-    router.children.reduce((sum, child) => sum + countRoutesInRouter(child), 0)
-  )
-}
-
 /**
  * Counts total routers across all apps.
  */

src/extension.ts

@@ -7,7 +7,7 @@ import { discoverFastAPIApps } from "./appDiscovery"
 import { clearImportCache } from "./core/importResolver"
 import { Parser } from "./core/parser"
 import { stripLeadingDynamicSegments } from "./core/pathUtils"
-import { collectAllRoutes, countRouters } from "./core/treeUtils"
+import { collectRoutes, countRouters } from "./core/treeUtils"
 import type { AppDefinition, SourceLocation } from "./core/types"
 import {
   type EndpointTreeItem,
@@ -109,7 +109,7 @@ export async function activate(context: vscode.ExtensionContext) {
   trackActivation({
     duration_ms: elapsed(),
     success,
-    routes_count: collectAllRoutes(apps).length,
+    routes_count: collectRoutes(apps).length,
     routers_count: countRouters(apps),
     apps_count: apps.length,
     workspace_folder_count: vscode.workspace.workspaceFolders?.length ?? 0,
@@ -234,7 +234,7 @@ function registerCommands(
       async () => {
         const workspacePrefix =
           vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? ""
-        const items = collectAllRoutes(endpointProvider.getApps())
+        const items = collectRoutes(endpointProvider.getApps())
           .map((route) => {
             const path = stripLeadingDynamicSegments(route.path)
             return {

src/providers/endpointTreeProvider.ts

@@ -7,7 +7,7 @@ import {
   TreeItemCollapsibleState,
 } from "vscode"
 import { stripLeadingDynamicSegments } from "../core/pathUtils"
-import { countRoutesInRouter, findRouter } from "../core/treeUtils"
+import { findRouter } from "../core/treeUtils"
 import type {
   AppDefinition,
   RouteDefinition,
@@ -319,7 +319,10 @@ export class EndpointTreeProvider
         routerItem.id = `router-${element.router.location.filePath}-${element.router.prefix}-${this.toggleCount}`
         routerItem.iconPath = new ThemeIcon("symbol-namespace")
 
-        const totalRoutes = countRoutesInRouter(element.router)
+        const countRoutes = (r: RouterDefinition): number =>
+          r.routes.length +
+          r.children.reduce((sum, child) => sum + countRoutes(child), 0)
+        const totalRoutes = countRoutes(element.router)
         routerItem.description =
           totalRoutes !== 1 ? `${totalRoutes} routes` : "1 route"
         routerItem.contextValue = "router"

src/providers/testCodeLensProvider.ts

@@ -21,7 +21,7 @@ import {
   pathMatchesEndpoint,
   stripLeadingDynamicSegments,
 } from "../core/pathUtils"
-import { collectAllRoutes } from "../core/treeUtils"
+import { collectRoutes } from "../core/treeUtils"
 import type { AppDefinition, SourceLocation } from "../core/types"
 import { trackCodeLensProvided } from "../utils/telemetry"
 
@@ -158,7 +158,7 @@ export class TestCodeLensProvider implements CodeLensProvider {
     testPath: string,
     testMethod: string,
   ): SourceLocation[] {
-    return collectAllRoutes(this.apps)
+    return collectRoutes(this.apps)
       .filter(
         (route) =>
           route.method.toLowerCase() === testMethod.toLowerCase() &&

src/test/core/treeUtils.test.ts

@@ -1,10 +1,5 @@
 import * as assert from "node:assert"
-import {
-  collectAllRoutes,
-  countRouters,
-  countRoutesInRouter,
-  findRouter,
-} from "../../core/treeUtils"
+import { collectRoutes, countRouters, findRouter } from "../../core/treeUtils"
 import type {
   AppDefinition,
   RouteDefinition,
@@ -96,17 +91,17 @@ suite("treeUtils", () => {
     })
   })
 
-  suite("collectAllRoutes", () => {
+  suite("collectRoutes", () => {
     test("returns empty array for empty apps", () => {
-      const result = collectAllRoutes([])
+      const result = collectRoutes([])
       assert.deepStrictEqual(result, [])
     })
 
     test("collects direct app routes", () => {
       const route = makeRoute("GET", "/")
       const apps = [makeApp("app", [route])]
 
-      const result = collectAllRoutes(apps)
+      const result = collectRoutes(apps)
       assert.deepStrictEqual(result, [route])
     })
 
@@ -121,7 +116,7 @@ suite("treeUtils", () => {
         ),
       ]
 
-      const result = collectAllRoutes(apps)
+      const result = collectRoutes(apps)
       assert.deepStrictEqual(result, [directRoute, routerRoute])
     })
 
@@ -130,41 +125,11 @@ suite("treeUtils", () => {
       const route2 = makeRoute("GET", "/app2")
       const apps = [makeApp("app1", [route1]), makeApp("app2", [route2])]
 
-      const result = collectAllRoutes(apps)
+      const result = collectRoutes(apps)
       assert.deepStrictEqual(result, [route1, route2])
     })
   })
 
-  suite("countRoutesInRouter", () => {
-    test("returns 0 for router with no routes", () => {
-      const router = makeRouter("empty", "/empty")
-      assert.strictEqual(countRoutesInRouter(router), 0)
-    })
-
-    test("counts direct routes", () => {
-      const router = makeRouter("r", "/r", [
-        makeRoute("GET", "/r"),
-        makeRoute("POST", "/r"),
-      ])
-      assert.strictEqual(countRoutesInRouter(router), 2)
-    })
-
-    test("counts routes in nested children", () => {
-      const router = makeRouter(
-        "parent",
-        "/parent",
-        [makeRoute("GET", "/parent")],
-        [
-          makeRouter("child", "/parent/child", [
-            makeRoute("GET", "/parent/child"),
-            makeRoute("POST", "/parent/child"),
-          ]),
-        ],
-      )
-      assert.strictEqual(countRoutesInRouter(router), 3)
-    })
-  })
-
   suite("countRouters", () => {
     test("returns 0 for empty apps", () => {
       assert.strictEqual(countRouters([]), 0)

src/test/layouts.test.ts

@@ -3,7 +3,7 @@ import { Parser } from "../core/parser"
 import { findProjectRoot } from "../core/pathUtils"
 import { buildRouterGraph } from "../core/routerResolver"
 import { routerNodeToAppDefinition } from "../core/transformer"
-import { collectAllRoutes } from "../core/treeUtils"
+import { collectRoutes } from "../core/treeUtils"
 import { fixtures, nodeFileSystem, wasmBinaries } from "./testUtils"
 
 suite("Project Layouts", () => {
@@ -34,7 +34,7 @@ suite("Project Layouts", () => {
     assert.ok(graph, "Should find FastAPI app")
 
     const appDef = routerNodeToAppDefinition(graph, fixtures.standard.root)
-    const allRoutes = collectAllRoutes([appDef])
+    const allRoutes = collectRoutes([appDef])
 
     // Should have: GET /, GET /health, GET /users/, GET /users/{user_id}, POST /users/, GET /items/, GET /items/{item_id}
     assert.strictEqual(
@@ -78,7 +78,7 @@ suite("Project Layouts", () => {
     assert.ok(graph, "Should find FastAPI app")
 
     const appDef = routerNodeToAppDefinition(graph, fixtures.flat.root)
-    const allRoutes = collectAllRoutes([appDef])
+    const allRoutes = collectRoutes([appDef])
 
     // Should have: GET /, GET /api/users, GET /api/items
     assert.strictEqual(
@@ -118,7 +118,7 @@ suite("Project Layouts", () => {
     assert.ok(graph, "Should find FastAPI app")
 
     const appDef = routerNodeToAppDefinition(graph, fixtures.namespace.root)
-    const allRoutes = collectAllRoutes([appDef])
+    const allRoutes = collectRoutes([appDef])
 
     // Should have: GET /, GET /users/, GET /users/{user_id}, GET /items/
     assert.strictEqual(
@@ -158,7 +158,7 @@ suite("Project Layouts", () => {
     assert.ok(graph, "Should find FastAPI app")
 
     const appDef = routerNodeToAppDefinition(graph, fixtures.reexport.root)
-    const allRoutes = collectAllRoutes([appDef])
+    const allRoutes = collectRoutes([appDef])
 
     // Should have: GET /, GET /integrations/github, GET /integrations/slack, POST /integrations/webhook,
     // and nested neon routes: GET /integrations/neon/, POST /integrations/neon/connect