tools: dump config.gypi as json

legendecas · RafaelGSS · commit 1c38f808bd11 · 2026-01-13T10:04:20.000-03:00
This helps js2c processing the node.gypi correctly when a string contains a quote. PR-URL: #60794 Refs: #60703 Reviewed-By: Richard Lau <richard.lau@ibm.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/configure.py b/configure.py
@@ -2446,8 +2446,9 @@ def make_bin_override():
 
 print_verbose(output)
 
+# Dump as JSON to allow js2c.cc read it as a simple json file.
 write('config.gypi', do_not_edit +
-      pprint.pformat(output, indent=2, width=128) + '\n')
+      json.dumps(output, indent=2) + '\n')
 
 write('config.status', '#!/bin/sh\nset -x\nexec ./configure ' +
       ' '.join([shlex.quote(arg) for arg in original_argv]) + '\n')
diff --git a/test/parallel/test-process-config.js b/test/parallel/test-process-config.js
@@ -49,8 +49,7 @@ let config = fs.readFileSync(configPath, 'utf8');
 
 // Clean up comment at the first line.
 config = config.split('\n').slice(1).join('\n');
-config = config.replace(/"/g, '\\"');
-config = config.replace(/'/g, '"');
+// Turn pseudo-booleans strings into booleans.
 config = JSON.parse(config, (key, value) => {
   if (value === 'true') return true;
   if (value === 'false') return false;
diff --git a/tools/js2c.cc b/tools/js2c.cc
@@ -796,21 +796,11 @@ std::vector<char> JSONify(const std::vector<char>& code) {
   // 1. Remove string comments
   std::vector<char> stripped = StripComments(code);
 
-  // 2. join multiline strings
-  std::vector<char> joined = JoinMultilineString(stripped);
+  // 2. turn pseudo-booleans strings into Booleans
+  std::vector<char> result1 = ReplaceAll(stripped, R"("true")", "true");
+  std::vector<char> result2 = ReplaceAll(result1, R"("false")", "false");
 
-  // 3. normalize string literals from ' into "
-  for (size_t i = 0; i < joined.size(); ++i) {
-    if (joined[i] == '\'') {
-      joined[i] = '"';
-    }
-  }
-
-  // 4. turn pseudo-booleans strings into Booleans
-  std::vector<char> result3 = ReplaceAll(joined, R"("true")", "true");
-  std::vector<char> result4 = ReplaceAll(result3, R"("false")", "false");
-
-  return result4;
+  return result2;
 }
 
 int AddGypi(const std::string& var,
