More tests. CombinedScope -> ScopeGenerator. Still need more tests

dfed · Dec 9, 2023 · d9fb05d · d9fb05d
1 parent 2bbc934
commit d9fb05d
Show file tree

Hide file tree

Showing 7 changed files with 717 additions and 306 deletions.
diff --git a/Sources/SafeDICore/Generators/DependencyTreeGenerator.swift b/Sources/SafeDICore/Generators/DependencyTreeGenerator.swift
@@ -39,35 +39,22 @@ public final class DependencyTreeGenerator {
 
         let typeDescriptionToScopeMap = try createTypeDescriptionToScopeMapping()
         try validateUndeclaredReceivedProperties(typeDescriptionToScopeMap: typeDescriptionToScopeMap)
-        let rootCombinedScopes = try rootInstantiableTypes
+        let rootScopeGenerators = try rootInstantiableTypes
             .sorted()
-            .compactMap { try typeDescriptionToScopeMap[$0]?.createCombinedScope() }
+            .compactMap { try typeDescriptionToScopeMap[$0]?.createScopeGenerator() }
 
         let dependencyTree = try await withThrowingTaskGroup(
             of: String.self,
             returning: String.self
         ) { taskGroup in
-            for rootCombinedScope in rootCombinedScopes {
-                if rootCombinedScope.instantiable.dependencies.isEmpty {
-                    // Nothing to do here! We already have an empty initializer.
-                } else {
-                    taskGroup.addTask {
-                        try await """
-                            extension \(rootCombinedScope.instantiable.concreteInstantiableType.asSource) {
-                                \(rootCombinedScope.instantiable.isClass ? "@convenience " : "")init() {
-                            \(rootCombinedScope.generateCode(leadingWhitespace: "        "))
-                                    self.init(\(rootCombinedScope.instantiable.initializer.createInitializerArgumentList(given: rootCombinedScope.instantiable.dependencies)))
-                                }
-                            }
-                            """
-                    }
-                }
+            for rootScopeGenerator in rootScopeGenerators {
+                taskGroup.addTask { try await rootScopeGenerator.generateCode() }
             }
-            var generatedCombinedScopes = [String]()
-            for try await generatedCombinedScope in taskGroup {
-                generatedCombinedScopes.append(generatedCombinedScope)
+            var generatedRoots = [String]()
+            for try await generatedRoot in taskGroup {
+                generatedRoots.append(generatedRoot)
             }
-            return generatedCombinedScopes.sorted().joined(separator: "\n\n")
+            return generatedRoots.sorted().joined(separator: "\n\n").trimmingCharacters(in: .whitespacesAndNewlines)
         }
 
         return """
@@ -220,7 +207,7 @@ public final class DependencyTreeGenerator {
                     property: instantiatedProperty,
                     instantiable: instantiable,
                     scope: instantiatedScope,
-                    type: instantiatedProperty.nonLazyPropertyType
+                    type: instantiatedProperty.propertyType
                 ))
             }
             for instantiatedProperty in scope.instantiable.lazyInstantiatedProperties {
@@ -247,7 +234,7 @@ public final class DependencyTreeGenerator {
 
     private func validateUndeclaredReceivedProperties(typeDescriptionToScopeMap: [TypeDescription: Scope]) throws {
         var unfulfillableProperties = Set<DependencyTreeGeneratorError.UnfulfillableProperty>()
-        func propagateUndeclaredReceivedProperties(
+        func validateUndeclaredReceivedProperties(
             on scope: Scope,
             receivableProperties: Set<Property>,
             instantiables: OrderedSet<Instantiable>
@@ -273,7 +260,7 @@ public final class DependencyTreeGenerator {
                 var instantiables = instantiables
                 instantiables.insert(scope.instantiable, at: 0)
 
-                propagateUndeclaredReceivedProperties(
+                validateUndeclaredReceivedProperties(
                     on: childScope,
                     receivableProperties: receivableProperties.union(scope.properties),
                     instantiables: instantiables
@@ -282,7 +269,7 @@ public final class DependencyTreeGenerator {
         }
 
         for rootScope in rootInstantiableTypes.compactMap({ typeDescriptionToScopeMap[$0] }) {
-            propagateUndeclaredReceivedProperties(
+            validateUndeclaredReceivedProperties(
                 on: rootScope,
                 receivableProperties: Set(rootScope.properties),
                 instantiables: []

diff --git a/Sources/SafeDICore/Models/CombinedScope.swift b/Sources/SafeDICore/Models/CombinedScope.swift
diff --git a/Sources/SafeDICore/Models/Property.swift b/Sources/SafeDICore/Models/Property.swift
@@ -22,7 +22,7 @@ import SwiftSyntax
 
 /// A representation of a property.
 /// e.g. `let myProperty: MyProperty`
-public struct Property: Codable, Hashable, Comparable {
+public struct Property: Codable, Hashable, Comparable, Sendable {
 
     // MARK: Initialization
 
@@ -39,7 +39,7 @@ public struct Property: Codable, Hashable, Comparable {
     /// The label by which the property is referenced.
     public let label: String
     /// The type to which the property conforms.
-    public var typeDescription: TypeDescription
+    public let typeDescription: TypeDescription
 
     // MARK: Hashable
 
@@ -61,7 +61,7 @@ public struct Property: Codable, Hashable, Comparable {
         )
     }
 
-    var nonLazyPropertyType: PropertyType {
+    var propertyType: PropertyType {
         switch typeDescription {
         case let .simple(name, _):
             if name == Dependency.instantiatorType {