refactor: split internal package

iseki0 · iseki0 · commit 8276656c10be · 2024-05-21T20:04:03.000+08:00
diff --git a/api/kotlinx-serialization-bencoding.api b/api/kotlinx-serialization-bencoding.api
@@ -106,10 +106,6 @@ public abstract interface class space/iseki/bencoding/BencodeOptions {
 	public abstract fun getFloatStrategy ()Lspace/iseki/bencoding/FloatNumberStrategy;
 }
 
-public final class space/iseki/bencoding/BencodingJVM {
-	public static final fun decodeFromStream (Lspace/iseki/bencoding/Bencode;Ljava/io/InputStream;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
-}
-
 public abstract interface annotation class space/iseki/bencoding/BinaryString : java/lang/annotation/Annotation {
 	public abstract fun strategy ()Lspace/iseki/bencoding/BinaryStringStrategy;
 }
@@ -139,3 +135,7 @@ public final class space/iseki/bencoding/FloatNumberStrategy : java/lang/Enum {
 	public static fun values ()[Lspace/iseki/bencoding/FloatNumberStrategy;
 }
 
+public final class space/iseki/bencoding/internal/BencodingJVM {
+	public static final fun decodeFromStream (Lspace/iseki/bencoding/Bencode;Ljava/io/InputStream;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;
+}
+
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/Bencode.kt b/src/commonMain/kotlin/space/iseki/bencoding/Bencode.kt
@@ -7,6 +7,11 @@ import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.modules.EmptySerializersModule
 import kotlinx.serialization.modules.SerializersModule
+import space.iseki.bencoding.internal.BencodeDecoder0
+import space.iseki.bencoding.internal.BencodeEncoder0
+import space.iseki.bencoding.internal.BencodeOptionsData
+import space.iseki.bencoding.internal.BytesLexer
+import space.iseki.bencoding.internal.createBytesWriter
 
 interface Bencode : BinaryFormat {
     val options: BencodeOptions
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/BencodeEncoder.kt b/src/commonMain/kotlin/space/iseki/bencoding/BencodeEncoder.kt
@@ -1,10 +1,6 @@
 package space.iseki.bencoding
 
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerializationStrategy
-import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.modules.SerializersModule
 
 interface BencodeEncoder : Encoder {
     val options: BencodeOptions
@@ -13,51 +9,3 @@ interface BencodeEncoder : Encoder {
     fun reportError(message: String): Nothing = throw BencodeEncodeException(message)
 }
 
-internal interface EncoderDelegate : BencodeEncoder {
-    val rootRef: BencodeEncoder
-    override val serializersModule: SerializersModule
-        get() = rootRef.serializersModule
-    override val options: BencodeOptions
-        get() = rootRef.options
-    override fun encodeChar(value: Char) = encodeLong(value.code.toLong())
-    override fun encodeByte(value: Byte) = encodeLong(value.toLong())
-    override fun encodeShort(value: Short) = encodeLong(value.toLong())
-    override fun encodeInt(value: Int) = encodeLong(value.toLong())
-    override fun encodeFloat(value: Float) = options.floatStrategy.encodeFloat(value)
-    override fun encodeDouble(value: Double) = options.doubleStrategy.encodeDouble(value)
-    override fun encodeBoolean(value: Boolean) = reportError("boolean is not supported")
-
-    @OptIn(ExperimentalSerializationApi::class)
-    override fun encodeEnum(enumDescriptor: SerialDescriptor, index: Int) {
-        encodeString(enumDescriptor.getElementName(index))
-    }
-
-    override fun encodeBinaryString(strategy: BinaryStringStrategy, value: String) {
-        options.binaryStringStrategy.encodeString(strategy, value)
-    }
-
-    @ExperimentalSerializationApi
-    override fun encodeNull() {
-        reportError("null is not supported")
-    }
-
-    override fun encodeInline(descriptor: SerialDescriptor): Encoder = this
-
-    override fun <T> encodeSerializableValue(serializer: SerializationStrategy<T>, value: T) {
-        encodeValue(EncodeValue.Serialized(value, serializer))
-    }
-
-    override fun encodeByteArray(bytes: ByteArray) {
-        encodeValue(EncodeValue.Bytes(bytes))
-    }
-
-    override fun encodeString(value: String) {
-        encodeValue(EncodeValue.Text(value))
-    }
-
-    override fun encodeLong(value: Long) {
-        encodeValue(EncodeValue.Number(value))
-    }
-
-    fun encodeValue(value: EncodeValue)
-}
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/BencodeOptions.kt b/src/commonMain/kotlin/space/iseki/bencoding/BencodeOptions.kt
@@ -6,9 +6,3 @@ interface BencodeOptions {
     val binaryStringStrategy: BinaryStringStrategy
 }
 
-internal data class BencodeOptionsData(
-    override val floatStrategy: FloatNumberStrategy,
-    override val doubleStrategy: FloatNumberStrategy,
-    override val binaryStringStrategy: BinaryStringStrategy,
-) : BencodeOptions
-
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/BinaryStringStrategy.kt b/src/commonMain/kotlin/space/iseki/bencoding/BinaryStringStrategy.kt
@@ -1,6 +1,8 @@
 package space.iseki.bencoding
 
 import kotlinx.serialization.descriptors.SerialDescriptor
+import space.iseki.bencoding.internal.bytes2StringIso88591
+import space.iseki.bencoding.internal.string2BytesIso88591
 import kotlin.io.encoding.ExperimentalEncodingApi
 
 /**
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/BWriter.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/BWriter.kt
@@ -1,4 +1,4 @@
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
 
 internal interface BWriter {
     fun writeData(b: Int)
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/BencodeDecoder0.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/BencodeDecoder0.kt
@@ -1,4 +1,4 @@
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
 
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.ExperimentalSerializationApi
@@ -7,6 +7,11 @@ import kotlinx.serialization.descriptors.StructureKind
 import kotlinx.serialization.encoding.CompositeDecoder
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.modules.SerializersModule
+import space.iseki.bencoding.BencodeCompositeDecoder
+import space.iseki.bencoding.BencodeDecodeException
+import space.iseki.bencoding.BencodeDecoder
+import space.iseki.bencoding.BencodeOptions
+import space.iseki.bencoding.BinaryStringStrategy
 
 @OptIn(ExperimentalSerializationApi::class)
 internal class BencodeDecoder0(
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/BencodeEncoder0.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/BencodeEncoder0.kt
@@ -1,11 +1,13 @@
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.StructureKind
 import kotlinx.serialization.encoding.CompositeEncoder
 import kotlinx.serialization.modules.SerializersModule
+import space.iseki.bencoding.BencodeEncoder
+import space.iseki.bencoding.BencodeOptions
 
 @OptIn(ExperimentalSerializationApi::class)
 internal class BencodeEncoder0(
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/BencodeOptionsData.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/BencodeOptionsData.kt
@@ -0,0 +1,11 @@
+package space.iseki.bencoding.internal
+
+import space.iseki.bencoding.BencodeOptions
+import space.iseki.bencoding.BinaryStringStrategy
+import space.iseki.bencoding.FloatNumberStrategy
+
+internal data class BencodeOptionsData(
+    override val floatStrategy: FloatNumberStrategy,
+    override val doubleStrategy: FloatNumberStrategy,
+    override val binaryStringStrategy: BinaryStringStrategy,
+) : BencodeOptions
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/BytesLexer.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/BytesLexer.kt
@@ -1,4 +1,4 @@
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
 
 
 internal class BytesLexer(private val bytes: ByteArray) : CommonLexer() {
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/CommonLexer.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/CommonLexer.kt
@@ -1,4 +1,6 @@
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
+
+import space.iseki.bencoding.BencodeDecodeException
 
 internal abstract class CommonLexer : Lexer {
     private fun unexpected(expected: Int, actual: Int): Nothing {
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/CompositeEncoderDelegate.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/CompositeEncoderDelegate.kt
@@ -1,11 +1,15 @@
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.CompositeEncoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.modules.SerializersModule
+import space.iseki.bencoding.BencodeCompositeEncoder
+import space.iseki.bencoding.BencodeEncoder
+import space.iseki.bencoding.BencodeOptions
+import space.iseki.bencoding.BinaryStringStrategy
 
 internal interface CompositeEncoderDelegate : BencodeCompositeEncoder {
     val rootRef: BencodeEncoder
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/EncodeValue.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/EncodeValue.kt
@@ -1,4 +1,4 @@
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
 
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.encoding.Encoder
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/EncoderDelegate.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/EncoderDelegate.kt
@@ -0,0 +1,59 @@
+package space.iseki.bencoding.internal
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.modules.SerializersModule
+import space.iseki.bencoding.BencodeEncoder
+import space.iseki.bencoding.BencodeOptions
+import space.iseki.bencoding.BinaryStringStrategy
+
+internal interface EncoderDelegate : BencodeEncoder {
+    val rootRef: BencodeEncoder
+    override val serializersModule: SerializersModule
+        get() = rootRef.serializersModule
+    override val options: BencodeOptions
+        get() = rootRef.options
+    override fun encodeChar(value: Char) = encodeLong(value.code.toLong())
+    override fun encodeByte(value: Byte) = encodeLong(value.toLong())
+    override fun encodeShort(value: Short) = encodeLong(value.toLong())
+    override fun encodeInt(value: Int) = encodeLong(value.toLong())
+    override fun encodeFloat(value: Float) = options.floatStrategy.encodeFloat(value)
+    override fun encodeDouble(value: Double) = options.doubleStrategy.encodeDouble(value)
+    override fun encodeBoolean(value: Boolean) = reportError("boolean is not supported")
+
+    @OptIn(ExperimentalSerializationApi::class)
+    override fun encodeEnum(enumDescriptor: SerialDescriptor, index: Int) {
+        encodeString(enumDescriptor.getElementName(index))
+    }
+
+    override fun encodeBinaryString(strategy: BinaryStringStrategy, value: String) {
+        options.binaryStringStrategy.encodeString(strategy, value)
+    }
+
+    @ExperimentalSerializationApi
+    override fun encodeNull() {
+        reportError("null is not supported")
+    }
+
+    override fun encodeInline(descriptor: SerialDescriptor): Encoder = this
+
+    override fun <T> encodeSerializableValue(serializer: SerializationStrategy<T>, value: T) {
+        encodeValue(EncodeValue.Serialized(value, serializer))
+    }
+
+    override fun encodeByteArray(bytes: ByteArray) {
+        encodeValue(EncodeValue.Bytes(bytes))
+    }
+
+    override fun encodeString(value: String) {
+        encodeValue(EncodeValue.Text(value))
+    }
+
+    override fun encodeLong(value: Long) {
+        encodeValue(EncodeValue.Number(value))
+    }
+
+    fun encodeValue(value: EncodeValue)
+}
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/Lexer.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/Lexer.kt
@@ -1,4 +1,6 @@
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
+
+import space.iseki.bencoding.BencodeDecodeException
 
 internal interface Lexer {
     companion object {
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/MapKeyExtractorEncoder.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/MapKeyExtractorEncoder.kt
@@ -1,10 +1,13 @@
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.CompositeEncoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.modules.SerializersModule
+import space.iseki.bencoding.BencodeEncoder
+import space.iseki.bencoding.BencodeOptions
+import space.iseki.bencoding.BinaryStringStrategy
 
 internal class MapKeyExtractorEncoder(
     private val parent: BencodeEncoder,
diff --git a/src/commonMain/kotlin/space/iseki/bencoding/internal/Utils.kt b/src/commonMain/kotlin/space/iseki/bencoding/internal/Utils.kt
@@ -1,9 +1,8 @@
-@file:JvmName("-Utils")
-
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.descriptors.SerialDescriptor
+import space.iseki.bencoding.BinaryString
 
 internal expect fun bytes2Long(bytes: ByteArray, off: Int, len: Int): Long
 internal expect fun bytes2StringIso88591(bytes: ByteArray, off: Int = 0, len: Int = bytes.size): String
diff --git a/src/jvmMain/kotlin/space/iseki/bencoding/internal/Bencoding.kt b/src/jvmMain/kotlin/space/iseki/bencoding/internal/Bencoding.kt
@@ -1,9 +1,10 @@
 @file:JvmName("BencodingJVM")
 
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.serializer
+import space.iseki.bencoding.Bencode
 import java.io.InputStream
 
 fun <T> Bencode.decodeFromStream(input: InputStream, serializer: KSerializer<T>): T =
diff --git a/src/jvmMain/kotlin/space/iseki/bencoding/internal/InputStreamLexer.kt b/src/jvmMain/kotlin/space/iseki/bencoding/internal/InputStreamLexer.kt
@@ -1,4 +1,4 @@
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
 
 import java.io.BufferedInputStream
 import java.io.EOFException
diff --git a/src/jvmMain/kotlin/space/iseki/bencoding/internal/Utils.jvm.kt b/src/jvmMain/kotlin/space/iseki/bencoding/internal/Utils.jvm.kt
@@ -1,4 +1,4 @@
-package space.iseki.bencoding
+package space.iseki.bencoding.internal
 
 import java.io.ByteArrayOutputStream
 import java.nio.charset.StandardCharsets
diff --git a/src/jvmTest/kotlin/space/iseki/bencoding/InputStreamInputKtTest.kt b/src/jvmTest/kotlin/space/iseki/bencoding/InputStreamInputKtTest.kt
@@ -1,6 +1,7 @@
 package space.iseki.bencoding
 
 import kotlinx.serialization.decodeFromByteArray
+import space.iseki.bencoding.internal.decodeFromStream
 import kotlin.test.assertEquals
 
 private val data = Meta.sampleTorrent
diff --git a/src/jvmTest/kotlin/space/iseki/bencoding/LexerTest.kt b/src/jvmTest/kotlin/space/iseki/bencoding/LexerTest.kt
@@ -1,6 +1,8 @@
 package space.iseki.bencoding
 
 import org.junit.Test
+import space.iseki.bencoding.internal.InputStreamLexer
+import space.iseki.bencoding.internal.Lexer
 
 class InputStreamLexerTest{
 

Original file line number	Diff line number	Diff line change
`@@ -106,10 +106,6 @@ public abstract interface class space/iseki/bencoding/BencodeOptions {`
`106`	`106`	`public abstract fun getFloatStrategy ()Lspace/iseki/bencoding/FloatNumberStrategy;`
`107`	`107`	`}`
`108`	`108`
`109`		`-public final class space/iseki/bencoding/BencodingJVM {`
`110`		`- public static final fun decodeFromStream (Lspace/iseki/bencoding/Bencode;Ljava/io/InputStream;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;`
`111`		`-}`
`112`		`-`
`113`	`109`	`public abstract interface annotation class space/iseki/bencoding/BinaryString : java/lang/annotation/Annotation {`
`114`	`110`	`public abstract fun strategy ()Lspace/iseki/bencoding/BinaryStringStrategy;`
`115`	`111`	`}`
`@@ -139,3 +135,7 @@ public final class space/iseki/bencoding/FloatNumberStrategy : java/lang/Enum {`
`139`	`135`	`public static fun values ()[Lspace/iseki/bencoding/FloatNumberStrategy;`
`140`	`136`	`}`
`141`	`137`
	`138`	`+public final class space/iseki/bencoding/internal/BencodingJVM {`
	`139`	`+ public static final fun decodeFromStream (Lspace/iseki/bencoding/Bencode;Ljava/io/InputStream;Lkotlinx/serialization/KSerializer;)Ljava/lang/Object;`
	`140`	`+}`
	`141`	`+`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,3 @@ interface BencodeOptions {`
`6`	`6`	`val binaryStringStrategy: BinaryStringStrategy`
`7`	`7`	`}`
`8`	`8`
`9`		`-internal data class BencodeOptionsData(`
`10`		`- override val floatStrategy: FloatNumberStrategy,`
`11`		`- override val doubleStrategy: FloatNumberStrategy,`
`12`		`- override val binaryStringStrategy: BinaryStringStrategy,`
`13`		`-) : BencodeOptions`
`14`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package space.iseki.bencoding`
	`1`	`+package space.iseki.bencoding.internal`
`2`	`2`
`3`	`3`	`internal interface BWriter {`
`4`	`4`	`fun writeData(b: Int)`