refactor(cli): extract new and modules command internals

Author: GaspardKirira

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

@@ -0,0 +1,43 @@
+/**
+ * @file ModulesCommands.hpp
+ * @author Gaspard Kirira
+ *
+ * Copyright 2025, Gaspard Kirira.  All rights reserved.
+ * https://github.com/vixcpp/vix
+ * Use of this source code is governed by a MIT license
+ * that can be found in the License file.
+ *
+ * Business-logic handlers for the `vix modules` subcommands.
+ * Each function is self-contained: it prints its own output
+ * and returns true on success.
+ */
+
+#ifndef VIX_CLI_MODULES_COMMANDS_HPP
+#define VIX_CLI_MODULES_COMMANDS_HPP
+
+#include <filesystem>
+#include <string>
+
+namespace vix::commands::modules_cmd::commands
+{
+
+  /// `vix modules init` — creates modules/ + cmake/vix_modules.cmake,
+  /// optionally patches root CMakeLists.txt.
+  bool cmd_init(const std::filesystem::path &root, bool patchRoot);
+
+  /// `vix modules add <module>` — scaffolds a new module skeleton under
+  /// modules/<module>/, optionally auto-links it in the root CMakeLists.txt.
+  bool cmd_add(
+      const std::filesystem::path &root,
+      const std::string &project,
+      const std::string &module,
+      bool patchRootLink);
+
+  /// `vix modules check` — validates module safety rules:
+  ///   - no public header includes a private src/ path
+  ///   - every cross-module include has a declared CMake dependency
+  bool cmd_check(const std::filesystem::path &root, const std::string &project);
+
+} // namespace vix::commands::modules_cmd::commands
+
+#endif

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

@@ -0,0 +1,100 @@
+/**
+ * @file ModulesContent.hpp
+ * @author Gaspard Kirira
+ *
+ * Copyright 2025, Gaspard Kirira.  All rights reserved.
+ * https://github.com/vixcpp/vix
+ * Use of this source code is governed by a MIT license
+ * that can be found in the License file.
+ *
+ * Module naming / validation, CMake and C++ content generators,
+ * and static analysis helpers for `vix modules`.
+ */
+#ifndef VIX_CLI_MODULES_CONTENT_HPP
+#define VIX_CLI_MODULES_CONTENT_HPP
+
+#include <filesystem>
+#include <set>
+#include <string>
+#include <unordered_set>
+
+namespace vix::commands::modules_cmd::content
+{
+  /// Replaces '-' with '_' and trims the name.
+  std::string normalize_module_id(std::string name);
+
+  /// Returns "<project>_<normalized_module>"  (CMake target name).
+  std::string module_target_name(const std::string &project, const std::string &module);
+
+  /// Returns "<project>::<normalized_module>"  (CMake alias / link name).
+  std::string module_alias_name(const std::string &project, const std::string &module);
+
+  // ------------------------------------------------------------------
+  // Validation
+  // ------------------------------------------------------------------
+
+  /// Accepts [A-Za-z0-9_-], non-empty.
+  bool is_valid_module_name(const std::string &name);
+
+  /// Returns true if name conflicts with a well-known tool/library name.
+  bool is_reserved_module_name(std::string name);
+
+  // ------------------------------------------------------------------
+  // CMake content generators
+  // ------------------------------------------------------------------
+
+  /// cmake/vix_modules.cmake — the central include file added by `init`.
+  std::string cmake_vix_modules_cmake_app_first();
+
+  /// modules/<m>/CMakeLists.txt for a new module.
+  std::string module_cmakelists_txt_app_first(const std::string &project, const std::string &module);
+
+  // ------------------------------------------------------------------
+  // C++ content generators
+  // ------------------------------------------------------------------
+
+  /// modules/<m>/include/<m>/api.hpp stub.
+  std::string module_public_header_app_first(const std::string &project, const std::string &module);
+
+  /// modules/<m>/src/<m>.cpp stub.
+  std::string module_impl_cpp_app_first(const std::string &project, const std::string &module);
+
+  // ------------------------------------------------------------------
+  // CMakeLists.txt patching
+  // ------------------------------------------------------------------
+
+  /// Inserts the vix_modules.cmake include block after the project() call
+  /// (idempotent via begin/end markers).
+  bool patch_root_cmakelists_include(const std::filesystem::path &root);
+
+  /// Inserts a conditional target_link_libraries block for the given module
+  /// inside the VIX_MODULE_LINKS section (idempotent per-module).
+  bool patch_root_cmakelists_link_module(
+      const std::filesystem::path &root,
+      const std::string &project,
+      const std::string &module);
+
+  // ------------------------------------------------------------------
+  // Static analysis helpers (used by cmd_check)
+  // ------------------------------------------------------------------
+
+  /// Extracts all "<project>::<mod>" aliases declared in a module's
+  /// CMakeLists.txt as explicit dependencies.
+  std::unordered_set<std::string> parse_declared_deps_from_module_cmake(
+      const std::filesystem::path &moduleCmake,
+      const std::string &project);
+
+  /// Returns module names referenced via "#include <other/...>" in a
+  /// public header, filtering to modules that actually exist on disk.
+  std::set<std::string> parse_public_includes_for_cross_module(
+      const std::filesystem::path &publicHeader,
+      const std::filesystem::path &modulesDir);
+
+  /// Returns true if a public header includes a private src/ path.
+  bool header_includes_private_impl(
+      const std::filesystem::path &publicHeader,
+      const std::filesystem::path &moduleDir);
+
+} // namespace vix::commands::modules_cmd::content
+
+#endif

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

@@ -0,0 +1,35 @@
+/**
+ * @file ModulesTypes.hpp
+ * @author Gaspard Kirira
+ *
+ * Copyright 2025, Gaspard Kirira.  All rights reserved.
+ * https://github.com/vixcpp/vix
+ * Use of this source code is governed by a MIT license
+ * that can be found in the License file.
+ *
+ * Shared types for the `vix modules` command.
+ */
+#ifndef VIX_CLI_MODULES_TYPES_HPP
+#define VIX_CLI_MODULES_TYPES_HPP
+
+#include <string>
+
+namespace vix::commands::modules_cmd
+{
+
+  /// Parsed CLI arguments for `vix modules`.
+  struct Options
+  {
+    std::string subcmd;  ///< "init" | "add" | "check" | "help"
+    std::string dir;     ///< --dir value (empty = cwd)
+    std::string project; ///< --project override (empty = auto-detect)
+    std::string module;  ///< module name for `add`
+
+    bool patchRoot = true; ///< patch root CMakeLists.txt on init
+    bool patchLink = true; ///< auto-link module into main target on add
+    bool showHelp = false;
+  };
+
+} // namespace vix::commands::modules_cmd
+
+#endif

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

@@ -0,0 +1,61 @@
+/**
+ * @file ModulesUtils.hpp
+ * @author Gaspard Kirira
+ *
+ * Copyright 2025, Gaspard Kirira.  All rights reserved.
+ * https://github.com/vixcpp/vix
+ * Use of this source code is governed by a MIT license
+ * that can be found in the License file.
+ *
+ * Generic string and filesystem helpers for `vix modules`.
+ * No dependency on CMake content or module business logic.
+ */
+
+#ifndef VIX_CLI_MODULES_UTILS_HPP
+#define VIX_CLI_MODULES_UTISL_HPP
+
+#include <filesystem>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <vector>
+
+namespace vix::commands::modules_cmd::utils
+{
+
+  // String helpers
+  bool starts_with(std::string_view s, std::string_view pfx);
+  bool ends_with(std::string_view s, std::string_view suf);
+  std::string trim(std::string s);
+  std::string to_lower(std::string s);
+
+  // Filesystem helpers
+  bool exists_dir(const std::filesystem::path &p);
+  bool exists_file(const std::filesystem::path &p);
+
+  /// Creates all directories (like mkdir -p). Returns true if the path
+  /// already exists or was created successfully.
+  bool ensure_dir(const std::filesystem::path &p);
+
+  /// Reads an entire file into a string. Returns nullopt on failure.
+  std::optional<std::string> read_file(const std::filesystem::path &p);
+
+  /// Writes content to p only if p does not already exist.
+  bool write_file_if_missing(const std::filesystem::path &p, const std::string &content);
+
+  /// Writes content to p, truncating any existing content.
+  bool write_file_overwrite(const std::filesystem::path &p, const std::string &content);
+
+  /// Returns all regular files under dir, recursively.
+  std::vector<std::filesystem::path> list_files_recursive(const std::filesystem::path &dir);
+
+  /// Resolves a raw --dir option to an absolute path (defaults to cwd).
+  std::filesystem::path resolve_root(const std::string &dirOpt);
+
+  /// Parses the project name from the first project() call in CMakeLists.txt.
+  /// Falls back to "myproj" if not found.
+  std::string detect_project_name_from_cmake(const std::filesystem::path &root);
+
+} // namespace vix::commands::modules_cmd::utils
+
+#endif

include/vix/cli/commands/new/NewGenerator.hpp

@@ -0,0 +1,69 @@
+#pragma once
+
+/**
+ * @file NewGenerator.hpp
+ * @author Gaspard Kirira
+ *
+ * Copyright 2025, Gaspard Kirira.  All rights reserved.
+ * https://github.com/vixcpp/vix
+ * Use of this source code is governed by a MIT license
+ * that can be found in the License file.
+ *
+ * File-system helpers and project scaffolding routines for `vix new`.
+ */
+
+#include <filesystem>
+#include <string>
+
+#include <vix/cli/commands/new/NewTypes.hpp>
+
+namespace vix::commands::new_cmd::generator
+{
+
+  namespace fs = std::filesystem;
+
+  // ------------------------------------------------------------------
+  // File-system helpers
+  // ------------------------------------------------------------------
+
+  bool dir_exists(const fs::path &p);
+  bool dir_is_empty(const fs::path &p);
+
+  /// Creates all directories in p (like mkdir -p). Returns false and sets err on failure.
+  bool ensure_dir(const fs::path &p, std::string &err);
+
+  /// Writes content to p, creating parent directories as needed.
+  bool write_text_file(const fs::path &p, const std::string &content, std::string &err);
+
+  // ------------------------------------------------------------------
+  // Path helpers
+  // ------------------------------------------------------------------
+
+  bool is_dot_path(const std::string &s);
+  std::string current_dir_name();
+
+  // ------------------------------------------------------------------
+  // Project scaffolding
+  // ------------------------------------------------------------------
+
+  /// Generates all files for an Application project under projectDir.
+  bool generate_app_project(
+      const fs::path &projectDir,
+      const std::string &projName,
+      const FeaturesSelection &features,
+      std::string &err);
+
+  /// Generates all files for a header-only Library project under projectDir.
+  bool generate_lib_project(
+      const fs::path &projectDir,
+      const std::string &projName,
+      std::string &err);
+
+  // ------------------------------------------------------------------
+  // Post-generation output
+  // ------------------------------------------------------------------
+
+  void print_next_steps_app(const fs::path &projectDir, const std::string &projName);
+  void print_next_steps_lib(const fs::path &projectDir, const std::string &projName);
+
+} // namespace vix::commands::new_cmd::generator