configure SymbolGraphConcurrentDecoder with given JSONDecoder in SymbolGraphLoader

Author: theMomax

Sources/SwiftDocC/Infrastructure/Symbol Graph/SymbolGraphConcurrentDecoder.swift

@@ -54,7 +54,9 @@ enum SymbolGraphConcurrentDecoder {
     /// it made sense to spread the work equally (in other words to decode each N-th symbol per worker)
     /// so that we can get the best performance out of the concurrent work.
 
-    static func decode(_ data: Data, concurrentBatches: Int = 4) throws -> SymbolGraph {
+    static func decode(_ data: Data, concurrentBatches: Int = 4, using decoder: JSONDecoder = JSONDecoder()) throws -> SymbolGraph {
+        
+        
         var symbolGraph: SymbolGraph!
 
         let decodeError = Synchronized<Error?>(nil)
@@ -67,15 +69,15 @@ enum SymbolGraphConcurrentDecoder {
         group.async(queue: queue) {
             do {
                 // Decode the symbol graph bar the symbol list.
-                symbolGraph = try JSONDecoder().decode(SymbolGraphWithoutSymbols.self, from: data).symbolGraph
+                symbolGraph = try JSONDecoder(like: decoder).decode(SymbolGraphWithoutSymbols.self, from: data).symbolGraph
             } catch {
                 decodeError.sync({ $0 = error })
             }
         }
 
         // Concurrently decode each batch of symbols in the graph.
         (0..<concurrentBatches).concurrentPerform { batchIndex in
-            let batchDecoder = JSONDecoder()
+            let batchDecoder = JSONDecoder(like: decoder)
 
             // Configure the decoder to decode the current batch
             batchDecoder.userInfo[CodingUserInfoKey.symbolCounter] = Counter()
@@ -179,3 +181,22 @@ enum SymbolGraphConcurrentDecoder {
         }
     }
 }
+
+private extension JSONDecoder {
+    /// Creates a new decoder with the same configuration as the
+    /// old one.
+    convenience init(like old: JSONDecoder) {
+        self.init()
+        
+        self.userInfo = old.userInfo
+        self.dataDecodingStrategy = old.dataDecodingStrategy
+        self.dateDecodingStrategy = old.dateDecodingStrategy
+        self.keyDecodingStrategy = old.keyDecodingStrategy
+        self.nonConformingFloatDecodingStrategy = old.nonConformingFloatDecodingStrategy
+        
+        if #available(macOS 12.0, *) {
+            self.allowsJSON5 = old.allowsJSON5
+            self.assumesTopLevelDictionary = old.assumesTopLevelDictionary
+        }
+    }
+}

Sources/SwiftDocC/Infrastructure/Symbol Graph/SymbolGraphLoader.swift

@@ -69,7 +69,7 @@ struct SymbolGraphLoader {
                 case .concurrentlyAllFiles:
                     symbolGraph = try decoder.decode(SymbolGraph.self, from: data)
                 case .concurrentlyEachFileInBatches:
-                    symbolGraph = try SymbolGraphConcurrentDecoder.decode(data)
+                    symbolGraph = try SymbolGraphConcurrentDecoder.decode(data, using: decoder)
                 }
 
                 // `moduleNameFor(_:at:)` is static because it's pure function.