Add --json flag in frame to provide JSON output support

docs/frame.markdown

@@ -2,7 +2,7 @@ Framing
 =======
 
 ```sh
-jsonschema frame <schema.json> [--verbose/-v]
+jsonschema frame <schema.json> [--json/-j] [--verbose/-v]
 ```
 
 To evaluate a schema, an implementation will first scan it to determine the
@@ -58,3 +58,9 @@ reference:
 ```sh
 jsonschema frame path/to/my/schema.json
 ```
+
+### Frame a JSON Schema with JSON output for all frames
+
+```sh
+jsonschema frame path/to/my/schema.json --json
+```

src/command_frame.cc

@@ -1,71 +1,98 @@
 #include <sourcemeta/jsontoolkit/json.h>
 #include <sourcemeta/jsontoolkit/jsonschema.h>
-
 #include <cstdlib>  // EXIT_SUCCESS, EXIT_FAILURE
 #include <iostream> // std::cout
+#include <sstream>  // std::ostringstream
 
 #include "command.h"
 #include "utils.h"
 
-auto intelligence::jsonschema::cli::frame(
-    const std::span<const std::string> &arguments) -> int {
-  const auto options{parse_options(arguments, {})};
-  CLI_ENSURE(!options.at("").empty(), "You must pass a JSON Schema as input")
-  const sourcemeta::jsontoolkit::JSON schema{
-      sourcemeta::jsontoolkit::from_file(options.at("").front())};
-
-  sourcemeta::jsontoolkit::ReferenceFrame frame;
-  sourcemeta::jsontoolkit::ReferenceMap references;
-  sourcemeta::jsontoolkit::frame(schema, frame, references,
-                                 sourcemeta::jsontoolkit::default_schema_walker,
-                                 resolver(options))
-      .wait();
-
-  for (const auto &[key, entry] : frame) {
-    std::cout << "(LOCATION) URI: ";
-    std::cout << key.second << "\n";
-    std::cout << "    Schema           : " << entry.root.value_or("<ANONYMOUS>")
-              << "\n";
-    std::cout << "    Pointer          :";
-    if (!entry.pointer.empty()) {
-      std::cout << " ";
-    }
+// Function to pad each line of a string except the first line
+std::string padLines(const std::string &input, int padding) {
+    std::istringstream inputStream(input);
+    std::ostringstream outputStream;
+    std::string line;
+    std::string pad(padding, ' ');
 
-    sourcemeta::jsontoolkit::stringify(entry.pointer, std::cout);
-    std::cout << "\n";
-    std::cout << "    Base URI         : " << entry.base << "\n";
-    std::cout << "    Relative Pointer :";
-    if (!entry.relative_pointer.empty()) {
-      std::cout << " ";
+    // Handle the first line
+    if (std::getline(inputStream, line)) {
+        outputStream << line << "\n";
     }
 
-    sourcemeta::jsontoolkit::stringify(entry.relative_pointer, std::cout);
-    std::cout << "\n";
-    std::cout << "    Dialect          : " << entry.dialect << "\n";
-  }
-
-  for (const auto &[pointer, entry] : references) {
-    std::cout << "(REFERENCE) URI: ";
-    sourcemeta::jsontoolkit::stringify(pointer.second, std::cout);
-    std::cout << "\n";
-
-    std::cout << "    Type             : ";
-    if (pointer.first == sourcemeta::jsontoolkit::ReferenceType::Dynamic) {
-      std::cout << "Dynamic";
-    } else {
-      std::cout << "Static";
+    while (std::getline(inputStream, line)) {
+        outputStream << pad << line << "\n";
     }
-    std::cout << "\n";
-    std::cout << "    Destination      : " << entry.destination << "\n";
 
-    if (entry.base.has_value()) {
-      std::cout << "    - (w/o fragment) : " << entry.base.value() << "\n";
+    return outputStream.str();
+}
+
+auto intelligence::jsonschema::cli::frame(const std::span<const std::string> &arguments) -> int {
+    const auto options{parse_options(arguments, {"json", "j"})};
+    CLI_ENSURE(!options.at("").empty(), "You must pass a JSON Schema as input")
+    const sourcemeta::jsontoolkit::JSON schema{
+        sourcemeta::jsontoolkit::from_file(options.at("").front())
+    };
+
+    sourcemeta::jsontoolkit::ReferenceFrame frame;
+    sourcemeta::jsontoolkit::ReferenceMap references;
+    sourcemeta::jsontoolkit::frame(schema, frame, references,
+                                   sourcemeta::jsontoolkit::default_schema_walker,
+                                   resolver(options))
+        .wait();
+
+    bool outputJson = options.contains("json") || options.contains("-j");
+
+    for (const auto &[key, entry] : frame) {
+        std::cout << "(LOCATION) URI: ";
+        std::cout << key.second << "\n";
+        std::cout << "    Schema           : " << entry.root.value_or("<ANONYMOUS>")
+                  << "\n";
+        std::cout << "    Pointer          :";
+        if (!entry.pointer.empty()) {
+            std::cout << " ";
+        }
+
+        sourcemeta::jsontoolkit::stringify(entry.pointer, std::cout);
+        if (outputJson) {
+            std::cout << "\n";
+            std::cout << "    JSON             : ";
+            std::ostringstream jsonStream;
+            sourcemeta::jsontoolkit::prettify(sourcemeta::jsontoolkit::get(schema, entry.pointer), jsonStream);
+            std::cout << padLines(jsonStream.str(), 23);
+        }
+        std::cout << "    Base URI         : " << entry.base << "\n";
+        std::cout << "    Relative Pointer :";
+        if (!entry.relative_pointer.empty()) {
+            std::cout << " ";
+        }
+
+        sourcemeta::jsontoolkit::stringify(entry.relative_pointer, std::cout);
+        std::cout << "\n";
+        std::cout << "    Dialect          : " << entry.dialect << "\n";
     }
 
-    if (entry.fragment.has_value()) {
-      std::cout << "    - (fragment)     : " << entry.fragment.value() << "\n";
+    for (const auto &[pointer, entry] : references) {
+        std::cout << "(REFERENCE) URI: ";
+        sourcemeta::jsontoolkit::stringify(pointer.second, std::cout);
+        std::cout << "\n";
+
+        std::cout << "    Type             : ";
+        if (pointer.first == sourcemeta::jsontoolkit::ReferenceType::Dynamic) {
+            std::cout << "Dynamic";
+        } else {
+            std::cout << "Static";
+        }
+        std::cout << "\n";
+        std::cout << "    Destination      : " << entry.destination << "\n";
+
+        if (entry.base.has_value()) {
+            std::cout << "    - (w/o fragment) : " << entry.base.value() << "\n";
+        }
+
+        if (entry.fragment.has_value()) {
+            std::cout << "    - (fragment)     : " << entry.fragment.value() << "\n";
+        }
     }
-  }
 
-  return EXIT_SUCCESS;
+    return EXIT_SUCCESS;
 }

src/main.cc

@@ -53,7 +53,7 @@ Global Options:
        Perform JSON Schema Bundling on a schema to inline remote references,
        printing the result to standard output.
 
-   frame <schema.json>
+   frame <schema.json> [--json/-j]
 
        Frame a schema in-place, displaying schema locations and references
        in a human-readable manner.