Review review

Author: schmidt-sebastian

packages/firestore/src/local/local_store.ts

@@ -1054,10 +1054,9 @@ export function lookupMutationDocuments(
   localStore: LocalStore,
   batchId: BatchId
 ): Promise<MaybeDocumentMap | null> {
-  const [localStoreImpl, mutationQueueImpl] = debugCast(
-    localStore,
-    LocalStoreImpl,
-    (localStore as LocalStoreImpl).mutationQueue,
+  const localStoreImpl = debugCast(localStore, LocalStoreImpl);
+  const mutationQueueImpl = debugCast(
+    localStoreImpl.mutationQueue,
     IndexedDbMutationQueue // We only support IndexedDb in multi-tab mode.
   );
   return localStoreImpl.persistence.runTransaction(
@@ -1106,10 +1105,9 @@ export function getCachedTarget(
   localStore: LocalStore,
   targetId: TargetId
 ): Promise<Target | null> {
-  const [localStoreImpl, targetCacheImpl] = debugCast(
-    localStore,
-    LocalStoreImpl,
-    (localStore as LocalStoreImpl).targetCache,
+  const localStoreImpl = debugCast(localStore, LocalStoreImpl);
+  const targetCacheImpl = debugCast(
+    localStoreImpl.targetCache,
     IndexedDbTargetCache // We only support IndexedDb in multi-tab mode.
   );
   const cachedTargetData = localStoreImpl.targetDataByTarget.get(targetId);
@@ -1138,10 +1136,9 @@ export function getCachedTarget(
 export function getNewDocumentChanges(
   localStore: LocalStore
 ): Promise<MaybeDocumentMap> {
-  const [localStoreImpl, remoteDocumentCacheImpl] = debugCast(
-    localStore,
-    LocalStoreImpl,
-    (localStore as LocalStoreImpl).remoteDocuments,
+  const localStoreImpl = debugCast(localStore, LocalStoreImpl);
+  const remoteDocumentCacheImpl = debugCast(
+    localStoreImpl.remoteDocuments,
     IndexedDbRemoteDocumentCache // We only support IndexedDb in multi-tab mode.
   );
   return localStoreImpl.persistence

packages/firestore/src/util/assert.ts

@@ -72,44 +72,17 @@ export function debugAssert(
 }
 
 /**
- * Casts `obj1` to `S` and `obj2` to `T`. In non-production builds,
- * verifies that `obj1` and `obj2` are instances of `S` and `T` before casting.
+ * Casts `obj` to `T`. In non-production builds, verifies that `obj` is an
+ * instance of `T` before casting.
  */
-export function debugCast<S, T>(
-  obj1: object,
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  constructor1: { new (...args: any[]): S },
-  obj2: object,
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  constructor2: { new (...args: any[]): T }
-): [S, T] | never;
-/**
- * Casts `obj` to `S`. In non-production builds, verifies that `obj` is an
- * instance of `S` before casting.
- */
-export function debugCast<S>(
+export function debugCast<T>(
   obj: object,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  constructor: { new (...args: any[]): S }
-): S | never;
-export function debugCast<S, T>(
-  obj1: object,
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  constructor1: { new (...args: any[]): S },
-  obj2?: object,
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  constructor2?: { new (...args: any[]): T }
-): S | [S, T] | never {
-  debugAssert(
-    obj1 instanceof constructor1,
-    `Expected type '${constructor1.name}', but was '${obj1.constructor.name}'`
-  );
-  if (!obj2 || !constructor2) {
-    return obj1 as S;
-  }
+  constructor: { new (...args: any[]): T }
+): T | never {
   debugAssert(
-    obj2 instanceof constructor2,
-    `Expected type '${constructor2.name}', but was '${obj2.constructor.name}'`
+    obj instanceof constructor,
+    `Expected type '${constructor.name}', but was '${obj.constructor.name}'`
   );
-  return [obj1 as S, obj2 as T];
+  return obj as T;
 }