fix: interop types

Author: MichaelVerdon

packages/firebase_database/firebase_database_web/lib/src/interop/database.dart

@@ -78,8 +78,7 @@ class Database
 /// can be used for reading or writing data to that database location.
 ///
 /// See: <https://firebase.google.com/docs/reference/js/firebase.database.Reference>.
-class DatabaseReference<T extends database_interop.ReferenceJsImpl>
-    extends Query<T> {
+class DatabaseReference extends Query<database_interop.ReferenceJsImpl> {
   static final _expando = Expando<DatabaseReference>();
 
   /// The last part of the current path.
@@ -204,11 +203,9 @@ class DatabaseReference<T extends database_interop.ReferenceJsImpl>
                 applyLocally: applyLocally.toJS),
           )
           .toDart;
-      final castedJsTransaction =
-          jsTransactionResult as database_interop.TransactionResultJsImpl;
       return Transaction(
-        committed: (castedJsTransaction.committed).toDart,
-        snapshot: DataSnapshot._fromJsObject(castedJsTransaction.snapshot),
+        committed: (jsTransactionResult.committed).toDart,
+        snapshot: DataSnapshot._fromJsObject(jsTransactionResult.snapshot),
       );
     } catch (e, s) {
       throw convertFirebaseDatabaseException(e, s);
@@ -317,8 +314,7 @@ class Query<T extends database_interop.QueryJsImpl> extends JsObjectWrapper<T> {
     final jsSnapshotPromise = database_interop.get(jsObject);
     final snapshot = await jsSnapshotPromise.toDart;
 
-    return DataSnapshot.getInstance(
-        snapshot as database_interop.DataSnapshotJsImpl);
+    return DataSnapshot.getInstance(snapshot);
   }
 
   /// Returns a Query with the ending point [value]. The ending point
@@ -674,18 +670,18 @@ class OnDisconnect
 /// [Future] property.
 ///
 /// See: <https://firebase.google.com/docs/reference/js/firebase.database.ThenableReference>.
-class ThenableReference
-    extends DatabaseReference<database_interop.ThenableReferenceJsImpl> {
-  late final Future<DatabaseReference> _future = jsObject
-      .then(((database_interop.ReferenceJsImpl reference) {
-        DatabaseReference.getInstance(reference);
-      }).toJS)
-      .toDart
-      .then((value) => value as DatabaseReference);
+class ThenableReference extends DatabaseReference {
+  late final Future<DatabaseReference> _future =
+      (jsObject as database_interop.ThenableReferenceJsImpl)
+          .then(((database_interop.ReferenceJsImpl reference) {
+            DatabaseReference.getInstance(reference);
+          }).toJS)
+          .toDart
+          .then((value) => value as DatabaseReference);
 
   /// Creates a new ThenableReference from a [jsObject].
   ThenableReference.fromJsObject(
-    super.jsObject,
+    database_interop.ThenableReferenceJsImpl super.jsObject,
   ) : super._fromJsObject();
 
   /// A Future property.

packages/firebase_database/firebase_database_web/lib/src/interop/database_interop.dart

@@ -183,16 +183,16 @@ external JSAny serverTimestamp();
 
 @JS()
 @staticInterop
-external JSPromise<ReferenceJsImpl> set(ReferenceJsImpl ref, JSAny? value);
+external JSPromise set(ReferenceJsImpl ref, JSAny? value);
 
 @JS()
 @staticInterop
-external JSPromise<ReferenceJsImpl> setPriority(
+external JSPromise setPriority(
     ReferenceJsImpl ref, /* JSString | JSNumber | null */ JSAny? priority);
 
 @JS()
 @staticInterop
-external JSPromise<ReferenceJsImpl> setWithPriority(ReferenceJsImpl ref, JSAny? value,
+external JSPromise setWithPriority(ReferenceJsImpl ref, JSAny? value,
     /* JSString | JSNumber | null */ JSAny? priority);
 
 @JS()
@@ -231,33 +231,34 @@ extension type QueryConstraintJsImpl._(JSObject _) implements JSObject {
 }
 
 extension type OnDisconnectJsImpl._(JSObject _) implements JSObject {
-  external JSPromise<ReferenceJsImpl> cancel([
+  external JSPromise cancel([
     JSFunction onComplete,
     //void Function(JSAny) onComplete
   ]);
 
-  external JSPromise<ReferenceJsImpl> remove([
+  external JSPromise remove([
     JSFunction onComplete,
     //void Function(JSAny) onComplete
   ]);
 
-  external JSPromise<ReferenceJsImpl> set(
+  external JSPromise set(
     JSAny? value, [
     JSFunction onComplete,
     //void Function(JSAny) onComplete
   ]);
 
-  external JSPromise<ReferenceJsImpl> setWithPriority(
+  external JSPromise setWithPriority(
     JSAny? value,
     JSAny? priority,
   );
 
-  external JSPromise<ReferenceJsImpl> update(
+  external JSPromise update(
     JSAny? values,
   );
 }
 
-extension type ThenableReferenceJsImpl._(JSObject _) implements JSObject {
+extension type ThenableReferenceJsImpl._(JSObject _)
+    implements JSObject, ReferenceJsImpl {
   external JSPromise then([JSFunction? onResolve, JSFunction? onReject]);
 }
 

packages/firebase_database/firebase_database_web/lib/src/interop/reference_interop.dart

@@ -10,7 +10,8 @@ extension type TransactionResultJsImpl._(JSObject _) implements JSObject {
   external DataSnapshotJsImpl get snapshot;
 }
 
-extension type ReferenceJsImpl._(JSObject _) implements JSObject {
+extension type ReferenceJsImpl._(JSObject _)
+    implements JSObject, QueryJsImpl {
   external JSString? get key;
 
   external ReferenceJsImpl? get parent;