feat: handle relative symbolic links (#98)

* add func to create symbolic link with RelativePath as destination * add failing test with relative sym link * fix handling of relative symbolic link * formatting * add createSymbolicLink with RelativePath to FileSysteming protocol * add private helper func for creating symbolic links with absolute and relative path * formatting * Make authentication optional --------- Co-authored-by: fortmarek <[email protected]>
tuist · Jan 9, 2025 · c60a236 · c60a236
1 parent 95fccd7
commit c60a236
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 13 deletions.
diff --git a/Sources/FileSystem/FileSystem.swift b/Sources/FileSystem/FileSystem.swift
@@ -220,6 +220,12 @@ public protocol FileSysteming {
     ///   - to: The path the symlink points to.
     func createSymbolicLink(from: AbsolutePath, to: AbsolutePath) async throws
 
+    /// Creates a relative symlink.
+    /// - Parameters:
+    ///   - from: The path where the symlink is created.
+    ///   - to: The relative path the symlink points to.
+    func createSymbolicLink(from: AbsolutePath, to: RelativePath) async throws
+
     /// Given a symlink, it resolves it returning the path to the file or directory the symlink is pointing to.
     /// - Parameter symlinkPath: The absolute path to the symlink.
     /// - Returns: The resolved path.
@@ -542,10 +548,18 @@ public struct FileSystem: FileSysteming, Sendable {
     }
 
     public func createSymbolicLink(from: AbsolutePath, to: AbsolutePath) async throws {
-        logger?.debug("Creating symbolic link from \(from.pathString) to \(to.pathString).")
+        try await createSymbolicLink(fromPathString: from.pathString, toPathString: to.pathString)
+    }
+
+    public func createSymbolicLink(from: AbsolutePath, to: RelativePath) async throws {
+        try await createSymbolicLink(fromPathString: from.pathString, toPathString: to.pathString)
+    }
+
+    private func createSymbolicLink(fromPathString: String, toPathString: String) async throws {
+        logger?.debug("Creating symbolic link from \(fromPathString) to \(toPathString).")
         try await NIOFileSystem.FileSystem.shared.createSymbolicLink(
-            at: FilePath(from.pathString),
-            withDestination: FilePath(to.pathString)
+            at: FilePath(fromPathString),
+            withDestination: FilePath(toPathString)
         )
     }
 

diff --git a/Sources/Glob/GlobSearch.swift b/Sources/Glob/GlobSearch.swift
@@ -83,17 +83,15 @@ public func search(
                     }
 
                     let path = baseURL.absoluteString.removingPercentEncoding ?? baseURL.absoluteString
-                    let symbolicLinkDestination: URL?
-                    if let symbolicLinkDestinationAbsoluteString = try? FileManager.default
-                        .destinationOfSymbolicLink(atPath: path)
-                    {
-                        symbolicLinkDestination = URL(string: symbolicLinkDestinationAbsoluteString)
-                    } else {
-                        symbolicLinkDestination = nil
-                    }
+                    let symbolicLinkDestination = URL(filePath: path).resolvingSymlinksInPath()
                     var isDirectory: ObjCBool = false
+
+                    let symbolicLinkDestinationPath: String = symbolicLinkDestination
+                        .path()
+                        .removingPercentEncoding ?? symbolicLinkDestination.path()
+
                     guard FileManager.default.fileExists(
-                        atPath: symbolicLinkDestination?.absoluteString ?? path,
+                        atPath: symbolicLinkDestinationPath,
                         isDirectory: &isDirectory
                     ),
                         isDirectory.boolValue

diff --git a/Tests/FileSystemTests/FileSystemTests.swift b/Tests/FileSystemTests/FileSystemTests.swift
@@ -856,6 +856,40 @@ final class FileSystemTests: XCTestCase, @unchecked Sendable {
         }
     }
 
+    func test_glob_with_relative_symlink() async throws {
+        try await subject.runInTemporaryDirectory(prefix: "FileSystem") { temporaryDirectory in
+            // Given
+            let frameworkDir = temporaryDirectory.appending(component: "Framework")
+            let sourceDir = frameworkDir.appending(component: "Source")
+            let spmResourcesDir = sourceDir.appending(component: "SwiftPackageResources")
+            let modelSymLinkPath = spmResourcesDir.appending(component: "MyModel.xcdatamodeld")
+
+            let actualResourcesDir = frameworkDir.appending(component: "Resources")
+            let actualModelPath = actualResourcesDir.appending(component: "MyModel.xcdatamodeld")
+            let versionPath = actualModelPath.appending(component: "MyModel_0.xcdatamodel")
+
+            try await subject.makeDirectory(at: spmResourcesDir)
+            try await subject.makeDirectory(at: actualResourcesDir)
+            try await subject.makeDirectory(at: actualModelPath)
+            try await subject.touch(versionPath)
+
+            let relativeActualModelPath = try RelativePath(validating: "../../Resources/MyModel.xcdatamodeld")
+            try await subject.createSymbolicLink(from: modelSymLinkPath, to: relativeActualModelPath)
+
+            // When
+            let got = try await subject.glob(
+                directory: modelSymLinkPath,
+                include: ["*.xcdatamodel"]
+            )
+            .collect()
+            .sorted()
+
+            // Then
+            XCTAssertEqual(got.count, 1)
+            XCTAssertEqual(got.map(\.basename), [versionPath.basename])
+        }
+    }
+
     func test_glob_with_double_directory_wildcard() async throws {
         try await subject.runInTemporaryDirectory(prefix: "FileSystem") { temporaryDirectory in
             // Given

diff --git a/Tuist.swift b/Tuist.swift
@@ -1,3 +1,10 @@
 import ProjectDescription
 
-let tuist = Tuist(fullHandle: "tuist/FileSystem")
+let tuist = Tuist(
+    fullHandle: "tuist/FileSystem",
+    project: .tuist(
+        generationOptions: .options(
+            optionalAuthentication: true
+        )
+    )
+)