Skip to content

Commit 95f7602

Browse files
committed
Addressing PR comments
1 parent 9f13d1b commit 95f7602

File tree

5 files changed

+9
-17
lines changed

5 files changed

+9
-17
lines changed

packages/app/src/firebaseApp.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ export class FirebaseAppImpl implements FirebaseApp {
116116
return Promise.all(
117117
services
118118
.filter(service => 'INTERNAL' in service)
119-
.map(service => {
120-
return service.INTERNAL!.delete();
121-
})
119+
.map(service => service.INTERNAL!.delete())
122120
);
123121
})
124122
.then(

packages/app/src/lite/firebaseAppLite.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,9 @@ export class FirebaseAppLiteImpl implements FirebaseApp {
9696
}
9797

9898
return Promise.all(
99-
services.map(service => {
100-
return service.INTERNAL
101-
? service.INTERNAL.delete()
102-
: Promise.resolve();
103-
})
99+
services
100+
.filter(service => 'INTERNAL' in service)
101+
.map(service => service.INTERNAL!.delete())
104102
);
105103
})
106104
.then(

packages/rxfire/database/list/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import { database } from 'firebase';
1919
import { QueryChange, ListenEvent } from '../interfaces';
2020
import { Observable, of, merge, from } from 'rxjs';
21-
import { validateEventsArray, isNil } from '../utils';
21+
import { validateEventsArray } from '../utils';
2222
import { fromRef } from '../fromRef';
2323
import { switchMap, scan, distinctUntilChanged, map } from 'rxjs/operators';
2424
import { changeToData } from '../object';
@@ -80,7 +80,7 @@ function positionFor(changes: QueryChange[], key) {
8080
}
8181

8282
function positionAfter(changes: QueryChange[], prevKey?: string) {
83-
if (isNil(prevKey)) {
83+
if (prevKey == null) {
8484
return 0;
8585
} else {
8686
const i = positionFor(changes, prevKey);

packages/rxfire/database/utils.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@
1717

1818
import { ListenEvent } from './interfaces';
1919

20-
export function isNil(obj: any): obj is null | undefined {
21-
return obj === undefined || obj === null;
22-
}
23-
2420
/**
2521
* Check the length of the provided array. If it is empty return an array
2622
* that is populated with all the Realtime Database child events.
2723
* @param events
2824
*/
2925
export function validateEventsArray(events?: ListenEvent[]): ListenEvent[] {
30-
if (isNil(events) || events!.length === 0) {
26+
if (events == null || events!.length === 0) {
3127
events = [
3228
ListenEvent.added,
3329
ListenEvent.removed,

packages/storage/src/implementation/requests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,14 +332,14 @@ export function createResumableUpload(
332332
): RequestInfo<string> {
333333
let urlPart = location.bucketOnlyServerUrl();
334334
let metadata = metadataForUpload_(location, blob, opt_metadata);
335-
let urlParams: UrlParams = { name: metadata['fullPath'] || '' };
335+
let urlParams: UrlParams = { name: metadata['fullPath']! };
336336
let url = UrlUtils.makeUrl(urlPart);
337337
let method = 'POST';
338338
let headers = {
339339
'X-Goog-Upload-Protocol': 'resumable',
340340
'X-Goog-Upload-Command': 'start',
341341
'X-Goog-Upload-Header-Content-Length': blob.size(),
342-
'X-Goog-Upload-Header-Content-Type': metadata['contentType'] || '',
342+
'X-Goog-Upload-Header-Content-Type': metadata['contentType']!,
343343
'Content-Type': 'application/json; charset=utf-8'
344344
};
345345
let body = MetadataUtils.toResourceString(metadata, mappings);

0 commit comments

Comments
 (0)