Fix: Handle cases where search header path does not end with "Headers" (

#431)

- Fixed issue with search header paths not ending with "Headers".
- Replaced incorrect usage of `map` with `flatMap` to resolve mapping error.

Sources/RugbyFoundation/Core/Build/XcodeBuild/XcodeBuild.swift

@@ -99,7 +99,7 @@ final class XcodeBuild {
             "-project \(paths.project.shellFriendly)",
             "SYMROOT=\(paths.symroot.shellFriendly)"
         ])
-        options.resultBundlePath.map {
+        options.resultBundlePath.flatMap {
             arguments.append("-resultBundlePath \($0.shellFriendly)")
         }
         arguments.append(contentsOf: options.xcargs)

Sources/RugbyFoundation/Core/Common/Hashers/TargetsHasher.swift

@@ -72,7 +72,7 @@ final class TargetsHasher {
                 "xcargs": xcargs.sorted()
             ],
             "buildPhases": buildPhaseHasher.hashContext(target: target),
-            "product": target.product.map(productHasher.hashContext) as Any,
+            "product": target.product.flatMap(productHasher.hashContext) as Any,
             "configurations": configurationsHasher.hashContext(target),
             "cocoaPodsScripts": cocoaPodsScriptsHasher.hashContext(target),
             "buildRules": buildRulesHasher.hashContext(target.buildRules)
@@ -93,7 +93,7 @@ extension TargetsHasher: ITargetsHasher {
         targets.modifyIf(rehash) { resetHash($0) }
 
         let xcodeVersion = try xcodeCLTVersionProvider.version()
-        let formattedXcodeBuildVersion = xcodeVersion.build.map { " (\($0))" } ?? ""
+        let formattedXcodeBuildVersion = xcodeVersion.build.flatMap { " (\($0))" } ?? ""
         let formattedXcodeVersion = "\(xcodeVersion.base)" + formattedXcodeBuildVersion
         try await targets.merging(targets.flatMapValues(\.dependencies)).values.concurrentForEach { target in
             guard target.targetHashContext == nil else { return }

Sources/RugbyFoundation/Core/Env/EnvironmentCollector.swift

@@ -103,7 +103,7 @@ extension EnvironmentCollector: IEnvironmentCollector {
         rugbyEnvironment: [String: String]
     ) async throws -> [String] {
         let xcodeCLTInfo = try xcodeCLTVersionProvider.version()
-        let xcodeCLTVersion = xcodeCLTInfo.build.map { "\(xcodeCLTInfo.base) (\($0))" } ?? xcodeCLTInfo.base
+        let xcodeCLTVersion = xcodeCLTInfo.build.flatMap { "\(xcodeCLTInfo.base) (\($0))" } ?? xcodeCLTInfo.base
         var output = try [
             "Rugby version: \(rugbyVersion)",
             await getSwiftVersion(),

Sources/RugbyFoundation/Core/Use/SupportFilesPatcher.swift

@@ -15,7 +15,7 @@ struct FileReplacement {
 
 enum ReplacementBoundary {
     static let prefix = #"(?<=(\"|'|\s))"#
-    static let suffix = #"(?=(\"|'|\s))"#
+    static let suffix = #"(?=(\"|'|\s|/))"#
 }
 
 protocol ISupportFilesPatcher: AnyObject {

Sources/RugbyFoundation/XcodeProject/Services/XcodeProjectDataSource.swift

@@ -50,7 +50,7 @@ final class XcodeProjectDataSource: Loggable {
     func save() async throws {
         // Save only read projects
         var projects = cachedSubprojects ?? []
-        cachedRootProject.map { projects.append($0) }
+        cachedRootProject.flatMap { projects.append($0) }
 
         try await projects.concurrentMap { project in
             try project.xcodeProj.write(pathString: project.path, override: true)

Tests/FoundationTests/Core/Use/SupportFilesPatcherTests.swift

@@ -4,7 +4,7 @@ import XCTest
 final class SupportFilesPatcherTests: XCTestCase {
     private var sut: ISupportFilesPatcher!
     private var expectedPrefixBoundary = #"(?<=(\"|'|\s))"#
-    private var expectedSuffixBoundary = #"(?=(\"|'|\s))"#
+    private var expectedSuffixBoundary = #"(?=(\"|'|\s|/))"#
 
     override func setUp() {
         super.setUp()