feat(cli): support vix.app modules integration

Author: GaspardKirira

include/vix/cli/app/AppManifest.hpp

@@ -168,6 +168,24 @@ namespace vix::cli::app
      */
     std::vector<std::string> defines;
 
+    /**
+     * @brief Internal application modules generated by `vix modules`.
+     *
+     * Each entry maps to a CMake alias target using the current
+     * application name as project prefix.
+     *
+     * Example:
+     * - "auth"     -> <app-name>::auth
+     * - "orders"   -> <app-name>::orders
+     *
+     * Modules are loaded from:
+     *
+     * cmake/vix_modules.cmake
+     *
+     * relative to the original user project directory.
+     */
+    std::vector<std::string> modules;
+
     /**
      * @brief CMake targets or libraries to link.
      */

include/vix/cli/commands/modules/ModulesUtils.hpp

@@ -12,7 +12,7 @@
  */
 
 #ifndef VIX_CLI_MODULES_UTILS_HPP
-#define VIX_CLI_MODULES_UTISL_HPP
+#define VIX_CLI_MODULES_UTILS_HPP
 
 #include <filesystem>
 #include <optional>
@@ -56,6 +56,14 @@ namespace vix::commands::modules_cmd::utils
   /// Falls back to "myproj" if not found.
   std::string detect_project_name_from_cmake(const std::filesystem::path &root);
 
+  /// Parses the project name from the `name = ...` field in vix.app.
+  /// Falls back to "myproj" if not found.
+  std::string detect_project_name_from_vix_app(const std::filesystem::path &root);
+
+  /// Detects the project name from CMakeLists.txt first, then vix.app.
+  /// Falls back to "myproj" if no project name can be detected.
+  std::string detect_project_name(const std::filesystem::path &root);
+
 } // namespace vix::commands::modules_cmd::utils
 
 #endif

src/app/AppCMakeGenerator.cpp

@@ -83,6 +83,38 @@ namespace vix::cli::app
       return value;
     }
 
+    static std::string normalize_module_id(std::string name)
+    {
+      name.erase(
+          name.begin(),
+          std::find_if(
+              name.begin(),
+              name.end(),
+              [](unsigned char c)
+              {
+                return std::isspace(c) == 0;
+              }));
+
+      name.erase(
+          std::find_if(
+              name.rbegin(),
+              name.rend(),
+              [](unsigned char c)
+              {
+                return std::isspace(c) == 0;
+              })
+              .base(),
+          name.end());
+
+      for (char &c : name)
+      {
+        if (c == '-')
+          c = '_';
+      }
+
+      return name;
+    }
+
     // ---------------------------------------------------------------
     // Standard normalization
     // ---------------------------------------------------------------
@@ -283,6 +315,19 @@ namespace vix::cli::app
       out << "set(CMAKE_CXX_EXTENSIONS OFF)\n\n";
     }
 
+    static void emit_modules_loader(
+        std::ostringstream &out,
+        const fs::path &projectDir)
+    {
+      const fs::path loader =
+          projectDir / "cmake" / "vix_modules.cmake";
+
+      out << "# Internal application modules declared by `vix modules`\n";
+      out << "if(EXISTS " << cmake_quoted_path(loader) << ")\n";
+      out << "  include(" << cmake_quoted_path(loader) << ")\n";
+      out << "endif()\n\n";
+    }
+
     static bool is_vix_package(const AppPackage &pkg)
     {
       const std::string name = lower_copy(pkg.name);
@@ -431,6 +476,39 @@ namespace vix::cli::app
           manifest.links);
     }
 
+    static void emit_modules_links(
+        std::ostringstream &out,
+        const AppManifest &manifest,
+        const std::string &targetName)
+    {
+      if (manifest.modules.empty())
+        return;
+
+      out << "# Modules declared in vix.app\n";
+
+      for (const std::string &module : manifest.modules)
+      {
+        const std::string normalized = normalize_module_id(module);
+        const std::string alias = manifest.name + "::" + normalized;
+
+        out << "if(TARGET " << alias << ")\n";
+        out << "  target_link_libraries("
+            << targetName
+            << " PRIVATE "
+            << alias
+            << ")\n";
+        out << "else()\n";
+        out << "  message(FATAL_ERROR \"vix.app module not found: "
+            << normalized
+            << " (expected target "
+            << alias
+            << ")\")\n";
+        out << "endif()\n";
+      }
+
+      out << "\n";
+    }
+
     static void emit_output_dir(
         std::ostringstream &out,
         const AppManifest &manifest,
@@ -646,10 +724,15 @@ namespace vix::cli::app
     // targets are available to target_link_libraries.
     emit_packages(out, manifest.packages);
 
+    // User application modules must be loaded before linking their
+    // alias targets into the generated application target.
+    emit_modules_loader(out, projectDir);
+
     emit_target(out, manifest, targetName, projectDir);
     emit_includes_and_defines(out, manifest, targetName, projectDir);
     emit_options_and_features(out, manifest, targetName);
     emit_links(out, manifest, targetName);
+    emit_modules_links(out, manifest, targetName);
     emit_output_dir(out, manifest, targetName);
     emit_resources(out, manifest, targetName, projectDir);
     emit_tests(out, manifest, targetName, projectDir);

src/app/AppManifest.cpp

@@ -582,6 +582,12 @@ namespace vix::cli::app
         return true;
       }
 
+      if (normalizedKey == "modules")
+      {
+        manifest.modules = values;
+        return true;
+      }
+
       if (normalizedKey == "compile_options" ||
           normalizedKey == "compileoptions" ||
           normalizedKey == "cxxflags")

src/commands/ModulesCommand.cpp

@@ -108,7 +108,7 @@ namespace vix::commands::ModulesCommand
     const auto root = utils::resolve_root(opt.dir);
 
     const std::string project = opt.project.empty()
-                                    ? utils::detect_project_name_from_cmake(root)
+                                    ? utils::detect_project_name(root)
                                     : opt.project;
 
     if (opt.subcmd == "init")

src/commands/modules/ModulesCommands.cpp

@@ -21,7 +21,6 @@
 
 namespace vix::commands::modules_cmd::commands
 {
-
   namespace fs = std::filesystem;
   namespace cnt = vix::commands::modules_cmd::content;
   namespace utils = vix::commands::modules_cmd::utils;
@@ -90,10 +89,31 @@ namespace vix::commands::modules_cmd::commands
       return false;
     }
 
-    if (patchRoot && !cnt::patch_root_cmakelists_include(root))
+    const bool hasRootCMake =
+        utils::exists_file(root / "CMakeLists.txt");
+
+    const bool hasVixApp =
+        utils::exists_file(root / "vix.app");
+
+    if (patchRoot && hasRootCMake)
     {
-      ui::err_line(std::cout, "Failed to patch root CMakeLists.txt.");
-      return false;
+      if (!cnt::patch_root_cmakelists_include(root))
+      {
+        ui::err_line(std::cout, "Failed to patch root CMakeLists.txt.");
+        return false;
+      }
+    }
+    else if (patchRoot && hasVixApp)
+    {
+      ui::warn_line(
+          std::cout,
+          "vix.app project detected. CMake patch skipped.");
+    }
+    else if (patchRoot)
+    {
+      ui::warn_line(
+          std::cout,
+          "CMakeLists.txt not found. Skipping root patch.");
     }
 
     print_modules_banner("modules", "initialized");
@@ -103,8 +123,10 @@ namespace vix::commands::modules_cmd::commands
     print_command_step(1, "modules/", "module directory");
     print_command_step(2, "cmake/vix_modules.cmake", "module loader");
 
-    if (patchRoot)
+    if (patchRoot && hasRootCMake)
+    {
       print_command_step(3, "CMakeLists.txt", "patched");
+    }
 
     sep();
     section("next");
@@ -187,54 +209,80 @@ namespace vix::commands::modules_cmd::commands
       return false;
     }
 
-    if (patchRootLink && !cnt::patch_root_cmakelists_link_module(root, project, module))
+    const bool hasRootCMake =
+        utils::exists_file(root / "CMakeLists.txt");
+
+    const bool hasVixApp =
+        utils::exists_file(root / "vix.app");
+
+    if (patchRootLink && hasRootCMake)
     {
-      ui::err_line(std::cout, "Failed to patch root CMakeLists.txt with module link.");
-      return false;
+      if (!cnt::patch_root_cmakelists_link_module(root, project, module))
+      {
+        ui::err_line(std::cout, "Failed to patch root CMakeLists.txt with module link.");
+        return false;
+      }
+    }
+    else if (patchRootLink && hasVixApp)
+    {
+      ui::warn_line(
+          std::cout,
+          "vix.app project detected. Add the module in vix.app.");
+    }
+    else if (patchRootLink)
+    {
+      ui::warn_line(
+          std::cout,
+          "CMakeLists.txt not found. Skipping auto-link.");
     }
 
-    print_modules_banner(normalized, "module");
+    print_modules_banner(normalized, "module created");
     sep();
 
     section("files");
     print_command_step(
         1,
-        "modules/" + normalized + "/include/" + normalized + "/api.hpp",
-        "public header");
+        "modules/" + normalized + "/");
 
     print_command_step(
         2,
-        "modules/" + normalized + "/src/" + normalized + ".cpp",
-        "implementation");
+        "modules/" + normalized + "/include/" + normalized + "/api.hpp");
 
     print_command_step(
         3,
-        "modules/" + normalized + "/CMakeLists.txt",
-        "target");
-
-    sep();
-    section("target");
-    print_command_step(1, cnt::module_alias_name(project, module), "CMake alias");
+        "modules/" + normalized + "/src/" + normalized + ".cpp");
 
     sep();
     section("next");
-    print_command_step(
-        1,
-        "#include <" + normalized + "/api.hpp>",
-        "include");
 
-    if (patchRootLink)
+    if (hasVixApp)
     {
-      print_command_step(2, "vix build", "compile");
+      print_command_step(
+          1,
+          "add \"" + normalized + "\" to modules in vix.app");
+
+      print_command_step(2, "vix build");
+    }
+    else if (patchRootLink && hasRootCMake)
+    {
+      print_command_step(
+          1,
+          "#include <" + normalized + "/api.hpp>");
+
+      print_command_step(2, "vix build");
     }
     else
     {
+      print_command_step(
+          1,
+          "#include <" + normalized + "/api.hpp>");
+
       print_command_step(
           2,
-          "target_link_libraries(" + project + " PRIVATE " + cnt::module_alias_name(project, module) + ")",
-          "link manually");
-    }
+          "target_link_libraries(" + project + " PRIVATE " + cnt::module_alias_name(project, module) + ")");
 
+      print_command_step(3, "vix build");
+    }
     return true;
   }