Allow "spotify:{type}:" to be valid uri

* Added test for new uri possibility
* Applied spotless

Author: molikuner

src/commonMain/kotlin/com.adamratzman.spotify/models/SpotifyUris.kt

@@ -10,9 +10,9 @@ import kotlinx.serialization.Serializer
 import kotlinx.serialization.internal.StringDescriptor
 
 private fun String.matchType(type: String): String? {
-    val typeRegex = "^spotify:(?:.*:)*$type:([^:]+)(?::.*)*$|^([^:]+)$".toRegex()
+    val typeRegex = "^spotify:(?:.*:)*$type:([^:]*)(?::.*)*$|^([^:]+)$".toRegex()
     val match = typeRegex.matchEntire(this)?.groupValues ?: return null
-    return match[1].takeIf { it.isNotEmpty() } ?: match[2].takeIf { it.isNotEmpty() }
+    return match[1].takeIf { it.isNotBlank() || match[2].isEmpty() } ?: match[2].takeIf { it.isNotEmpty() }
 }
 
 private fun String.add(type: String): String {

src/commonTest/kotlin/com.adamratzman/spotify/utilities/JsonTests.kt

@@ -8,15 +8,15 @@ import com.adamratzman.spotify.models.ArtistUri
 import com.adamratzman.spotify.models.CursorBasedPagingObject
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.Track
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 import kotlinx.serialization.ImplicitReflectionSerializer
 import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.internal.nullable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.parse
 import org.spekframework.spek2.Spek
 import org.spekframework.spek2.style.specification.describe
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
 
 @ImplicitReflectionSerializer
 @UnstableDefault

src/commonTest/kotlin/com.adamratzman/spotify/utilities/UrisTests.kt

@@ -10,14 +10,14 @@ import com.adamratzman.spotify.models.SpotifyUri
 import com.adamratzman.spotify.models.SpotifyUriException
 import com.adamratzman.spotify.models.TrackUri
 import com.adamratzman.spotify.models.UserUri
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonConfiguration
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
 
 class UrisTests : Spek({
     describe("Uris tests") {
@@ -220,6 +220,16 @@ class UrisTests : Spek({
                     "7r7uq6qxa4ymx3wnjd9mm6i83",
                     UserUri("spotify:user:7r7uq6qxa4ymx3wnjd9mm6i83:playlist:66wcLiS5R50akaQ3onDyZd").id
                 )
+
+                assertEquals(
+                    "spotify:user:",
+                    UserUri("spotify:user:").uri
+                )
+
+                assertEquals(
+                    "",
+                    UserUri("spotify:user:").id
+                )
             }
         }