Merge branch 'main' into dfed--renamed-received-resolution

dfed · Jan 19, 2024 · 12db159 · 12db159
2 parents 99eb896 + 38c295c
commit 12db159
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 0 deletions.
diff --git a/Sources/SafeDICore/Models/Scope.swift b/Sources/SafeDICore/Models/Scope.swift
@@ -91,6 +91,14 @@ final class Scope {
                         && $0.property != property
                     }
                     .map(\.property)
+            ).subtracting(
+                // We want the local version of any instantiated property.
+                propertiesToInstantiate.map(\.property)
+                + instantiable
+                    .dependencies
+                    // We want the local version of any aliased property.
+                    .filter { $0.fulfillingProperty != nil }
+                    .map(\.property)
             )
             let scopeGenerator = ScopeGenerator(
                 instantiable: instantiable,

diff --git a/Sources/SafeDICore/Models/TypeDescription.swift b/Sources/SafeDICore/Models/TypeDescription.swift
@@ -440,6 +440,12 @@ public struct UnorderedComparingCollection<Element: Codable & Hashable & Sendabl
         lhs.set == rhs.set
     }
 
+    // MARK: Hashable
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(set)
+    }
+
     // MARK: Collection
 
     public func makeIterator() -> IndexingIterator<Array<Element>> { array.makeIterator() }

diff --git a/Tests/SafeDICoreTests/TypeDescriptionTests.swift b/Tests/SafeDICoreTests/TypeDescriptionTests.swift
@@ -588,6 +588,13 @@ final class TypeDescriptionTests: XCTestCase {
         }
     }
 
+    func test_UnorderedComparingCollection_hashesEquivalentCollectionsIdentically() {
+        XCTAssertEqual(
+            UnorderedComparingCollection([1, 2, 3]).hashValue,
+            UnorderedComparingCollection([2, 1, 3]).hashValue
+        )
+    }
+
     // MARK: - Visitors
 
     private final class TypeIdentifierSyntaxVisitor: SyntaxVisitor {

diff --git a/Tests/SafeDIToolTests/SafeDIToolTests.swift b/Tests/SafeDIToolTests/SafeDIToolTests.swift
@@ -1588,6 +1588,75 @@ final class SafeDIToolTests: XCTestCase {
         )
     }
 
+    func test_run_writesConvenienceExtensionOnRootOfTree_whenRootInstantiatesPropertiesWithSingleTreeThatInstantiateTheSamePropertyAtMultipleLevels() async throws {
+        let output = try await executeSystemUnderTest(
+            swiftFileContent: [
+                """
+                @Instantiable
+                public final class Root {
+                    @Instantiated
+                    let child: Child
+                }
+                """,
+                """
+                @Instantiable
+                public final class Recreated {}
+                """,
+                """
+                @Instantiable
+                public final class Child {
+                    @Instantiated
+                    let grandchild: Grandchild
+                    @Instantiated
+                    let recreated: Recreated
+                }
+                """,
+                """
+                @Instantiable
+                public final class Grandchild {
+                    @Instantiated
+                    let greatGrandchild: GreatGrandchild
+                    @Instantiated
+                    let recreated: Recreated
+                }
+                """,
+                """
+                @Instantiable
+                public final class GreatGrandchild {
+                    @Received
+                    let recreated: Recreated
+                }
+                """,
+
+            ],
+            buildDependencyTreeOutput: true
+        )
+
+        XCTAssertEqual(
+            try XCTUnwrap(output.dependencyTree),
+            """
+            // This file was generated by the SafeDIGenerateDependencyTree build tool plugin.
+            // Any modifications made to this file will be overwritten on subsequent builds.
+            // Please refrain from editing this file directly.
+
+            extension Root {
+                public convenience init() {
+                    let child = {
+                        let grandchild = {
+                            let recreated = Recreated()
+                            let greatGrandchild = GreatGrandchild(recreated: recreated)
+                            return Grandchild(greatGrandchild: greatGrandchild, recreated: recreated)
+                        }()
+                        let recreated = Recreated()
+                        return Child(grandchild: grandchild, recreated: recreated)
+                    }()
+                    self.init(child: child)
+                }
+            }
+            """
+        )
+    }
+
     func test_run_writesConvenienceExtensionOnRootOfTree_whenRootInstantiatesPropertiesWithMultipleTreesThatInstantiateTheSamePropertyMultipleLayersDeep() async throws {
         let output = try await executeSystemUnderTest(
             swiftFileContent: [