changed an api to use Task instead of async/await

Author: Overcot

Sources/Basics/TemporaryFile.swift

@@ -29,18 +29,28 @@ import TSCLibc
 ///           If `body` has a return value, that value is also used as the
 ///           return value for the `withTemporaryDirectory` function.
 ///           The cleanup block should be called when the temporary directory is no longer needed.
-///
+/// - Returns: `Task<Result, Error>` which can be used
 /// - Throws: `MakeDirectoryError` and rethrows all errors from `body`.
 @available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
 public func withTemporaryDirectory<Result>(
     dir: AbsolutePath? = nil,
     prefix: String = "TemporaryDirectory",
-    _ body: (AbsolutePath, @escaping (AbsolutePath) -> Void) async throws -> Result
-) async throws -> Result {
+    _ body: @escaping (AbsolutePath, @escaping (AbsolutePath) -> Void) async throws -> Result
+) throws -> Task<Result, Error> {
     let temporaryDirectory = try createTemporaryDirectory(dir: dir, prefix: prefix)
-    return try await body(temporaryDirectory) { path in
-        _ = try? FileManager.default.removeItem(atPath: path.pathString)
+    
+    let task: Task<Result, Error> = Task {
+        try await withTaskCancellationHandler {
+            try await body(temporaryDirectory) { path in
+                _ = try? FileManager.default.removeItem(atPath: path.pathString)
+            }
+        } onCancel: {
+            _ = try? FileManager.default.removeItem(atPath: temporaryDirectory.pathString)
+        }
+        
     }
+    
+    return task
 }
 
 /// Creates a temporary directory and evaluates a closure with the directory path as an argument.
@@ -63,10 +73,10 @@ public func withTemporaryDirectory<Result>(
 public func withTemporaryDirectory<Result>(
     dir: AbsolutePath? = nil,
     prefix: String = "TemporaryDirectory",
-    removeTreeOnDeinit: Bool = false ,
-    _ body: (AbsolutePath) async throws -> Result
-) async throws -> Result {
-    try await withTemporaryDirectory(dir: dir, prefix: prefix) { path, cleanup in
+    removeTreeOnDeinit: Bool = false,
+    _ body: @escaping (AbsolutePath) async throws -> Result
+) throws -> Task<Result, Error> {
+    try withTemporaryDirectory(dir: dir, prefix: prefix) { path, cleanup in
         defer { if removeTreeOnDeinit { cleanup(path) } }
         return try await body(path)
     }

Tests/BasicsTests/TemporaryFileTests.swift

@@ -29,7 +29,7 @@ class TemporaryAsyncFileTests: XCTestCase {
 
             XCTAssertTrue(localFileSystem.isDirectory(tempDirPath))
             return tempDirPath
-        }
+        }.value
         XCTAssertFalse(localFileSystem.isDirectory(path1))
 
         // Test temp directory is not removed when its not empty.
@@ -45,7 +45,7 @@ class TemporaryAsyncFileTests: XCTestCase {
 
             try localFileSystem.writeFileContents(filePath, bytes: ByteString())
             return tempDirPath
-        }
+        }.value
         XCTAssertTrue(localFileSystem.isDirectory(path2))
         // Cleanup.
         try FileManager.default.removeItem(atPath: path2.pathString)
@@ -63,7 +63,7 @@ class TemporaryAsyncFileTests: XCTestCase {
 
             try localFileSystem.writeFileContents(filePath, bytes: ByteString())
             return tempDirPath
-        }
+        }.value
         XCTAssertFalse(localFileSystem.isDirectory(path3))
     }
 
@@ -81,10 +81,26 @@ class TemporaryAsyncFileTests: XCTestCase {
                 // Their paths should be different.
                 XCTAssertTrue(pathOne != pathTwo)
                 return pathTwo
-            }
+            }.value
             return (pathOne, pathTwo)
-        }
+        }.value
         XCTAssertFalse(localFileSystem.isDirectory(pathOne))
         XCTAssertFalse(localFileSystem.isDirectory(pathTwo))
     }
+    
+    func testCancelOfTask() async throws {
+        let task: Task<AbsolutePath, Error> = try withTemporaryDirectory { path in
+            
+            try await Task.sleep(nanoseconds: 1_000_000_000)
+            XCTAssertTrue(Task.isCancelled)
+            XCTAssertFalse(localFileSystem.isDirectory(path))
+            return path
+        }
+        task.cancel()
+        do {
+            // The correct path is to throw an error here
+            let result = try await task.value
+            XCTAssertFalse(localFileSystem.isDirectory(result))
+        } catch {}
+    }
 }