Expand serialParse flag to also apply to Composer.uniqueTypesAndFunct…

…ions (#1301)
krzysztofzablocki · Mar 13, 2024 · df53fed · df53fed
1 parent 735659c
commit df53fed
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/Sourcery/Sourcery.swift b/Sourcery/Sourcery.swift
@@ -405,7 +405,7 @@ extension Sourcery {
         let uniqueTypeStart = currentTimestamp()
 
         // ! All files have been scanned, time to join extensions with base class
-        let (types, functions, typealiases) = Composer.uniqueTypesAndFunctions(parserResult)
+        let (types, functions, typealiases) = Composer.uniqueTypesAndFunctions(parserResult, serial: serialParse)
 
 
         let filesThatHadToBeParsed = allResults

diff --git a/SourceryRuntime/Sources/Common/Array+Parallel.swift b/SourceryRuntime/Sources/Common/Array+Parallel.swift
@@ -24,9 +24,9 @@ public extension Array {
         }
     }
 
-    func parallelPerform(transform: (Element) -> Void) {
+    func parallelPerform(_ work: (Element) -> Void) {
         DispatchQueue.concurrentPerform(iterations: count) { idx in
-            transform(self[idx])
+            work(self[idx])
         }
     }
 }
diff --git a/SourceryRuntime/Sources/Common/Composer/Composer.swift b/SourceryRuntime/Sources/Common/Composer/Composer.swift
@@ -19,8 +19,9 @@ public enum Composer {
     /// - filters out any private types and extensions
     ///
     /// - Parameter parserResult: Result of parsing source code.
+    /// - Parameter serial: Whether to process results serially instead of concurrently
     /// - Returns: Final types and extensions of unknown types.
-    public static func uniqueTypesAndFunctions(_ parserResult: FileParserResult) -> (types: [Type], functions: [SourceryMethod], typealiases: [Typealias]) {
+    public static func uniqueTypesAndFunctions(_ parserResult: FileParserResult, serial: Bool = false) -> (types: [Type], functions: [SourceryMethod], typealiases: [Typealias]) {
         let composed = ParserResultsComposed(parserResult: parserResult)
 
         let resolveType = { (typeName: TypeName, containingType: Type?) -> Type? in
@@ -31,7 +32,7 @@ public enum Composer {
             return composed.resolveType(typeName: typeName, containingType: containingType, method: method)
         }
 
-        composed.types.parallelPerform { type in
+        let processType = { (type: Type) in
             type.variables.forEach {
                 resolveVariableTypes($0, of: type, resolve: resolveType)
             }
@@ -55,10 +56,18 @@ public enum Composer {
             }
         }
 
-        composed.functions.parallelPerform { function in
+        let processFunction = { (function: SourceryMethod) in
             resolveMethodTypes(function, of: nil, resolve: methodResolveType)
         }
 
+        if serial {
+            composed.types.forEach(processType)
+            composed.functions.forEach(processFunction)
+        } else {
+            composed.types.parallelPerform(processType)
+            composed.functions.parallelPerform(processFunction)
+        }
+
         updateTypeRelationships(types: composed.types)
 
         return (

diff --git a/SourceryRuntime/Sources/Common/TemplateContext.swift b/SourceryRuntime/Sources/Common/TemplateContext.swift
@@ -48,7 +48,7 @@ public final class TemplateContext: NSObject, SourceryModel, NSCoding, Diffable
         let fileParserResultCopy: FileParserResult? = nil
 //      fileParserResultCopy = try? NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(NSKeyedArchiver.archivedData(withRootObject: parserResult)) as? FileParserResult
 
-        let composed = Composer.uniqueTypesAndFunctions(parserResult)
+        let composed = Composer.uniqueTypesAndFunctions(parserResult, serial: false)
         self.types = .init(types: composed.types, typealiases: composed.typealiases)
         self.functions = composed.functions