fix spec_test_runner.ts

Author: dconeybe

packages/firestore/src/core/firestore_client.ts

@@ -33,7 +33,7 @@ import {
   localStoreReadDocument,
   localStoreSetIndexAutoCreationEnabled
 } from '../local/local_store_impl';
-import { Persistence } from '../local/persistence';
+import { Persistence, DatabaseDeletedListenerAbortResult, DatabaseDeletedListenerContinueResult } from '../local/persistence';
 import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
 import { FieldIndex } from '../model/field_index';
@@ -234,12 +234,10 @@ export async function setOfflineComponentProvider(
   // need to be terminated to allow the delete to succeed.
   offlineComponentProvider.persistence.setDatabaseDeletedListener(reason => {
     client.terminate();
-    if (reason === "persistence cleared") {
-      return { reason: `allowing another tab's "clear persistence" attempt to succeed` };
-    } else if (reason === "site data cleared") {
-      return { reason: `protecting against database corruption` };
-    } else {
-      return { reason: `unknown (code: vpfvjqeqvn)` };
+    if (reason === "site data cleared") {
+      return new DatabaseDeletedListenerAbortResult("protecting against database corruption");
+    } else  {
+      return new DatabaseDeletedListenerContinueResult();
     }
   });
 

packages/firestore/src/local/persistence.ts

@@ -100,13 +100,16 @@ export interface ReferenceDelegate {
 
 export type DatabaseDeletedReason = "persistence cleared" | "site data cleared";
 
-export const DatabaseDeletedListenerContinueResult: unique symbol = Symbol("DatabaseDeletedListenerContinueResult");
+export class DatabaseDeletedListenerContinueResult {
+  readonly type = "continue" as const;
+}
 
-export interface DatabaseDeletedListenerAbortResult {
-  reason: string;
+export class DatabaseDeletedListenerAbortResult {
+  readonly type = "abort" as const;
+  constructor(readonly abortReason: string) {}
 }
 
-export type DatabaseDeletedListenerResult = typeof DatabaseDeletedListenerContinueResult | DatabaseDeletedListenerAbortResult;
+export type DatabaseDeletedListenerResult = DatabaseDeletedListenerContinueResult | DatabaseDeletedListenerAbortResult;
 
 export type DatabaseDeletedListener = (reason: DatabaseDeletedReason) => DatabaseDeletedListenerResult;
 

packages/firestore/src/local/simple_db.ts

@@ -23,10 +23,7 @@ import {logDebug, logError, logWarn} from '../util/log';
 import {Deferred} from '../util/promise';
 
 import {PersistencePromise} from './persistence_promise';
-import {
-  type DatabaseDeletedListener,
-  DatabaseDeletedListenerContinueResult
-} from './persistence';
+import {type DatabaseDeletedListener} from './persistence';
 
 // References to `indexedDB` are guarded by SimpleDb.isAvailable() and getGlobal()
 /* eslint-disable no-restricted-globals */
@@ -371,11 +368,11 @@ export class SimpleDb {
             );
             if (this.databaseDeletedListener) {
               const listenerResult = this.databaseDeletedListener("site data cleared");
-              if (listenerResult !== DatabaseDeletedListenerContinueResult) {
+              if (listenerResult.type !== "continue") {
                 throw new Error(
                   `Refusing to open IndexedDB database after having been ` +
                   `cleared, such as by clicking the "clear site data" button ` +
-                  `in a web browser: ${listenerResult.reason} (` +
+                  `in a web browser: ${listenerResult.abortReason} (` +
                   `db.name=${db.name}, ` +
                   `db.version=${db.version}, ` +
                   `lastClosedDbVersion=${this.lastClosedDbVersion}, ` +
@@ -435,11 +432,11 @@ export class SimpleDb {
       );
       if (this.databaseDeletedListener) {
         const listenerResult = this.databaseDeletedListener("persistence cleared");
-        if (listenerResult !== DatabaseDeletedListenerContinueResult) {
+        if (listenerResult.type !== "continue") {
           logWarn(
             `Closing IndexedDB database "${db.name}" in response to ` +
             `"versionchange" event with newVersion===null: ` +
-            `${listenerResult.reason}`
+            `${listenerResult.abortReason}`
           );
           db.close();
           if (db === this.db) {

packages/firestore/test/unit/specs/spec_test_runner.ts

@@ -77,6 +77,7 @@ import {
   SCHEMA_VERSION
 } from '../../../src/local/indexeddb_schema';
 import { SchemaConverter } from '../../../src/local/indexeddb_schema_converter';
+import { DatabaseDeletedListenerContinueResult } from '../../../src/local/persistence';
 import {
   DbPrimaryClientKey,
   DbPrimaryClientStore
@@ -365,8 +366,9 @@ abstract class TestRunner {
     this.eventManager.onLastRemoteStoreUnlisten =
       triggerRemoteStoreUnlisten.bind(null, this.syncEngine);
 
-    await this.persistence.setDatabaseDeletedListener(async () => {
-      await this.shutdown();
+    this.persistence.setDatabaseDeletedListener(() => {
+      this.shutdown();
+      return new DatabaseDeletedListenerContinueResult();
     });
 
     this.started = true;