Migrate Snowflake and flags to inline value classes (#886)

Related to #711
kordlib · Jun 5, 2024 · b427a29 · b427a29
1 parent 2cdf33c
commit b427a29
Show file tree

Hide file tree

Showing 30 changed files with 4,382 additions and 4,472 deletions.
diff --git a/common/api/common.api b/common/api/common.api
diff --git a/common/api/common.klib.api b/common/api/common.klib.api
diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ActivityFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ActivityFlag.kt
@@ -7,15 +7,9 @@ package dev.kord.common.entity
 import kotlin.LazyThreadSafetyMode.PUBLICATION
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
+import kotlin.jvm.JvmInline
 import kotlin.jvm.JvmName
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
 
 /**
  * See [ActivityFlag]s in the
@@ -191,8 +185,9 @@ public sealed class ActivityFlag(
  * @see ActivityFlag
  * @see ActivityFlags.Builder
  */
-@Serializable(with = ActivityFlags.Serializer::class)
-public class ActivityFlags internal constructor(
+@JvmInline
+@Serializable
+public value class ActivityFlags internal constructor(
     /**
      * The raw value used by Discord.
      */
@@ -260,11 +255,6 @@ public class ActivityFlags internal constructor(
         return Builder(value).apply(builder).build()
     }
 
-    override fun equals(other: Any?): Boolean = this === other ||
-            (other is ActivityFlags && this.value == other.value)
-
-    override fun hashCode(): Int = value.hashCode()
-
     override fun toString(): String = "ActivityFlags(values=$values)"
 
     public class Builder(
@@ -304,20 +294,6 @@ public class ActivityFlags internal constructor(
          */
         public fun build(): ActivityFlags = ActivityFlags(value)
     }
-
-    internal object Serializer : KSerializer<ActivityFlags> {
-        override val descriptor: SerialDescriptor =
-                PrimitiveSerialDescriptor("dev.kord.common.entity.ActivityFlags", PrimitiveKind.INT)
-
-        private val `delegate`: KSerializer<Int> = Int.serializer()
-
-        override fun serialize(encoder: Encoder, `value`: ActivityFlags) {
-            encoder.encodeSerializableValue(delegate, value.value)
-        }
-
-        override fun deserialize(decoder: Decoder): ActivityFlags =
-                ActivityFlags(decoder.decodeSerializableValue(delegate))
-    }
 }
 
 /**
@@ -336,14 +312,6 @@ public fun ActivityFlags(vararg flags: ActivityFlag): ActivityFlags = ActivityFl
     flags.forEach { +it }
 }
 
-/**
- * Returns an instance of [ActivityFlags] that has all bits set that are set in any element of
- * [flags].
- */
-public fun ActivityFlags(vararg flags: ActivityFlags): ActivityFlags = ActivityFlags {
-    flags.forEach { +it }
-}
-
 /**
  * Returns an instance of [ActivityFlags] that has all bits set that are set in any element of
  * [flags].

diff --git a/.../build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationFlag.kt b/.../build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationFlag.kt
@@ -7,15 +7,9 @@ package dev.kord.common.entity
 import kotlin.LazyThreadSafetyMode.PUBLICATION
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
+import kotlin.jvm.JvmInline
 import kotlin.jvm.JvmName
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
 
 /**
  * See [ApplicationFlag]s in the
@@ -237,8 +231,9 @@ public sealed class ApplicationFlag(
  * @see ApplicationFlag
  * @see ApplicationFlags.Builder
  */
-@Serializable(with = ApplicationFlags.Serializer::class)
-public class ApplicationFlags internal constructor(
+@JvmInline
+@Serializable
+public value class ApplicationFlags internal constructor(
     /**
      * The raw code used by Discord.
      */
@@ -306,11 +301,6 @@ public class ApplicationFlags internal constructor(
         return Builder(code).apply(builder).build()
     }
 
-    override fun equals(other: Any?): Boolean = this === other ||
-            (other is ApplicationFlags && this.code == other.code)
-
-    override fun hashCode(): Int = code.hashCode()
-
     override fun toString(): String = "ApplicationFlags(values=$values)"
 
     public class Builder(
@@ -350,21 +340,6 @@ public class ApplicationFlags internal constructor(
          */
         public fun build(): ApplicationFlags = ApplicationFlags(code)
     }
-
-    internal object Serializer : KSerializer<ApplicationFlags> {
-        override val descriptor: SerialDescriptor =
-                PrimitiveSerialDescriptor("dev.kord.common.entity.ApplicationFlags",
-                PrimitiveKind.INT)
-
-        private val `delegate`: KSerializer<Int> = Int.serializer()
-
-        override fun serialize(encoder: Encoder, `value`: ApplicationFlags) {
-            encoder.encodeSerializableValue(delegate, value.code)
-        }
-
-        override fun deserialize(decoder: Decoder): ApplicationFlags =
-                ApplicationFlags(decoder.decodeSerializableValue(delegate))
-    }
 }
 
 /**
@@ -384,14 +359,6 @@ public fun ApplicationFlags(vararg flags: ApplicationFlag): ApplicationFlags = A
     flags.forEach { +it }
 }
 
-/**
- * Returns an instance of [ApplicationFlags] that has all bits set that are set in any element of
- * [flags].
- */
-public fun ApplicationFlags(vararg flags: ApplicationFlags): ApplicationFlags = ApplicationFlags {
-    flags.forEach { +it }
-}
-
 /**
  * Returns an instance of [ApplicationFlags] that has all bits set that are set in any element of
  * [flags].

diff --git a/...n/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AttachmentFlag.kt b/...n/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/AttachmentFlag.kt
@@ -7,15 +7,9 @@ package dev.kord.common.entity
 import kotlin.LazyThreadSafetyMode.PUBLICATION
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
+import kotlin.jvm.JvmInline
 import kotlin.jvm.JvmName
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
 
 /**
  * See [AttachmentFlag]s in the
@@ -162,8 +156,9 @@ public sealed class AttachmentFlag(
  * @see AttachmentFlag
  * @see AttachmentFlags.Builder
  */
-@Serializable(with = AttachmentFlags.Serializer::class)
-public class AttachmentFlags internal constructor(
+@JvmInline
+@Serializable
+public value class AttachmentFlags internal constructor(
     /**
      * The raw value used by Discord.
      */
@@ -231,11 +226,6 @@ public class AttachmentFlags internal constructor(
         return Builder(value).apply(builder).build()
     }
 
-    override fun equals(other: Any?): Boolean = this === other ||
-            (other is AttachmentFlags && this.value == other.value)
-
-    override fun hashCode(): Int = value.hashCode()
-
     override fun toString(): String = "AttachmentFlags(values=$values)"
 
     public class Builder(
@@ -275,21 +265,6 @@ public class AttachmentFlags internal constructor(
          */
         public fun build(): AttachmentFlags = AttachmentFlags(value)
     }
-
-    internal object Serializer : KSerializer<AttachmentFlags> {
-        override val descriptor: SerialDescriptor =
-                PrimitiveSerialDescriptor("dev.kord.common.entity.AttachmentFlags",
-                PrimitiveKind.INT)
-
-        private val `delegate`: KSerializer<Int> = Int.serializer()
-
-        override fun serialize(encoder: Encoder, `value`: AttachmentFlags) {
-            encoder.encodeSerializableValue(delegate, value.value)
-        }
-
-        override fun deserialize(decoder: Decoder): AttachmentFlags =
-                AttachmentFlags(decoder.decodeSerializableValue(delegate))
-    }
 }
 
 /**
@@ -309,14 +284,6 @@ public fun AttachmentFlags(vararg flags: AttachmentFlag): AttachmentFlags = Atta
     flags.forEach { +it }
 }
 
-/**
- * Returns an instance of [AttachmentFlags] that has all bits set that are set in any element of
- * [flags].
- */
-public fun AttachmentFlags(vararg flags: AttachmentFlags): AttachmentFlags = AttachmentFlags {
-    flags.forEach { +it }
-}
-
 /**
  * Returns an instance of [AttachmentFlags] that has all bits set that are set in any element of
  * [flags].

diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelFlag.kt
@@ -7,15 +7,9 @@ package dev.kord.common.entity
 import kotlin.LazyThreadSafetyMode.PUBLICATION
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
+import kotlin.jvm.JvmInline
 import kotlin.jvm.JvmName
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
 
 /**
  * See [ChannelFlag]s in the
@@ -176,8 +170,9 @@ public sealed class ChannelFlag(
  * @see ChannelFlag
  * @see ChannelFlags.Builder
  */
-@Serializable(with = ChannelFlags.Serializer::class)
-public class ChannelFlags internal constructor(
+@JvmInline
+@Serializable
+public value class ChannelFlags internal constructor(
     /**
      * The raw code used by Discord.
      */
@@ -243,11 +238,6 @@ public class ChannelFlags internal constructor(
         return Builder(code).apply(builder).build()
     }
 
-    override fun equals(other: Any?): Boolean = this === other ||
-            (other is ChannelFlags && this.code == other.code)
-
-    override fun hashCode(): Int = code.hashCode()
-
     override fun toString(): String = "ChannelFlags(values=$values)"
 
     public class Builder(
@@ -287,20 +277,6 @@ public class ChannelFlags internal constructor(
          */
         public fun build(): ChannelFlags = ChannelFlags(code)
     }
-
-    internal object Serializer : KSerializer<ChannelFlags> {
-        override val descriptor: SerialDescriptor =
-                PrimitiveSerialDescriptor("dev.kord.common.entity.ChannelFlags", PrimitiveKind.INT)
-
-        private val `delegate`: KSerializer<Int> = Int.serializer()
-
-        override fun serialize(encoder: Encoder, `value`: ChannelFlags) {
-            encoder.encodeSerializableValue(delegate, value.code)
-        }
-
-        override fun deserialize(decoder: Decoder): ChannelFlags =
-                ChannelFlags(decoder.decodeSerializableValue(delegate))
-    }
 }
 
 /**
@@ -319,14 +295,6 @@ public fun ChannelFlags(vararg flags: ChannelFlag): ChannelFlags = ChannelFlags
     flags.forEach { +it }
 }
 
-/**
- * Returns an instance of [ChannelFlags] that has all bits set that are set in any element of
- * [flags].
- */
-public fun ChannelFlags(vararg flags: ChannelFlags): ChannelFlags = ChannelFlags {
-    flags.forEach { +it }
-}
-
 /**
  * Returns an instance of [ChannelFlags] that has all bits set that are set in any element of
  * [flags].

diff --git a/.../build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildMemberFlag.kt b/.../build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/GuildMemberFlag.kt
@@ -7,15 +7,9 @@ package dev.kord.common.entity
 import kotlin.LazyThreadSafetyMode.PUBLICATION
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
+import kotlin.jvm.JvmInline
 import kotlin.jvm.JvmName
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
 
 /**
  * See [GuildMemberFlag]s in the
@@ -183,8 +177,9 @@ public sealed class GuildMemberFlag(
  * @see GuildMemberFlag
  * @see GuildMemberFlags.Builder
  */
-@Serializable(with = GuildMemberFlags.Serializer::class)
-public class GuildMemberFlags internal constructor(
+@JvmInline
+@Serializable
+public value class GuildMemberFlags internal constructor(
     /**
      * The raw code used by Discord.
      */
@@ -252,11 +247,6 @@ public class GuildMemberFlags internal constructor(
         return Builder(code).apply(builder).build()
     }
 
-    override fun equals(other: Any?): Boolean = this === other ||
-            (other is GuildMemberFlags && this.code == other.code)
-
-    override fun hashCode(): Int = code.hashCode()
-
     override fun toString(): String = "GuildMemberFlags(values=$values)"
 
     public class Builder(
@@ -296,21 +286,6 @@ public class GuildMemberFlags internal constructor(
          */
         public fun build(): GuildMemberFlags = GuildMemberFlags(code)
     }
-
-    internal object Serializer : KSerializer<GuildMemberFlags> {
-        override val descriptor: SerialDescriptor =
-                PrimitiveSerialDescriptor("dev.kord.common.entity.GuildMemberFlags",
-                PrimitiveKind.INT)
-
-        private val `delegate`: KSerializer<Int> = Int.serializer()
-
-        override fun serialize(encoder: Encoder, `value`: GuildMemberFlags) {
-            encoder.encodeSerializableValue(delegate, value.code)
-        }
-
-        override fun deserialize(decoder: Decoder): GuildMemberFlags =
-                GuildMemberFlags(decoder.decodeSerializableValue(delegate))
-    }
 }
 
 /**
@@ -330,14 +305,6 @@ public fun GuildMemberFlags(vararg flags: GuildMemberFlag): GuildMemberFlags = G
     flags.forEach { +it }
 }
 
-/**
- * Returns an instance of [GuildMemberFlags] that has all bits set that are set in any element of
- * [flags].
- */
-public fun GuildMemberFlags(vararg flags: GuildMemberFlags): GuildMemberFlags = GuildMemberFlags {
-    flags.forEach { +it }
-}
-
 /**
  * Returns an instance of [GuildMemberFlags] that has all bits set that are set in any element of
  * [flags].