🐛 Add support to extractors for keyword args in definitions (#95)

Author: savannahostrowski

src/core/extractors.ts

@@ -178,10 +178,11 @@ export function decoratorExtractor(node: Node): RouteInfo | null {
     return null
   }
 
-  // Skip comment nodes to find the actual first argument
-  const pathArgNode = argumentsNode.namedChildren.find(
+  // Find path: first positional arg, or "path" keyword argument
+  const nonCommentArgs = argumentsNode.namedChildren.filter(
     (child) => child.type !== "comment",
   )
+  const pathArgNode = resolveArgNode(nonCommentArgs, 0, "path")
   const path = pathArgNode ? extractPathFromNode(pathArgNode) : ""
 
   // For api_route, extract methods from keyword argument
@@ -371,6 +372,33 @@ export function importExtractor(node: Node): ImportInfo | null {
   return { modulePath, names, namedImports, isRelative, relativeDots }
 }
 
+/**
+ * Resolves a function argument value node by positional index or keyword name.
+ *
+ * Examples:
+ *   app.get("/users", response_model=List[User])  → position 0 = string node "/users"
+ *   app.get(path="/users", response_model=List[User]) → keyword "path" = string node "/users"
+ */
+function resolveArgNode(
+  args: Node[],
+  position: number,
+  keywordName: string,
+): Node | undefined {
+  const positional = args.filter((a) => a.type !== "keyword_argument")
+  if (positional[position]) {
+    return positional[position]
+  }
+  return (
+    args
+      .find(
+        (a) =>
+          a.type === "keyword_argument" &&
+          a.childForFieldName("name")?.text === keywordName,
+      )
+      ?.childForFieldName("value") ?? undefined
+  )
+}
+
 /** Extracts method call info: object.method(args) */
 function extractMethodCall(
   node: Node,
@@ -420,9 +448,12 @@ export function includeRouterExtractor(node: Node): IncludeRouterInfo | null {
     }
   }
 
+  // Find router: first positional arg, or "router" keyword argument
+  const routerNode = resolveArgNode(call.args, 0, "router")
+
   return {
     owner: call.object,
-    router: call.args[0]?.text ?? "",
+    router: routerNode?.text ?? "",
     prefix,
     tags,
   }
@@ -435,9 +466,13 @@ export function mountExtractor(node: Node): MountInfo | null {
     return null
   }
 
+  // Find path and app: positional or keyword argument style
+  const pathNode = resolveArgNode(call.args, 0, "path")
+  const appNode = resolveArgNode(call.args, 1, "app")
+
   return {
     owner: call.object,
-    path: extractPathFromNode(call.args[0]),
-    app: call.args[1].text,
+    path: pathNode ? extractPathFromNode(pathNode) : "",
+    app: appNode?.text ?? "",
   }
 }

src/test/core/extractors.test.ts

@@ -223,6 +223,23 @@ def handle_items():
       assert.strictEqual(result.method, "GET")
     })
 
+    test("extracts route with 'path' keyword argument", () => {
+      const code = `
+@app.get(path="/users/{user_id}", include_in_schema=False)
+def get_user(user_id: int):
+    pass
+`
+      const tree = parse(code)
+      const decoratedDefs = findNodesByType(
+        tree.rootNode,
+        "decorated_definition",
+      )
+      const result = decoratorExtractor(decoratedDefs[0])
+
+      assert.ok(result)
+      assert.strictEqual(result.path, "/users/{user_id}")
+    })
+
     test("returns null for non-decorated definition", () => {
       const code = `
 def regular_function():
@@ -576,6 +593,17 @@ def list_users():
       assert.deepStrictEqual(result.tags, ["users", "admin"])
     })
 
+    test("extracts include_router with 'router' keyword argument", () => {
+      const code = `app.include_router(router=users_router, prefix="/api")`
+      const tree = parse(code)
+      const calls = findNodesByType(tree.rootNode, "call")
+      const result = includeRouterExtractor(calls[0])
+
+      assert.ok(result)
+      assert.strictEqual(result.router, "users_router")
+      assert.strictEqual(result.prefix, "/api")
+    })
+
     test("returns null for non-include_router call", () => {
       const code = "app.some_method(arg)"
       const tree = parse(code)