File tree Expand file tree Collapse file tree 6 files changed +9
-18
lines changed
packages-exp/app-types-exp Expand file tree Collapse file tree 6 files changed +9
-18
lines changed Original file line number Diff line number Diff line change @@ -113,7 +113,7 @@ export interface _FirebaseService {
113
113
* Delete the service and free it's resources - called from
114
114
* {@link @firebase/app-exp#deleteApp | deleteApp() }
115
115
*/
116
- delete ( ) : Promise < void > ;
116
+ _delete ( ) : Promise < void > ;
117
117
}
118
118
119
119
export interface VersionService {
Original file line number Diff line number Diff line change @@ -232,7 +232,7 @@ describe('Provider', () => {
232
232
const deleteFake = fake ( ) ;
233
233
const myService : _FirebaseService = {
234
234
app : getFakeApp ( ) ,
235
- delete : deleteFake
235
+ _delete : deleteFake
236
236
} ;
237
237
238
238
// provide factory and create a service instance
Original file line number Diff line number Diff line change @@ -176,18 +176,9 @@ export class Provider<T extends Name> {
176
176
// eslint-disable-next-line @typescript-eslint/no-explicit-any
177
177
. map ( service => ( service as any ) . INTERNAL ! . delete ( ) ) ,
178
178
...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
189
180
// eslint-disable-next-line @typescript-eslint/no-explicit-any
190
- . map ( service => ( service as any ) . delete ( ) )
181
+ . map ( service => ( service as any ) . _delete ( ) )
191
182
] ) ;
192
183
}
193
184
Original file line number Diff line number Diff line change @@ -71,7 +71,7 @@ export async function setOfflineComponentProvider(
71
71
// When a user calls clearPersistence() in one client, all other clients
72
72
// need to be terminated to allow the delete to succeed.
73
73
offlineComponentProvider . persistence . setDatabaseDeletedListener ( ( ) =>
74
- firestore . delete ( )
74
+ firestore . _delete ( )
75
75
) ;
76
76
offlineDeferred . resolve ( offlineComponentProvider ) ;
77
77
}
Original file line number Diff line number Diff line change @@ -306,7 +306,7 @@ export function terminate(
306
306
) : Promise < void > {
307
307
_removeServiceInstance ( firestore . app , 'firestore-exp' ) ;
308
308
const firestoreImpl = cast ( firestore , Firestore ) ;
309
- return firestoreImpl . delete ( ) ;
309
+ return firestoreImpl . _delete ( ) ;
310
310
}
311
311
312
312
function verifyNotInitialized ( firestore : Firestore ) : void {
Original file line number Diff line number Diff line change @@ -95,7 +95,7 @@ export class Firestore
95
95
return new DatabaseId ( app . options . projectId ! ) ;
96
96
}
97
97
98
- delete ( ) : Promise < void > {
98
+ _delete ( ) : Promise < void > {
99
99
if ( ! this . _terminateTask ) {
100
100
this . _terminateTask = this . _terminate ( ) ;
101
101
}
@@ -117,7 +117,7 @@ export class Firestore
117
117
// TODO(firestoreexp): `deleteApp()` should call the delete method above,
118
118
// but it still calls INTERNAL.delete().
119
119
INTERNAL = {
120
- delete : ( ) => this . delete ( )
120
+ delete : ( ) => this . _delete ( )
121
121
} ;
122
122
}
123
123
@@ -142,5 +142,5 @@ export function terminate(
142
142
) : Promise < void > {
143
143
_removeServiceInstance ( firestore . app , 'firestore/lite' ) ;
144
144
const firestoreClient = cast ( firestore , Firestore ) ;
145
- return firestoreClient . delete ( ) ;
145
+ return firestoreClient . _delete ( ) ;
146
146
}
You can’t perform that action at this time.
0 commit comments