Move kotlinx.io.filesystem to a separate package

Author: fzhinkin

core/api/kotlinx-io-core.api

@@ -236,58 +236,6 @@ public final class kotlinx/io/Utf8Kt {
 	public static synthetic fun writeString$default (Lkotlinx/io/Sink;Ljava/lang/String;IIILjava/lang/Object;)V
 }
 
-public final class kotlinx/io/files/FileMetadata {
-	public fun <init> ()V
-	public fun <init> (ZZJ)V
-	public synthetic fun <init> (ZZJILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getSize ()J
-	public final fun isDirectory ()Z
-	public final fun isRegularFile ()Z
-}
-
-public abstract interface class kotlinx/io/files/FileSystem {
-	public abstract fun atomicMove (Lkotlinx/io/files/Path;Lkotlinx/io/files/Path;)V
-	public abstract fun createDirectories (Lkotlinx/io/files/Path;Z)V
-	public static synthetic fun createDirectories$default (Lkotlinx/io/files/FileSystem;Lkotlinx/io/files/Path;ZILjava/lang/Object;)V
-	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 list (Lkotlinx/io/files/Path;)Ljava/util/Collection;
-	public abstract fun metadataOrNull (Lkotlinx/io/files/Path;)Lkotlinx/io/files/FileMetadata;
-	public abstract fun resolve (Lkotlinx/io/files/Path;)Lkotlinx/io/files/Path;
-	public abstract fun sink (Lkotlinx/io/files/Path;Z)Lkotlinx/io/RawSink;
-	public static synthetic fun sink$default (Lkotlinx/io/files/FileSystem;Lkotlinx/io/files/Path;ZILjava/lang/Object;)Lkotlinx/io/RawSink;
-	public abstract fun source (Lkotlinx/io/files/Path;)Lkotlinx/io/RawSource;
-}
-
-public final class kotlinx/io/files/FileSystemJvmKt {
-	public static final field SystemFileSystem Lkotlinx/io/files/FileSystem;
-	public static final field SystemTemporaryDirectory Lkotlinx/io/files/Path;
-}
-
-public final class kotlinx/io/files/Path {
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getName ()Ljava/lang/String;
-	public final fun getParent ()Lkotlinx/io/files/Path;
-	public fun hashCode ()I
-	public final fun isAbsolute ()Z
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class kotlinx/io/files/PathsJvmKt {
-	public static final field SystemPathSeparator C
-	public static final fun Path (Ljava/lang/String;)Lkotlinx/io/files/Path;
-	public static final fun sink (Lkotlinx/io/files/Path;)Lkotlinx/io/Sink;
-	public static final fun source (Lkotlinx/io/files/Path;)Lkotlinx/io/Source;
-}
-
-public final class kotlinx/io/files/PathsKt {
-	public static final fun Path (Ljava/lang/String;[Ljava/lang/String;)Lkotlinx/io/files/Path;
-	public static final fun Path (Lkotlinx/io/files/Path;[Ljava/lang/String;)Lkotlinx/io/files/Path;
-	public static final fun sinkDeprecated (Lkotlinx/io/files/Path;)Lkotlinx/io/Sink;
-	public static final fun sourceDeprecated (Lkotlinx/io/files/Path;)Lkotlinx/io/Source;
-}
-
 public abstract interface class kotlinx/io/unsafe/BufferIterationContext : kotlinx/io/unsafe/SegmentReadContext {
 	public abstract fun next (Lkotlinx/io/Segment;)Lkotlinx/io/Segment;
 }

core/api/kotlinx-io-core.klib.api

@@ -45,18 +45,6 @@ abstract interface kotlinx.io/RawSource : kotlin/AutoCloseable { // kotlinx.io/R
     abstract fun readAtMostTo(kotlinx.io/Buffer, kotlin/Long): kotlin/Long // kotlinx.io/RawSource.readAtMostTo|readAtMostTo(kotlinx.io.Buffer;kotlin.Long){}[0]
 }
 
-sealed interface kotlinx.io.files/FileSystem { // kotlinx.io.files/FileSystem|null[0]
-    abstract fun atomicMove(kotlinx.io.files/Path, kotlinx.io.files/Path) // kotlinx.io.files/FileSystem.atomicMove|atomicMove(kotlinx.io.files.Path;kotlinx.io.files.Path){}[0]
-    abstract fun createDirectories(kotlinx.io.files/Path, kotlin/Boolean = ...) // kotlinx.io.files/FileSystem.createDirectories|createDirectories(kotlinx.io.files.Path;kotlin.Boolean){}[0]
-    abstract fun delete(kotlinx.io.files/Path, kotlin/Boolean = ...) // kotlinx.io.files/FileSystem.delete|delete(kotlinx.io.files.Path;kotlin.Boolean){}[0]
-    abstract fun exists(kotlinx.io.files/Path): kotlin/Boolean // kotlinx.io.files/FileSystem.exists|exists(kotlinx.io.files.Path){}[0]
-    abstract fun list(kotlinx.io.files/Path): kotlin.collections/Collection<kotlinx.io.files/Path> // kotlinx.io.files/FileSystem.list|list(kotlinx.io.files.Path){}[0]
-    abstract fun metadataOrNull(kotlinx.io.files/Path): kotlinx.io.files/FileMetadata? // kotlinx.io.files/FileSystem.metadataOrNull|metadataOrNull(kotlinx.io.files.Path){}[0]
-    abstract fun resolve(kotlinx.io.files/Path): kotlinx.io.files/Path // kotlinx.io.files/FileSystem.resolve|resolve(kotlinx.io.files.Path){}[0]
-    abstract fun sink(kotlinx.io.files/Path, kotlin/Boolean = ...): kotlinx.io/RawSink // kotlinx.io.files/FileSystem.sink|sink(kotlinx.io.files.Path;kotlin.Boolean){}[0]
-    abstract fun source(kotlinx.io.files/Path): kotlinx.io/RawSource // kotlinx.io.files/FileSystem.source|source(kotlinx.io.files.Path){}[0]
-}
-
 sealed interface kotlinx.io/Sink : kotlinx.io/RawSink { // kotlinx.io/Sink|null[0]
     abstract val buffer // kotlinx.io/Sink.buffer|{}buffer[0]
         abstract fun <get-buffer>(): kotlinx.io/Buffer // kotlinx.io/Sink.buffer.<get-buffer>|<get-buffer>(){}[0]
@@ -91,30 +79,6 @@ sealed interface kotlinx.io/Source : kotlinx.io/RawSource { // kotlinx.io/Source
     abstract fun transferTo(kotlinx.io/RawSink): kotlin/Long // kotlinx.io/Source.transferTo|transferTo(kotlinx.io.RawSink){}[0]
 }
 
-final class kotlinx.io.files/FileMetadata { // kotlinx.io.files/FileMetadata|null[0]
-    constructor <init>(kotlin/Boolean = ..., kotlin/Boolean = ..., kotlin/Long = ...) // kotlinx.io.files/FileMetadata.<init>|<init>(kotlin.Boolean;kotlin.Boolean;kotlin.Long){}[0]
-
-    final val isDirectory // kotlinx.io.files/FileMetadata.isDirectory|{}isDirectory[0]
-        final fun <get-isDirectory>(): kotlin/Boolean // kotlinx.io.files/FileMetadata.isDirectory.<get-isDirectory>|<get-isDirectory>(){}[0]
-    final val isRegularFile // kotlinx.io.files/FileMetadata.isRegularFile|{}isRegularFile[0]
-        final fun <get-isRegularFile>(): kotlin/Boolean // kotlinx.io.files/FileMetadata.isRegularFile.<get-isRegularFile>|<get-isRegularFile>(){}[0]
-    final val size // kotlinx.io.files/FileMetadata.size|{}size[0]
-        final fun <get-size>(): kotlin/Long // kotlinx.io.files/FileMetadata.size.<get-size>|<get-size>(){}[0]
-}
-
-final class kotlinx.io.files/Path { // kotlinx.io.files/Path|null[0]
-    final val isAbsolute // kotlinx.io.files/Path.isAbsolute|{}isAbsolute[0]
-        final fun <get-isAbsolute>(): kotlin/Boolean // kotlinx.io.files/Path.isAbsolute.<get-isAbsolute>|<get-isAbsolute>(){}[0]
-    final val name // kotlinx.io.files/Path.name|{}name[0]
-        final fun <get-name>(): kotlin/String // kotlinx.io.files/Path.name.<get-name>|<get-name>(){}[0]
-    final val parent // kotlinx.io.files/Path.parent|{}parent[0]
-        final fun <get-parent>(): kotlinx.io.files/Path? // kotlinx.io.files/Path.parent.<get-parent>|<get-parent>(){}[0]
-
-    final fun equals(kotlin/Any?): kotlin/Boolean // kotlinx.io.files/Path.equals|equals(kotlin.Any?){}[0]
-    final fun hashCode(): kotlin/Int // kotlinx.io.files/Path.hashCode|hashCode(){}[0]
-    final fun toString(): kotlin/String // kotlinx.io.files/Path.toString|toString(){}[0]
-}
-
 final class kotlinx.io/Buffer : kotlinx.io/Sink, kotlinx.io/Source { // kotlinx.io/Buffer|null[0]
     constructor <init>() // kotlinx.io/Buffer.<init>|<init>(){}[0]
 
@@ -190,10 +154,6 @@ final class kotlinx.io/Segment { // kotlinx.io/Segment|null[0]
     final fun writeBackData(kotlin/ByteArray, kotlin/Int) // kotlinx.io/Segment.writeBackData|writeBackData(kotlin.ByteArray;kotlin.Int){}[0]
 }
 
-open class kotlinx.io.files/FileNotFoundException : kotlinx.io/IOException { // kotlinx.io.files/FileNotFoundException|null[0]
-    constructor <init>(kotlin/String?) // kotlinx.io.files/FileNotFoundException.<init>|<init>(kotlin.String?){}[0]
-}
-
 open class kotlinx.io/EOFException : kotlinx.io/IOException { // kotlinx.io/EOFException|null[0]
     constructor <init>() // kotlinx.io/EOFException.<init>|<init>(){}[0]
     constructor <init>(kotlin/String?) // kotlinx.io/EOFException.<init>|<init>(kotlin.String?){}[0]
@@ -221,21 +181,13 @@ final object kotlinx.io.unsafe/UnsafeBufferOperations { // kotlinx.io.unsafe/Uns
     final inline fun writeToTail(kotlinx.io/Buffer, kotlin/Int, kotlin/Function3<kotlin/ByteArray, kotlin/Int, kotlin/Int, kotlin/Int>): kotlin/Int // kotlinx.io.unsafe/UnsafeBufferOperations.writeToTail|writeToTail(kotlinx.io.Buffer;kotlin.Int;kotlin.Function3<kotlin.ByteArray,kotlin.Int,kotlin.Int,kotlin.Int>){}[0]
 }
 
-final val kotlinx.io.files/SystemFileSystem // kotlinx.io.files/SystemFileSystem|{}SystemFileSystem[0]
-    final fun <get-SystemFileSystem>(): kotlinx.io.files/FileSystem // kotlinx.io.files/SystemFileSystem.<get-SystemFileSystem>|<get-SystemFileSystem>(){}[0]
-final val kotlinx.io.files/SystemPathSeparator // kotlinx.io.files/SystemPathSeparator|{}SystemPathSeparator[0]
-    final fun <get-SystemPathSeparator>(): kotlin/Char // kotlinx.io.files/SystemPathSeparator.<get-SystemPathSeparator>|<get-SystemPathSeparator>(){}[0]
-final val kotlinx.io.files/SystemTemporaryDirectory // kotlinx.io.files/SystemTemporaryDirectory|{}SystemTemporaryDirectory[0]
-    final fun <get-SystemTemporaryDirectory>(): kotlinx.io.files/Path // kotlinx.io.files/SystemTemporaryDirectory.<get-SystemTemporaryDirectory>|<get-SystemTemporaryDirectory>(){}[0]
 final val kotlinx.io.unsafe/BufferIterationContextImpl // kotlinx.io.unsafe/BufferIterationContextImpl|{}BufferIterationContextImpl[0]
     final fun <get-BufferIterationContextImpl>(): kotlinx.io.unsafe/BufferIterationContext // kotlinx.io.unsafe/BufferIterationContextImpl.<get-BufferIterationContextImpl>|<get-BufferIterationContextImpl>(){}[0]
 final val kotlinx.io.unsafe/SegmentReadContextImpl // kotlinx.io.unsafe/SegmentReadContextImpl|{}SegmentReadContextImpl[0]
     final fun <get-SegmentReadContextImpl>(): kotlinx.io.unsafe/SegmentReadContext // kotlinx.io.unsafe/SegmentReadContextImpl.<get-SegmentReadContextImpl>|<get-SegmentReadContextImpl>(){}[0]
 final val kotlinx.io.unsafe/SegmentWriteContextImpl // kotlinx.io.unsafe/SegmentWriteContextImpl|{}SegmentWriteContextImpl[0]
     final fun <get-SegmentWriteContextImpl>(): kotlinx.io.unsafe/SegmentWriteContext // kotlinx.io.unsafe/SegmentWriteContextImpl.<get-SegmentWriteContextImpl>|<get-SegmentWriteContextImpl>(){}[0]
 
-final fun (kotlinx.io.files/Path).kotlinx.io.files/sink(): kotlinx.io/Sink // kotlinx.io.files/sink|sink@kotlinx.io.files.Path(){}[0]
-final fun (kotlinx.io.files/Path).kotlinx.io.files/source(): kotlinx.io/Source // kotlinx.io.files/source|source@kotlinx.io.files.Path(){}[0]
 final fun (kotlinx.io/Buffer).kotlinx.io/indexOf(kotlin/Byte, kotlin/Long = ..., kotlin/Long = ...): kotlin/Long // kotlinx.io/indexOf|indexOf@kotlinx.io.Buffer(kotlin.Byte;kotlin.Long;kotlin.Long){}[0]
 final fun (kotlinx.io/Buffer).kotlinx.io/indexOf(kotlinx.io.bytestring/ByteString, kotlin/Long = ...): kotlin/Long // kotlinx.io/indexOf|indexOf@kotlinx.io.Buffer(kotlinx.io.bytestring.ByteString;kotlin.Long){}[0]
 final fun (kotlinx.io/Buffer).kotlinx.io/readString(): kotlin/String // kotlinx.io/readString|readString@kotlinx.io.Buffer(){}[0]
@@ -292,9 +244,6 @@ final fun (kotlinx.io/Source).kotlinx.io/readULongLe(): kotlin/ULong // kotlinx.
 final fun (kotlinx.io/Source).kotlinx.io/readUShort(): kotlin/UShort // kotlinx.io/readUShort|readUShort@kotlinx.io.Source(){}[0]
 final fun (kotlinx.io/Source).kotlinx.io/readUShortLe(): kotlin/UShort // kotlinx.io/readUShortLe|readUShortLe@kotlinx.io.Source(){}[0]
 final fun (kotlinx.io/Source).kotlinx.io/startsWith(kotlin/Byte): kotlin/Boolean // kotlinx.io/startsWith|startsWith@kotlinx.io.Source(kotlin.Byte){}[0]
-final fun kotlinx.io.files/Path(kotlin/String): kotlinx.io.files/Path // kotlinx.io.files/Path|Path(kotlin.String){}[0]
-final fun kotlinx.io.files/Path(kotlin/String, kotlin/Array<out kotlin/String>...): kotlinx.io.files/Path // kotlinx.io.files/Path|Path(kotlin.String;kotlin.Array<out|kotlin.String>...){}[0]
-final fun kotlinx.io.files/Path(kotlinx.io.files/Path, kotlin/Array<out kotlin/String>...): kotlinx.io.files/Path // kotlinx.io.files/Path|Path(kotlinx.io.files.Path;kotlin.Array<out|kotlin.String>...){}[0]
 final fun kotlinx.io/discardingSink(): kotlinx.io/RawSink // kotlinx.io/discardingSink|discardingSink(){}[0]
 final inline fun (kotlinx.io.unsafe/SegmentReadContext).kotlinx.io.unsafe/withData(kotlinx.io/Segment, kotlin/Function3<kotlin/ByteArray, kotlin/Int, kotlin/Int, kotlin/Unit>) // kotlinx.io.unsafe/withData|withData@kotlinx.io.unsafe.SegmentReadContext(kotlinx.io.Segment;kotlin.Function3<kotlin.ByteArray,kotlin.Int,kotlin.Int,kotlin.Unit>){}[0]
 final inline fun (kotlinx.io/Sink).kotlinx.io/writeToInternalBuffer(kotlin/Function1<kotlinx.io/Buffer, kotlin/Unit>) // kotlinx.io/writeToInternalBuffer|writeToInternalBuffer@kotlinx.io.Sink(kotlin.Function1<kotlinx.io.Buffer,kotlin.Unit>){}[0]

core/apple/test/NSInputStreamSourceTest.kt

@@ -4,11 +4,7 @@
  */
 
 package kotlinx.io
-
-import kotlinx.io.files.Path
-import kotlinx.io.files.SystemFileSystem
 import platform.Foundation.NSInputStream
-import platform.Foundation.NSURL
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
@@ -23,24 +19,6 @@ class NSInputStreamSourceTest {
         assertEquals("a", buffer.readString())
     }
 
-    @Test
-    fun nsInputStreamSourceFromFile() {
-        val file = tempFileName()
-        try {
-            SystemFileSystem.sink(Path(file)).buffered().use {
-                it.writeString("example")
-            }
-
-            val input = NSInputStream(uRL = NSURL.fileURLWithPath(file))
-            val source = input.asSource()
-            val buffer = Buffer()
-            assertEquals(7, source.readAtMostTo(buffer, 10))
-            assertEquals("example", buffer.readString())
-        } finally {
-            SystemFileSystem.delete(Path(file))
-        }
-    }
-
     @Test
     fun sourceFromInputStream() {
         val input = NSInputStream(data = ("a" + "b".repeat(Segment.SIZE * 2) + "c").encodeToByteArray().toNSData())

core/build.gradle.kts

@@ -54,32 +54,6 @@ kotlin {
     }
 }
 
-tasks.named("wasmWasiNodeTest") {
-    // TODO: remove once https://youtrack.jetbrains.com/issue/KT-65179 solved
-    doFirst {
-        val layout = project.layout
-        val templateFile = layout.projectDirectory.file("wasmWasi/test/test-driver.mjs.template").asFile
-
-        val driverFile = layout.buildDirectory.file(
-            "compileSync/wasmWasi/test/testDevelopmentExecutable/kotlin/kotlinx-io-kotlinx-io-core-wasm-wasi-test.mjs"
-        )
-
-        fun File.mkdirsAndEscape(): String {
-            mkdirs()
-            return absolutePath.replace("\\", "\\\\")
-        }
-
-        val tmpDir = temporaryDir.resolve("kotlinx-io-core-wasi-test").mkdirsAndEscape()
-        val tmpDir2 = temporaryDir.resolve("kotlinx-io-core-wasi-test-2").mkdirsAndEscape()
-
-        val newDriver = templateFile.readText()
-            .replace("<SYSTEM_TEMP_DIR>", tmpDir, false)
-            .replace("<SYSTEM_TEMP_DIR2>", tmpDir2, false)
-
-        driverFile.get().asFile.writeText(newDriver)
-    }
-}
-
 animalsniffer {
     annotation = "kotlinx.io.files.AnimalSnifferIgnore"
 }

core/common/test/util.kt

@@ -40,8 +40,6 @@ fun assertNoEmptySegments(buffer: Buffer) {
     assertTrue(segmentSizes(buffer).all { it != 0 }, "Expected all segments to be non-empty")
 }
 
-expect fun tempFileName(): String
-
 private fun fromHexChar(char: Char): Int {
     val code = char.code
     return when (code) {

core/js/src/-PlatformJs.kt

@@ -22,12 +22,3 @@ public actual open class EOFException : IOException {
 
     public constructor(message: String?, cause: Throwable?) : super(message, cause)
 }
-
-internal actual fun withCaughtException(block: () -> Unit): Throwable? {
-    try {
-        block()
-        return null
-    } catch (t: Throwable) {
-        return t
-    }
-}

core/jvm/module/module-info.java

@@ -3,6 +3,5 @@
     requires transitive kotlinx.io.bytestring;
 
     exports kotlinx.io;
-    exports kotlinx.io.files;
     exports kotlinx.io.unsafe;
 }

core/jvm/test/utilJVM.kt

@@ -4,23 +4,8 @@
  */
 package kotlinx.io
 
-import kotlinx.io.files.SystemTemporaryDirectory
-import java.io.File
-import kotlin.random.Random
 import kotlin.test.assertEquals
 
-@OptIn(ExperimentalStdlibApi::class)
-actual fun tempFileName(): String {
-    val tmpDir = SystemTemporaryDirectory.file
-    while (true) {
-        val randomString = Random.nextBytes(32).toHexString()
-        val res = File(tmpDir, randomString)
-        if (!res.exists()) {
-            return res.absolutePath
-        }
-    }
-}
-
 fun assertByteArrayEquals(expectedUtf8: String, b: ByteArray) {
     assertEquals(expectedUtf8, b.toString(Charsets.UTF_8))
 }

core/native/test/util.kt

@@ -7,22 +7,6 @@
 
 package kotlinx.io
 
-import kotlinx.io.files.SystemTemporaryDirectory
-import platform.posix.F_OK
-import platform.posix.access
-import kotlin.random.Random
 
-@OptIn(ExperimentalStdlibApi::class)
-actual fun tempFileName(): String {
-    val tmpDir = SystemTemporaryDirectory.path
-    for (i in 0 until 10) {
-        val name = Random.nextBytes(32).toHexString()
-        val path = "$tmpDir/$name"
-        if (access(path, F_OK) != 0) {
-            return path
-        }
-    }
-    throw IOException("Failed to generate temp file name")
-}
 
 internal actual fun String.asUtf8ToByteArray(): ByteArray = commonAsUtf8ToByteArray()