[WIP] Introduce a new --default-dialect option for most commands

See: #218
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

src/command_bundle.cc

@@ -11,6 +11,7 @@ auto sourcemeta::jsonschema::cli::bundle(
     const std::span<const std::string> &arguments) -> int {
   const auto options{
       parse_options(arguments, {"h", "http", "w", "without-id"})};
+  const auto dialect{default_dialect(options)};
 
   if (options.at("").size() < 1) {
     std::cerr
@@ -23,13 +24,15 @@ auto sourcemeta::jsonschema::cli::bundle(
 
   sourcemeta::core::bundle(
       schema, sourcemeta::core::schema_official_walker,
-      resolver(options, options.contains("h") || options.contains("http")));
+      resolver(options, options.contains("h") || options.contains("http")),
+      dialect);
 
   if (options.contains("w") || options.contains("without-id")) {
     log_verbose(options) << "Removing schema identifiers\n";
     sourcemeta::core::unidentify(
         schema, sourcemeta::core::schema_official_walker,
-        resolver(options, options.contains("h") || options.contains("http")));
+        resolver(options, options.contains("h") || options.contains("http")),
+        dialect);
   }
 
   sourcemeta::core::prettify(schema, std::cout,

src/command_inspect.cc

@@ -22,8 +22,10 @@ auto sourcemeta::jsonschema::cli::inspect(
 
   sourcemeta::core::SchemaFrame frame{
       sourcemeta::core::SchemaFrame::Mode::Instances};
+
+  const auto dialect{default_dialect(options)};
   frame.analyse(schema, sourcemeta::core::schema_official_walker,
-                resolver(options));
+                resolver(options), dialect);
 
   if (options.contains("json") || options.contains("j")) {
     sourcemeta::core::prettify(frame.to_json(), std::cout);

src/command_lint.cc

@@ -61,6 +61,7 @@ auto sourcemeta::jsonschema::cli::lint(
 
   bool result{true};
   auto errors_array = sourcemeta::core::JSON::make_array();
+  const auto dialect{default_dialect(options)};
 
   if (options.contains("f") || options.contains("fix")) {
     for (const auto &entry :
@@ -75,7 +76,7 @@ auto sourcemeta::jsonschema::cli::lint(
 
       auto copy = entry.second;
       bundle.apply(copy, sourcemeta::core::schema_official_walker,
-                   resolver(options));
+                   resolver(options), dialect);
       std::ofstream output{entry.first};
       if (options.contains("k") || options.contains("keep-ordering")) {
         sourcemeta::core::prettify(copy, output);
@@ -114,7 +115,8 @@ auto sourcemeta::jsonschema::cli::lint(
             sourcemeta::core::stringify(pointer, std::cout);
             std::cout << "\"\n";
           }
-        });
+        },
+        dialect);
 
     if (!subresult) {
       result = false;

src/command_metaschema.cc

@@ -37,16 +37,18 @@ auto sourcemeta::jsonschema::cli::metaschema(
       return EXIT_FAILURE;
     }
 
-    const auto dialect{sourcemeta::core::dialect(entry.second)};
+    const auto default_dialect_option{default_dialect(options)};
+    const auto dialect{
+        sourcemeta::core::dialect(entry.second, default_dialect_option)};
     assert(dialect.has_value());
 
-    const auto metaschema{
-        sourcemeta::core::metaschema(entry.second, custom_resolver)};
+    const auto metaschema{sourcemeta::core::metaschema(
+        entry.second, custom_resolver, default_dialect_option)};
     if (!cache.contains(dialect.value())) {
       const auto metaschema_template{sourcemeta::blaze::compile(
           metaschema, sourcemeta::core::schema_official_walker, custom_resolver,
           sourcemeta::blaze::default_schema_compiler,
-          sourcemeta::blaze::Mode::Exhaustive)};
+          sourcemeta::blaze::Mode::Exhaustive, default_dialect_option)};
       cache.insert({dialect.value(), metaschema_template});
     }
 

src/command_test.cc

@@ -48,6 +48,7 @@ auto sourcemeta::jsonschema::cli::test(
       resolver(options, options.contains("h") || options.contains("http"))};
   const auto verbose{options.contains("verbose") || options.contains("v")};
   sourcemeta::blaze::Evaluator evaluator;
+  const auto dialect{default_dialect(options)};
 
   for (const auto &entry : for_each_json(options.at(""), parse_ignore(options),
                                          parse_extensions(options))) {
@@ -117,7 +118,8 @@ auto sourcemeta::jsonschema::cli::test(
     try {
       schema_template = sourcemeta::blaze::compile(
           schema, sourcemeta::core::schema_official_walker, test_resolver,
-          sourcemeta::blaze::default_schema_compiler);
+          sourcemeta::blaze::default_schema_compiler,
+          sourcemeta::blaze::Mode::FastValidation, dialect);
     } catch (const sourcemeta::core::SchemaReferenceError &error) {
       if (error.location() == sourcemeta::core::Pointer{"$ref"} &&
           error.id() == schema_uri.recompose()) {

src/command_validate.cc

@@ -54,14 +54,15 @@ auto sourcemeta::jsonschema::cli::validate(
   }
 
   const auto fast_mode{options.contains("f") || options.contains("fast")};
-
   const auto benchmark{options.contains("b") || options.contains("benchmark")};
   const auto trace{options.contains("t") || options.contains("trace")};
+  const auto dialect{default_dialect(options)};
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker, custom_resolver,
       sourcemeta::blaze::default_schema_compiler,
       fast_mode ? sourcemeta::blaze::Mode::FastValidation
-                : sourcemeta::blaze::Mode::Exhaustive)};
+                : sourcemeta::blaze::Mode::Exhaustive,
+      dialect)};
   sourcemeta::blaze::Evaluator evaluator;
 
   bool result{true};

src/utils.cc

@@ -375,4 +375,19 @@ auto safe_weakly_canonical(const std::filesystem::path &input)
              : std::filesystem::weakly_canonical(input);
 }
 
+auto default_dialect(
+    const std::map<std::string, std::vector<std::string>> &options)
+    -> std::optional<std::string> {
+
+  if (options.contains("default-dialect")) {
+    return options.at("default-dialect").front();
+  }
+
+  if (options.contains("l")) {
+    return options.at("l").front();
+  }
+
+  return std::nullopt;
+}
+
 } // namespace sourcemeta::jsonschema::cli

src/utils.h

@@ -53,6 +53,10 @@ auto parse_ignore(
 auto safe_weakly_canonical(const std::filesystem::path &input)
     -> std::filesystem::path;
 
+auto default_dialect(
+    const std::map<std::string, std::vector<std::string>> &options)
+    -> std::optional<std::string>;
+
 } // namespace sourcemeta::jsonschema::cli
 
 #endif