Merge pull request #112 from Adyen/parameter-diff

Parameter diffing

Author: goergisn

.github/workflows/run-tests.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Select latest Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '16.1'
+        xcode-version: '16.2'
 
     - name: 🛠️ Run All Tests
       run: |

Package.resolved

@@ -140,3 +140,20 @@ public enum CustomEnum {
 
     indirect case recursive(CustomEnum)
 }
+
+public struct PublicStructThatIsOnlyAvailableInTheReferencePackage {
+    
+    public var foo: String
+    public func bar() -> Void {
+        print("Hello")
+    }
+}
+
+public extension CustomEnum {
+    enum PublicEnumInExtensionOfCustomEnumThatIsOnlyAvailableInTheReferencePackage {
+        case alpha
+        case beta
+    }
+}
+
+public extension CustomEnum {}

ReferencePackages/ReferencePackage/Sources/ReferencePackage/ReferencePackage.swift

@@ -23,6 +23,7 @@ struct XcodeTools {
 
     internal enum Constants {
         static let derivedDataPath: String = ".build"
+        static let buildDirPath: String = ".build/Build"
         static let simulatorSdkCommand = "xcrun --sdk iphonesimulator --show-sdk-path"
     }
 
@@ -87,16 +88,15 @@ struct XcodeTools {
 
             let result = shell.execute(command)
             let derivedDataPath = "\(projectDirectoryPath)/\(Constants.derivedDataPath)"
+            let buildDirPath = "\(projectDirectoryPath)/\(Constants.buildDirPath)"
 
             logger?.debug(result, from: String(describing: Self.self))
 
             // It might be that the archive failed but the .swiftinterface files are still created
             // so we have to check outside if they exist.
             //
             // Also see: https://github.com/swiftlang/swift/issues/56573
-            guard fileHandler.fileExists(atPath: derivedDataPath) else {
-                print(result)
-
+            guard fileHandler.fileExists(atPath: buildDirPath) else {
                 throw XcodeToolsError(
                     errorDescription: "💥 Building project failed",
                     underlyingError: result

Sources/PublicModules/PADProjectBuilder/SwiftInterfaceProducer/XcodeTools.swift

@@ -81,7 +81,7 @@ struct SwiftInterfaceAnalyzer: SwiftInterfaceAnalyzing {
 
             // No matching element was found so either it was removed or added
             let changeType: IndependentSwiftInterfaceChange.ChangeType = oldFirst ?
-                .removal(lhsElement.description) :
+                .removal(lhsElement.recursiveDescription()) :
                 .addition(lhsElement.recursiveDescription())
 
             return [

Sources/PublicModules/PADSwiftInterfaceDiff/SwiftInterfaceAnalyzer/SwiftInterfaceAnalyzer.swift

@@ -22,6 +22,7 @@ extension EnumCaseDeclSyntax {
                 name: $0.name.trimmedDescription,
                 parameters: $0.parameterClause?.parameters.map {
                     .init(
+                        attributes: [],
                         firstName: $0.firstName?.trimmedDescription,
                         secondName: $0.secondName?.trimmedDescription,
                         type: $0.type.trimmedDescription,

Sources/PublicModules/PADSwiftInterfaceDiff/SwiftInterfaceParser/DeclSyntax+SwiftInterface/EnumCaseDeclSyntax+SwiftInterface.swift

@@ -23,7 +23,7 @@ extension FunctionDeclSyntax {
             }
         }
 
-        let parameters: [SwiftInterfaceFunction.Parameter] = self.signature.parameterClause.parameters.map {
+        let parameters: [SwiftInterfaceElementParameter] = self.signature.parameterClause.parameters.map {
             .init(
                 attributes: $0.attributes.sanitizedList,
                 firstName: $0.firstName.trimmedDescription,

Sources/PublicModules/PADSwiftInterfaceDiff/SwiftInterfaceParser/DeclSyntax+SwiftInterface/FunctionDeclSyntax+SwiftInterface.swift

@@ -23,7 +23,7 @@ extension InitializerDeclSyntax {
             }
         }
 
-        let parameters: [SwiftInterfaceFunction.Parameter] = self.signature.parameterClause.parameters.map {
+        let parameters: [SwiftInterfaceElementParameter] = self.signature.parameterClause.parameters.map {
             .init(
                 attributes: $0.attributes.sanitizedList,
                 firstName: $0.firstName.trimmedDescription,

Sources/PublicModules/PADSwiftInterfaceDiff/SwiftInterfaceParser/DeclSyntax+SwiftInterface/InitializerDeclSyntax+SwiftInterface.swift

@@ -12,8 +12,9 @@ extension SubscriptDeclSyntax {
 
     func toInterfaceElement() -> SwiftInterfaceSubscript {
 
-        let parameters: [SwiftInterfaceSubscript.Parameter] = self.parameterClause.parameters.map {
+        let parameters: [SwiftInterfaceElementParameter] = self.parameterClause.parameters.map {
             .init(
+                attributes: $0.attributes.sanitizedList,
                 firstName: $0.firstName.trimmedDescription,
                 secondName: $0.secondName?.trimmedDescription,
                 type: $0.type.trimmedDescription,

Sources/PublicModules/PADSwiftInterfaceDiff/SwiftInterfaceParser/DeclSyntax+SwiftInterface/SubscriptDeclSyntax+SwiftInterface.swift

@@ -6,39 +6,6 @@
 
 import Foundation
 
-extension SwiftInterfaceEnumCase {
-
-    struct Parameter {
-
-        let firstName: String?
-
-        let secondName: String?
-
-        let type: String
-
-        let defaultValue: String?
-
-        var description: String {
-            var description = [
-                firstName,
-                secondName
-            ].compactMap { $0 }.joined(separator: " ")
-
-            if description.isEmpty {
-                description += "\(type)"
-            } else {
-                description += ": \(type)"
-            }
-
-            if let defaultValue {
-                description += " = \(defaultValue)"
-            }
-
-            return description
-        }
-    }
-}
-
 class SwiftInterfaceEnumCase: SwiftInterfaceElement {
 
     /// e.g. @discardableResult, @MainActor, @objc, @_spi(...), ...
@@ -49,7 +16,7 @@ class SwiftInterfaceEnumCase: SwiftInterfaceElement {
 
     let name: String
 
-    let parameters: [Parameter]?
+    let parameters: [SwiftInterfaceElementParameter]?
 
     let rawValue: String?
 
@@ -72,7 +39,7 @@ class SwiftInterfaceEnumCase: SwiftInterfaceElement {
         attributes: [String],
         modifiers: [String],
         name: String,
-        parameters: [Parameter]?,
+        parameters: [SwiftInterfaceElementParameter]?,
         rawValue: String?
     ) {
         self.attributes = attributes
@@ -90,7 +57,7 @@ extension SwiftInterfaceEnumCase {
         guard let other = otherElement as? Self else { return [] }
         changes += diffDescription(propertyType: "attribute", oldValues: other.attributes, newValues: attributes)
         changes += diffDescription(propertyType: "modifier", oldValues: other.modifiers, newValues: modifiers)
-        changes += diffDescription(propertyType: "parameter", oldValues: other.parameters?.map(\.description), newValues: parameters?.map(\.description))
+        changes += diffDescription(oldParameters: other.parameters, newParameters: parameters)
         changes += diffDescription(propertyType: "raw value", oldValue: other.rawValue, newValue: rawValue)
         return changes.compactMap { $0 }
     }