style(clang-tidy): fix bugprone-unchecked-optional-access

Signed-off-by: Balakrishna Avulapati <ba@bavulapati.com>

Author: bavulapati

src/core/jsonschema/frame.cc

@@ -75,9 +75,10 @@ auto find_anchors(const sourcemeta::core::JSON &schema,
       assert(schema.at("$id").is_string());
       const sourcemeta::core::URI identifier(schema.at("$id").to_string());
       if (identifier.is_fragment_only()) {
-        result.insert(
-            {sourcemeta::core::JSON::String{identifier.fragment().value()},
-             AnchorType::Static});
+        result.insert({sourcemeta::core::JSON::String{
+                           identifier.fragment() ? identifier.fragment().value()
+                                                 : "what should we have here?"},
+                       AnchorType::Static});
       }
     }
   }
@@ -90,9 +91,10 @@ auto find_anchors(const sourcemeta::core::JSON &schema,
       assert(schema.at("id").is_string());
       const sourcemeta::core::URI identifier(schema.at("id").to_string());
       if (identifier.is_fragment_only()) {
-        result.insert(
-            {sourcemeta::core::JSON::String{identifier.fragment().value()},
-             AnchorType::Static});
+        result.insert({sourcemeta::core::JSON::String{
+                           identifier.fragment() ? identifier.fragment().value()
+                                                 : "what should we have here?"},
+                       AnchorType::Static});
       }
     }
   }

src/core/jsonschema/jsonschema.cc

@@ -62,8 +62,10 @@ static auto id_keyword(const std::string &base_dialect) -> std::string {
 auto sourcemeta::core::identify(
     const sourcemeta::core::JSON &schema, const SchemaResolver &resolver,
     const SchemaIdentificationStrategy strategy,
-    const std::optional<std::string> &default_dialect,
-    const std::optional<std::string> &default_id)
+    const std::optional<std::string>
+        &default_dialect, // NOLINT(bugprone-easily-swappable-parameters)
+    const std::optional<std::string>
+        &default_id) // NOLINT(bugprone-easily-swappable-parameters)
     -> std::optional<std::string> {
   std::optional<std::string> maybe_base_dialect;
 

src/core/jsonschema/walker.cc

@@ -1,3 +1,4 @@
+#include <optional>
 #include <sourcemeta/core/jsonschema.h>
 
 #include <algorithm> // std::max, std::sort
@@ -44,11 +45,13 @@ auto walk(const std::optional<sourcemeta::core::Pointer> &parent,
   const auto is_schema_resource{level == 0 || id.has_value()};
   const auto current_dialect{is_schema_resource ? maybe_current_dialect.value()
                                                 : dialect};
-  const auto current_base_dialect{
-      is_schema_resource
-          ? sourcemeta::core::base_dialect(subschema, resolver, current_dialect)
-                .value()
-          : base_dialect};
+  const auto opt_current_base_dialect =
+      sourcemeta::core::base_dialect(subschema, resolver, current_dialect);
+  const auto current_base_dialect{is_schema_resource
+                                      ? (opt_current_base_dialect
+                                             ? opt_current_base_dialect.value()
+                                             : base_dialect)
+                                      : base_dialect};
 
   const auto vocabularies{sourcemeta::core::vocabularies(
       resolver, current_base_dialect, current_dialect)};

src/core/uri/uri.cc

@@ -620,6 +620,7 @@ auto URI::relative_to(const URI &base) -> URI & {
   return *this;
 }
 
+// NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
 auto URI::rebase(const URI &base, const URI &new_base) -> URI & {
   this->relative_to(base);
   if (!this->is_relative()) {