options: generate config schema in C++

Author: mertcanaltin

lib/internal/options.js

@@ -1,21 +1,15 @@
 'use strict';
 
 const {
-  ArrayPrototypeMap,
-  ArrayPrototypeSort,
-  ObjectEntries,
-  ObjectFromEntries,
-  ObjectKeys,
-  StringPrototypeReplace,
+  JSONParse,
 } = primordials;
 
 const {
   getCLIOptionsValues,
   getCLIOptionsInfo,
   getOptionsAsFlags,
   getEmbedderOptions: getEmbedderOptionsFromBinding,
-  getEnvOptionsInputType,
-  getNamespaceOptionsInputType,
+  getConfigJsonSchema,
 } = internalBinding('options');
 
 let warnOnAllowUnauthorized = true;
@@ -46,101 +40,7 @@ function getEmbedderOptions() {
 }
 
 function generateConfigJsonSchema() {
-  const envOptionsMap = getEnvOptionsInputType();
-  const namespaceOptionsMap = getNamespaceOptionsInputType();
-
-  function createPropertyForOptionDetail(detail) {
-    const { type, description } = detail;
-    if (type === 'array') {
-      return {
-        __proto__: null,
-        oneOf: [
-          { __proto__: null, type: 'string' },
-          { __proto__: null, type: 'array', minItems: 1, items: { __proto__: null, type: 'string' } },
-        ],
-        description,
-      };
-    }
-
-    return { __proto__: null, type, description };
-  }
-
-  const schema = {
-    __proto__: null,
-    $schema: 'https://json-schema.org/draft/2020-12/schema',
-    additionalProperties: false,
-    required: [],
-    properties: {
-      $schema: {
-        __proto__: null,
-        type: 'string',
-      },
-      nodeOptions: {
-        __proto__: null,
-        additionalProperties: false,
-        required: [],
-        properties: { __proto__: null },
-        type: 'object',
-      },
-      __proto__: null,
-    },
-    type: 'object',
-  };
-
-  // Get the root properties object for adding namespaces
-  const rootProperties = schema.properties;
-  const nodeOptions = rootProperties.nodeOptions.properties;
-
-  // Add env options to nodeOptions (backward compatibility)
-  for (const { 0: key, 1: type } of ObjectEntries(envOptionsMap)) {
-    const keyWithoutPrefix = StringPrototypeReplace(key, '--', '');
-    nodeOptions[keyWithoutPrefix] = createPropertyForOptionDetail(type);
-  }
-
-  // Add namespace properties at the root level
-  for (const { 0: namespace, 1: optionsMap } of namespaceOptionsMap) {
-    // Create namespace object at the root level
-    rootProperties[namespace] = {
-      __proto__: null,
-      type: 'object',
-      additionalProperties: false,
-      required: [],
-      properties: { __proto__: null },
-    };
-
-    const namespaceProperties = rootProperties[namespace].properties;
-
-    // Add all options for this namespace
-    for (const { 0: optionName, 1: optionType } of ObjectEntries(optionsMap)) {
-      const keyWithoutPrefix = StringPrototypeReplace(optionName, '--', '');
-      namespaceProperties[keyWithoutPrefix] = createPropertyForOptionDetail(optionType);
-    }
-
-    // Sort the namespace properties alphabetically
-    const sortedNamespaceKeys = ArrayPrototypeSort(ObjectKeys(namespaceProperties));
-    const sortedNamespaceProperties = ObjectFromEntries(
-      ArrayPrototypeMap(sortedNamespaceKeys, (key) => [key, namespaceProperties[key]]),
-    );
-    rootProperties[namespace].properties = sortedNamespaceProperties;
-  }
-
-  // Sort the top-level properties by key alphabetically
-  const sortedKeys = ArrayPrototypeSort(ObjectKeys(nodeOptions));
-  const sortedProperties = ObjectFromEntries(
-    ArrayPrototypeMap(sortedKeys, (key) => [key, nodeOptions[key]]),
-  );
-
-  schema.properties.nodeOptions.properties = sortedProperties;
-
-  // Also sort the root level properties
-  const sortedRootKeys = ArrayPrototypeSort(ObjectKeys(rootProperties));
-  const sortedRootProperties = ObjectFromEntries(
-    ArrayPrototypeMap(sortedRootKeys, (key) => [key, rootProperties[key]]),
-  );
-
-  schema.properties = sortedRootProperties;
-
-  return schema;
+  return JSONParse(getConfigJsonSchema());
 }
 
 function refreshOptions() {

src/node_config_file.cc

@@ -1,7 +1,7 @@
 #include "node_config_file.h"
 #include "ata.h"
 #include "debug_utils-inl.h"
-#include "node_config_schema.h"
+#include "node_options.h"
 #include "simdjson.h"
 
 namespace node {
@@ -237,8 +237,8 @@ ParseResult ConfigReader::ParseConfig(const std::string_view& config_path) {
   }
 
   {
-    static const ata::schema_ref compiled_schema =
-        ata::compile(kNodeConfigSchema);
+    static const ata::schema_ref compiled_schema = ata::compile(
+        options_parser::GenerateConfigJsonSchema(false));
     CHECK(compiled_schema);
     auto result = ata::validate(compiled_schema, file_content);
     if (!result.valid) {