Skip to content

Commit cd29bb6

Browse files
Remove cast
1 parent 30fb0d5 commit cd29bb6

File tree

13 files changed

+138
-186
lines changed

13 files changed

+138
-186
lines changed

packages/firestore/exp/src/api/database.ts

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import {
3535
FirebaseFirestore as LiteFirestore,
3636
Settings as LiteSettings
3737
} from '../../../lite/src/api/database';
38-
import { cast } from '../../../lite/src/api/util';
3938
import { Code, FirestoreError } from '../../../src/util/error';
4039
import { Deferred } from '../../../src/util/promise';
4140
import { LruParams } from '../../../src/local/lru_garbage_collector';
@@ -206,23 +205,22 @@ export function enableIndexedDbPersistence(
206205
firestore: FirebaseFirestore,
207206
persistenceSettings?: PersistenceSettings
208207
): Promise<void> {
209-
const firestoreImpl = cast(firestore, FirebaseFirestore);
210-
verifyNotInitialized(firestoreImpl);
208+
verifyNotInitialized(firestore);
211209

212210
// `_getSettings()` freezes the client settings and prevents further changes
213211
// to the components (as `verifyNotInitialized()` would fail). Components can
214212
// then be accessed via `getOfflineComponentProvider()` and
215213
// `getOnlineComponentProvider()`
216-
const settings = firestoreImpl._getSettings();
214+
const settings = firestore._getSettings();
217215

218216
const onlineComponentProvider = new OnlineComponentProvider();
219217
const offlineComponentProvider = new IndexedDbOfflineComponentProvider(
220218
onlineComponentProvider
221219
);
222220

223-
return firestoreImpl._queue.enqueue(async () => {
221+
return firestore._queue.enqueue(async () => {
224222
await setOfflineComponentProvider(
225-
firestoreImpl,
223+
firestore,
226224
{
227225
durable: true,
228226
synchronizeTabs: false,
@@ -232,29 +230,28 @@ export function enableIndexedDbPersistence(
232230
},
233231
offlineComponentProvider
234232
);
235-
await setOnlineComponentProvider(firestoreImpl, onlineComponentProvider);
233+
await setOnlineComponentProvider(firestore, onlineComponentProvider);
236234
});
237235
}
238236

239237
export function enableMultiTabIndexedDbPersistence(
240238
firestore: FirebaseFirestore
241239
): Promise<void> {
242-
const firestoreImpl = cast(firestore, FirebaseFirestore);
243-
verifyNotInitialized(firestoreImpl);
240+
verifyNotInitialized(firestore);
244241

245242
// `_getSettings()` freezes the client settings and prevents further changes
246243
// to the components (as `verifyNotInitialized()` would fail). Components can
247244
// then be accessed via `getOfflineComponentProvider()` and
248245
// `getOnlineComponentProvider()`
249-
const settings = firestoreImpl._getSettings();
246+
const settings = firestore._getSettings();
250247

251248
const onlineComponentProvider = new OnlineComponentProvider();
252249
const offlineComponentProvider = new MultiTabOfflineComponentProvider(
253250
onlineComponentProvider
254251
);
255-
return firestoreImpl._queue.enqueue(async () => {
252+
return firestore._queue.enqueue(async () => {
256253
await setOfflineComponentProvider(
257-
firestoreImpl,
254+
firestore,
258255
{
259256
durable: true,
260257
synchronizeTabs: true,
@@ -264,15 +261,14 @@ export function enableMultiTabIndexedDbPersistence(
264261
},
265262
offlineComponentProvider
266263
);
267-
await setOnlineComponentProvider(firestoreImpl, onlineComponentProvider);
264+
await setOnlineComponentProvider(firestore, onlineComponentProvider);
268265
});
269266
}
270267

271268
export function clearIndexedDbPersistence(
272269
firestore: FirebaseFirestore
273270
): Promise<void> {
274-
const firestoreImpl = cast(firestore, FirebaseFirestore);
275-
if (firestoreImpl._initialized && !firestoreImpl._terminated) {
271+
if (firestore._initialized && !firestore._terminated) {
276272
throw new FirestoreError(
277273
Code.FAILED_PRECONDITION,
278274
'Persistence can only be cleared before a Firestore instance is ' +
@@ -281,13 +277,10 @@ export function clearIndexedDbPersistence(
281277
}
282278

283279
const deferred = new Deferred<void>();
284-
firestoreImpl._queue.enqueueAndForgetEvenWhileRestricted(async () => {
280+
firestore._queue.enqueueAndForgetEvenWhileRestricted(async () => {
285281
try {
286282
await indexedDbClearPersistence(
287-
indexedDbStoragePrefix(
288-
firestoreImpl._databaseId,
289-
firestoreImpl._persistenceKey
290-
)
283+
indexedDbStoragePrefix(firestore._databaseId, firestore._persistenceKey)
291284
);
292285
deferred.resolve();
293286
} catch (e) {
@@ -300,45 +293,41 @@ export function clearIndexedDbPersistence(
300293
export function waitForPendingWrites(
301294
firestore: FirebaseFirestore
302295
): Promise<void> {
303-
const firestoreImpl = cast(firestore, FirebaseFirestore);
304-
firestoreImpl._verifyNotTerminated();
296+
firestore._verifyNotTerminated();
305297

306298
const deferred = new Deferred<void>();
307-
firestoreImpl._queue.enqueueAndForget(async () => {
308-
const syncEngine = await getSyncEngine(firestoreImpl);
299+
firestore._queue.enqueueAndForget(async () => {
300+
const syncEngine = await getSyncEngine(firestore);
309301
return registerPendingWritesCallback(syncEngine, deferred);
310302
});
311303
return deferred.promise;
312304
}
313305

314306
export function enableNetwork(firestore: FirebaseFirestore): Promise<void> {
315-
const firestoreImpl = cast(firestore, FirebaseFirestore);
316-
firestoreImpl._verifyNotTerminated();
307+
firestore._verifyNotTerminated();
317308

318-
return firestoreImpl._queue.enqueue(async () => {
319-
const remoteStore = await getRemoteStore(firestoreImpl);
320-
const persistence = await getPersistence(firestoreImpl);
309+
return firestore._queue.enqueue(async () => {
310+
const remoteStore = await getRemoteStore(firestore);
311+
const persistence = await getPersistence(firestore);
321312
persistence.setNetworkEnabled(true);
322313
return remoteStoreEnableNetwork(remoteStore);
323314
});
324315
}
325316

326317
export function disableNetwork(firestore: FirebaseFirestore): Promise<void> {
327-
const firestoreImpl = cast(firestore, FirebaseFirestore);
328-
firestoreImpl._verifyNotTerminated();
318+
firestore._verifyNotTerminated();
329319

330-
return firestoreImpl._queue.enqueue(async () => {
331-
const remoteStore = await getRemoteStore(firestoreImpl);
332-
const persistence = await getPersistence(firestoreImpl);
320+
return firestore._queue.enqueue(async () => {
321+
const remoteStore = await getRemoteStore(firestore);
322+
const persistence = await getPersistence(firestore);
333323
persistence.setNetworkEnabled(false);
334324
return remoteStoreDisableNetwork(remoteStore);
335325
});
336326
}
337327

338328
export function terminate(firestore: FirebaseFirestore): Promise<void> {
339329
_removeServiceInstance(firestore.app, 'firestore-exp');
340-
const firestoreImpl = cast(firestore, FirebaseFirestore);
341-
return firestoreImpl._delete();
330+
return firestore._delete();
342331
}
343332

344333
function verifyNotInitialized(firestore: FirebaseFirestore): void {

0 commit comments

Comments
 (0)