Merge branch 'feature/kotlin-2.0' into feature/api-validation

Author: Daeda88

firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

@@ -149,7 +149,7 @@ public actual class DocumentChange(public val js: JsDocumentChange) {
         get() = js.newIndex
     public actual val oldIndex: Int
         get() = js.oldIndex
-    public actual val type: ChangeType
+    actual val type: ChangeType
         get() = ChangeType.entries.first { it.jsString == js.type }
 }
 

firebase-storage/src/commonTest/kotlin/dev/gitlive/firebase/storage/storage.kt

@@ -54,7 +54,7 @@ class FirebaseStorageTest {
     }
 
     @Test
-    fun testStorageNotNull() {
+    fun testStorageNotNull() = runTest {
         assertNotNull(storage)
     }
 
@@ -79,7 +79,7 @@ class FirebaseStorageTest {
 
         assertNotNull(metadataResult)
         assertNotNull(metadataResult.contentType)
-        assertEquals(metadataResult.contentType, metadata.contentType)
+        assertEquals(metadata.contentType, metadataResult.contentType)
     }
 
     @Test
@@ -95,7 +95,7 @@ class FirebaseStorageTest {
         val metadataResult = ref.getMetadata()
 
         assertNotNull(metadataResult)
-        assertEquals(metadataResult.customMetadata["key"], metadata.customMetadata["key"])
+        assertEquals(metadata.customMetadata["key"], metadataResult.customMetadata["key"])
     }
 }
 

firebase-storage/src/jsMain/kotlin/dev/gitlive/firebase/storage/externals/storage.kt

@@ -4,28 +4,30 @@
 package dev.gitlive.firebase.storage.externals
 
 import dev.gitlive.firebase.externals.FirebaseApp
+import kotlin.js.Json
 import kotlin.js.Promise
 
-public external fun getStorage(app: FirebaseApp? = definedExternally, url: String): FirebaseStorage
+external fun getStorage(app: FirebaseApp? = definedExternally, bucketUrl: String): FirebaseStorage
 
 public external fun getStorage(app: FirebaseApp? = definedExternally): FirebaseStorage
 
-public external fun ref(storage: FirebaseStorage, url: String? = definedExternally): StorageReference
-public external fun ref(ref: StorageReference, url: String? = definedExternally): StorageReference
+external fun ref(storage: FirebaseStorage, url: String? = definedExternally): StorageReference
+external fun ref(ref: StorageReference, path: String? = definedExternally): StorageReference
 
 public external fun getDownloadURL(ref: StorageReference): Promise<String>
 
-public external fun getMetadata(ref: StorageReference): Promise<StorageMetadata>
+external fun getMetadata(ref: StorageReference): Promise<FullMetadata>
+external fun updateMetadata(ref: StorageReference, metadata: SettableMetadata): Promise<FullMetadata>
 
-public external fun uploadBytes(ref: StorageReference, file: dynamic, metadata: StorageMetadata?): Promise<Unit>
+external fun uploadBytes(ref: StorageReference, file: dynamic, metadata: Json?): Promise<UploadResult>
+external fun uploadBytesResumable(ref: StorageReference, data: dynamic, metadata: Json?): UploadTask
 
-public external fun uploadBytesResumable(ref: StorageReference, data: dynamic, metadata: StorageMetadata?): UploadTask
+external fun deleteObject(ref: StorageReference): Promise<Unit>
 
-public external fun deleteObject(ref: StorageReference): Promise<Unit>
+external fun list(ref: StorageReference, options: ListOptions?): Promise<ListResult>
+external fun listAll(ref: StorageReference): Promise<ListResult>
 
-public external fun listAll(ref: StorageReference): Promise<ListResult>
-
-public external fun connectStorageEmulator(
+external fun connectStorageEmulator(
     storage: FirebaseStorage,
     host: String,
     port: Double,
@@ -46,44 +48,63 @@ public external interface StorageReference {
     public val storage: FirebaseStorage
 }
 
-public open external class ListResult {
-    public val items: Array<StorageReference>
-    public val nextPageToken: String
-    public val prefixes: Array<StorageReference>
+external interface ListOptions {
+    val maxResults: Double?
+    val pageToken: String?
+}
+
+external interface ListResult {
+    val items: Array<StorageReference>
+    val nextPageToken: String
+    val prefixes: Array<StorageReference>
 }
 
 public external interface StorageError
 
-public external interface UploadTaskSnapshot {
-    public val bytesTransferred: Number
-    public val ref: StorageReference
-    public val state: String
-    public val task: UploadTask
-    public val totalBytes: Number
+external interface SettableMetadata {
+    val cacheControl: String?
+    val contentDisposition: String?
+    val contentEncoding: String?
+    val contentLanguage: String?
+    val contentType: String?
+    val customMetadata: Json?
+}
+
+external interface UploadMetadata : SettableMetadata {
+    val md5Hash: String?
+}
+
+external interface FullMetadata : UploadMetadata {
+    val bucket: String
+    val downloadTokens: Array<String>?
+    val fullPath: String
+    val generation: String
+    val metageneration: String
+    val name: String
+    val ref: StorageReference?
+    val size: Double
+    val timeCreated: String
+    val updated: String
+}
+
+external interface UploadResult {
+    val metadata: FullMetadata
+    val ref: StorageReference
 }
 
-public external class StorageMetadata {
-    public val bucket: String?
-    public var cacheControl: String?
-    public var contentDisposition: String?
-    public var contentEncoding: String?
-    public var contentLanguage: String?
-    public var contentType: String?
-    public var customMetadata: Map<String, String>?
-    public val fullPath: String?
-    public val generation: String?
-    public val md5Hash: String?
-    public val metageneration: String?
-    public val name: String?
-    public val size: Number?
-    public val timeCreated: String?
-    public val updated: String?
+external interface UploadTask {
+    fun cancel(): Boolean
+    fun on(event: String, next: (snapshot: UploadTaskSnapshot) -> Unit, error: (a: StorageError) -> Unit, complete: () -> Unit): () -> Unit
+    fun pause(): Boolean
+    fun resume(): Boolean
+    fun then(onFulfilled: ((UploadTaskSnapshot) -> Unit)?, onRejected: ((StorageError) -> Unit)?): Promise<Unit>
+    val snapshot: UploadTaskSnapshot
 }
 
-public external class UploadTask : Promise<UploadTaskSnapshot> {
-    public fun cancel(): Boolean
-    public fun on(event: String, next: (snapshot: UploadTaskSnapshot) -> Unit, error: (a: StorageError) -> Unit, complete: () -> Unit): () -> Unit
-    public fun pause(): Boolean
-    public fun resume(): Boolean
-    public val snapshot: UploadTaskSnapshot
+external interface UploadTaskSnapshot {
+    val bytesTransferred: Double
+    val ref: StorageReference
+    val state: String
+    val task: UploadTask
+    val totalBytes: Double
 }

firebase-storage/src/jsMain/kotlin/dev/gitlive/firebase/storage/storage.kt

@@ -14,6 +14,8 @@ import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.emitAll
+import kotlin.js.Json
+import kotlin.js.json
 
 public actual val Firebase.storage: FirebaseStorage
     get() = FirebaseStorage(getStorage())
@@ -130,7 +132,7 @@ internal fun errorToException(error: dynamic) = (error?.code ?: error?.message ?
         }
     }
 
-internal fun StorageMetadata.toFirebaseStorageMetadata(): FirebaseStorageMetadata {
+internal fun UploadMetadata.toFirebaseStorageMetadata(): FirebaseStorageMetadata {
     val sdkMetadata = this
     return storageMetadata {
         md5Hash = sdkMetadata.md5Hash
@@ -139,19 +141,21 @@ internal fun StorageMetadata.toFirebaseStorageMetadata(): FirebaseStorageMetadat
         contentEncoding = sdkMetadata.contentEncoding
         contentLanguage = sdkMetadata.contentLanguage
         contentType = sdkMetadata.contentType
-        sdkMetadata.customMetadata?.entries?.forEach {
-            setCustomMetadata(it.key, it.value)
-        }
+        customMetadata = sdkMetadata.customMetadata?.let { metadata ->
+            val objectKeys = js("Object.keys")
+            objectKeys(metadata).unsafeCast<Array<String>>().associateWith { key ->
+                metadata[key]?.toString().orEmpty()
+            }
+        }.orEmpty().toMutableMap()
     }
 }
 
-internal fun FirebaseStorageMetadata.toStorageMetadata(): StorageMetadata {
-    val metadata = StorageMetadata()
-    metadata.cacheControl = cacheControl
-    metadata.contentDisposition = contentDisposition
-    metadata.contentEncoding = contentEncoding
-    metadata.contentLanguage = contentLanguage
-    metadata.contentType = contentType
-    metadata.customMetadata = customMetadata
-    return metadata
-}
+internal fun FirebaseStorageMetadata.toStorageMetadata(): Json = json(
+    "cacheControl" to cacheControl,
+    "contentDisposition" to contentDisposition,
+    "contentEncoding" to contentEncoding,
+    "contentLanguage" to contentLanguage,
+    "contentType" to contentType,
+    "customMetadata" to json(*customMetadata.toList().toTypedArray()),
+    "md5Hash" to md5Hash,
+)

firebase-storage/src/jsTest/kotlin/dev/gitlive/firebase/storage/storage.js.kt

@@ -1,5 +1,5 @@
 package dev.gitlive.firebase.storage
 
-actual fun createTestData(): Data {
-    TODO("Not yet implemented")
-}
+import org.khronos.webgl.Uint8Array
+
+actual fun createTestData(): Data = Data(Uint8Array("test".encodeToByteArray().toTypedArray()))