Skip to content

Further improve on config() type #138

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
merged 3 commits into from
Nov 30, 2017
Merged

Further improve on config() type #138

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95fba45
Update config().firebase typings to not be undefined since error will…
bmass02 Nov 30, 2017
aa99d5f
Added type guard when testing for existence of 'firebase' in merged.
bmass02 Nov 30, 2017
2009fe5
Updated to use existing type.
bmass02 Nov 30, 2017
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
8 changes: 6 additions & 2 deletions src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function config(): config.Config {
export namespace config {
// Config type is usable as a object (dot notation allowed), and firebase
// property will also code complete.
export type Config = { [key: string]: any } & { firebase?: firebase.AppOptions };
export type Config = { [key: string]: any } & { firebase: firebase.AppOptions };

/** @internal */
export let singleton: config.Config;
Expand All @@ -56,11 +56,15 @@ function init (credential: firebase.credential.Credential) {
}
let merged= _.merge({}, loadedFromFile, firebaseEnv);

if (!_.has(merged, 'firebase')) {
if (!hasFirebase(merged)) {
throw new Error('Firebase config variables are not available. ' +
'Please use the latest version of the Firebase CLI to deploy this function.');
}

_.set(merged, 'firebase.credential', credential);
config.singleton = merged;
}

function hasFirebase (merged: { [key: string]: any }): merged is config.Config {
return _.has(merged, 'firebase');
}