fix(typescript): preserve awaited generic call edges

Author: ngallodev

internal/cbm/extract_calls.c

@@ -259,9 +259,18 @@ static char *extract_constructor_callee(CBMArena *a, TSNode node, const char *so
 }
 
 // Try common field-based callee resolution (function, name, method fields).
+static TSNode unwrap_await_callee(TSNode node) {
+    if (ts_node_is_null(node) || strcmp(ts_node_type(node), "await_expression") != 0 ||
+        ts_node_named_child_count(node) == 0) {
+        return node;
+    }
+    return ts_node_named_child(node, 0);
+}
+
 static char *extract_callee_from_fields(CBMArena *a, TSNode node, const char *source) {
     // Try "function" field
     TSNode func_node = ts_node_child_by_field_name(node, TS_FIELD("function"));
+    func_node = unwrap_await_callee(func_node);
     if (!ts_node_is_null(func_node)) {
         const char *fk = ts_node_type(func_node);
         if (strcmp(fk, "selector_expression") == 0) {
@@ -3435,6 +3444,7 @@ static CBMPrimaryCalleeSelection select_primary_callee(CBMExtractCtx *ctx, TSNod
     }
 
     selection.expr = language_specific_callee_expr(ctx->language, node);
+    selection.expr = unwrap_await_callee(selection.expr);
     if (is_dynamic_callee_expr(ctx, selection.expr)) {
         selection.expr = (TSNode){0};
         return selection;

internal/cbm/lsp/ts_lsp.c

@@ -2800,8 +2800,17 @@ static void resolve_value_references_at(TSLSPContext *ctx, TSNode call_node) {
     }
 }
 
+static TSNode unwrap_await_callee(TSNode node) {
+    if (ts_node_is_null(node) || strcmp(ts_node_type(node), "await_expression") != 0 ||
+        ts_node_named_child_count(node) == 0) {
+        return node;
+    }
+    return ts_node_named_child(node, 0);
+}
+
 static void resolve_call_at(TSLSPContext *ctx, TSNode call_node) {
     TSNode fn = ts_node_child_by_field_name(call_node, "function", TS_LSP_FIELD_LEN("function"));
+    fn = unwrap_await_callee(fn);
     if (ts_node_is_null(fn))
         return;
 

tests/test_extraction.c

@@ -4056,6 +4056,18 @@ TEST(extract_ts_url_builder_issue1009) {
     PASS();
 }
 
+TEST(extract_ts_await_generic_call_issue2210) {
+    CBMFileResult *r = extract("function parseJsonBody<T>() { return {} as T; }\n"
+                               "async function plain() { return await parseJsonBody(); }\n"
+                               "async function generic() { return await parseJsonBody<string>(); }\n",
+                               CBM_LANG_TYPESCRIPT, "t", "await.ts");
+    ASSERT_NOT_NULL(r);
+    ASSERT_FALSE(r->has_error);
+    ASSERT_EQ(count_calls_named(r, "parseJsonBody"), 2);
+    cbm_free_result(r);
+    PASS();
+}
+
 /* Issue #1009 (composed builders): a builder whose template inlines an earlier
  * builder's call plus a query string: `return \`${basePath(id)}?${params}\``.
  * The known-substitution is inlined and the query string is truncated, so the
@@ -6903,6 +6915,7 @@ SUITE(extraction) {
     RUN_TEST(extract_go_binary_concat_url_issue1249);
     RUN_TEST(extract_go_binary_concat_url_no_literal_suffix_issue1249);
     RUN_TEST(extract_ts_url_builder_issue1009);
+    RUN_TEST(extract_ts_await_generic_call_issue2210);
     RUN_TEST(extract_ts_url_builder_composed_issue1009);
     RUN_TEST(extract_c_url_builder_gated_issue1009);
     RUN_TEST(extract_ts_url_builder_mixed_returns_issue1009);

tests/test_ts_lsp.c

@@ -729,6 +729,18 @@ TEST(tslsp_nocrash_megasource) {
 
 /* ── Category 11: generics (deeper) ─────────────────────────────────────────── */
 
+TEST(tslsp_await_generic_call_issue2210) {
+    CBMFileResult *r =
+        extract_ts("function parseJsonBody<T>(): T { return null as T; }\n"
+                   "async function plain() { return await parseJsonBody(); }\n"
+                   "async function generic() { return await parseJsonBody<string>(); }\n");
+    ASSERT_NOT_NULL(r);
+    ASSERT_TRUE(find_resolved(r, "plain", "parseJsonBody") >= 0);
+    ASSERT_TRUE(find_resolved(r, "generic", "parseJsonBody") >= 0);
+    cbm_free_result(r);
+    PASS();
+}
+
 TEST(tslsp_generic_identity_inference) {
     CBMFileResult *r = extract_ts("function identity<T>(x: T): T { return x; }\n"
                                   "class Box { use(): void {} }\n"
@@ -4316,6 +4328,8 @@ SUITE(ts_lsp) {
     RUN_TEST(tslsp_nocrash_using_decl);
     RUN_TEST(tslsp_nocrash_megasource);
 
+    RUN_TEST(tslsp_await_generic_call_issue2210);
+
     /* Category 11: generics deeper */
     RUN_TEST(tslsp_generic_identity_inference);
     RUN_TEST(tslsp_generic_array_map_chain);