Overload FlatFileSchemaResolver::add to manually take file contents

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Jan 15, 2025 · 3df64e6 · 3df64e6
1 parent c7d91b8
commit 3df64e6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_resolver.h b/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_resolver.h
@@ -123,6 +123,13 @@ class SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT FlatFileSchemaResolver {
 
   /// Register a schema to the flat file resolver, returning the detected
   /// identifier for the schema
+  auto add(const std::filesystem::path &path, const JSON &schema,
+           const std::optional<std::string> &default_dialect = std::nullopt,
+           const std::optional<std::string> &default_id = std::nullopt)
+      -> const std::string &;
+
+  /// Read and register a schema to the flat file resolver, returning the
+  /// detected identifier for the schema
   auto add(const std::filesystem::path &path,
            const std::optional<std::string> &default_dialect = std::nullopt,
            const std::optional<std::string> &default_id = std::nullopt)

diff --git a/src/jsonschema/resolver.cc b/src/jsonschema/resolver.cc
@@ -91,11 +91,10 @@ static auto to_lowercase(const std::string_view input) -> std::string {
 }
 
 auto FlatFileSchemaResolver::add(
-    const std::filesystem::path &path,
+    const std::filesystem::path &path, const JSON &schema,
     const std::optional<std::string> &default_dialect,
     const std::optional<std::string> &default_id) -> const std::string & {
   const auto canonical{std::filesystem::canonical(path)};
-  const auto schema{sourcemeta::jsontoolkit::from_file(canonical)};
   assert(sourcemeta::jsontoolkit::is_schema(schema));
   const auto identifier{sourcemeta::jsontoolkit::identify(
       schema, *this, IdentificationStrategy::Loose, default_dialect,
@@ -123,6 +122,14 @@ auto FlatFileSchemaResolver::add(
   return result.first->first;
 }
 
+auto FlatFileSchemaResolver::add(
+    const std::filesystem::path &path,
+    const std::optional<std::string> &default_dialect,
+    const std::optional<std::string> &default_id) -> const std::string & {
+  return this->add(path, sourcemeta::jsontoolkit::from_file(path),
+                   default_dialect, default_id);
+}
+
 auto FlatFileSchemaResolver::reidentify(const std::string &schema,
                                         const std::string &new_identifier)
     -> void {

diff --git a/test/jsonschema/jsonschema_flat_file_resolver_test.cc b/test/jsonschema/jsonschema_flat_file_resolver_test.cc
@@ -30,6 +30,19 @@ TEST(JSONSchema_FlatFileSchemaResolver, single_schema) {
             sourcemeta::jsontoolkit::from_file(schema_path));
 }
 
+TEST(JSONSchema_FlatFileSchemaResolver, single_schema_manual_read) {
+  sourcemeta::jsontoolkit::FlatFileSchemaResolver resolver;
+  const auto schema_path{std::filesystem::path{SCHEMAS_PATH} /
+                         "2020-12-id.json"};
+  const auto &identifier{resolver.add(
+      schema_path, sourcemeta::jsontoolkit::from_file(schema_path))};
+  EXPECT_EQ(identifier, "https://www.sourcemeta.com/2020-12-id.json");
+  EXPECT_TRUE(
+      resolver("https://www.sourcemeta.com/2020-12-id.json").has_value());
+  EXPECT_EQ(resolver("https://www.sourcemeta.com/2020-12-id.json").value(),
+            sourcemeta::jsontoolkit::from_file(schema_path));
+}
+
 TEST(JSONSchema_FlatFileSchemaResolver, single_schema_with_default_dialect) {
   sourcemeta::jsontoolkit::FlatFileSchemaResolver resolver;
   const auto schema_path{std::filesystem::path{SCHEMAS_PATH} / "only-id.json"};