Skip to content

Commit 5f5bbb6

Browse files
dconeybedconeybe
committed
prettier
1 parent eaa8ae8 commit 5f5bbb6

File tree

4 files changed

+91
-68
lines changed

4 files changed

+91
-68
lines changed

‎packages/firestore/src/core/firestore_client.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ import {
3333
localStoreReadDocument,
3434
localStoreSetIndexAutoCreationEnabled
3535
} from '../local/local_store_impl';
36-
import { Persistence, DatabaseDeletedListenerAbortResult, DatabaseDeletedListenerContinueResult } from '../local/persistence';
36+
import {
37+
Persistence,
38+
DatabaseDeletedListenerAbortResult,
39+
DatabaseDeletedListenerContinueResult
40+
} from '../local/persistence';
3741
import { Document } from '../model/document';
3842
import { DocumentKey } from '../model/document_key';
3943
import { FieldIndex } from '../model/field_index';
@@ -234,9 +238,11 @@ export async function setOfflineComponentProvider(
234238
// need to be terminated to allow the delete to succeed.
235239
offlineComponentProvider.persistence.setDatabaseDeletedListener(reason => {
236240
client.terminate();
237-
if (reason === "site data cleared") {
238-
return new DatabaseDeletedListenerAbortResult("protecting against database corruption");
239-
} else {
241+
if (reason === 'site data cleared') {
242+
return new DatabaseDeletedListenerAbortResult(
243+
'protecting against database corruption'
244+
);
245+
} else {
240246
return new DatabaseDeletedListenerContinueResult();
241247
}
242248
});

‎packages/firestore/src/local/indexeddb_persistence.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ import { IndexedDbTargetCache } from './indexeddb_target_cache';
5858
import { getStore, IndexedDbTransaction } from './indexeddb_transaction';
5959
import { LocalSerializer } from './local_serializer';
6060
import { LruParams } from './lru_garbage_collector';
61-
import { Persistence, PrimaryStateListener, DatabaseDeletedListener } from './persistence';
61+
import {
62+
Persistence,
63+
PrimaryStateListener,
64+
DatabaseDeletedListener
65+
} from './persistence';
6266
import { PersistencePromise } from './persistence_promise';
6367
import {
6468
PersistenceTransaction,

‎packages/firestore/src/local/persistence.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,24 @@ export interface ReferenceDelegate {
9898
): PersistencePromise<void>;
9999
}
100100

101-
export type DatabaseDeletedReason = "persistence cleared" | "site data cleared";
101+
export type DatabaseDeletedReason = 'persistence cleared' | 'site data cleared';
102102

103103
export class DatabaseDeletedListenerContinueResult {
104-
readonly type = "continue" as const;
104+
readonly type = 'continue' as const;
105105
}
106106

107107
export class DatabaseDeletedListenerAbortResult {
108-
readonly type = "abort" as const;
108+
readonly type = 'abort' as const;
109109
constructor(readonly abortReason: string) {}
110110
}
111111

112-
export type DatabaseDeletedListenerResult = DatabaseDeletedListenerContinueResult | DatabaseDeletedListenerAbortResult;
112+
export type DatabaseDeletedListenerResult =
113+
| DatabaseDeletedListenerContinueResult
114+
| DatabaseDeletedListenerAbortResult;
113115

114-
export type DatabaseDeletedListener = (reason: DatabaseDeletedReason) => DatabaseDeletedListenerResult;
116+
export type DatabaseDeletedListener = (
117+
reason: DatabaseDeletedReason
118+
) => DatabaseDeletedListenerResult;
115119

116120
/**
117121
* Persistence is the lowest-level shared interface to persistent storage in

‎packages/firestore/src/local/simple_db.ts‎

Lines changed: 67 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
* limitations under the License.
1616
*/
1717

18-
import {getGlobal, getUA, isIndexedDBAvailable} from '@firebase/util';
18+
import { getGlobal, getUA, isIndexedDBAvailable } from '@firebase/util';
1919

20-
import {debugAssert} from '../util/assert';
21-
import {Code, FirestoreError} from '../util/error';
22-
import {logDebug, logError, logWarn} from '../util/log';
23-
import {Deferred} from '../util/promise';
20+
import { debugAssert } from '../util/assert';
21+
import { Code, FirestoreError } from '../util/error';
22+
import { logDebug, logError, logWarn } from '../util/log';
23+
import { Deferred } from '../util/promise';
2424

25-
import {PersistencePromise} from './persistence_promise';
26-
import {type DatabaseDeletedListener} from './persistence';
25+
import { PersistencePromise } from './persistence_promise';
26+
import { type DatabaseDeletedListener } from './persistence';
2727

2828
// References to `indexedDB` are guarded by SimpleDb.isAvailable() and getGlobal()
2929
/* eslint-disable no-restricted-globals */
@@ -355,30 +355,31 @@ export class SimpleDb {
355355
) {
356356
logWarn(
357357
`IndexedDB onupgradeneeded indicates that the ` +
358-
`database contents may have been cleared, such as by clicking ` +
359-
`the "clear site data" button in a browser. This _could_ cause ` +
360-
`corruption of the IndexeDB database data if the clear ` +
361-
`operation happened in the middle of Firestore operations. (` +
362-
`db.name=${db.name}, ` +
363-
`db.version=${db.version}, ` +
364-
`lastClosedDbVersion=${this.lastClosedDbVersion}, ` +
365-
`event.oldVersion=${event.oldVersion}, ` +
366-
`event.newVersion=${event.newVersion}` +
367-
`)`
358+
`database contents may have been cleared, such as by clicking ` +
359+
`the "clear site data" button in a browser. This _could_ cause ` +
360+
`corruption of the IndexeDB database data if the clear ` +
361+
`operation happened in the middle of Firestore operations. (` +
362+
`db.name=${db.name}, ` +
363+
`db.version=${db.version}, ` +
364+
`lastClosedDbVersion=${this.lastClosedDbVersion}, ` +
365+
`event.oldVersion=${event.oldVersion}, ` +
366+
`event.newVersion=${event.newVersion}` +
367+
`)`
368368
);
369369
if (this.databaseDeletedListener) {
370-
const listenerResult = this.databaseDeletedListener("site data cleared");
371-
if (listenerResult.type !== "continue") {
370+
const listenerResult =
371+
this.databaseDeletedListener('site data cleared');
372+
if (listenerResult.type !== 'continue') {
372373
throw new Error(
373374
`Refusing to open IndexedDB database after having been ` +
374-
`cleared, such as by clicking the "clear site data" button ` +
375-
`in a web browser: ${listenerResult.abortReason} (` +
376-
`db.name=${db.name}, ` +
377-
`db.version=${db.version}, ` +
378-
`lastClosedDbVersion=${this.lastClosedDbVersion}, ` +
379-
`event.oldVersion=${event.oldVersion}, ` +
380-
`event.newVersion=${event.newVersion}` +
381-
`)`
375+
`cleared, such as by clicking the "clear site data" button ` +
376+
`in a web browser: ${listenerResult.abortReason} (` +
377+
`db.name=${db.name}, ` +
378+
`db.version=${db.version}, ` +
379+
`lastClosedDbVersion=${this.lastClosedDbVersion}, ` +
380+
`event.oldVersion=${event.oldVersion}, ` +
381+
`event.newVersion=${event.newVersion}` +
382+
`)`
382383
);
383384
}
384385
}
@@ -406,52 +407,60 @@ export class SimpleDb {
406407
this.lastClosedDbVersion = db.version;
407408
logWarn(
408409
`IndexedDB "close" event received, indicating abnormal database ` +
409-
`closure. The database contents may have been cleared, such as ` +
410-
`by clicking the "clear site data" button in a browser. ` +
411-
`Re-opening the IndexedDB database may fail to avoid IndexedDB ` +
412-
`database data corruption (` +
413-
`db.name=${db.name}, ` +
414-
`db.version=${db.version}` +
415-
`)`
410+
`closure. The database contents may have been cleared, such as ` +
411+
`by clicking the "clear site data" button in a browser. ` +
412+
`Re-opening the IndexedDB database may fail to avoid IndexedDB ` +
413+
`database data corruption (` +
414+
`db.name=${db.name}, ` +
415+
`db.version=${db.version}` +
416+
`)`
416417
);
417418
},
418419
{ passive: true }
419420
);
420421
}
421422

422-
this.db.addEventListener("versionchange", event => {
423-
const db = event.target as IDBDatabase;
424-
if (event.newVersion !== null) {
425-
return;
426-
}
423+
this.db.addEventListener(
424+
'versionchange',
425+
event => {
426+
const db = event.target as IDBDatabase;
427+
if (event.newVersion !== null) {
428+
return;
429+
}
427430

428-
logDebug(
429-
`IndexedDB "versionchange" event with newVersion===null received; ` +
430-
`this is likely because clearIndexedDbPersistence() was called, ` +
431-
`possibly in another tab if multi-tab persistence is enabled.`
432-
);
433-
if (this.databaseDeletedListener) {
434-
const listenerResult = this.databaseDeletedListener("persistence cleared");
435-
if (listenerResult.type !== "continue") {
436-
logWarn(
437-
`Closing IndexedDB database "${db.name}" in response to ` +
438-
`"versionchange" event with newVersion===null: ` +
439-
`${listenerResult.abortReason}`
431+
logDebug(
432+
`IndexedDB "versionchange" event with newVersion===null received; ` +
433+
`this is likely because clearIndexedDbPersistence() was called, ` +
434+
`possibly in another tab if multi-tab persistence is enabled.`
435+
);
436+
if (this.databaseDeletedListener) {
437+
const listenerResult = this.databaseDeletedListener(
438+
'persistence cleared'
440439
);
441-
db.close();
442-
if (db === this.db) {
443-
this.db = undefined;
440+
if (listenerResult.type !== 'continue') {
441+
logWarn(
442+
`Closing IndexedDB database "${db.name}" in response to ` +
443+
`"versionchange" event with newVersion===null: ` +
444+
`${listenerResult.abortReason}`
445+
);
446+
db.close();
447+
if (db === this.db) {
448+
this.db = undefined;
449+
}
444450
}
445451
}
446-
}
447-
}, {passive:true});
452+
},
453+
{ passive: true }
454+
);
448455

449456
return this.db;
450457
}
451458

452-
setDatabaseDeletedListener(databaseDeletedListener: DatabaseDeletedListener): void {
459+
setDatabaseDeletedListener(
460+
databaseDeletedListener: DatabaseDeletedListener
461+
): void {
453462
if (this.databaseDeletedListener) {
454-
throw new Error("setOnDatabaseDeletedListener() has already been called");
463+
throw new Error('setOnDatabaseDeletedListener() has already been called');
455464
}
456465
this.databaseDeletedListener = databaseDeletedListener;
457466
}

0 commit comments

Comments
 (0)