fix: resolve entry path in lookup function and add test for relative file resolution

Author: tsurumi-yizhou

src/extract/compdb.cppm

@@ -96,7 +96,7 @@ auto lookup(const CompilationDatabase& db, std::string_view file)
     auto target = fs::path(file).lexically_normal();
 
     for(auto& entry : db.entries) {
-        auto entry_path = fs::path(entry.file).lexically_normal();
+        auto entry_path = (fs::path(entry.directory) / entry.file).lexically_normal();
         if(entry_path == target) {
             results.push_back(&entry);
         }

src/generate/generate.cppm

@@ -414,12 +414,6 @@ auto build_module_page_graph(const config::TaskConfig& config,
             }
         }
 
-        if(auto colon_pos = mod_name.find(':'); colon_pos != std::string::npos) {
-            auto main_name = mod_name.substr(0, colon_pos);
-            if(auto main_it = mod_to_page.find(main_name); main_it != mod_to_page.end()) {
-                add_page_dependency(graph, page_a, main_it->second);
-            }
-        }
     }
 
     // Call graph edges between module pages

tests/unit/extract/compdb.cpp

@@ -87,4 +87,23 @@ TEST_SUITE(compdb) {
         auto no_results = lookup(db, "/project/src/nonexistent.cpp");
         EXPECT_EQ(no_results.size(), 0u);
     }
+
+    TEST_CASE(lookup_resolves_relative_file_against_entry_directory) {
+        namespace fs = std::filesystem;
+
+        auto project_dir = (fs::temp_directory_path() / "clore_test_compdb_relative").lexically_normal();
+        auto source_path = (project_dir / "src" / "main.cpp").lexically_normal();
+
+        CompilationDatabase db;
+        db.entries.push_back(CompileEntry{
+            .file = "src/main.cpp",
+            .directory = project_dir.generic_string(),
+            .arguments = {"clang++", "-c", "src/main.cpp"},
+        });
+
+        auto results = lookup(db, source_path.generic_string());
+        ASSERT_EQ(results.size(), 1u);
+        EXPECT_EQ(results.front()->file, "src/main.cpp");
+        EXPECT_EQ(results.front()->directory, project_dir.generic_string());
+    }
 };

tests/unit/generate/generate.cpp

@@ -364,4 +364,65 @@ TEST_SUITE(generate) {
         EXPECT_NE(partition_prompt_it->prompt.find("## Module: `demo.math:detail`"),
                   std::string::npos);
     }
+
+    TEST_CASE(build_module_graph_does_not_create_partition_main_cycle) {
+        ScopedTempDir temp("build_module_cycle");
+        fs::create_directories(temp.path / "src");
+
+        auto config = make_config(temp.path);
+
+        extract::ProjectModel model;
+        model.uses_modules = true;
+
+        auto main_file = (temp.path / "src" / "math.cppm").generic_string();
+        auto partition_file = (temp.path / "src" / "math.detail.cppm").generic_string();
+
+        auto api_symbol = make_symbol(21, "add", "demo::math::add", "int add(int lhs, int rhs)", main_file);
+        auto partition_symbol = make_symbol(22, "detail", "demo::math::detail", "int detail()", partition_file);
+
+        model.symbols.emplace(api_symbol.id, api_symbol);
+        model.symbols.emplace(partition_symbol.id, partition_symbol);
+
+        model.modules.emplace(
+            main_file,
+            extract::ModuleUnit{
+                .name = "demo.math",
+                .is_interface = true,
+                .source_file = main_file,
+                .imports = {"demo.math:detail"},
+                .symbols = {api_symbol.id},
+            });
+        model.modules.emplace(
+            partition_file,
+            extract::ModuleUnit{
+                .name = "demo.math:detail",
+                .is_interface = true,
+                .source_file = partition_file,
+                .imports = {},
+                .symbols = {partition_symbol.id},
+            });
+
+        auto graph = build_page_graph(config, model);
+
+        ASSERT_TRUE(graph.nodes.contains("demo.math/index.md"));
+        ASSERT_TRUE(graph.nodes.contains("demo.math/detail.md"));
+
+        auto& main_node = graph.nodes.at("demo.math/index.md");
+        auto& partition_node = graph.nodes.at("demo.math/detail.md");
+
+        EXPECT_EQ(std::count(main_node.depends_on.begin(), main_node.depends_on.end(),
+                             "demo.math/detail.md"),
+                  1);
+        EXPECT_EQ(std::count(partition_node.depends_on.begin(), partition_node.depends_on.end(),
+                             "demo.math/index.md"),
+                  0);
+
+        auto pos_main = std::find(graph.generation_order.begin(), graph.generation_order.end(),
+                                  "demo.math/index.md");
+        auto pos_partition = std::find(graph.generation_order.begin(), graph.generation_order.end(),
+                                       "demo.math/detail.md");
+        ASSERT_TRUE(pos_main != graph.generation_order.end());
+        ASSERT_TRUE(pos_partition != graph.generation_order.end());
+        EXPECT_LT(pos_partition, pos_main);
+    }
 };