[config] add $schema to config.json

Author: tstack

docs/schemas/event-file-format-detected-v1.schema.json

@@ -4,11 +4,6 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "description": "Event fired when a log format is detected for a file.",
     "properties": {
-        "$schema": {
-            "title": "/$schema",
-            "type": "string",
-            "const": "https://lnav.org/event-file-format-detected-v1.schema.json"
-        },
         "filename": {
             "title": "/filename",
             "description": "The path of the file for which a matching format was found",

docs/schemas/event-file-open-v1.schema.json

@@ -4,11 +4,6 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "description": "Event fired when a file is opened.",
     "properties": {
-        "$schema": {
-            "title": "/$schema",
-            "type": "string",
-            "const": "https://lnav.org/event-file-open-v1.schema.json"
-        },
         "filename": {
             "title": "/filename",
             "description": "The path of the file that was opened",

docs/schemas/event-log-msg-detected-v1.schema.json

@@ -4,11 +4,6 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "description": "Event fired when a log message is detected by a watch expression.",
     "properties": {
-        "$schema": {
-            "title": "/$schema",
-            "type": "string",
-            "const": "https://lnav.org/event-log-msg-detected-v1.schema.json"
-        },
         "watch-name": {
             "title": "/watch-name",
             "description": "The name of the watch expression that matched this log message",

docs/schemas/event-session-loaded-v1.schema.json

@@ -3,14 +3,5 @@
     "title": "https://lnav.org/event-session-loaded-v1.schema.json",
     "$schema": "http://json-schema.org/draft-07/schema#",
     "description": "Event fired when a session is loaded.",
-    "properties": {
-        "$schema": {
-            "title": "/$schema",
-            "type": "string",
-            "examples": [
-                "https://lnav.org/event-session-loaded-v1.schema.json"
-            ]
-        }
-    },
     "additionalProperties": false
 }

src/lnav.events.cc

@@ -40,8 +40,6 @@ const string_fragment open::SCHEMA_ID
     = "https://lnav.org/event-file-open-v1.schema.json"_frag;
 
 const typed_json_path_container<open> open::handlers = typed_json_path_container<open>{
-    yajlpp::property_handler("$schema").for_field(&open::o_schema)
-        .with_const(SCHEMA_ID),
     yajlpp::property_handler("filename")
         .with_description("The path of the file that was opened")
         .for_field(&open::o_filename),
@@ -53,8 +51,6 @@ const string_fragment format_detected::SCHEMA_ID
     = "https://lnav.org/event-file-format-detected-v1.schema.json"_frag;
 
 const typed_json_path_container<format_detected> format_detected::handlers = typed_json_path_container<format_detected>{
-    yajlpp::property_handler("$schema").for_field(&format_detected::fd_schema)
-        .with_const(SCHEMA_ID),
     yajlpp::property_handler("filename")
         .with_description("The path of the file for which a matching format was found")
         .for_field(&format_detected::fd_filename),
@@ -79,8 +75,6 @@ static const json_path_container msg_values_handlers = {
 };
 
 const typed_json_path_container<msg_detected> msg_detected::handlers = typed_json_path_container<msg_detected>{
-    yajlpp::property_handler("$schema").for_field(&msg_detected::md_schema)
-        .with_const(SCHEMA_ID),
     yajlpp::property_handler("watch-name")
         .with_description("The name of the watch expression that matched this log message")
         .for_field(&msg_detected::md_watch_name),
@@ -110,12 +104,10 @@ namespace session {
 const string_fragment loaded::SCHEMA_ID
     = "https://lnav.org/event-session-loaded-v1.schema.json"_frag;
 
-const typed_json_path_container<loaded> loaded::handlers = typed_json_path_container<loaded>{
-    yajlpp::property_handler("$schema").for_field(&loaded::l_schema)
-        .with_example(SCHEMA_ID),
-}
-    .with_schema_id2(SCHEMA_ID)
-    .with_description2("Event fired when a session is loaded.");
+const typed_json_path_container<loaded> loaded::handlers
+    = typed_json_path_container<loaded>{}
+          .with_schema_id2(SCHEMA_ID)
+          .with_description2("Event fired when a session is loaded.");
 
 }  // namespace session
 

src/yajlpp/yajlpp.cc

@@ -1322,6 +1322,10 @@ yajlpp_gen_context::gen()
 {
     yajlpp_map root(this->ygc_handle);
 
+    if (!this->ygc_handlers->jpc_schema_id.empty()) {
+        root.gen("$schema");
+        root.gen(this->ygc_handlers->jpc_schema_id);
+    }
     for (const auto& jph : this->ygc_handlers->jpc_children) {
         jph.gen(*this, this->ygc_handle);
     }

test/expected/test_cli.sh_0b3639753916f71254e8c9cce4ebb8bfd9978d3e.out

@@ -1,4 +1,5 @@
 {
+    "$schema": "https://lnav.org/schemas/config-v1.schema.json",
     "apps": {
         "lnav": {
             "api-test": {