Skip to content

Commit 9b4d697

Browse files
committed
fix(ui): preserve framework route entry points
Signed-off-by: lorenzozanee <wyz0707@proton.me>
1 parent 59a05eb commit 9b4d697

2 files changed

Lines changed: 74 additions & 5 deletions

File tree

‎src/ui/layout3d.c‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -554,15 +554,17 @@ cbm_layout_result_t *cbm_layout_compute(cbm_store_t *store, const char *project,
554554

555555
/* 3. Query edges — filter during fetch via binary search (O(e log n)) */
556556
int *deg = calloc((size_t)n, sizeof(int));
557+
bool *framework_entry = calloc((size_t)n, sizeof(bool));
557558
int mapped = 0;
558559
int edge_cap = CBM_SZ_256;
559560
cbm_edge_t *all_edges = malloc((size_t)edge_cap * sizeof(cbm_edge_t));
560561
int *es = malloc((size_t)edge_cap * sizeof(int));
561562
int *ed = malloc((size_t)edge_cap * sizeof(int));
562563
cbm_schema_info_t schema;
563564
memset(&schema, 0, sizeof(schema));
564-
if (deg && all_edges && es && ed &&
565-
cbm_store_get_schema(store, project, &schema) == CBM_STORE_OK) {
565+
bool framework_entries_valid = deg && framework_entry && all_edges && es && ed;
566+
if (framework_entries_valid) {
567+
if (cbm_store_get_schema(store, project, &schema) == CBM_STORE_OK) {
566568
for (int t = 0; t < schema.edge_type_count; t++) {
567569
cbm_edge_t *te = NULL;
568570
int tc = 0;
@@ -571,13 +573,23 @@ cbm_layout_result_t *cbm_layout_compute(cbm_store_t *store, const char *project,
571573
for (int e = 0; e < tc; e++) {
572574
int si = find_node_index(id_map, n, te[e].source_id);
573575
int di = find_node_index(id_map, n, te[e].target_id);
576+
if (si >= 0 && te[e].type && strcmp(te[e].type, "HANDLES") == 0) {
577+
cbm_node_t route = {0};
578+
if (cbm_store_find_node_by_id(store, te[e].target_id, &route) == CBM_STORE_OK) {
579+
if (route.label && strcmp(route.label, "Route") == 0)
580+
framework_entry[si] = true;
581+
cbm_node_free_fields(&route);
582+
} else
583+
framework_entries_valid = false;
584+
}
574585
if (si >= 0 && di >= 0) {
575586
if (mapped >= edge_cap) {
576587
int nc = edge_cap * PAIR_LEN;
577588
cbm_edge_t *te2 = realloc(all_edges, (size_t)nc * sizeof(cbm_edge_t));
578589
int *ts = realloc(es, (size_t)nc * sizeof(int));
579590
int *td = realloc(ed, (size_t)nc * sizeof(int));
580591
if (!te2 || !ts || !td) {
592+
framework_entries_valid = false;
581593
if (te2)
582594
all_edges = te2;
583595
if (ts)
@@ -606,7 +618,11 @@ cbm_layout_result_t *cbm_layout_compute(cbm_store_t *store, const char *project,
606618
}
607619
}
608620
free(te);
609-
}
621+
} else
622+
framework_entries_valid = false;
623+
}
624+
} else {
625+
framework_entries_valid = false;
610626
}
611627
edges_done:
612628
cbm_store_schema_free(&schema);
@@ -630,6 +646,7 @@ cbm_layout_result_t *cbm_layout_compute(cbm_store_t *store, const char *project,
630646
if (!result || !bodies) {
631647
free(bodies);
632648
free(deg);
649+
free(framework_entry);
633650
free(es);
634651
free(ed);
635652
free(cdepth);
@@ -735,11 +752,12 @@ cbm_layout_result_t *cbm_layout_compute(cbm_store_t *store, const char *project,
735752
status = "structural";
736753
else if (testish)
737754
status = "test";
738-
else if (nf.is_entry || nf.is_route)
755+
else if (nf.is_entry || nf.is_route ||
756+
(framework_entries_valid && framework_entry && framework_entry[i]))
739757
status = "entry";
740758
else if (nf.is_exported)
741759
status = "exported";
742-
else if (ic == 0 && iu == 0)
760+
else if (framework_entries_valid && ic == 0 && iu == 0)
743761
status = "dead";
744762
else if (ic == 1)
745763
status = "single";
@@ -772,6 +790,7 @@ cbm_layout_result_t *cbm_layout_compute(cbm_store_t *store, const char *project,
772790

773791
free(bodies);
774792
free(deg);
793+
free(framework_entry);
775794
free(es);
776795
free(ed);
777796
free(cdepth);

‎tests/test_ui.c‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,30 @@ TEST(layout_dead_code_classification) {
627627
.qualified_name = "dc::exportedfn",
628628
.file_path = "src/d.c",
629629
.properties_json = "{\"is_exported\":true}"};
630+
cbm_node_t framework = {.project = "dc",
631+
.label = "Function",
632+
.name = "frameworkfn",
633+
.qualified_name = "dc::frameworkfn",
634+
.file_path = "src/routes.c",
635+
.properties_json = "{}"};
636+
cbm_node_t route = {.project = "dc",
637+
.label = "Route",
638+
.name = "GET /framework",
639+
.qualified_name = "dc::route",
640+
.file_path = "src/routes.c",
641+
.properties_json = "{}"};
642+
cbm_node_t unrelated = {.project = "dc",
643+
.label = "Class",
644+
.name = "UnrelatedTarget",
645+
.qualified_name = "dc::unrelated",
646+
.file_path = "src/routes.c",
647+
.properties_json = "{}"};
648+
cbm_node_t nonroute = {.project = "dc",
649+
.label = "Function",
650+
.name = "nonroutefn",
651+
.qualified_name = "dc::nonroutefn",
652+
.file_path = "src/routes.c",
653+
.properties_json = "{}"};
630654
cbm_node_t single = {.project = "dc",
631655
.label = "Function",
632656
.name = "calledonce",
@@ -658,6 +682,14 @@ TEST(layout_dead_code_classification) {
658682
cbm_store_upsert_node(store, &tst);
659683
cbm_store_upsert_node(store, &tstpath);
660684
cbm_store_upsert_node(store, &exp);
685+
int64_t id_framework = cbm_store_upsert_node(store, &framework);
686+
int64_t id_route = cbm_store_upsert_node(store, &route);
687+
int64_t id_unrelated = cbm_store_upsert_node(store, &unrelated);
688+
int64_t id_nonroute = cbm_store_upsert_node(store, &nonroute);
689+
ASSERT_GT(id_framework, 0);
690+
ASSERT_GT(id_route, 0);
691+
ASSERT_GT(id_unrelated, 0);
692+
ASSERT_GT(id_nonroute, 0);
661693
int64_t id_single = cbm_store_upsert_node(store, &single);
662694
int64_t id_norm = cbm_store_upsert_node(store, &norm);
663695
int64_t id_caller = cbm_store_upsert_node(store, &caller);
@@ -670,9 +702,15 @@ TEST(layout_dead_code_classification) {
670702
cbm_edge_t e2 = {
671703
.project = "dc", .source_id = id_caller, .target_id = id_norm, .type = "CALLS"};
672704
cbm_edge_t e3 = {.project = "dc", .source_id = id_dead, .target_id = id_norm, .type = "CALLS"};
705+
cbm_edge_t framework_route = {
706+
.project = "dc", .source_id = id_framework, .target_id = id_route, .type = "HANDLES"};
707+
cbm_edge_t framework_unrelated = {
708+
.project = "dc", .source_id = id_nonroute, .target_id = id_unrelated, .type = "HANDLES"};
673709
cbm_store_insert_edge(store, &e1);
674710
cbm_store_insert_edge(store, &e2);
675711
cbm_store_insert_edge(store, &e3);
712+
ASSERT_GT(cbm_store_insert_edge(store, &framework_route), 0);
713+
ASSERT_GT(cbm_store_insert_edge(store, &framework_unrelated), 0);
676714

677715
cbm_layout_result_t *r = cbm_layout_compute(store, "dc", CBM_LAYOUT_OVERVIEW, NULL, 0, 100);
678716
ASSERT_NOT_NULL(r);
@@ -700,6 +738,18 @@ TEST(layout_dead_code_classification) {
700738
ASSERT_NOT_NULL(ln);
701739
ASSERT_STR_EQ(ln->status, "exported");
702740

741+
ln = find_layout_node(r, "frameworkfn");
742+
ASSERT_NOT_NULL(ln);
743+
ASSERT_STR_EQ(ln->status, "entry");
744+
745+
ln = find_layout_node(r, "nonroutefn");
746+
ASSERT_NOT_NULL(ln);
747+
ASSERT_STR_EQ(ln->status, "dead");
748+
749+
ln = find_layout_node(r, "GET /framework");
750+
ASSERT_NOT_NULL(ln);
751+
ASSERT_STR_EQ(ln->status, "structural");
752+
703753
ln = find_layout_node(r, "calledonce");
704754
ASSERT_NOT_NULL(ln);
705755
ASSERT_STR_EQ(ln->status, "single");

0 commit comments

Comments
 (0)