Skip to content

chore(): Shoring up @Optional types #2014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Updating the Cloud Messaging docs for Angular Fire modular
merged 2 commits into from
Mar 9, 2019
Merged

chore(): Shoring up @Optional types #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9409d79
chore(): Shoring up @Optional types
jamesdaniels Feb 22, 2019
0e74bd4
Merge branch 'master' into shoring_up_optional_types
davideast Mar 9, 2019
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
2 changes: 1 addition & 1 deletion src/auth/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class AngularFireAuth {

constructor(
@Inject(FirebaseOptionsToken) options:FirebaseOptions,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|undefined,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|null|undefined,
@Inject(PLATFORM_ID) platformId: Object,
private zone: NgZone
) {
Expand Down
2 changes: 1 addition & 1 deletion src/core/firebase.app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class FirebaseApp implements app.App {
functions: (region?: string) => FirebaseFunctions;
}

export function _firebaseAppFactory(options: FirebaseOptions, nameOrConfig?: string | FirebaseAppConfig) {
export function _firebaseAppFactory(options: FirebaseOptions, nameOrConfig?: string|FirebaseAppConfig|null) {
const name = typeof nameOrConfig === 'string' && nameOrConfig || '[DEFAULT]';
const config = typeof nameOrConfig === 'object' && nameOrConfig || {};
config.name = config.name || name;
Expand Down
4 changes: 2 additions & 2 deletions src/database-deprecated/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export class AngularFireDatabase {

constructor(
@Inject(FirebaseOptionsToken) options:FirebaseOptions,
@Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|undefined,
@Optional() @Inject(RealtimeDatabaseURL) databaseURL:string,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|null|undefined,
@Optional() @Inject(RealtimeDatabaseURL) databaseURL:string|null,
zone: NgZone
) {
this.database = zone.runOutsideAngular(() => {
Expand Down
4 changes: 2 additions & 2 deletions src/database/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export class AngularFireDatabase {

constructor(
@Inject(FirebaseOptionsToken) options:FirebaseOptions,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|undefined,
@Optional() @Inject(RealtimeDatabaseURL) databaseURL:string,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|null|undefined,
@Optional() @Inject(RealtimeDatabaseURL) databaseURL:string|null,
@Inject(PLATFORM_ID) platformId: Object,
zone: NgZone
) {
Expand Down
10 changes: 5 additions & 5 deletions src/firestore/firestore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ export class AngularFirestore {
*/
constructor(
@Inject(FirebaseOptionsToken) options:FirebaseOptions,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|undefined,
@Optional() @Inject(EnablePersistenceToken) shouldEnablePersistence: boolean,
@Optional() @Inject(FirestoreSettingsToken) settings: Settings,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|null|undefined,
@Optional() @Inject(EnablePersistenceToken) shouldEnablePersistence: boolean|null,
@Optional() @Inject(FirestoreSettingsToken) settings: Settings|null,
@Inject(PLATFORM_ID) platformId: Object,
zone: NgZone,
@Optional() @Inject(PersistenceSettingsToken) persistenceSettings: PersistenceSettings|undefined,
@Optional() @Inject(PersistenceSettingsToken) persistenceSettings: PersistenceSettings|null,
) {
this.scheduler = new FirebaseZoneScheduler(zone, platformId);
this.firestore = zone.runOutsideAngular(() => {
Expand All @@ -128,7 +128,7 @@ export class AngularFirestore {
// https://github.com/firebase/firebase-js-sdk/issues/608
const enablePersistence = () => {
try {
return from(this.firestore.enablePersistence(persistenceSettings).then(() => true, () => false));
return from(this.firestore.enablePersistence(persistenceSettings || undefined).then(() => true, () => false));
} catch(e) {
return of(false);
}
Expand Down
4 changes: 2 additions & 2 deletions src/functions/functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ export class AngularFireFunctions {

constructor(
@Inject(FirebaseOptionsToken) options:FirebaseOptions,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|undefined,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|null|undefined,
@Inject(PLATFORM_ID) platformId: Object,
zone: NgZone,
@Optional() @Inject(FunctionsRegionToken) region:string|undefined
@Optional() @Inject(FunctionsRegionToken) region:string|null
) {
this.scheduler = new FirebaseZoneScheduler(zone, platformId);

Expand Down
2 changes: 1 addition & 1 deletion src/messaging/messaging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class AngularFireMessaging {

constructor(
@Inject(FirebaseOptionsToken) options:FirebaseOptions,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|undefined,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|null|undefined,
@Inject(PLATFORM_ID) platformId: Object,
zone: NgZone
) {
Expand Down
4 changes: 2 additions & 2 deletions src/storage/storage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ export class AngularFireStorage {

constructor(
@Inject(FirebaseOptionsToken) options:FirebaseOptions,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|undefined,
@Optional() @Inject(StorageBucket) storageBucket:string,
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|null|undefined,
@Optional() @Inject(StorageBucket) storageBucket:string|null,
@Inject(PLATFORM_ID) platformId: Object,
zone: NgZone
) {
Expand Down