More TS syntactic sugar

Author: savannahostrowski

src/core/importResolver.ts

@@ -24,9 +24,8 @@ import type { Parser } from "./parser"
 const fileExistsCache = new Map<string, boolean>()
 
 function cachedExistsSync(path: string): boolean {
-  const cached = fileExistsCache.get(path)
-  if (cached !== undefined) {
-    return cached
+  if (fileExistsCache.has(path)) {
+    return fileExistsCache.get(path)!
   }
   const exists = existsSync(path)
   fileExistsCache.set(path, exists)
@@ -55,25 +54,16 @@ function resolvePythonModule(basePath: string): string | null {
   return null
 }
 
-/**
- * Finds an import that provides a given exported name
- * Used for resolving re-exports in __init__.py files
- **/
+/** Finds an import that provides a given exported name (for re-exports in __init__.py) */
 function findImportByExportedName(
   imports: ImportInfo[],
   name: string,
-): ImportInfo | null {
-  // Each import may provide multiple named imports
-  // e.g. from module import A as B, C
-  for (const imp of imports) {
-    for (const namedImport of imp.namedImports) {
-      const providedName = namedImport.alias ?? namedImport.name
-      if (providedName === name) {
-        return imp
-      }
-    }
-  }
-  return null
+): ImportInfo | undefined {
+  return imports.find((imp) =>
+    imp.namedImports.some(
+      (namedImport) => (namedImport.alias ?? namedImport.name) === name,
+    ),
+  )
 }
 
 /**
@@ -190,19 +180,11 @@ export function resolveRouterFromInit(
   }
 
   const analysis = analyzeFile(initFilePath, parser)
-  if (!analysis) {
-    return null
-  }
-
-  // If this file has routers defined, no need to follow re-exports
-  if (analysis.routers.length > 0) {
+  // If file has routers defined, no need to follow re-exports
+  if (!analysis || analysis.routers.length > 0) {
     return null
   }
 
   const imp = findImportByExportedName(analysis.imports, "router")
-  if (imp) {
-    return resolveImport(imp, initFilePath, projectRoot)
-  }
-
-  return null
+  return imp ? resolveImport(imp, initFilePath, projectRoot) : null
 }

src/core/internal.ts

@@ -20,16 +20,11 @@ export const ROUTE_METHODS = new Set([
   "websocket",
 ])
 
-/**
- * Normalizes a method string to a valid RouteMethod.
- * Returns "GET" as default for invalid methods.
- */
+/** Normalizes a method string to a valid RouteMethod. Returns "GET" for invalid methods. */
 export function normalizeMethod(method: string): RouteMethod {
-  const lower = method.toLowerCase()
-  if (ROUTE_METHODS.has(lower)) {
-    return method.toUpperCase() as RouteMethod
-  }
-  return "GET"
+  return ROUTE_METHODS.has(method.toLowerCase())
+    ? (method.toUpperCase() as RouteMethod)
+    : "GET"
 }
 
 export interface RouteInfo {

src/core/routerResolver.ts

@@ -36,14 +36,11 @@ function buildRouterGraphInternal(
 ): RouterNode | null {
   // Resolve the full path of the entry file if necessary
   let resolvedEntryFile = entryFile
+  if (!existsSync(resolvedEntryFile) && !isAbsolute(entryFile)) {
+    resolvedEntryFile = join(projectRoot, entryFile)
+  }
   if (!existsSync(resolvedEntryFile)) {
-    // Only try joining if entryFile is not already absolute
-    if (!isAbsolute(entryFile)) {
-      resolvedEntryFile = join(projectRoot, entryFile)
-    }
-    if (!existsSync(resolvedEntryFile)) {
-      return null
-    }
+    return null
   }
 
   // Prevent infinite recursion on circular imports
@@ -116,17 +113,18 @@ function buildRouterGraphInternal(
       parser,
       visited,
     )
-    if (childRouter) {
-      // Merge tags from include_router call with the router's own tags
-      if (include.tags.length > 0) {
-        childRouter.tags = [...new Set([...childRouter.tags, ...include.tags])]
-      }
-      rootRouter.children.push({
-        router: childRouter,
-        prefix: include.prefix,
-        tags: include.tags,
-      })
+    if (!childRouter) {
+      continue
+    }
+    // Merge tags from include_router call with the router's own tags
+    if (include.tags.length > 0) {
+      childRouter.tags = [...new Set([...childRouter.tags, ...include.tags])]
     }
+    rootRouter.children.push({
+      router: childRouter,
+      prefix: include.prefix,
+      tags: include.tags,
+    })
   }
 
   // Process mount() calls for subapps
@@ -139,13 +137,14 @@ function buildRouterGraphInternal(
       parser,
       visited,
     )
-    if (childRouter) {
-      rootRouter.children.push({
-        router: childRouter,
-        prefix: mount.path,
-        tags: [],
-      })
+    if (!childRouter) {
+      continue
     }
+    rootRouter.children.push({
+      router: childRouter,
+      prefix: mount.path,
+      tags: [],
+    })
   }
 
   return rootRouter
@@ -168,7 +167,6 @@ function resolveRouterReference(
   const matchingImport = analysis.imports.find((imp) =>
     imp.names.includes(moduleName),
   )
-
   if (!matchingImport) {
     return null
   }
@@ -184,7 +182,6 @@ function resolveRouterReference(
     projectRoot,
     parser,
   )
-
   if (!importedFilePath) {
     return null
   }

src/providers/EndpointTreeProvider.ts

@@ -93,15 +93,15 @@ export class EndpointTreeProvider
     return `${route.method} ${path}`.toLowerCase()
   }
 
-  /**
-   * Counts total routes including nested children.
-   */
+  /** Counts total routes including nested children. */
   private getTotalRouteCount(router: RouterDefinition): number {
-    let count = router.routes.length
-    for (const child of router.children) {
-      count += this.getTotalRouteCount(child)
-    }
-    return count
+    return (
+      router.routes.length +
+      router.children.reduce(
+        (sum, child) => sum + this.getTotalRouteCount(child),
+        0,
+      )
+    )
   }
 
   /**
@@ -206,13 +206,10 @@ export class EndpointTreeProvider
       case "app": {
         // Check if apps are grouped under workspaces
         const rootItems = this.groupApps(this.apps)
-        for (const root of rootItems) {
-          if (root.type === "workspace" && root.apps.includes(element.app)) {
-            return root
-          }
-        }
-        // App is at root level
-        return undefined
+        return rootItems.find(
+          (root) =>
+            root.type === "workspace" && root.apps.includes(element.app),
+        )
       }
 
       case "router": {
@@ -222,12 +219,8 @@ export class EndpointTreeProvider
           return { type: "router", router: parentRouter }
         }
         // Find which app contains this router at top level
-        for (const app of this.apps) {
-          if (app.routers.includes(element.router)) {
-            return { type: "app", app }
-          }
-        }
-        return undefined
+        const app = this.apps.find((a) => a.routers.includes(element.router))
+        return app ? { type: "app", app } : undefined
       }
 
       case "route": {
@@ -237,12 +230,8 @@ export class EndpointTreeProvider
           return { type: "router", router: parentRouter }
         }
         // Check if route is directly on an app
-        for (const app of this.apps) {
-          if (app.routes.includes(element.route)) {
-            return { type: "app", app }
-          }
-        }
-        return undefined
+        const app = this.apps.find((a) => a.routes.includes(element.route))
+        return app ? { type: "app", app } : undefined
       }
     }
   }