Don't escape slashes in various JSONEncoders

This makes the JSON easier to work with, especially for paths.

Author: ahoppen

Sources/Diagnose/RequestInfo.swift

@@ -40,7 +40,7 @@ package struct RequestInfo: Sendable {
 
   package func request(for file: URL) throws -> String {
     let encoder = JSONEncoder()
-    encoder.outputFormatting = .prettyPrinted
+    encoder.outputFormatting = [.prettyPrinted, .withoutEscapingSlashes]
     guard var compilerArgs = String(data: try encoder.encode(compilerArgs), encoding: .utf8) else {
       throw GenericError("Failed to encode compiler arguments")
     }

Sources/SKLogging/CustomLogStringConvertible.swift

@@ -101,8 +101,7 @@ extension Optional where Wrapped: CustomLogStringConvertible {
 extension Encodable {
   package var prettyPrintedJSON: String {
     let encoder = JSONEncoder()
-    encoder.outputFormatting.insert(.prettyPrinted)
-    encoder.outputFormatting.insert(.sortedKeys)
+    encoder.outputFormatting = [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]
     guard let data = try? encoder.encode(self) else {
       return "\(self)"
     }
@@ -137,7 +136,7 @@ extension Encodable {
       let jsonObject = try? JSONSerialization.jsonObject(with: encoded),
       let data = try? JSONSerialization.data(
         withJSONObject: redact(subject: jsonObject),
-        options: [.prettyPrinted, .sortedKeys]
+        options: [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]
       ),
       let string = String(data: data, encoding: .utf8)
     else {

Sources/SKTestSupport/CheckCoding.swift

@@ -24,8 +24,7 @@ package func checkCoding<T: Codable & Equatable>(
   line: UInt = #line
 ) {
   let encoder = JSONEncoder()
-  encoder.outputFormatting.insert(.prettyPrinted)
-  encoder.outputFormatting.insert(.sortedKeys)
+  encoder.outputFormatting = [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]
 
   let data = try! encoder.encode(WrapFragment(value: value))
   let wrappedStr = String(data: data, encoding: .utf8)!
@@ -64,8 +63,7 @@ package func checkEncoding<T: Encodable & Equatable>(
   line: UInt = #line
 ) {
   let encoder = JSONEncoder()
-  encoder.outputFormatting.insert(.prettyPrinted)
-  encoder.outputFormatting.insert(.sortedKeys)
+  encoder.outputFormatting = [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]
   let data = try! encoder.encode(value)
   let str = String(data: data, encoding: .utf8)!
     // Remove trailing whitespace to normalize between corelibs and Apple Foundation.
@@ -101,8 +99,7 @@ package func checkCoding<T: Codable>(
   body: (T) -> Void
 ) {
   let encoder = JSONEncoder()
-  encoder.outputFormatting.insert(.prettyPrinted)
-  encoder.outputFormatting.insert(.sortedKeys)
+  encoder.outputFormatting = [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]
   let data = try! encoder.encode(value)
   let str = String(data: data, encoding: .utf8)!
     // Remove trailing whitespace to normalize between corelibs and Apple Foundation.

Sources/SKTestSupport/IndexedSingleSwiftFileTestProject.swift

@@ -130,7 +130,7 @@ package struct IndexedSingleSwiftFileTestProject {
       ]
     )
     let encoder = JSONEncoder()
-    encoder.outputFormatting = .prettyPrinted
+    encoder.outputFormatting = [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]
     try encoder.encode(compilationDatabase).write(
       to: testWorkspaceDirectory.appendingPathComponent(JSONCompilationDatabaseBuildSystem.dbName)
     )

Tests/BuildSystemIntegrationTests/CompilationDatabaseTests.swift

@@ -32,7 +32,7 @@ final class CompilationDatabaseTests: XCTestCase {
       line: UInt = #line
     ) throws {
       let encoder = JSONEncoder()
-      encoder.outputFormatting.insert(.sortedKeys)
+      encoder.outputFormatting = [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]
       let encodedString = try String(data: encoder.encode(cmd), encoding: .utf8)
       XCTAssertEqual(encodedString, expected, file: file, line: line)
     }