fix: searching for files in symlinked directories (#78)

tuist · Nov 1, 2024 · 4397564 · 4397564
1 parent ef51eeb
commit 4397564
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/tuist/swift-glob",
       "state" : {
-        "revision" : "c086760260c4bd6541ea42fdbb8cc76a9798b3fa",
-        "version" : "0.3.6"
+        "revision" : "106ff5ea97cca6ee504765133af3175ecd5ca257",
+        "version" : "0.3.7"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .package(url: "https://github.com/weichsel/ZIPFoundation", .upToNextMajor(from: "0.9.19")),
         // We are depending on a fork as swift-glob currently can't handle some scenario that we need in tuist/tuist.
         // For example, the package currently goes through all directories regradless of whether that's necessary.'
-        .package(url: "https://github.com/tuist/swift-glob", .upToNextMajor(from: "0.3.6")),
+        .package(url: "https://github.com/tuist/swift-glob", .upToNextMajor(from: "0.3.7")),
     ],
     targets: [
         .target(

diff --git a/Tests/FileSystemTests/FileSystemTests.swift b/Tests/FileSystemTests/FileSystemTests.swift
@@ -760,4 +760,30 @@ final class FileSystemTests: XCTestCase, @unchecked Sendable {
             XCTAssertEqual(got, [firstDirectory, sourceFile, secondDirectory])
         }
     }
+
+    func test_glob_with_symlink_and_only_a_directory_wildcard() async throws {
+        try await subject.runInTemporaryDirectory(prefix: "FileSystem") { temporaryDirectory in
+            // Given
+            let firstDirectory = temporaryDirectory.appending(component: "first")
+            let symlink = firstDirectory.appending(component: "symlink")
+            let secondDirectory = temporaryDirectory.appending(component: "second")
+            let sourceFile = secondDirectory.appending(component: "file.swift")
+            let symlinkSourceFilePath = symlink.appending(component: "file.swift")
+            try await subject.makeDirectory(at: firstDirectory)
+            try await subject.makeDirectory(at: secondDirectory)
+            try await subject.touch(sourceFile)
+            try await subject.createSymbolicLink(from: symlink, to: secondDirectory)
+
+            // When
+            let got = try await subject.glob(
+                directory: firstDirectory,
+                include: ["**/*.swift"]
+            )
+            .collect()
+            .sorted()
+
+            // Then
+            XCTAssertEqual(got, [symlinkSourceFilePath])
+        }
+    }
 }