Make temporaryDir independent of a particular FS instance

Author: fzhinkin

core/api/kotlinx-io-core.api

@@ -212,14 +212,14 @@ public abstract interface class kotlinx/io/files/FileSystem {
 	public abstract fun delete (Lkotlinx/io/files/Path;Z)V
 	public static synthetic fun delete$default (Lkotlinx/io/files/FileSystem;Lkotlinx/io/files/Path;ZILjava/lang/Object;)V
 	public abstract fun exists (Lkotlinx/io/files/Path;)Z
-	public abstract fun getTemporaryDirectory ()Lkotlinx/io/files/Path;
 	public abstract fun metadataOrNull (Lkotlinx/io/files/Path;)Lkotlinx/io/files/FileMetadata;
 	public abstract fun read (Lkotlinx/io/files/Path;)Lkotlinx/io/Source;
 	public abstract fun write (Lkotlinx/io/files/Path;)Lkotlinx/io/Sink;
 }
 
 public final class kotlinx/io/files/FileSystem$Companion {
 	public final fun getSystem ()Lkotlinx/io/files/FileSystem;
+	public final fun getSystemTemporaryDirectory ()Lkotlinx/io/files/Path;
 }
 
 public final class kotlinx/io/files/Path {

core/apple/src/files/FileSystemApple.kt

@@ -21,7 +21,7 @@ internal actual fun atomicMoveImpl(source: Path, destination: Path) {
     }
 }
 
-internal actual val NativeTempDir: Path
+internal actual val SystemTemporaryDirectoryImpl: Path
     get() = Path(NSTemporaryDirectory())
 
 internal actual fun dirnameImpl(path: String): String {

core/common/src/files/FileSystem.kt

@@ -15,11 +15,6 @@ import kotlinx.io.Source
  * **This API is unstable and subject to change.**
  */
 public sealed interface FileSystem {
-    /**
-     * Path to a directory suitable for creating temporary files.
-     */
-    public val temporaryDirectory: Path
-
     /**
      * Returns `true` if there is a filesystem entity a [path] points to,
      * otherwise returns `false`.
@@ -123,6 +118,13 @@ public sealed interface FileSystem {
          * An instance of [FileSystem] representing a default system-wide filesystem.
          */
         public val System: FileSystem = SystemFileSystem
+
+        /**
+         * Path to a directory suitable for creating temporary files.
+         *
+         * This path is not bound to a particular filesystem, but rather a system-wide temporary directory.
+         */
+        public val SystemTemporaryDirectory: Path = SystemTemporaryDirectoryImpl
     }
 }
 
@@ -136,6 +138,8 @@ internal abstract class SystemFileSystemImpl : FileSystem {
 
 internal expect val SystemFileSystem: FileSystem
 
+internal expect val SystemTemporaryDirectoryImpl: Path
+
 /**
  * Represents information about a file or directory obtainable from a filesystem.
  */

core/common/test/files/SmokeFileTest.kt

@@ -87,7 +87,7 @@ class SmokeFileTest {
 
     @Test
     fun checkTmpDir() {
-        assertTrue(FileSystem.System.exists(FileSystem.System.temporaryDirectory))
+        assertTrue(FileSystem.System.exists(FileSystem.SystemTemporaryDirectory))
     }
 
     @OptIn(ExperimentalStdlibApi::class)

core/js/src/files/FileSystemJs.kt

@@ -30,12 +30,6 @@ private class JsFileSystem : SystemFileSystemImpl() {
         val Instance = JsFileSystem()
     }
 
-    override val temporaryDirectory: Path
-        get() {
-            check(os !== null) { "Module 'os' was not found" }
-            return Path(os.tmpdir() as? String ?: "")
-        }
-
     override fun exists(path: Path): Boolean {
         check(fs !== null) { "Module 'fs' was not found" }
         return fs.existsSync(path.path) as Boolean
@@ -112,6 +106,12 @@ private class JsFileSystem : SystemFileSystemImpl() {
 
 internal actual val SystemFileSystem: FileSystem = JsFileSystem.Instance
 
+internal actual val SystemTemporaryDirectoryImpl: Path
+    get() {
+        check(os !== null) { "Module 'os' was not found" }
+        return Path(os.tmpdir() as? String ?: "")
+    }
+
 public actual open class FileNotFoundException actual constructor(
     message: String?,
 ) : IOException(message)

core/jvm/src/files/FileSystemJvm.kt

@@ -46,9 +46,6 @@ private class JvmFileSystem : SystemFileSystemImpl() {
         val Instance = JvmFileSystem()
     }
 
-    override val temporaryDirectory: Path
-        get() = Path(System.getProperty("java.io.tmpdir"))
-
     override fun exists(path: Path): Boolean {
         return path.file.exists()
     }
@@ -84,4 +81,7 @@ private class JvmFileSystem : SystemFileSystemImpl() {
 
 internal actual val SystemFileSystem: FileSystem = JvmFileSystem.Instance
 
+internal actual val SystemTemporaryDirectoryImpl: Path
+    get() = Path(System.getProperty("java.io.tmpdir"))
+
 public actual typealias FileNotFoundException = java.io.FileNotFoundException

core/jvm/test/utilJVM.kt

@@ -13,7 +13,7 @@ import kotlin.test.assertEquals
 
 @OptIn(ExperimentalStdlibApi::class)
 actual fun tempFileName(): String {
-    val tmpDir = FileSystem.System.temporaryDirectory.file
+    val tmpDir = FileSystem.SystemTemporaryDirectory.file
     while (true) {
         val randomString = Random.nextBytes(32).toHexString()
         val res = File(tmpDir, randomString)

core/native/src/files/FileSystemNative.kt

@@ -9,16 +9,11 @@ import kotlinx.cinterop.*
 import kotlinx.io.IOException
 import platform.posix.*
 
-internal expect val NativeTempDir: Path
-
 private class NativeFileSystem : SystemFileSystemImpl() {
     companion object {
         val Instance = NativeFileSystem()
     }
 
-    override val temporaryDirectory: Path
-        get() = NativeTempDir
-
     override fun exists(path: Path): Boolean {
         return access(path.path, F_OK) == 0
     }

core/native/test/util.kt

@@ -15,7 +15,7 @@ import kotlin.random.Random
 
 @OptIn(UnsafeNumber::class, ExperimentalStdlibApi::class)
 actual fun tempFileName(): String {
-    val tmpDir = FileSystem.System.temporaryDirectory.path
+    val tmpDir = FileSystem.SystemTemporaryDirectory.path
     for (i in 0 until 10) {
         val name = Random.nextBytes(32).toHexString()
         val path = "$tmpDir/$name"

core/nonApple/src/files/FileSystemNonApple.kt

@@ -10,5 +10,5 @@ import kotlinx.cinterop.toKString
 import platform.posix.getenv
 
 @OptIn(ExperimentalForeignApi::class)
-internal actual val NativeTempDir: Path
+internal actual val SystemTemporaryDirectoryImpl: Path
     get() = Path(getenv("TMPDIR")?.toKString() ?: getenv("TMP")?.toKString() ?: "")

core/wasm/src/files/FileSystemWasm.kt

@@ -11,9 +11,10 @@ import kotlinx.io.Source
 
 internal fun unsupported(): Nothing = TODO("Paths are not supported for Wasm target")
 
+internal actual val SystemTemporaryDirectoryImpl: Path
+    get() = unsupported()
+
 internal actual val SystemFileSystem: FileSystem = object : SystemFileSystemImpl() {
-    override val temporaryDirectory: Path
-        get() = unsupported()
 
     override fun exists(path: Path): Boolean = unsupported()