Move externals to related modules

shepeliev · shepeliev · commit 541ea9974de0 · 2023-04-06T17:41:38.000+03:00
diff --git a/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/externals/app.kt b/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/externals/app.kt
@@ -1,7 +1,7 @@
 @file:JsModule("firebase/app")
 @file:JsNonModule
 
-package dev.gitlive.firebase.externals.app
+package dev.gitlive.firebase.externals
 
 import kotlin.js.Promise
 
diff --git a/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt
@@ -4,12 +4,12 @@
 
 package dev.gitlive.firebase
 
-import dev.gitlive.firebase.externals.app.deleteApp
-import dev.gitlive.firebase.externals.app.getApp
-import dev.gitlive.firebase.externals.app.getApps
-import dev.gitlive.firebase.externals.app.initializeApp
+import dev.gitlive.firebase.externals.deleteApp
+import dev.gitlive.firebase.externals.getApp
+import dev.gitlive.firebase.externals.getApps
+import dev.gitlive.firebase.externals.initializeApp
 import kotlin.js.json
-import dev.gitlive.firebase.externals.app.FirebaseApp as JsFirebaseApp
+import dev.gitlive.firebase.externals.FirebaseApp as JsFirebaseApp
 
 actual val Firebase.app: FirebaseApp
     get() = FirebaseApp(getApp())
diff --git a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -6,12 +6,12 @@ package dev.gitlive.firebase.auth
 
 import dev.gitlive.firebase.*
 import dev.gitlive.firebase.FirebaseApp
-import dev.gitlive.firebase.externals.auth.*
+import dev.gitlive.firebase.auth.externals.*
 import kotlinx.coroutines.await
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
 import kotlin.js.json
-import dev.gitlive.firebase.externals.auth.AuthResult as JsAuthResult
+import dev.gitlive.firebase.auth.externals.AuthResult as JsAuthResult
 
 actual val Firebase.auth
     get() = rethrow { FirebaseAuth(getAuth()) }
diff --git a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/credentials.kt b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/credentials.kt
@@ -1,16 +1,16 @@
 package dev.gitlive.firebase.auth
 
-import dev.gitlive.firebase.externals.auth.*
-import dev.gitlive.firebase.externals.auth.EmailAuthProvider
-import dev.gitlive.firebase.externals.auth.FacebookAuthProvider
-import dev.gitlive.firebase.externals.auth.GithubAuthProvider
-import dev.gitlive.firebase.externals.auth.GoogleAuthProvider
-import dev.gitlive.firebase.externals.auth.PhoneAuthProvider
-import dev.gitlive.firebase.externals.auth.TwitterAuthProvider
+import dev.gitlive.firebase.auth.externals.ApplicationVerifier
+import dev.gitlive.firebase.auth.externals.EmailAuthProvider
+import dev.gitlive.firebase.auth.externals.FacebookAuthProvider
+import dev.gitlive.firebase.auth.externals.GithubAuthProvider
+import dev.gitlive.firebase.auth.externals.GoogleAuthProvider
+import dev.gitlive.firebase.auth.externals.PhoneAuthProvider
+import dev.gitlive.firebase.auth.externals.TwitterAuthProvider
 import kotlinx.coroutines.await
 import kotlin.js.json
-import dev.gitlive.firebase.externals.auth.AuthCredential as JsAuthCredential
-import dev.gitlive.firebase.externals.auth.OAuthProvider as JsOAuthProvider
+import dev.gitlive.firebase.auth.externals.AuthCredential as JsAuthCredential
+import dev.gitlive.firebase.auth.externals.OAuthProvider as JsOAuthProvider
 
 actual open class AuthCredential(val js: JsAuthCredential) {
     actual val providerId: String
diff --git a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/externals/auth.kt b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/externals/auth.kt
@@ -1,10 +1,10 @@
 @file:JsModule("firebase/auth")
 @file:JsNonModule
 
-package dev.gitlive.firebase.externals.auth
+package dev.gitlive.firebase.auth.externals
 
 import dev.gitlive.firebase.Unsubscribe
-import dev.gitlive.firebase.externals.app.FirebaseApp
+import dev.gitlive.firebase.externals.FirebaseApp
 import kotlin.js.Json
 import kotlin.js.Promise
 
diff --git a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/multifactor.kt b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/multifactor.kt
@@ -1,12 +1,12 @@
 package dev.gitlive.firebase.auth
 
-import dev.gitlive.firebase.externals.auth.MultiFactorUser
+import dev.gitlive.firebase.auth.externals.MultiFactorUser
 import kotlinx.coroutines.await
 import kotlin.js.Date
-import dev.gitlive.firebase.externals.auth.MultiFactorAssertion as JsMultiFactorAssertion
-import dev.gitlive.firebase.externals.auth.MultiFactorInfo as JsMultiFactorInfo
-import dev.gitlive.firebase.externals.auth.MultiFactorResolver as JsMultiFactorResolver
-import dev.gitlive.firebase.externals.auth.MultiFactorSession as JsMultiFactorSession
+import dev.gitlive.firebase.auth.externals.MultiFactorAssertion as JsMultiFactorAssertion
+import dev.gitlive.firebase.auth.externals.MultiFactorInfo as JsMultiFactorInfo
+import dev.gitlive.firebase.auth.externals.MultiFactorResolver as JsMultiFactorResolver
+import dev.gitlive.firebase.auth.externals.MultiFactorSession as JsMultiFactorSession
 
 actual class MultiFactor(val js: MultiFactorUser) {
     actual val enrolledFactors: List<MultiFactorInfo>
diff --git a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/user.kt b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/user.kt
@@ -1,9 +1,9 @@
 package dev.gitlive.firebase.auth
 
-import dev.gitlive.firebase.externals.auth.*
+import dev.gitlive.firebase.auth.externals.*
 import kotlinx.coroutines.await
 import kotlin.js.Date
-import dev.gitlive.firebase.externals.auth.UserInfo as JsUserInfo
+import dev.gitlive.firebase.auth.externals.UserInfo as JsUserInfo
 
 actual class FirebaseUser internal constructor(val js: User) {
     actual val uid: String
diff --git a/firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt b/firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt
@@ -3,7 +3,7 @@ package dev.gitlive.firebase.remoteconfig
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.FirebaseException
-import dev.gitlive.firebase.externals.remoteconfig.*
+import dev.gitlive.firebase.remoteconfig.externals.*
 import kotlinx.coroutines.await
 import kotlin.js.json
 
diff --git a/firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigValue.kt b/firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigValue.kt
@@ -1,6 +1,6 @@
 package dev.gitlive.firebase.remoteconfig
 
-import dev.gitlive.firebase.externals.remoteconfig.Value
+import dev.gitlive.firebase.remoteconfig.externals.Value
 
 actual class FirebaseRemoteConfigValue(val js: Value) {
     actual fun asBoolean(): Boolean = rethrow { js.asBoolean() }
diff --git a/firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/externals/remoteconfig.kt b/firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/externals/remoteconfig.kt
@@ -1,9 +1,9 @@
 @file:JsModule("firebase/remote-config")
 @file:JsNonModule
 
-package dev.gitlive.firebase.externals.remoteconfig
+package dev.gitlive.firebase.remoteconfig.externals
 
-import dev.gitlive.firebase.externals.app.FirebaseApp
+import dev.gitlive.firebase.externals.FirebaseApp
 import kotlin.js.Json
 import kotlin.js.Promise
 
diff --git a/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt
@@ -6,7 +6,7 @@ package dev.gitlive.firebase.database
 
 import dev.gitlive.firebase.*
 import dev.gitlive.firebase.FirebaseApp
-import dev.gitlive.firebase.externals.database.*
+import dev.gitlive.firebase.database.externals.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
@@ -18,18 +18,18 @@ import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerializationStrategy
 import kotlin.js.Promise
 import kotlin.js.json
-import dev.gitlive.firebase.externals.database.DataSnapshot as JsDataSnapshot
-import dev.gitlive.firebase.externals.database.DatabaseReference as JsDatabaseReference
-import dev.gitlive.firebase.externals.database.OnDisconnect as JsOnDisconnect
-import dev.gitlive.firebase.externals.database.Query as JsQuery
-import dev.gitlive.firebase.externals.database.endAt as jsEndAt
-import dev.gitlive.firebase.externals.database.equalTo as jsEqualTo
-import dev.gitlive.firebase.externals.database.limitToFirst as jsLimitToFirst
-import dev.gitlive.firebase.externals.database.limitToLast as jsLimitToLast
-import dev.gitlive.firebase.externals.database.orderByChild as jsOrderByChild
-import dev.gitlive.firebase.externals.database.orderByKey as jsOrderByKey
-import dev.gitlive.firebase.externals.database.orderByValue as jsOrderByValue
-import dev.gitlive.firebase.externals.database.startAt as jsStartAt
+import dev.gitlive.firebase.database.externals.DataSnapshot as JsDataSnapshot
+import dev.gitlive.firebase.database.externals.DatabaseReference as JsDatabaseReference
+import dev.gitlive.firebase.database.externals.OnDisconnect as JsOnDisconnect
+import dev.gitlive.firebase.database.externals.Query as JsQuery
+import dev.gitlive.firebase.database.externals.endAt as jsEndAt
+import dev.gitlive.firebase.database.externals.equalTo as jsEqualTo
+import dev.gitlive.firebase.database.externals.limitToFirst as jsLimitToFirst
+import dev.gitlive.firebase.database.externals.limitToLast as jsLimitToLast
+import dev.gitlive.firebase.database.externals.orderByChild as jsOrderByChild
+import dev.gitlive.firebase.database.externals.orderByKey as jsOrderByKey
+import dev.gitlive.firebase.database.externals.orderByValue as jsOrderByValue
+import dev.gitlive.firebase.database.externals.startAt as jsStartAt
 
 @PublishedApi
 internal inline fun <reified T> encode(value: T, shouldEncodeElementDefault: Boolean) =
@@ -153,7 +153,7 @@ actual class DatabaseReference internal constructor(override val js: JsDatabaseR
 
     actual suspend fun <T> runTransaction(strategy: KSerializer<T>, transactionUpdate: (currentData: T) -> T): DataSnapshot =
         rethrow {
-            val result = dev.gitlive.firebase.externals.database.runTransaction(
+            val result = runTransaction(
                 js,
                 transactionUpdate,
             ).awaitWhileOnline()
diff --git a/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/externals/callbacks.kt b/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/externals/callbacks.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.gitlive.firebase.externals.database
+package dev.gitlive.firebase.database.externals
 
 typealias ChangeSnapshotCallback = (data: DataSnapshot, previousChildName: String?) -> Unit
 typealias ValueSnapshotCallback = (data: DataSnapshot) -> Unit
diff --git a/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/externals/database.kt b/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/externals/database.kt
@@ -1,10 +1,10 @@
 @file:JsModule("firebase/database")
 @file:JsNonModule
 
-package dev.gitlive.firebase.externals.database
+package dev.gitlive.firebase.database.externals
 
 import dev.gitlive.firebase.*
-import dev.gitlive.firebase.externals.app.FirebaseApp
+import dev.gitlive.firebase.externals.FirebaseApp
 import kotlin.js.Promise
 
 external fun child(parent: DatabaseReference, path: String): DatabaseReference
diff --git a/firebase-database/src/jsTest/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/jsTest/kotlin/dev/gitlive/firebase/database/database.kt
@@ -1,9 +1,9 @@
 package dev.gitlive.firebase.database
 
 import dev.gitlive.firebase.Firebase
-import dev.gitlive.firebase.externals.database.getDatabase
-import dev.gitlive.firebase.externals.database.goOffline
-import dev.gitlive.firebase.externals.database.goOnline
+import dev.gitlive.firebase.database.externals.getDatabase
+import dev.gitlive.firebase.database.externals.goOffline
+import dev.gitlive.firebase.database.externals.goOnline
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext
diff --git a/firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/externals/firestore.kt b/firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/externals/firestore.kt
@@ -1,11 +1,10 @@
 @file:JsModule("firebase/firestore")
 @file:JsNonModule
 
-package dev.gitlive.firebase.externals.firestore
+package dev.gitlive.firebase.firestore.externals
 
 import dev.gitlive.firebase.Unsubscribe
-import dev.gitlive.firebase.externals.app.FirebaseApp
-import dev.gitlive.firebase.externals.database.QueryConstraint
+import dev.gitlive.firebase.externals.FirebaseApp
 import kotlin.js.Json
 import kotlin.js.Promise
 
diff --git a/firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -5,7 +5,8 @@
 package dev.gitlive.firebase.firestore
 
 import dev.gitlive.firebase.*
-import dev.gitlive.firebase.externals.firestore.*
+import dev.gitlive.firebase.FirebaseApp
+import dev.gitlive.firebase.firestore.externals.*
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.await
 import kotlinx.coroutines.channels.awaitClose
@@ -14,26 +15,26 @@ import kotlinx.coroutines.promise
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerializationStrategy
 import kotlin.js.json
-import dev.gitlive.firebase.externals.firestore.CollectionReference as JsCollectionReference
-import dev.gitlive.firebase.externals.firestore.DocumentChange as JsDocumentChange
-import dev.gitlive.firebase.externals.firestore.DocumentReference as JsDocumentReference
-import dev.gitlive.firebase.externals.firestore.DocumentSnapshot as JsDocumentSnapshot
-import dev.gitlive.firebase.externals.firestore.FieldPath as JsFieldPath
-import dev.gitlive.firebase.externals.firestore.Query as JsQuery
-import dev.gitlive.firebase.externals.firestore.QuerySnapshot as JsQuerySnapshot
-import dev.gitlive.firebase.externals.firestore.SnapshotMetadata as JsSnapshotMetadata
-import dev.gitlive.firebase.externals.firestore.Transaction as JsTransaction
-import dev.gitlive.firebase.externals.firestore.WriteBatch as JsWriteBatch
-import dev.gitlive.firebase.externals.firestore.arrayRemove as jsArrayRemove
-import dev.gitlive.firebase.externals.firestore.arrayUnion as jsArrayUnion
-import dev.gitlive.firebase.externals.firestore.endAt as jsEndAt
-import dev.gitlive.firebase.externals.firestore.endBefore as jsEndBefore
-import dev.gitlive.firebase.externals.firestore.increment as jsIncrement
-import dev.gitlive.firebase.externals.firestore.updateDoc as jsUpdate
-import dev.gitlive.firebase.externals.firestore.limit as jsLimit
-import dev.gitlive.firebase.externals.firestore.startAfter as jsStartAfter
-import dev.gitlive.firebase.externals.firestore.startAt as jsStartAt
-import dev.gitlive.firebase.externals.firestore.where as jsWhere
+import dev.gitlive.firebase.firestore.externals.CollectionReference as JsCollectionReference
+import dev.gitlive.firebase.firestore.externals.DocumentChange as JsDocumentChange
+import dev.gitlive.firebase.firestore.externals.DocumentReference as JsDocumentReference
+import dev.gitlive.firebase.firestore.externals.DocumentSnapshot as JsDocumentSnapshot
+import dev.gitlive.firebase.firestore.externals.FieldPath as JsFieldPath
+import dev.gitlive.firebase.firestore.externals.Query as JsQuery
+import dev.gitlive.firebase.firestore.externals.QuerySnapshot as JsQuerySnapshot
+import dev.gitlive.firebase.firestore.externals.SnapshotMetadata as JsSnapshotMetadata
+import dev.gitlive.firebase.firestore.externals.Transaction as JsTransaction
+import dev.gitlive.firebase.firestore.externals.WriteBatch as JsWriteBatch
+import dev.gitlive.firebase.firestore.externals.arrayRemove as jsArrayRemove
+import dev.gitlive.firebase.firestore.externals.arrayUnion as jsArrayUnion
+import dev.gitlive.firebase.firestore.externals.endAt as jsEndAt
+import dev.gitlive.firebase.firestore.externals.endBefore as jsEndBefore
+import dev.gitlive.firebase.firestore.externals.increment as jsIncrement
+import dev.gitlive.firebase.firestore.externals.limit as jsLimit
+import dev.gitlive.firebase.firestore.externals.startAfter as jsStartAfter
+import dev.gitlive.firebase.firestore.externals.startAt as jsStartAt
+import dev.gitlive.firebase.firestore.externals.updateDoc as jsUpdate
+import dev.gitlive.firebase.firestore.externals.where as jsWhere
 
 @PublishedApi
 internal inline fun <reified T> decode(value: Any?): T =
diff --git a/firebase-functions/src/jsMain/kotlin/dev/gitlive/firebase/functions/externals/HttpsCallableExt.kt b/firebase-functions/src/jsMain/kotlin/dev/gitlive/firebase/functions/externals/HttpsCallableExt.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.gitlive.firebase.externals.functions
+package dev.gitlive.firebase.functions.externals
 
 import kotlin.js.Promise
 
diff --git a/firebase-functions/src/jsMain/kotlin/dev/gitlive/firebase/functions/externals/functions.kt b/firebase-functions/src/jsMain/kotlin/dev/gitlive/firebase/functions/externals/functions.kt
@@ -1,9 +1,9 @@
 @file:JsModule("firebase/functions")
 @file:JsNonModule
 
-package dev.gitlive.firebase.externals.functions
+package dev.gitlive.firebase.functions.externals
 
-import dev.gitlive.firebase.externals.app.FirebaseApp
+import dev.gitlive.firebase.externals.FirebaseApp
 import kotlin.js.Json
 
 external fun connectFunctionsEmulator(functions: Functions, host: String, port: Int)
diff --git a/firebase-functions/src/jsMain/kotlin/dev/gitlive/firebase/functions/functions.kt b/firebase-functions/src/jsMain/kotlin/dev/gitlive/firebase/functions/functions.kt
@@ -5,13 +5,13 @@
 package dev.gitlive.firebase.functions
 
 import dev.gitlive.firebase.*
-import dev.gitlive.firebase.externals.functions.*
+import dev.gitlive.firebase.functions.externals.*
 import kotlinx.coroutines.await
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerializationStrategy
 import org.w3c.dom.url.URL
 import kotlin.js.json
-import dev.gitlive.firebase.externals.functions.HttpsCallableResult as JsHttpsCallableResult
+import dev.gitlive.firebase.functions.externals.HttpsCallableResult as JsHttpsCallableResult
 
 actual val Firebase.functions: FirebaseFunctions
     get() = rethrow { FirebaseFunctions(getFunctions()) }
diff --git a/firebase-installations/src/jsMain/kotlin/dev/gitlive/firebase/installations/externals/installations.kt b/firebase-installations/src/jsMain/kotlin/dev/gitlive/firebase/installations/externals/installations.kt
@@ -1,9 +1,9 @@
 @file:JsModule("firebase/installations")
 @file:JsNonModule
 
-package dev.gitlive.firebase.externals.installations
+package dev.gitlive.firebase.installations.externals
 
-import dev.gitlive.firebase.externals.app.FirebaseApp
+import dev.gitlive.firebase.externals.FirebaseApp
 import kotlin.js.Promise
 
 external fun delete(installations: Installations): Promise<Unit>
diff --git a/firebase-installations/src/jsMain/kotlin/dev/gitlive/firebase/installations/installations.kt b/firebase-installations/src/jsMain/kotlin/dev/gitlive/firebase/installations/installations.kt
@@ -1,7 +1,7 @@
 package dev.gitlive.firebase.installations
 
 import dev.gitlive.firebase.*
-import dev.gitlive.firebase.externals.installations.*
+import dev.gitlive.firebase.installations.externals.*
 import kotlinx.coroutines.await
 
 actual val Firebase.installations
diff --git a/firebase-perf/src/jsMain/kotlin/dev/gitlive/firebase/perf/externals/performance.kt b/firebase-perf/src/jsMain/kotlin/dev/gitlive/firebase/perf/externals/performance.kt
@@ -1,20 +1,20 @@
 @file:JsModule("firebase/performance")
 @file:JsNonModule
 
-package dev.gitlive.firebase.perf
+package dev.gitlive.firebase.perf.externals
 
-import dev.gitlive.firebase.externals.app.FirebaseApp
+import dev.gitlive.firebase.externals.FirebaseApp
 
-external fun getPerformance(app: FirebaseApp? = definedExternally): JsFirebasePerformance
+external fun getPerformance(app: FirebaseApp? = definedExternally): FirebasePerformance
 
-external fun trace(performance: JsFirebasePerformance, name: String): JsPerformanceTrace
+external fun trace(performance: FirebasePerformance, name: String): PerformanceTrace
 
-external interface JsFirebasePerformance {
+external interface FirebasePerformance {
     var dataCollectionEnabled: Boolean
     var instrumentationEnabled: Boolean
 }
 
-external interface JsPerformanceTrace {
+external interface PerformanceTrace {
     fun getAttribute(attr: String): String?
     fun getAttributes(): Map<String, String>
     fun getMetric(metricName: String): Int
diff --git a/firebase-perf/src/jsMain/kotlin/dev/gitlive/firebase/perf/metrics/Trace.kt b/firebase-perf/src/jsMain/kotlin/dev/gitlive/firebase/perf/metrics/Trace.kt
@@ -1,10 +1,10 @@
 package dev.gitlive.firebase.perf.metrics
 
-import dev.gitlive.firebase.perf.JsPerformanceTrace
+import dev.gitlive.firebase.perf.externals.PerformanceTrace
 import dev.gitlive.firebase.perf.rethrow
 
 
-actual class Trace internal constructor(private val js: JsPerformanceTrace) {
+actual class Trace internal constructor(private val js: PerformanceTrace) {
 
     actual fun start() = rethrow { js.start() }
     actual fun stop() = rethrow { js.stop() }
diff --git a/firebase-perf/src/jsMain/kotlin/dev/gitlive/firebase/perf/performance.kt b/firebase-perf/src/jsMain/kotlin/dev/gitlive/firebase/perf/performance.kt
