Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions packages/firestore/src/api/database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ class FirestoreConfig {
* The root reference to the database.
*/
export class Firestore implements firestore.Firestore, FirebaseService {
private _config: FirestoreConfig;
private readonly _config: FirestoreConfig;
public readonly _databaseId: DatabaseId;

// The firestore client instance. This will be available as soon as
// configureClient is called, but any calls against it will block until
Expand All @@ -189,10 +190,6 @@ export class Firestore implements firestore.Firestore, FirebaseService {
private _firestoreClient: FirestoreClient | undefined;
public _dataConverter: UserDataConverter;

public get _databaseId(): DatabaseId {
return this._config.databaseId;
}

constructor(databaseIdOrApp: FirestoreDatabase | FirebaseApp) {
const config = new FirestoreConfig();
if (typeof (databaseIdOrApp as FirebaseApp).options === 'object') {
Expand Down Expand Up @@ -220,6 +217,7 @@ export class Firestore implements firestore.Firestore, FirebaseService {

config.settings = new FirestoreSettings({});
this._config = config;
this._databaseId = config.databaseId;
}

settings(settingsLiteral: firestore.Settings): void {
Expand Down