fix(run): auto-link installed registry dependencies

GaspardKirira · GaspardKirira · commit 88b6ff3202f7 · 2026-05-11T16:16:09.000+03:00
diff --git a/src/commands/InstallCommand.cpp b/src/commands/InstallCommand.cpp
@@ -75,6 +75,7 @@ namespace vix::commands
       std::string type;
       std::string include{"include"};
       std::vector<std::string> dependencies;
+      std::vector<std::string> cmakeTargets;
 
       fs::path checkout;
       fs::path linkDir;
@@ -465,6 +466,7 @@ namespace vix::commands
         dep.type = "unknown";
         dep.include = "include";
         dep.dependencies.clear();
+        dep.cmakeTargets.clear();
         return;
       }
 
@@ -508,6 +510,38 @@ namespace vix::commands
         }
       };
 
+      dep.cmakeTargets.clear();
+
+      auto append_target = [&](const std::string &target)
+      {
+        const std::string t = trim_copy(target);
+        if (t.empty())
+          return;
+
+        if (std::find(dep.cmakeTargets.begin(), dep.cmakeTargets.end(), t) == dep.cmakeTargets.end())
+          dep.cmakeTargets.push_back(t);
+      };
+
+      if (j.contains("cmake") && j["cmake"].is_object())
+      {
+        const auto &cmake = j["cmake"];
+
+        if (cmake.contains("target") && cmake["target"].is_string())
+          append_target(cmake["target"].get<std::string>());
+
+        if (cmake.contains("targets") && cmake["targets"].is_array())
+        {
+          for (const auto &item : cmake["targets"])
+          {
+            if (item.is_string())
+              append_target(item.get<std::string>());
+          }
+        }
+      }
+
+      if (j.contains("cmake_target") && j["cmake_target"].is_string())
+        append_target(j["cmake_target"].get<std::string>());
+
       if (j.contains("dependencies"))
         read_dep_block(j["dependencies"]);
 
@@ -744,6 +778,21 @@ namespace vix::commands
 
       out << "set(_VIX_DEPS_DIR " << cmake_quote(project_deps_dir().string()) << ")\n\n";
 
+      out << "# Vix installed package roots\n";
+      out << "if(DEFINED ENV{VIX_ROOT} AND NOT \"$ENV{VIX_ROOT}\" STREQUAL \"\")\n";
+      out << "  list(PREPEND CMAKE_PREFIX_PATH \"$ENV{VIX_ROOT}\")\n";
+      out << "endif()\n\n";
+
+      out << "if(DEFINED ENV{HOME} AND NOT \"$ENV{HOME}\" STREQUAL \"\")\n";
+      out << "  list(APPEND CMAKE_PREFIX_PATH \"$ENV{HOME}/.vix\")\n";
+      out << "  list(APPEND CMAKE_PREFIX_PATH \"$ENV{HOME}/.local\")\n";
+      out << "endif()\n\n";
+
+      out << "if(DEFINED ENV{USERPROFILE} AND NOT \"$ENV{USERPROFILE}\" STREQUAL \"\")\n";
+      out << "  list(APPEND CMAKE_PREFIX_PATH \"$ENV{USERPROFILE}/.vix\")\n";
+      out << "  list(APPEND CMAKE_PREFIX_PATH \"$ENV{USERPROFILE}/.local\")\n";
+      out << "endif()\n\n";
+
       out << "# ------------------------------------------------------\n";
       out << "# Internal helpers generated by Vix\n";
       out << "# ------------------------------------------------------\n\n";
@@ -825,12 +874,40 @@ namespace vix::commands
       out << "    return()\n";
       out << "  endif()\n";
       out << "\n";
+      out << "  string(REPLACE \"-\" \"_\" _VIX_NS_UNDERSCORE \"${dep_ns}\")\n";
+      out << "  string(REPLACE \".\" \"_\" _VIX_NS_UNDERSCORE \"${_VIX_NS_UNDERSCORE}\")\n";
+      out << "\n";
+      out << "  string(REPLACE \"-\" \"_\" _VIX_NAME_UNDERSCORE \"${dep_name}\")\n";
+      out << "  string(REPLACE \".\" \"_\" _VIX_NAME_UNDERSCORE \"${_VIX_NAME_UNDERSCORE}\")\n";
+      out << "\n";
+      out << "  string(REPLACE \"-\" \"\" _VIX_NAME_FLAT \"${dep_name}\")\n";
+      out << "  string(REPLACE \"_\" \"\" _VIX_NAME_FLAT \"${_VIX_NAME_FLAT}\")\n";
+      out << "  string(REPLACE \".\" \"\" _VIX_NAME_FLAT \"${_VIX_NAME_FLAT}\")\n";
+      out << "\n";
       out << "  set(_VIX_CANDIDATES\n";
+      out << "    ${ARGN}\n";
       out << "    \"${dep_name}\"\n";
+      out << "    \"${_VIX_NAME_UNDERSCORE}\"\n";
+      out << "    \"${_VIX_NAME_FLAT}\"\n";
+      out << "\n";
       out << "    \"${dep_name}::${dep_name}\"\n";
+      out << "    \"${dep_name}::${_VIX_NAME_UNDERSCORE}\"\n";
+      out << "    \"${_VIX_NAME_UNDERSCORE}::${_VIX_NAME_UNDERSCORE}\"\n";
+      out << "    \"${_VIX_NAME_UNDERSCORE}::${dep_name}\"\n";
+      out << "    \"${_VIX_NAME_FLAT}::${_VIX_NAME_FLAT}\"\n";
+      out << "\n";
       out << "    \"${dep_ns}_${dep_name}\"\n";
+      out << "    \"${dep_ns}_${_VIX_NAME_UNDERSCORE}\"\n";
+      out << "    \"${_VIX_NS_UNDERSCORE}_${dep_name}\"\n";
+      out << "    \"${_VIX_NS_UNDERSCORE}_${_VIX_NAME_UNDERSCORE}\"\n";
+      out << "\n";
       out << "    \"${dep_ns}-${dep_name}\"\n";
       out << "    \"${dep_ns}.${dep_name}\"\n";
+      out << "\n";
+      out << "    \"${dep_ns}::${dep_name}\"\n";
+      out << "    \"${dep_ns}::${_VIX_NAME_UNDERSCORE}\"\n";
+      out << "    \"${_VIX_NS_UNDERSCORE}::${dep_name}\"\n";
+      out << "    \"${_VIX_NS_UNDERSCORE}::${_VIX_NAME_UNDERSCORE}\"\n";
       out << "  )\n";
       out << "\n";
       out << "  foreach(_VIX_CAND IN LISTS _VIX_CANDIDATES)\n";
@@ -877,7 +954,12 @@ namespace vix::commands
               << cmake_quote((project_vix_dir() / buildDirName).string())
               << " EXCLUDE_FROM_ALL)\n";
           out << "endif()\n";
-          out << "_vix_try_bridge_for_dep(" << depNs << " " << depName << ")\n";
+          out << "_vix_try_bridge_for_dep(" << depNs << " " << depName;
+
+          for (const auto &target : dep.cmakeTargets)
+            out << " " << target;
+
+          out << ")\n";
         }
         else if (isHeaderOnly)
         {
@@ -908,7 +990,12 @@ namespace vix::commands
                 << cmake_quote((project_vix_dir() / buildDirName).string())
                 << " EXCLUDE_FROM_ALL)\n";
             out << "endif()\n";
-            out << "_vix_try_bridge_for_dep(" << depNs << " " << depName << ")\n";
+            out << "_vix_try_bridge_for_dep(" << depNs << " " << depName;
+
+            for (const auto &target : dep.cmakeTargets)
+              out << " " << target;
+
+            out << ")\n";
           }
           else if (fs::exists(depIncludeDir))
           {
diff --git a/src/commands/run/RunScript.cpp b/src/commands/run/RunScript.cpp
@@ -101,18 +101,80 @@ namespace vix::commands::RunCommand::detail
       return state;
     }
 
+    bool project_has_registry_lock_dependencies(const fs::path &projectDir)
+    {
+      const fs::path lockPath = projectDir / "vix.lock";
+
+      if (!fs::exists(lockPath))
+        return false;
+
+      std::ifstream ifs(lockPath);
+      if (!ifs)
+        return false;
+
+      nlohmann::json lock;
+
+      try
+      {
+        ifs >> lock;
+      }
+      catch (...)
+      {
+        return false;
+      }
+
+      if (!lock.is_object())
+        return false;
+
+      if (!lock.contains("dependencies") || !lock["dependencies"].is_array())
+        return false;
+
+      return !lock["dependencies"].empty();
+    }
+
+    bool project_registry_deps_installed(const fs::path &projectDir)
+    {
+      const fs::path vixDir = projectDir / ".vix";
+      const fs::path depsDir = vixDir / "deps";
+      const fs::path depsCmake = vixDir / "vix_deps.cmake";
+
+      return fs::exists(depsDir) && fs::exists(depsCmake);
+    }
+
+    bool ensure_registry_deps_installed_if_needed(const fs::path &projectDir)
+    {
+      if (!project_has_registry_lock_dependencies(projectDir))
+        return true;
+
+      if (project_registry_deps_installed(projectDir))
+        return true;
+
+      error("Dependencies not installed");
+      hint("run: vix install");
+      return false;
+    }
+
     int prepare_script_options_common(Options &opt)
     {
       print_double_dash_warning_if_needed(opt);
 
       if (!ensure_script_exists(opt.cppFile))
         return 1;
 
+      const fs::path projectDir =
+          opt.cppFile.has_parent_path()
+              ? fs::absolute(opt.cppFile.parent_path()).lexically_normal()
+              : fs::current_path();
+
+      if (!ensure_registry_deps_installed_if_needed(projectDir))
+        return 1;
+
       if (opt.autoDeps != AutoDepsMode::None)
         apply_auto_deps_includes_from_deps_folder(opt, opt.cppFile.parent_path());
 
       return 0;
     }
+
     inline bool is_sigint_exit_code(int code) noexcept
     {
       return code == 130;
diff --git a/src/commands/run/detail/ScriptCMake.cpp b/src/commands/run/detail/ScriptCMake.cpp
@@ -348,20 +348,59 @@ namespace vix::commands::RunCommand::detail
             if (pkg.contains("id") && pkg["id"].is_string())
               ordered.push_back(pkg["id"].get<std::string>());
           }
+
+          return ordered;
+        }
+
+        if (j.contains("dependencies") && j["dependencies"].is_array())
+        {
+          for (const auto &dep : j["dependencies"])
+          {
+            if (dep.is_string())
+            {
+              ordered.push_back(dep.get<std::string>());
+            }
+            else if (dep.is_object())
+            {
+              if (dep.contains("id") && dep["id"].is_string())
+                ordered.push_back(dep["id"].get<std::string>());
+            }
+          }
+
           return ordered;
         }
 
         if (j.contains("dependencies") && j["dependencies"].is_object())
         {
           for (auto it = j["dependencies"].begin(); it != j["dependencies"].end(); ++it)
             ordered.push_back(it.key());
+
           return ordered;
         }
       }
 
       return ordered;
     }
 
+    std::vector<std::string> lock_package_ids_to_aliases(
+        const std::vector<std::string> &packageIds)
+    {
+      std::vector<std::string> aliases;
+
+      for (const auto &id : packageIds)
+      {
+        if (id.empty())
+          continue;
+
+        append_unique_string(aliases, dep_id_to_cmake_alias(id));
+      }
+
+      std::sort(aliases.begin(), aliases.end());
+      aliases.erase(std::unique(aliases.begin(), aliases.end()), aliases.end());
+
+      return aliases;
+    }
+
     std::vector<std::pair<std::string, std::string>> extract_dep_packages_from_include_dirs(
         const std::vector<std::string> &includeDirs)
     {
@@ -686,6 +725,32 @@ namespace vix::commands::RunCommand::detail
       return out;
     }
 
+    fs::path local_vix_deps_cmake_path(const fs::path &cppPath)
+    {
+      return cppPath.parent_path() / ".vix" / "vix_deps.cmake";
+    }
+
+    bool has_local_vix_deps_cmake(const fs::path &cppPath)
+    {
+      return fs::exists(local_vix_deps_cmake_path(cppPath));
+    }
+
+    void append_local_vix_deps_include(
+        std::string &s,
+        const fs::path &cppPath)
+    {
+      const fs::path depsCmake = local_vix_deps_cmake_path(cppPath);
+
+      if (!fs::exists(depsCmake))
+        return;
+
+      append_line(s, "# Local Vix registry dependencies");
+      append_line(s, "if (EXISTS " + cmake_quote(depsCmake.string()) + ")");
+      append_line(s, "  include(" + cmake_quote(depsCmake.string()) + ")");
+      append_line(s, "endif()");
+      append_line(s);
+    }
+
     std::string cmake_quote_raw(const std::string &p)
     {
       return "\"" + p + "\"";
@@ -813,6 +878,24 @@ namespace vix::commands::RunCommand::detail
       append_line(s, "set(CMAKE_CXX_EXTENSIONS OFF)");
       append_line(s);
 
+      append_line(s, "# Vix installed package roots");
+      append_line(s, "if(DEFINED ENV{VIX_ROOT} AND NOT \"$ENV{VIX_ROOT}\" STREQUAL \"\")");
+      append_line(s, "  list(PREPEND CMAKE_PREFIX_PATH \"$ENV{VIX_ROOT}\")");
+      append_line(s, "endif()");
+      append_line(s);
+
+      append_line(s, "if(DEFINED ENV{HOME} AND NOT \"$ENV{HOME}\" STREQUAL \"\")");
+      append_line(s, "  list(APPEND CMAKE_PREFIX_PATH \"$ENV{HOME}/.vix\")");
+      append_line(s, "  list(APPEND CMAKE_PREFIX_PATH \"$ENV{HOME}/.local\")");
+      append_line(s, "endif()");
+      append_line(s);
+
+      append_line(s, "if(DEFINED ENV{USERPROFILE} AND NOT \"$ENV{USERPROFILE}\" STREQUAL \"\")");
+      append_line(s, "  list(APPEND CMAKE_PREFIX_PATH \"$ENV{USERPROFILE}/.vix\")");
+      append_line(s, "  list(APPEND CMAKE_PREFIX_PATH \"$ENV{USERPROFILE}/.local\")");
+      append_line(s, "endif()");
+      append_line(s);
+
       append_line(s, "if (NOT CMAKE_BUILD_TYPE)");
       append_line(s, "  set(CMAKE_BUILD_TYPE Debug CACHE STRING \"Build type\" FORCE)");
       append_line(s, "endif()");
@@ -1156,15 +1239,35 @@ namespace vix::commands::RunCommand::detail
     append_sanitizer_options_block(s, feat);
 
     const ResolvedScriptDeps deps = resolve_script_deps(cppPath, cf);
-    append_dependency_subdirectories(s, deps.uniqueCmakeDeps);
+
+    const bool useLocalVixDepsCmake = has_local_vix_deps_cmake(cppPath);
+
+    if (useLocalVixDepsCmake)
+    {
+      append_local_vix_deps_include(s, cppPath);
+    }
+    else
+    {
+      append_dependency_subdirectories(s, deps.uniqueCmakeDeps);
+    }
 
     append_line(s, "add_executable(" + targetName + " " + cmake_quote(cppPath.string()) + ")");
     append_line(s, "set_target_properties(" + targetName + " PROPERTIES OUTPUT_NAME " + cmake_quote(outputName) + ")");
     append_line(s);
 
     append_target_include_directories(s, targetName, cf.includeDirs, false);
     append_target_include_directories(s, targetName, cf.systemIncludeDirs, true);
-    append_bridged_dep_links(s, targetName, deps.cmakeDepAliases);
+
+    std::vector<std::string> scriptDepAliases = deps.cmakeDepAliases;
+
+    if (useLocalVixDepsCmake)
+    {
+      const fs::path lockPath = cppPath.parent_path() / "vix.lock";
+      scriptDepAliases = lock_package_ids_to_aliases(
+          load_ordered_packages_from_lock(lockPath));
+    }
+
+    append_bridged_dep_links(s, targetName, scriptDepAliases);
     append_target_compile_definitions(s, targetName, cf.defines);
     append_target_compile_options(s, targetName, cf.compileOpts);
     append_target_link_directories(s, targetName, lf.libDirs);
