src: cache compiled node.config.json schema and align with runtime

Author: mertcanaltin

src/node_config_file.cc

@@ -258,30 +258,25 @@ ParseResult ConfigReader::ParseConfig(const std::string_view& config_path) {
     return ParseResult::InvalidContent;
   }
 
-  // Validate against JSON Schema after basic parsing succeeds.
-  // This catches type errors in properties before the option
-  // parsing loop, which would otherwise produce less clear messages.
+  // Validate against JSON Schema after basic parsing succeeds. This catches
+  // unknown namespaces and type errors in properties before the option parsing
+  // loop, which would otherwise produce less clear messages (or silently skip
+  // unknown top-level keys). kNodeConfigSchema is a compile-time constant, so
+  // compile it once on first call.
   {
-    auto schema = ata::compile(kNodeConfigSchema);
-    if (schema) {
-      auto result = ata::validate(schema, file_content);
-      if (!result.valid) {
-        for (const auto& err : result.errors) {
-          if (err.code != ata::error_code::additional_property_not_allowed) {
-            FPrintF(
-                stderr, "Invalid configuration in %s:\n", config_path.data());
-            for (const auto& e : result.errors) {
-              if (e.code != ata::error_code::additional_property_not_allowed) {
-                FPrintF(stderr,
-                        "  %s: %s\n",
-                        e.path.empty() ? "/" : e.path,
-                        e.message);
-              }
-            }
-            return ParseResult::InvalidContent;
-          }
-        }
+    static const ata::schema_ref compiled_schema =
+        ata::compile(kNodeConfigSchema);
+    CHECK(compiled_schema);
+    auto result = ata::validate(compiled_schema, file_content);
+    if (!result.valid) {
+      FPrintF(stderr, "Invalid configuration in %s:\n", config_path.data());
+      for (const auto& err : result.errors) {
+        FPrintF(stderr,
+                "  %s: %s\n",
+                err.path.empty() ? "/" : err.path,
+                err.message);
       }
+      return ParseResult::InvalidContent;
     }
   }
 

src/node_config_schema.h

@@ -4,14 +4,12 @@
 static constexpr const char kNodeConfigSchema[] = R"JSON(
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "additionalProperties": false,
   "required": [],
   "properties": {
     "$schema": {
       "type": "string"
     },
     "nodeOptions": {
-      "additionalProperties": false,
       "required": [],
       "properties": {
         "addons": {
@@ -761,7 +759,6 @@ static constexpr const char kNodeConfigSchema[] = R"JSON(
     },
     "permission": {
       "type": "object",
-      "additionalProperties": false,
       "required": [],
       "properties": {
         "allow-addons": {
@@ -826,7 +823,6 @@ static constexpr const char kNodeConfigSchema[] = R"JSON(
     },
     "test": {
       "type": "object",
-      "additionalProperties": false,
       "required": [],
       "properties": {
         "experimental-test-coverage": {
@@ -991,7 +987,6 @@ static constexpr const char kNodeConfigSchema[] = R"JSON(
     },
     "watch": {
       "type": "object",
-      "additionalProperties": false,
       "required": [],
       "properties": {
         "watch": {

test/fixtures/rc/invalid-schema-multiple-errors.json

@@ -0,0 +1,6 @@
+{
+  "nodeOptions": {
+    "addons": "not-a-boolean",
+    "max-http-header-size": "not-a-number"
+  }
+}

test/parallel/test-config-file.js

@@ -684,6 +684,7 @@ describe('JSON Schema validation', () => {
       '-p', '"Hello"',
     ]);
     assert.match(result.stderr, /Invalid configuration/);
+    assert.match(result.stderr, /\/nodeOptions\/addons/);
     assert.strictEqual(result.code, 9);
   });
 
@@ -694,6 +695,7 @@ describe('JSON Schema validation', () => {
       '-p', '"Hello"',
     ]);
     assert.match(result.stderr, /Invalid configuration/);
+    assert.match(result.stderr, /\/nodeOptions\/max-http-header-size/);
     assert.strictEqual(result.code, 9);
   });
 
@@ -704,6 +706,7 @@ describe('JSON Schema validation', () => {
       '-p', '"Hello"',
     ]);
     assert.match(result.stderr, /Invalid configuration/);
+    assert.match(result.stderr, /\/nodeOptions\/import/);
     assert.strictEqual(result.code, 9);
   });
 
@@ -714,6 +717,19 @@ describe('JSON Schema validation', () => {
       '-p', '"Hello"',
     ]);
     assert.match(result.stderr, /Invalid configuration/);
+    assert.match(result.stderr, /\/nodeOptions\/import/);
+    assert.strictEqual(result.code, 9);
+  });
+
+  test('reports every error when multiple properties fail', async () => {
+    const result = await spawnPromisified(process.execPath, [
+      '--experimental-config-file',
+      fixtures.path('rc/invalid-schema-multiple-errors.json'),
+      '-p', '"Hello"',
+    ]);
+    assert.match(result.stderr, /Invalid configuration/);
+    assert.match(result.stderr, /\/nodeOptions\/addons/);
+    assert.match(result.stderr, /\/nodeOptions\/max-http-header-size/);
     assert.strictEqual(result.code, 9);
   });