Local code intelligence for developers and AI agents. Connect code, docs and infrastructure in a persistent graph, with CBM Lens, MCP tools, agent integrations and change-aware test selection.
C aiderastclaude-codecode-analysiscode-intelligencecodexcursorcypherdeveloper-toolsgemini-cligraph-visualizationkilocodeknowledge-graphmcpmcp-servermodel-context-protocolopencodesqlitetree-sitterwindsurf
fix(typescript): preserve awaited generic call edges
lorenzozaneee8a46c16e233
diff --git a/internal/cbm/extract_calls.c b/internal/cbm/extract_calls.cindex 47250203d..728059c71 100644--- a/internal/cbm/extract_calls.c+++ b/internal/cbm/extract_calls.c@@ -258,9 +258,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" fieldTSNode 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) {@@ -3521,6 +3530,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;diff --git a/internal/cbm/lsp/ts_lsp.c b/internal/cbm/lsp/ts_lsp.cindex fc8b8911f..0072aa999 100644--- a/internal/cbm/lsp/ts_lsp.c+++ b/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;diff --git a/tests/test_extraction.c b/tests/test_extraction.cindex 14d75bf8b..f4939517e 100644--- a/tests/test_extraction.c+++ b/tests/test_extraction.c@@ -4362,6 +4362,18 @@ TEST(swift_labeled_call_string_arg_issue1892) {* literal, consumed as client(buildPath(id)). The builder's URL is recorded in* the per-file constant map and resolved at the call site, for both return* statements and arrow expression bodies. */+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();+}+TEST(extract_ts_url_builder_issue1009) {CBMFileResult *r = extract("function thingDetail(id: string): string {\n"" return `/api/v1/things/${id}/detail`;\n"@@ -7831,6 +7843,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_route_handler_after_named_middleware);RUN_TEST(extract_ts_route_handler_after_inline_middleware);RUN_TEST(extract_ts_url_builder_composed_issue1009);diff --git a/tests/test_ts_lsp.c b/tests/test_ts_lsp.cindex 52c3bbacb..b5e38b592 100644--- a/tests/test_ts_lsp.c+++ b/tests/test_ts_lsp.c@@ -729,6 +729,17 @@ 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 +4327,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);