Skip to content

Commit 950712d

Browse files
committed
rename delete to _delete
1 parent 7a2a71f commit 950712d

File tree

6 files changed

+9
-18
lines changed

6 files changed

+9
-18
lines changed

packages-exp/app-types-exp/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export interface _FirebaseService {
113113
* Delete the service and free it's resources - called from
114114
* {@link @firebase/app-exp#deleteApp | deleteApp()}
115115
*/
116-
delete(): Promise<void>;
116+
_delete(): Promise<void>;
117117
}
118118

119119
export interface VersionService {

packages/component/src/provider.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ describe('Provider', () => {
232232
const deleteFake = fake();
233233
const myService: _FirebaseService = {
234234
app: getFakeApp(),
235-
delete: deleteFake
235+
_delete: deleteFake
236236
};
237237

238238
// provide factory and create a service instance

packages/component/src/provider.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -176,18 +176,9 @@ export class Provider<T extends Name> {
176176
// eslint-disable-next-line @typescript-eslint/no-explicit-any
177177
.map(service => (service as any).INTERNAL!.delete()),
178178
...services
179-
.filter(
180-
service =>
181-
'delete' in service &&
182-
this.component &&
183-
// TODO: remove !== 'app' when modular SDKs become official
184-
// People call app.delete() to trigger provider.delete() for all registered components, so
185-
// we don't call delete() on legacy FirebaseApp to avoid getting into a loop.
186-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
187-
(this.component.name as any) !== 'app'
188-
) // modular services
179+
.filter(service => '_delete' in service) // modularized services
189180
// eslint-disable-next-line @typescript-eslint/no-explicit-any
190-
.map(service => (service as any).delete())
181+
.map(service => (service as any)._delete())
191182
]);
192183
}
193184

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export async function setOfflineComponentProvider(
7171
// When a user calls clearPersistence() in one client, all other clients
7272
// need to be terminated to allow the delete to succeed.
7373
offlineComponentProvider.persistence.setDatabaseDeletedListener(() =>
74-
firestore.delete()
74+
firestore._delete()
7575
);
7676
offlineDeferred.resolve(offlineComponentProvider);
7777
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ export function terminate(
306306
): Promise<void> {
307307
_removeServiceInstance(firestore.app, 'firestore-exp');
308308
const firestoreImpl = cast(firestore, Firestore);
309-
return firestoreImpl.delete();
309+
return firestoreImpl._delete();
310310
}
311311

312312
function verifyNotInitialized(firestore: Firestore): void {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export class Firestore
9595
return new DatabaseId(app.options.projectId!);
9696
}
9797

98-
delete(): Promise<void> {
98+
_delete(): Promise<void> {
9999
if (!this._terminateTask) {
100100
this._terminateTask = this._terminate();
101101
}
@@ -117,7 +117,7 @@ export class Firestore
117117
// TODO(firestoreexp): `deleteApp()` should call the delete method above,
118118
// but it still calls INTERNAL.delete().
119119
INTERNAL = {
120-
delete: () => this.delete()
120+
delete: () => this._delete()
121121
};
122122
}
123123

@@ -142,5 +142,5 @@ export function terminate(
142142
): Promise<void> {
143143
_removeServiceInstance(firestore.app, 'firestore/lite');
144144
const firestoreClient = cast(firestore, Firestore);
145-
return firestoreClient.delete();
145+
return firestoreClient._delete();
146146
}

0 commit comments

Comments
 (0)