Merge pull request #16 from irgaly/fix_dependency_order

Fix dependency sort order, Swift Package dropped randomly
CuriositySoftware · Nov 5, 2023 · 5523a14 · 5523a14
2 parents 79ddc87 + ee59ca9
commit 5523a14
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 14 deletions.
diff --git a/Sources/Converter/ProjectConverter.swift b/Sources/Converter/ProjectConverter.swift
@@ -25,9 +25,17 @@ public struct ProjectConverter {
             nativeTarget.packageProductDependencies.forEach { dependency in
                 switch dependency.type {
                 case .remote:
-                    accumulators.0.append(dependency)
+                    if !accumulators.0.contains(where: {
+                        $0.name == dependency.name
+                    }) {
+                        accumulators.0.append(dependency)
+                    }
                 case .local:
-                    accumulators.1.append(dependency)
+                    if !accumulators.1.contains(where: {
+                        $0.name == dependency.name
+                    }) {
+                        accumulators.1.append(dependency)
+                    }
                 }
             }
 

diff --git a/Sources/Formatter/Mermaid/MermaidFormatter.swift b/Sources/Formatter/Mermaid/MermaidFormatter.swift
@@ -117,13 +117,19 @@ public struct MermaidFormatter {
 
         let formatNodeEdge = NodeEdgeFormatter()
 
-        project.nativeTargets.forEach { native in
-            result += native.targetDependencies.reduce("") { result, connectedNode in
+        project.nativeTargets
+            .sorted( by: { $0.name < $1.name } )
+            .forEach { native in
+            result += native.targetDependencies
+                .sorted(by: { $0.name < $1.name })
+                .reduce("") { result, connectedNode in
                 result + formatNodeEdge(node: native.name, connectedNode: connectedNode.name)
             }
 
             if swiftPackageOutput {
-                result += native.packageProductDependencies.reduce("") { result, connectedNode in
+                result += native.packageProductDependencies
+                    .sorted(by: { $0.name < $1.name })
+                    .reduce("") { result, connectedNode in
                     result + formatNodeEdge(node: native.name, connectedNode: connectedNode.name)
                 }
             }
@@ -143,6 +149,7 @@ public struct MermaidFormatter {
                     return vendorOutput
                 }
             }
+            .sorted(by: { $0.name < $1.name })
             .reduce("") { result, connectedNode in
                 result + formatNodeEdge(node: native.name, connectedNode: connectedNode.name)
             }

diff --git a/Sources/Generator/ProjectMaker.swift b/Sources/Generator/ProjectMaker.swift
@@ -40,8 +40,9 @@ struct ProjectMaker {
                             $0.packageProductDependencies.map {
                                 if let package = $0.package, let urlString = package.repositoryURL {
                                     return .init(
-                                        id: package.uuid,
+                                        id: $0.uuid,
                                         name: $0.productName,
+                                        packageName: package.name,
                                         type: .remote(
                                             urlString: urlString
                                         )
@@ -50,6 +51,7 @@ struct ProjectMaker {
                                     return .init(
                                         id: $0.uuid,
                                         name: $0.productName,
+                                        packageName: nil,
                                         type: .local
                                     )
                                 }

diff --git a/Sources/Value/Project.swift b/Sources/Value/Project.swift
@@ -90,15 +90,18 @@ public struct Project {
 
         public var id: String
         public let name: String
+        public let packageName: String?
         public let type: DependencyType
 
         public init(
             id: String,
             name: String,
+            packageName: String?,
             type: DependencyType
         ) {
             self.id = id
             self.name = name
+            self.packageName = packageName
             self.type = type
         }
     }

diff --git a/Tests/MermaidFormatterTests.swift b/Tests/MermaidFormatterTests.swift
@@ -18,7 +18,10 @@ final class MermaidFormatterTests: XCTestCase {
                 .init(
                     id: "ShareExtension",
                     name: "ShareExtension",
-                    targetDependencies: [.init(id: "B", name: "Core")],
+                    targetDependencies: [
+                        .init(id: "B", name: "Core"),
+                        .init(id: "C", name: "LibraryC")
+                    ],
                     packageProductDependencies: [],
                     otherDependencies: []
                 )
@@ -43,6 +46,7 @@ final class MermaidFormatterTests: XCTestCase {
             end
             App --> Core
             ShareExtension --> Core
+            ShareExtension --> LibraryC
             ```
 
             """

diff --git a/Tests/ProjectConverterTests.swift b/Tests/ProjectConverterTests.swift
@@ -7,17 +7,20 @@ final class ProjectConverterTests: XCTestCase {
 
     func testReduce() {
         let packageProductA = Project.SwiftPackage(
-            id: "A", name: "A", type: .remote(urlString: "")
+            id: "A", name: "A", packageName: "A", type: .remote(urlString: "")
         )
-        let packageProductB = Project.SwiftPackage(
-            id: "B", name: "B", type: .remote(urlString: "")
+        let packageProductB1 = Project.SwiftPackage(
+            id: "B1", name: "B1", packageName: "B", type: .remote(urlString: "")
+        )
+        let packageProductB2 = Project.SwiftPackage(
+            id: "B2", name: "B2", packageName: "B", type: .remote(urlString: "")
         )
 
         let internalPackageProduct1 = Project.SwiftPackage(
-            id: "P1", name: "InternalProduct1", type: .local
+            id: "P1", name: "InternalProduct1", packageName: nil, type: .local
         )
         let internalPackageProduct2 = Project.SwiftPackage(
-            id: "P2", name: "InternalProduct2", type: .local
+            id: "P2", name: "InternalProduct2", packageName: nil, type: .local
         )
 
         let appleSDKあ = Project.Framework(
@@ -64,7 +67,8 @@ final class ProjectConverterTests: XCTestCase {
                     ],
                     packageProductDependencies: [
                         packageProductA,
-                        packageProductB,
+                        packageProductB1,
+                        packageProductB2,
                         internalPackageProduct1,
                         internalPackageProduct2
                     ],
@@ -91,7 +95,7 @@ final class ProjectConverterTests: XCTestCase {
 
         XCTAssertEqual(
             subject.packageProducts,
-            [packageProductA, packageProductB]
+            [packageProductA, packageProductB1, packageProductB2]
         )
 
         XCTAssertEqual(