Skip to content

Commit a865ae9

Browse files
Don't use interface types (#3770)
1 parent b1854ab commit a865ae9

32 files changed

+1251
-1370
lines changed

packages/firestore/exp/dependencies.json

+300-391
Large diffs are not rendered by default.

packages/firestore/exp/index.ts

+21-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ registerFirestore();
2222
export { FieldPath, documentId } from '../lite/src/api/field_path';
2323

2424
export {
25-
Firestore as FirebaseFirestore,
25+
FirebaseFirestore,
2626
initializeFirestore,
2727
getFirestore,
2828
enableIndexedDbPersistence,
@@ -31,14 +31,19 @@ export {
3131
waitForPendingWrites,
3232
disableNetwork,
3333
enableNetwork,
34-
terminate
34+
terminate,
35+
Settings
3536
} from './src/api/database';
3637

3738
export {
39+
DocumentChange,
3840
DocumentSnapshot,
3941
QueryDocumentSnapshot,
4042
QuerySnapshot,
41-
snapshotEqual
43+
snapshotEqual,
44+
SnapshotOptions,
45+
FirestoreDataConverter,
46+
DocumentChangeType
4247
} from './src/api/snapshot';
4348

4449
export { SnapshotMetadata } from '../src/api/database';
@@ -59,7 +64,12 @@ export {
5964
limit,
6065
limitToLast,
6166
where,
62-
orderBy
67+
orderBy,
68+
SetOptions,
69+
QueryConstraintType,
70+
DocumentData,
71+
UpdateData,
72+
OrderByDirection
6373
} from '../lite/src/api/reference';
6474

6575
export { runTransaction, Transaction } from './src/api/transaction';
@@ -88,7 +98,7 @@ export {
8898
serverTimestamp
8999
} from '../lite/src/api/field_value';
90100

91-
export { setLogLevel } from '../src/util/log';
101+
export { setLogLevel, LogLevel } from '../src/util/log';
92102

93103
export { Bytes } from '../lite/src/api/bytes';
94104

@@ -101,3 +111,9 @@ export { GeoPoint } from '../src/api/geo_point';
101111
export { Timestamp } from '../src/api/timestamp';
102112

103113
export { refEqual, queryEqual } from '../lite/src/api/reference';
114+
115+
export { SnapshotListenOptions } from './src/api/reference';
116+
117+
export { CACHE_SIZE_UNLIMITED } from '../src/api/database';
118+
119+
export { FirestoreErrorCode, FirestoreError } from '../src/util/error';

packages/firestore/exp/register.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import { _registerComponent, registerVersion } from '@firebase/app-exp';
1919
import { Component, ComponentType } from '@firebase/component';
2020

21-
import { Firestore } from './src/api/database';
21+
import { FirebaseFirestore } from './src/api/database';
2222
import { version } from '../package.json';
2323

2424
export function registerFirestore(): void {
@@ -27,7 +27,7 @@ export function registerFirestore(): void {
2727
'firestore-exp',
2828
container => {
2929
const app = container.getProvider('app-exp').getImmediate()!;
30-
return ((app, auth) => new Firestore(app, auth))(
30+
return ((app, auth) => new FirebaseFirestore(app, auth))(
3131
app,
3232
container.getProvider('auth-internal')
3333
);

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

+25-13
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { Firestore } from './database';
18+
import { FirebaseFirestore } from './database';
1919
import { PersistenceSettings } from '../../../src/core/firestore_client';
2020
import {
2121
MemoryOfflineComponentProvider,
@@ -45,16 +45,16 @@ export const LOG_TAG = 'ComponentProvider';
4545
// Instance maps that ensure that only one component provider exists per
4646
// Firestore instance.
4747
const offlineComponentProviders = new Map<
48-
Firestore,
48+
FirebaseFirestore,
4949
Promise<OfflineComponentProvider>
5050
>();
5151
const onlineComponentProviders = new Map<
52-
Firestore,
52+
FirebaseFirestore,
5353
Promise<OnlineComponentProvider>
5454
>();
5555

5656
export async function setOfflineComponentProvider(
57-
firestore: Firestore,
57+
firestore: FirebaseFirestore,
5858
persistenceSettings: PersistenceSettings,
5959
offlineComponentProvider: OfflineComponentProvider
6060
): Promise<void> {
@@ -83,7 +83,7 @@ export async function setOfflineComponentProvider(
8383
}
8484

8585
export async function setOnlineComponentProvider(
86-
firestore: Firestore,
86+
firestore: FirebaseFirestore,
8787
onlineComponentProvider: OnlineComponentProvider
8888
): Promise<void> {
8989
const onlineDeferred = new Deferred<OnlineComponentProvider>();
@@ -112,7 +112,7 @@ export async function setOnlineComponentProvider(
112112
}
113113

114114
function getOfflineComponentProvider(
115-
firestore: Firestore
115+
firestore: FirebaseFirestore
116116
): Promise<OfflineComponentProvider> {
117117
firestore._queue.verifyOperationInProgress();
118118

@@ -129,7 +129,7 @@ function getOfflineComponentProvider(
129129
}
130130

131131
function getOnlineComponentProvider(
132-
firestore: Firestore
132+
firestore: FirebaseFirestore
133133
): Promise<OnlineComponentProvider> {
134134
firestore._queue.verifyOperationInProgress();
135135

@@ -144,19 +144,25 @@ function getOnlineComponentProvider(
144144
// Note: These functions cannot be `async` since we want to throw an exception
145145
// when Firestore is terminated (via `getOnlineComponentProvider()`).
146146

147-
export function getSyncEngine(firestore: Firestore): Promise<SyncEngine> {
147+
export function getSyncEngine(
148+
firestore: FirebaseFirestore
149+
): Promise<SyncEngine> {
148150
return getOnlineComponentProvider(firestore).then(
149151
components => components.syncEngine
150152
);
151153
}
152154

153-
export function getRemoteStore(firestore: Firestore): Promise<RemoteStore> {
155+
export function getRemoteStore(
156+
firestore: FirebaseFirestore
157+
): Promise<RemoteStore> {
154158
return getOnlineComponentProvider(firestore).then(
155159
components => components.remoteStore
156160
);
157161
}
158162

159-
export function getEventManager(firestore: Firestore): Promise<EventManager> {
163+
export function getEventManager(
164+
firestore: FirebaseFirestore
165+
): Promise<EventManager> {
160166
return getOnlineComponentProvider(firestore).then(components => {
161167
const eventManager = components.eventManager;
162168
eventManager.onListen = syncEngineListen.bind(null, components.syncEngine);
@@ -168,13 +174,17 @@ export function getEventManager(firestore: Firestore): Promise<EventManager> {
168174
});
169175
}
170176

171-
export function getPersistence(firestore: Firestore): Promise<Persistence> {
177+
export function getPersistence(
178+
firestore: FirebaseFirestore
179+
): Promise<Persistence> {
172180
return getOfflineComponentProvider(firestore).then(
173181
components => components.persistence
174182
);
175183
}
176184

177-
export function getLocalStore(firestore: Firestore): Promise<LocalStore> {
185+
export function getLocalStore(
186+
firestore: FirebaseFirestore
187+
): Promise<LocalStore> {
178188
return getOfflineComponentProvider(firestore).then(
179189
provider => provider.localStore
180190
);
@@ -184,7 +194,9 @@ export function getLocalStore(firestore: Firestore): Promise<LocalStore> {
184194
* Removes all components associated with the provided instance. Must be called
185195
* when the Firestore instance is terminated.
186196
*/
187-
export async function removeComponents(firestore: Firestore): Promise<void> {
197+
export async function removeComponents(
198+
firestore: FirebaseFirestore
199+
): Promise<void> {
188200
const onlineComponentProviderPromise = onlineComponentProviders.get(
189201
firestore
190202
);

0 commit comments

Comments
 (0)