cleanup and add flow annotations to firestack class

Author: Salakar

lib/firestack.js

@@ -4,9 +4,9 @@
  */
 
 
-import { NativeModules, NativeEventEmitter, AsyncStorage } from 'react-native';
+import { NativeModules, NativeEventEmitter } from 'react-native';
 
-import Log from './utils/log'
+import Log from './utils/log';
 import promisify from './utils/promisify';
 import Singleton from './utils/singleton';
 
@@ -34,7 +34,7 @@ export default class Firestack extends Singleton {
    * @param options
    * @param name - TODO support naming multiple instances
    */
-  constructor(options, name) {
+  constructor(options: Object, name: string) {
     const instance = super(options);
 
     instance.options = options || {};
@@ -49,7 +49,6 @@ export default class Firestack extends Singleton {
     delete instance.options.remoteConfig;
 
     instance.configured = instance.options.configure || false;
-    instance._auth = null;
 
     instance.eventHandlers = {};
 
@@ -59,13 +58,24 @@ export default class Firestack extends Singleton {
     instance._auth = new Auth(instance, instance.options);
   }
 
+  _db: ?Object;
+  _log: ?Object;
+  _auth: ?Object;
+  _store: ?Object;
+  _storage: ?Object;
+  _presence: ?Object;
+  _analytics: ?Object;
+  _constants: ?Object;
+  _messaging: ?Object;
+  _remoteConfig: ?Object;
+
   /**
    * Support web version of initApp.
    * @param options
    * @param name
    * @returns {*}
    */
-  static initializeApp(options, name = 'default') {
+  static initializeApp(options: Object = {}, name: string = 'default') {
     if (!instances[name]) instances[name] = new Firestack(options);
     return instances[name];
   }
@@ -76,7 +86,7 @@ export default class Firestack extends Singleton {
    * @param opts
    * @returns {Promise.<TResult>|*|Promise.<T>}
    */
-  configure(opts = {}) {
+  configure(opts: Object = {}) {
     if (!this.configurePromise) {
       const firestackOptions = Object.assign({}, this.options, opts);
 
@@ -88,12 +98,13 @@ export default class Firestack extends Singleton {
           return configuredProperties;
         }).catch((err) => {
           log.info('Native error occurred while calling configure', err);
-        })
+        });
     }
     return this.configurePromise;
   }
 
-  onReady(cb) {
+  onReady(cb: Function) {
+    // TODO wut o.O
     return this.configurePromise = this.configurePromise.then(cb);
   }
 
@@ -104,24 +115,18 @@ export default class Firestack extends Singleton {
    * idea or not (imperative vs. direct manipulation/proxy)
    */
   auth() {
-    console.log('auth GET');
-    if (!this._auth) {
-      this._auth = new Auth(this);
-    }
     return this._auth;
   }
 
-  // database
+
   database() {
     if (!this._db) {
       this._db = new Database(this);
     }
     return this._db;
-    // db.enableLogging(this._debug);
-    // return this.appInstance.database();
   }
 
-  // analytics
+
   analytics() {
     if (!this._analytics) {
       this._analytics = new Analytics(this);
@@ -137,71 +142,61 @@ export default class Firestack extends Singleton {
     return this._storage;
   }
 
-  // presence
   presence() {
     if (!this._presence) {
       this._presence = new Presence(this);
     }
     return this._presence;
   }
 
-  // CloudMessaging
   messaging() {
-    if (!this._cloudMessaging) {
-      this._cloudMessaging = new Messaging(this);
+    if (!this._messaging) {
+      this._messaging = new Messaging(this);
     }
-    return this._cloudMessaging;
+    return this._messaging;
   }
 
-  /**
-   * remote config
-   */
   remoteConfig() {
-    if (!this.remoteConfig) {
-      this.remoteConfig = new RemoteConfig(this._remoteConfig);
+    if (!this._remoteConfig) {
+      this._remoteConfig = new RemoteConfig(this);
     }
-    return this.remoteConfig;
+    return this._remoteConfig;
   }
 
   // other
-  get ServerValue() {
+  get ServerValue(): Promise<*> {
     return promisify('serverValue', FirestackModule)();
   }
 
-
-  /**
-   * app instance
-   **/
-  get app() {
+  // TODO what are these for?
+  get app(): Object {
     return this.appInstance;
   }
 
-  /**
-   * app instance
-   **/
-  getInstance() {
+  // TODO what are these for?
+  getInstance(): Object {
     return this.appInstance;
   }
 
-  get apps() {
+  get apps(): Array<string> {
     return Object.keys(instances);
   }
 
   /**
    * Logger
    */
-  get log() {
+  get log(): Log {
     return this._log;
   }
 
   /**
    * Redux store
    **/
-  get store() {
+  get store(): Object {
     return this._store;
   }
 
-  get constants() {
+  get constants(): Object {
     if (!this._constants) {
       this._constants = Object.assign({}, Storage.constants)
     }
@@ -211,7 +206,7 @@ export default class Firestack extends Singleton {
   /**
    * Set the redux store helper
    */
-  setStore(store) {
+  setStore(store: Object) {
     if (store) {
       this.log.info('Setting the store for Firestack instance');
       this._store = store;
@@ -221,19 +216,17 @@ export default class Firestack extends Singleton {
   /**
    * Global event handlers for the single Firestack instance
    */
-  on(name, cb, nativeModule) {
+  on(name: string, cb: Function, nativeModule: Object = FirestackModuleEvt) {
     if (!this.eventHandlers[name]) {
       this.eventHandlers[name] = [];
     }
-    if (!nativeModule) {
-      nativeModule = FirestackModuleEvt;
-    }
+
     const sub = nativeModule.addListener(name, cb);
     this.eventHandlers[name].push(sub);
     return sub;
   }
 
-  off(name) {
+  off(name: string) {
     if (this.eventHandlers[name]) {
       this.eventHandlers[name]
         .forEach(subscription => subscription.remove());

lib/utils/log.js

@@ -1,17 +1,17 @@
 // document hack
-import root from './window-or-global'
+import root from './window-or-global';
 
 let bows;
 (function (base) {
   window = base || window
-  if(!window.localStorage) window.localStorage = {};
+  if (!window.localStorage) window.localStorage = {};
 })(root);
 
 const levels = [
   'warn', 'info', 'error', 'debug'
 ];
 
-export class Log {
+class Log {
   constructor(namespace) {
     this._namespace = namespace || 'firestack';
     this.loggers = {};
@@ -22,16 +22,16 @@ export class Log {
 
   static enable(booleanOrStringDebug) {
     window.localStorage.debug =
-      typeof booleanOrStringDebug === 'string' ? 
-        (booleanOrStringDebug === '*' ? true : booleanOrStringDebug) : 
+      typeof booleanOrStringDebug === 'string' ?
+        (booleanOrStringDebug === '*' ? true : booleanOrStringDebug) :
         (booleanOrStringDebug instanceof RegExp ? booleanOrStringDebug.toString() : booleanOrStringDebug);
 
     window.localStorage.debugColors = !!window.localStorage.debug;
   }
 
   _log(level) {
     if (!this.loggers[level]) {
-      (function() {
+      (function () {
         const bows = require('bows');
         bows.config({ padLength: 20 });
         this.loggers[level] = bows(this._namespace, `[${level}]`);
@@ -41,4 +41,4 @@ export class Log {
   }
 }
 
-export default Log;
+export default Log;