Remove non-dynamic prefix stripping

Author: savannahostrowski

src/core/extractors.ts

@@ -333,12 +333,20 @@ export function includeRouterExtractor(node: Node): IncludeRouterInfo | null {
   const router = routerArg ? routerArg.text : ""
 
   let prefix = ""
+  const tags: string[] = []
   for (const argNode of argumentsNode.namedChildren) {
     if (argNode.type === "keyword_argument") {
       const nameNode = argNode.childForFieldName("name")
       const valueNode = argNode.childForFieldName("value")
       if (nameNode?.text === "prefix" && valueNode) {
         prefix = extractPathFromNode(valueNode)
+      } else if (nameNode?.text === "tags" && valueNode?.type === "list") {
+        for (const elem of valueNode.namedChildren) {
+          const tagValue = extractStringValue(elem)
+          if (tagValue !== null) {
+            tags.push(tagValue)
+          }
+        }
       }
     }
   }
@@ -347,6 +355,7 @@ export function includeRouterExtractor(node: Node): IncludeRouterInfo | null {
     object: objectNode.text,
     router,
     prefix,
+    tags,
   }
 }
 

src/core/internal.ts

@@ -69,6 +69,7 @@ export interface IncludeRouterInfo {
   object: string
   router: string
   prefix: string
+  tags: string[]
 }
 
 export interface MountInfo {
@@ -101,5 +102,5 @@ export interface RouterNode {
     line: number
     column: number
   }[]
-  children: { router: RouterNode; prefix: string }[]
+  children: { router: RouterNode; prefix: string; tags: string[] }[]
 }

src/core/pathUtils.ts

@@ -3,7 +3,6 @@ import { dirname, join, relative, sep } from "node:path"
 
 /**
  * Strips leading dynamic segments (like {settings.API_V1_STR}) from a path.
- * These are runtime variables, not URL path parameters.
  *
  * Examples:
  *   "{settings.API_V1_STR}/users/{id}" -> "/users/{id}"

src/core/routerResolver.ts

@@ -117,9 +117,14 @@ function buildRouterGraphInternal(
       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,
       })
     }
   }
@@ -138,6 +143,7 @@ function buildRouterGraphInternal(
       rootRouter.children.push({
         router: childRouter,
         prefix: mount.path,
+        tags: [],
       })
     }
   }

src/core/transformer.ts

@@ -107,7 +107,7 @@ function buildPrefixHierarchy(
     const strippedPrefix = stripLeadingDynamicSegments(router.prefix)
     const segmentCount = countSegments(strippedPrefix)
 
-    // Skip routers with no meaningful prefix (root level)
+    // Handle routers with no meaningful prefix
     if (segmentCount === 0) {
       rootRouters.push(router)
       prefixToRouter.set(strippedPrefix, router)
@@ -147,30 +147,53 @@ function buildPrefixHierarchy(
       let groupRouter = prefixToRouter.get(groupPrefix)
 
       if (!groupRouter) {
-        // Check if there are other routers that would be siblings under this group
-        const wouldHaveSiblings = sorted.some((other) => {
-          if (other === router) return false
-          const otherPrefix = stripLeadingDynamicSegments(other.prefix)
-          const otherSegments = countSegments(otherPrefix)
+        // Check if there's a root-level router with matching tag that should be the parent
+        const matchingRootRouter = rootRouters.find((r) => {
+          if (r === router) return false
+          // Router has no prefix but has a tag matching this group
+          const rPrefix = stripLeadingDynamicSegments(r.prefix)
           return (
-            otherSegments >= 2 &&
-            getPathSegments(otherPrefix, 1) === groupPrefix &&
-            otherPrefix !== strippedPrefix
+            countSegments(rPrefix) === 0 &&
+            r.tags.length > 0 &&
+            `/${r.tags[0]}` === groupPrefix
           )
         })
 
-        if (wouldHaveSiblings) {
-          // Create a synthetic group router
-          groupRouter = {
-            name: groupPrefix.replace(/^\//, ""),
-            prefix: groupPrefix,
-            tags: [],
-            location: router.location,
-            routes: [],
-            children: [],
+        if (matchingRootRouter) {
+          // Use this router as the group parent
+          groupRouter = matchingRootRouter
+          // Remove from root and re-register under the group prefix
+          const idx = rootRouters.indexOf(matchingRootRouter)
+          if (idx !== -1) rootRouters.splice(idx, 1)
+          matchingRootRouter.prefix = groupPrefix
+          prefixToRouter.set(groupPrefix, matchingRootRouter)
+          rootRouters.push(matchingRootRouter)
+        } else {
+          // Check if there are other routers that would be siblings under this group
+          const wouldHaveSiblings = sorted.some((other) => {
+            if (other === router) return false
+            const otherPrefix = stripLeadingDynamicSegments(other.prefix)
+            const otherSegments = countSegments(otherPrefix)
+            return (
+              otherSegments >= 2 &&
+              getPathSegments(otherPrefix, 1) === groupPrefix &&
+              otherPrefix !== strippedPrefix
+            )
+          })
+
+          if (wouldHaveSiblings) {
+            // Create a synthetic group router
+            groupRouter = {
+              name: groupPrefix.replace(/^\//, ""),
+              prefix: groupPrefix,
+              tags: [],
+              location: router.location,
+              routes: [],
+              children: [],
+            }
+            prefixToRouter.set(groupPrefix, groupRouter)
+            rootRouters.push(groupRouter)
           }
-          prefixToRouter.set(groupPrefix, groupRouter)
-          rootRouters.push(groupRouter)
         }
       }
 

src/providers/EndpointTreeProvider.ts

@@ -325,12 +325,11 @@ export class EndpointTreeProvider
       }
 
       case "router": {
-        // Use prefix as label (stripped of dynamic segments), or first tag, or filename as fallback
+        // Use prefix as label, showing relative path if nested under a parent
         const strippedPrefix = stripLeadingDynamicSegments(
           element.router.prefix,
         )
 
-        // If nested under a parent router, show only the relative part
         const parentRouter = this.findParentRouter(element.router)
         const parentPrefix = parentRouter
           ? stripLeadingDynamicSegments(parentRouter.prefix)
@@ -339,15 +338,18 @@ export class EndpointTreeProvider
 
         let routerLabel = displayPrefix !== "/" ? displayPrefix : ""
         if (!routerLabel) {
+          // Fallback: use tag, then filename
           if (element.router.tags.length > 0) {
-            // Add / prefix to tag-based labels for consistency
             routerLabel = `/${element.router.tags[0]}`
           } else {
-            // Use filename as label (e.g., "api_routes" from "routes/api_routes.py")
-            const filePath = element.router.location.filePath
-            const fileName =
-              filePath.split("/").pop()?.replace(/\.py$/, "") ?? ""
-            routerLabel = fileName
+            const parts = element.router.location.filePath.split("/")
+            const fileName = parts.pop()?.replace(/\.py$/, "") ?? ""
+            // Use parent directory for generic filenames
+            if (fileName === "router" || fileName === "routes") {
+              routerLabel = parts.pop() ?? fileName
+            } else {
+              routerLabel = fileName
+            }
           }
         }
         const routerItem = new TreeItem(
@@ -369,23 +371,9 @@ export class EndpointTreeProvider
       }
 
       case "route": {
-        // Strip leading dynamic segments for cleaner display
-        const strippedPath = stripLeadingDynamicSegments(element.route.path)
-
-        // Find parent router to show relative path
-        const parentRouter = this.findParentRouterForRoute(element.route)
-        const parentPrefix = parentRouter
-          ? stripLeadingDynamicSegments(parentRouter.prefix)
-          : "/"
-        let displayPath = this.getRelativePath(strippedPath, parentPrefix)
-
-        // Ensure path starts with / and doesn't end with / (unless it's just "/")
-        if (!displayPath.startsWith("/")) {
-          displayPath = `/${displayPath}`
-        }
-        if (displayPath.length > 1 && displayPath.endsWith("/")) {
-          displayPath = displayPath.slice(0, -1)
-        }
+        // Only strip leading dynamic segments (like {settings.API_V1_STR})
+        // Keep the full path otherwise for clarity
+        const displayPath = stripLeadingDynamicSegments(element.route.path)
 
         const label =
           element.route.method === "WEBSOCKET"