Build Kord with K2

common/src/commonMain/kotlin/entity/DiscordUser.kt

@@ -156,12 +156,11 @@ public data class DiscordOptionallyMemberUser(
     val member: Optional<DiscordGuildMember> = Optional.Missing(),
 )
 
-@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR")
+@Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "'UserFlags.UserFlagsBuilder' is deprecated, use 'UserFlags.Builder' instead.",
     level = DeprecationLevel.HIDDEN,
 )
-@kotlin.internal.LowPriorityInOverloadResolution
 public inline fun UserFlags(builder: UserFlags.UserFlagsBuilder.() -> Unit): UserFlags {
     contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) }
     return UserFlags.UserFlagsBuilder().apply(builder).flags()

common/src/commonMain/kotlin/entity/Interactions.kt

@@ -404,7 +404,7 @@ public sealed class Option {
                 ApplicationCommandOptionType.User -> CommandArgument.Serializer.deserialize(
                     json, jsonValue!!, name, type!!, focused
                 )
-                null, is ApplicationCommandOptionType.Unknown -> error("unknown ApplicationCommandOptionType $type")
+                is ApplicationCommandOptionType.Unknown -> error("unknown ApplicationCommandOptionType $type")
             }
         }
 
@@ -601,7 +601,7 @@ public sealed class CommandArgument<out T> : Option() {
                     is AutoCompleteArgument, is StringArgument -> encodeStringElement(
                         descriptor,
                         1,
-                        value.value as String
+                        value.value
                     )
                 }
             }

common/src/commonMain/kotlin/entity/Permission.kt

@@ -630,12 +630,11 @@ public class Permissions internal constructor(
         return Builder(code.copy()).apply(builder).build()
     }
 
-    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR")
+    @Suppress("DEPRECATION_ERROR")
     @Deprecated(
         "'Permissions.PermissionsBuilder' is deprecated, use 'Permissions.Builder' instead.",
         level = DeprecationLevel.HIDDEN,
     )
-    @kotlin.internal.LowPriorityInOverloadResolution
     public inline fun copy(block: PermissionsBuilder.() -> Unit): Permissions {
         contract { callsInPlace(block, EXACTLY_ONCE) }
         return PermissionsBuilder(code.copy()).apply(block).permissions()
@@ -764,12 +763,11 @@ public inline fun Permissions(builder: Permissions.Builder.() -> Unit = {}): Per
     return Permissions.Builder().apply(builder).build()
 }
 
-@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR")
+@Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "'Permissions.PermissionsBuilder' is deprecated, use 'Permissions.Builder' instead.",
     level = DeprecationLevel.HIDDEN,
 )
-@kotlin.internal.LowPriorityInOverloadResolution
 public inline fun Permissions(block: Permissions.PermissionsBuilder.() -> Unit = {}): Permissions {
     contract { callsInPlace(block, EXACTLY_ONCE) }
     return Permissions.PermissionsBuilder(DiscordBitSet(0)).apply(block).permissions()

common/src/commonMain/kotlin/entity/UserFlag.kt

@@ -544,12 +544,11 @@ public class UserFlags internal constructor(
         return Builder(code).apply(builder).build()
     }
 
-    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR")
+    @Suppress("DEPRECATION_ERROR")
     @Deprecated(
         "'UserFlags.UserFlagsBuilder' is deprecated, use 'UserFlags.Builder' instead.",
         level = DeprecationLevel.HIDDEN,
     )
-    @kotlin.internal.LowPriorityInOverloadResolution
     public inline fun copy(block: UserFlagsBuilder.() -> Unit): UserFlags {
         contract { callsInPlace(block, EXACTLY_ONCE) }
         return UserFlagsBuilder(code).apply(block).flags()

common/src/jvmMain/kotlin/Class.kt

@@ -8,7 +8,5 @@ import kotlin.jvm.java as getJavaClass
 public actual typealias Class<T> = java.lang.Class<T>
 
 /** @suppress */
-@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
-@kotlin.internal.InlineOnly
 @KordInternal
 public actual inline val <T : Any> KClass<T>.java: Class<T> inline get() = getJavaClass

common/src/nonJvmMain/kotlin/Class.kt

@@ -4,11 +4,9 @@ import dev.kord.common.annotation.KordInternal
 import kotlin.reflect.KClass
 
 /** @suppress */
-@Suppress("ACTUAL_WITHOUT_EXPECT")
-public actual typealias Class<T> = KClass<T>
+public actual typealias Class<T> = ArrayDeque<T>
 
 /** @suppress */
-@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
-@kotlin.internal.InlineOnly
 @KordInternal
-public actual inline val <T : Any> KClass<T>.java: Class<T> inline get() = this
+public actual inline val <T : Any> KClass<T>.java: Class<T>
+    inline get() = throw UnsupportedOperationException("'getDeclaringClass()' was never present on Kotlin/JS")

core/src/commonMain/kotlin/Kord.kt

@@ -114,9 +114,9 @@ public class Kord(
      * Logs in to the configured [Gateways][Gateway]. Suspends until [logout] or [shutdown] is called.
      */
     public suspend inline fun login(builder: LoginBuilder.() -> Unit = {}) {
-        contract {
-            callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
-        }
+//        contract {
+//            callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
+//        }
         val loginBuilder = LoginBuilder().apply(builder)
         gateway.start(resources.token) {
             shard = DiscordShard(0, resources.shards.totalShards)
@@ -163,7 +163,7 @@ public class Kord(
     public suspend inline fun updateApplicationRoleConnectionMetadataRecords(
         builder: ApplicationRoleConnectionMetadataRecordsBuilder.() -> Unit,
     ): List<ApplicationRoleConnectionMetadata> {
-        contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) }
+//        contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) }
         return rest.applicationRoleConnectionMetadata
             .updateApplicationRoleConnectionMetadataRecords(selfId, builder)
             .map { ApplicationRoleConnectionMetadata(data = it, kord = this) }
@@ -525,7 +525,7 @@ public class Kord(
         builder: GlobalMultiApplicationCommandBuilder.() -> Unit,
     ): Flow<GlobalApplicationCommand> {
 
-        contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) }
+//        contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) }
         val commands = rest.interaction.createGlobalApplicationCommands(resources.applicationId, builder)
         return flow {
             commands.forEach {
@@ -593,7 +593,7 @@ public class Kord(
         guildId: Snowflake,
         builder: GuildMultiApplicationCommandBuilder.() -> Unit,
     ): Flow<GuildApplicationCommand> {
-        contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) }
+//        contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) }
 
         val commands = rest.interaction.createGuildApplicationCommands(resources.applicationId, guildId, builder)
 

core/src/commonMain/kotlin/Util.kt

@@ -30,9 +30,9 @@ import kotlin.contracts.contract
 import kotlin.reflect.KClass
 
 internal inline fun <T> catchNotFound(block: () -> T): T? {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
+//    contract {
+//        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+//    }
     return try {
         block()
     } catch (exception: RestRequestException) {
@@ -42,9 +42,9 @@ internal inline fun <T> catchNotFound(block: () -> T): T? {
 }
 
 internal inline fun <T> catchDiscordError(vararg codes: JsonErrorCode, block: () -> T): T? {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
+//    contract {
+//        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+//    }
     return try {
         block()
     } catch (exception: RestRequestException) {

core/src/commonMain/kotlin/behavior/GuildBehavior.kt

@@ -721,7 +721,7 @@ public suspend inline fun GuildBehavior.createUserCommand(
 public suspend inline fun GuildBehavior.createApplicationCommands(
     builder: GuildMultiApplicationCommandBuilder.() -> Unit
 ): Flow<GuildApplicationCommand> {
-    contract { callsInPlace(builder, EXACTLY_ONCE) }
+//    contract { callsInPlace(builder, EXACTLY_ONCE) }
     return kord.createGuildApplicationCommands(id, builder)
 }
 
@@ -899,9 +899,9 @@ public suspend inline fun GuildBehavior.swapChannelPositions(builder: GuildChann
  * @throws [RestRequestException] if something went wrong during the request.
  */
 public suspend inline fun GuildBehavior.swapRolePositions(builder: RolePositionsModifyBuilder.() -> Unit): Flow<Role> {
-    contract {
-        callsInPlace(builder, EXACTLY_ONCE)
-    }
+//    contract {
+//        callsInPlace(builder, EXACTLY_ONCE)
+//    }
     val response = kord.rest.guild.modifyGuildRolePosition(id, builder)
     return response.asFlow().map { RoleData.from(id, it) }.map { Role(it, kord) }
 
@@ -933,7 +933,7 @@ public suspend inline fun GuildBehavior.ban(userId: Snowflake, builder: BanCreat
     contract {
         callsInPlace(builder, EXACTLY_ONCE)
     }
-    kord.rest.guild.addGuildBan(guildId = id, userId = userId, builder = builder)
+    kord.rest.guild.addGuildBan(guildId = id, userId = userId, builder)
 }
 
 /**
@@ -1000,7 +1000,7 @@ public suspend inline fun GuildBehavior.editOnboarding(
  *  ```
  */
 public inline fun GuildBehavior.getAuditLogEntries(builder: AuditLogGetRequestBuilder.() -> Unit = {}): Flow<AuditLogEntry> {
-    contract { callsInPlace(builder, EXACTLY_ONCE) }
+//    contract { callsInPlace(builder, EXACTLY_ONCE) }
     return kord.with(rest).getAuditLogEntries(id, builder).map { AuditLogEntry(it, kord) }
 }
 

core/src/commonMain/kotlin/behavior/MessageBehavior.kt

@@ -254,7 +254,7 @@ public suspend inline fun MessageBehavior.edit(builder: UserMessageModifyBuilder
     }
 
     val response =
-        kord.rest.channel.editMessage(channelId = channelId, messageId = id, builder = builder)
+        kord.rest.channel.editMessage(channelId = channelId, messageId = id, builder)
     val data = MessageData.from(response)
 
     return Message(data, kord)
@@ -276,9 +276,9 @@ public suspend inline fun MessageBehavior.edit(
     threadId: Snowflake? = null,
     builder: WebhookMessageModifyBuilder.() -> Unit
 ): Message {
-    contract {
-        callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
-    }
+//    contract {
+//        callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
+//    }
     val response = kord.rest.webhook.editWebhookMessage(webhookId, token, messageId = id, threadId, builder)
     val data = MessageData.from(response)
     return Message(data, kord)

core/src/commonMain/kotlin/behavior/RoleBehavior.kt

@@ -153,7 +153,7 @@ public suspend inline fun RoleBehavior.edit(builder: RoleModifyBuilder.() -> Uni
     contract {
         callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
     }
-    val response = kord.rest.guild.modifyGuildRole(guildId = guildId, roleId = id, builder = builder)
+    val response = kord.rest.guild.modifyGuildRole(guildId = guildId, roleId = id, builder)
     val data = RoleData.from(id, response)
 
     return Role(data, kord)

core/src/commonMain/kotlin/behavior/WebhookBehavior.kt

@@ -161,9 +161,9 @@ public suspend inline fun WebhookBehavior.execute(
     threadId: Snowflake? = null,
     builder: WebhookMessageCreateBuilder.() -> Unit,
 ): Message {
-    contract {
-        callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
-    }
+//    contract {
+//        callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
+//    }
     val response = kord.rest.webhook.executeWebhook(id, token, wait = true, threadId, builder)!!
     val data = MessageData.from(response)
     return Message(data, kord)
@@ -184,8 +184,8 @@ public suspend inline fun WebhookBehavior.executeIgnored(
     threadId: Snowflake? = null,
     builder: WebhookMessageCreateBuilder.() -> Unit,
 ) {
-    contract {
-        callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
-    }
+//    contract {
+//        callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
+//    }
     kord.rest.webhook.executeWebhook(id, token, wait = false, threadId, builder)
 }

core/src/commonMain/kotlin/behavior/channel/MessageChannelBehavior.kt

@@ -294,9 +294,9 @@ public suspend inline fun MessageChannelBehavior.createMessage(builder: UserMess
  * @throws [RestRequestException] if something went wrong during the request.
  */
 public suspend inline fun MessageChannelBehavior.createEmbed(block: EmbedBuilder.() -> Unit): Message {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
+//    contract {
+//        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+//    }
     return createMessage { embed(block) }
 }
 
@@ -316,9 +316,6 @@ public suspend inline fun MessageChannelBehavior.createEmbed(block: EmbedBuilder
  * @throws RestRequestException if something went wrong during a [type][MessageChannelBehavior.type] request.
  */
 public suspend fun <T : MessageChannelBehavior, R> T.withTyping(block: suspend T.() -> R): R {
-    // see contract in `coroutineScope {}`
-    contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
-
     type() // guarantees that the typing indicator is triggered before `block` is called
     return coroutineScope {
         val typingJob = launch {

core/src/commonMain/kotlin/behavior/channel/TopGuildChannelBehavior.kt

@@ -128,7 +128,7 @@ public suspend inline fun TopGuildChannelBehavior.editRolePermission(
     contract {
         callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
     }
-    kord.rest.channel.editRolePermission(channelId = id, roleId = roleId, builder = builder)
+    kord.rest.channel.editRolePermission(channelId = id, roleId = roleId, builder)
 }
 
 /**
@@ -143,5 +143,5 @@ public suspend inline fun TopGuildChannelBehavior.editMemberPermission(
     contract {
         callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
     }
-    kord.rest.channel.editMemberPermissions(channelId = id, memberId = memberId, builder = builder)
+    kord.rest.channel.editMemberPermissions(channelId = id, memberId = memberId, builder)
 }

core/src/commonMain/kotlin/builder/kord/KordBuilder.kt

@@ -169,7 +169,6 @@ public abstract class BaseKordBuilder internal constructor(public val token: Str
      * ```
      */
     public fun cache(builder: KordCacheBuilder.(resources: ClientResources) -> Unit) {
-        contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) }
         val old = cacheBuilder
         cacheBuilder = { resources: ClientResources ->
             old(resources)

core/src/commonMain/kotlin/entity/Emoji.kt

@@ -154,7 +154,7 @@ public class GuildEmoji(
         contract {
             callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
         }
-        kord.rest.emoji.modifyEmoji(guildId = guildId, emojiId = id, builder = builder)
+        kord.rest.emoji.modifyEmoji(guildId = guildId, emojiId = id, builder)
     }
 
     /**

core/src/commonMain/kotlin/entity/interaction/OptionValue.kt

@@ -61,7 +61,7 @@ public fun OptionValue(value: CommandArgument<*>, resolvedObjects: ResolvedObjec
         is CommandArgument.BooleanArgument -> BooleanOptionValue(value.value, focused)
         is CommandArgument.IntegerArgument -> IntegerOptionValue(value.value, focused)
         is CommandArgument.StringArgument, is CommandArgument.AutoCompleteArgument ->
-            StringOptionValue(value.value as String, focused)
+            StringOptionValue(value.value, focused)
         is CommandArgument.ChannelArgument -> {
             val channel = resolvedObjects?.channels.orEmpty()[value.value]
             ChannelOptionValue(value.value, focused, channel)