TreeStructure: Unify parsing of precomputed roots in just-mr

4 files changed, 76 insertions, 94 deletions

diff --git a/src/other_tools/utils/TARGETS b/src/other_tools/utils/TARGETS
index 8e1803b9..550de9f5 100644
--- a/src/other_tools/utils/TARGETS
+++ b/src/other_tools/utils/TARGETS
@@ -95,14 +95,13 @@
     ]
   , "stage": ["src", "other_tools", "utils"]
   }
-, "parse_computed_root":
+, "parse_precomputed_root":
   { "type": ["@", "rules", "CC", "library"]
-  , "name": ["parse_computed_root"]
-  , "hdrs": ["parse_computed_root.hpp"]
-  , "srcs": ["parse_computed_root.cpp"]
+  , "name": ["parse_precomputed_root"]
+  , "hdrs": ["parse_precomputed_root.hpp"]
+  , "srcs": ["parse_precomputed_root.cpp"]
   , "deps":
-    [ ["@", "gsl", "", "gsl"]
-    , ["src/buildtool/build_engine/expression", "expression_ptr_interface"]
+    [ ["src/buildtool/build_engine/expression", "expression_ptr_interface"]
     , ["src/buildtool/file_system", "precomputed_root"]
     , ["src/utils/cpp", "expected"]
     ]
diff --git a/src/other_tools/utils/parse_computed_root.hpp b/src/other_tools/utils/parse_computed_root.hpp
deleted file mode 100644
index 2cc54c87..00000000
--- a/src/other_tools/utils/parse_computed_root.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2024 Huawei Cloud Computing Technology Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef INCLUDED_SRC_OTHER_TOOLS_UTILS_PARSE_COMPUTED_ROOT_HPP
-#define INCLUDED_SRC_OTHER_TOOLS_UTILS_PARSE_COMPUTED_ROOT_HPP
-
-#include <optional>
-#include <string>
-
-#include "gsl/gsl"
-#include "src/buildtool/build_engine/expression/expression_ptr.hpp"
-#include "src/buildtool/file_system/precomputed_root.hpp"
-#include "src/utils/cpp/expected.hpp"
-
-class ComputedRootParser final {
-  public:
-    /// \brief Create a parser for computed roots
-    /// \param repository Repository to be parsed
-    /// \return Initialized parser on success, or std::nullopt if repository
-    /// isn't Map or type is not computed.
-    [[nodiscard]] static auto Create(
-        gsl::not_null<ExpressionPtr const*> const& repository) noexcept
-        -> std::optional<ComputedRootParser>;
-
-    [[nodiscard]] auto GetTargetRepository() const
-        -> expected<std::string, std::string>;
-
-    [[nodiscard]] auto GetResult() const -> expected<ComputedRoot, std::string>;
-
-  private:
-    ExpressionPtr const& repository_;
-    explicit ComputedRootParser(
-        gsl::not_null<ExpressionPtr const*> const& repository)
-        : repository_{*repository} {}
-};
-
-#endif  // INCLUDED_SRC_OTHER_TOOLS_UTILS_PARSE_COMPUTED_ROOT_HPP
diff --git a/src/other_tools/utils/parse_computed_root.cpp b/src/other_tools/utils/parse_precomputed_root.cpp
index 540f43c0..0b176450 100644
--- a/src/other_tools/utils/parse_computed_root.cpp
+++ b/src/other_tools/utils/parse_precomputed_root.cpp
@@ -12,75 +12,79 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/other_tools/utils/parse_computed_root.hpp"
+#include "src/other_tools/utils/parse_precomputed_root.hpp"
+
+#include <utility>
 
 #include "fmt/core.h"
 #include "nlohmann/json.hpp"
 #include "src/buildtool/build_engine/expression/expression.hpp"
 
-auto ComputedRootParser::Create(
-    gsl::not_null<ExpressionPtr const*> const& repository) noexcept
-    -> std::optional<ComputedRootParser> {
-    if (not repository->IsNotNull() or not(*repository)->IsMap()) {
-        return std::nullopt;
-    }
-    try {
-        auto const type = (*repository)->Get("type", Expression::none_t{});
-        if (type.IsNotNull() and type->IsString() and
-            type->String() == "computed") {
-            return ComputedRootParser{repository};
-        }
-    } catch (...) {
-        return std::nullopt;
-    }
-    return std::nullopt;
-}
-
-auto ComputedRootParser::GetTargetRepository() const
-    -> expected<std::string, std::string> {
-    auto const repo = repository_->Get("repo", Expression::none_t{});
+namespace {
+[[nodiscard]] auto ParseComputedRoot(ExpressionPtr const& repository)
+    -> expected<ComputedRoot, std::string> {
+    auto const repo = repository->Get("repo", Expression::none_t{});
     if (not repo.IsNotNull()) {
         return unexpected<std::string>{"Mandatory key \"repo\" is missing"};
     }
     if (not repo->IsString()) {
-        return unexpected{fmt::format("Unsupported value {} for key \"repo\".",
+        return unexpected{fmt::format("Unsupported value for key \"repo\":\n{}",
                                       repo->ToString())};
     }
-    return repo->String();
-}
-
-auto ComputedRootParser::GetResult() const
-    -> expected<ComputedRoot, std::string> {
-    auto const repo = GetTargetRepository();
-    if (not repo) {
-        return unexpected{repo.error()};
-    }
 
-    auto const target = repository_->Get("target", Expression::none_t{});
+    auto const target = repository->Get("target", Expression::none_t{});
     if (not target.IsNotNull()) {
         return unexpected<std::string>{"Mandatory key \"target\" is missing"};
     }
     if (not target->IsList() or target->List().size() != 2) {
-        return unexpected{fmt::format("Unsupported value {} for key \"target\"",
-                                      target->ToString())};
+        return unexpected{fmt::format(
+            "Unsupported value for key \"target\":\n{}", target->ToString())};
     }
     auto const& target_list = target->List();
     auto const target_module = target_list.at(0);
     auto const target_name = target_list.at(1);
     if (not target_module->IsString() or not target_name->IsString()) {
         return unexpected{fmt::format(
-            "Unsupported format {} for key \"target\"", target->ToString())};
+            "Unsupported format for key \"target\":\n{}", target->ToString())};
     }
 
-    auto const config = repository_->Get("config", Expression::none_t{});
+    auto const config = repository->Get("config", Expression::none_t{});
     if (config.IsNotNull() and not config->IsMap()) {
-        return unexpected{fmt::format("Unsupported value {} for key \"config\"",
-                                      config->ToString())};
+        return unexpected{fmt::format(
+            "Unsupported value for key \"config\":\n{}", config->ToString())};
     }
-    return ComputedRoot{.repository = *repo,
+    return ComputedRoot{.repository = repo->String(),
                         .target_module = target_module->String(),
                         .target_name = target_module->String(),
                         .config = config.IsNotNull()
                                       ? config->ToJson()
                                       : nlohmann::json::object()};
 }
+}  // namespace
+
+auto ParsePrecomputedRoot(ExpressionPtr const& repository)
+    -> expected<PrecomputedRoot, std::string> {
+    if (not repository.IsNotNull() or not repository->IsMap()) {
+        return unexpected<std::string>{"Repository has an incorrect format"};
+    }
+
+    auto const type = repository->Get("type", Expression::none_t());
+    if (not type.IsNotNull()) {
+        return unexpected<std::string>{"Mandatory key \"type\" is missing"};
+    }
+    if (not type->IsString()) {
+        return unexpected{fmt::format("Unsupported value for key \"type\":\n{}",
+                                      type->ToString())};
+    }
+
+    auto const& type_marker = type->String();
+    if (type_marker == ComputedRoot::kMarker) {
+        auto computed = ParseComputedRoot(repository);
+        if (not computed) {
+            return unexpected{std::move(computed).error()};
+        }
+        return PrecomputedRoot{*std::move(computed)};
+    }
+    return unexpected{
+        fmt::format("Unknown type {} of precomputed repository", type_marker)};
+}
diff --git a/src/other_tools/utils/parse_precomputed_root.hpp b/src/other_tools/utils/parse_precomputed_root.hpp
new file mode 100644
index 00000000..be72dd9a
--- /dev/null
+++ b/src/other_tools/utils/parse_precomputed_root.hpp
@@ -0,0 +1,27 @@
+// Copyright 2024 Huawei Cloud Computing Technology Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef INCLUDED_SRC_OTHER_TOOLS_UTILS_PARSE_PRECOMPUTED_ROOT_HPP
+#define INCLUDED_SRC_OTHER_TOOLS_UTILS_PARSE_PRECOMPUTED_ROOT_HPP
+
+#include <string>
+
+#include "src/buildtool/build_engine/expression/expression_ptr.hpp"
+#include "src/buildtool/file_system/precomputed_root.hpp"
+#include "src/utils/cpp/expected.hpp"
+
+[[nodiscard]] auto ParsePrecomputedRoot(ExpressionPtr const& repository)
+    -> expected<PrecomputedRoot, std::string>;
+
+#endif  // INCLUDED_SRC_OTHER_TOOLS_UTILS_PARSE_PRECOMPUTED_ROOT_HPP