commandLineSink paths should not be resolved

#fix

Author: alandefreitas

src/lib/Lib/Config.cpp

@@ -257,39 +257,71 @@ struct PublicSettingsVisitor {
         PublicSettings::OptionProperties const& opts,
         bool const usingDefault) const
     {
-        for (auto& value : values)
+        // Move command line sink values to appropriate destinations
+        // Normalization happens later for each destination
+        if (opts.commandLineSink && opts.filenameMapping.has_value())
         {
-            MRDOCS_TRY(normalizeStringPath(self, name, value, dirs, opts, usingDefault));
+            MRDOCS_TRY(normalizeCmdLineSink(self, values, opts));
         }
+        else
+        {
+            // General case, normalize each path
+            for (auto& value : values)
+            {
+                MRDOCS_TRY(normalizeStringPath(self, name, value, dirs, opts, usingDefault));
+            }
+        }
+        return {};
+    }
 
+    template <class T>
+    Expected<void>
+    normalizeCmdLineSink(
+        PublicSettings& self,
+        T& values,
+        PublicSettings::OptionProperties const& opts) const
+    {
         // Move command line sink values to appropriate destinations
-        if (opts.commandLineSink && opts.filenameMapping.has_value())
+        for (auto& value : values)
         {
-            for (auto& value : values)
+            std::string_view filename = files::getFileName(value);
+            auto it = opts.filenameMapping->find(std::string(filename));
+            if (it == opts.filenameMapping->end())
             {
-                for (auto const& map = opts.filenameMapping.value();
-                     auto& [from, to] : map)
+                report::warn("command line input: unknown destination for filename \"{}\"", filename);
+                continue;
+            }
+            // Assign the value to the destination option of the map
+            std::string const& destOption = it->second;
+            bool foundOption = false;
+            bool setOption = false;
+            self.visit(
+                [&]<typename U>(
+                    std::string_view const optionName, U& optionValue)
+            {
+                if constexpr (std::convertible_to<U, std::string>)
                 {
-                    auto filename = files::getFileName(value);
-                    if (filename == from)
+                    if (optionName == destOption)
                     {
-                        self.visit(
-                            [&]<typename U>(
-                                std::string_view const otherName, U& otherValue)
+                        foundOption = true;
+                        if (optionValue.empty())
                         {
-                            if constexpr (std::convertible_to<U, std::string>)
-                            {
-                                if (otherName == to)
-                                {
-                                    otherValue = value;
-                                }
-                            }
-                        });
+                            optionValue = value;
+                            setOption = true;
+                        }
                     }
                 }
+            });
+            if (!foundOption)
+            {
+                report::warn("command line input: cannot find destination option \"{}\"", destOption);
+            }
+            else if (!setOption)
+            {
+                report::warn("command line input: destination option was \"{}\" already set", destOption);
             }
         }
-
+        values.clear();
         return {};
     }
 

src/lib/Lib/ConfigOptions.json

@@ -15,8 +15,8 @@
         "command-line-sink": true,
         "filename-mapping": {
           "mrdocs.yml": "config",
-          "compile_commands.json": "compilationDatabase",
-          "CMakeLists.txt": "compilationDatabase"
+          "compile_commands.json": "compilation-database",
+          "CMakeLists.txt": "compilation-database"
         },
         "relative-to": "<cwd>",
         "must-exist": true,