Tidy up path usage throughout firestack in preparation for looking at storage

Author: chrisbianca

lib/firestack.js

@@ -176,16 +176,6 @@ export default class Firestack extends Singleton {
     return promisify('serverValue', FirestackModule)();
   }
 
-  // TODO what are these for?
-  get app(): Object {
-    return this.appInstance;
-  }
-
-  // TODO what are these for?
-  getInstance(): Object {
-    return this.appInstance;
-  }
-
   get apps(): Array<string> {
     return Object.keys(instances);
   }

lib/modules/base.js

@@ -35,20 +35,6 @@ export class Base extends EventEmitter {
     return logs[this.namespace];
   }
 
-  // TODO unused - do we need this anymore?
-  _addConstantExports(constants) {
-    Object.keys(constants).forEach((name) => {
-      FirestackModule[name] = constants[name];
-    });
-  }
-
-  // TODO unused - do we need this anymore?
-  _addToFirestackInstance(...methods: Array<string>) {
-    methods.forEach((name) => {
-      this.firestack[name] = this[name].bind(this);
-    });
-  }
-
   /**
    * app instance
    **/
@@ -91,26 +77,12 @@ export class Base extends EventEmitter {
 }
 
 export class ReferenceBase extends Base {
-  constructor(firestack: Object, path: Array<string> | string) {
+  constructor(firestack: Object, path: string) {
     super(firestack);
-
-    this.path = Array.isArray(path) ? path : (typeof path === 'string' ? [path] : []);
-
-    // sanitize path, just in case
-    this.path = this.path.filter(str => str !== '');
+    this.path = path || '/';
   }
 
   get key(): string {
-    const path = this.path;
-    return path.length === 0 ? '/' : path[path.length - 1];
-  }
-
-  pathToString(): string {
-    const path = this.path;
-    let pathStr = (path.length > 0 ? path.join('/') : '/');
-    if (pathStr[0] != '/') {
-      pathStr = `/${pathStr}`;
-    }
-    return pathStr;
+    return this.path === '/' ? null : this.path.substring(this.path.lastIndexOf('/') + 1);
   }
 }

lib/modules/database/disconnect.js

@@ -17,7 +17,7 @@ export default class Disconnect {
   }
 
   setValue(val: string | Object) {
-    const path = this.ref.dbPath();
+    const path = this.ref._dbPath();
     if (typeof val === 'string') {
       return promisify('onDisconnectSetString', FirestackDatabase)(path, val);
     } else if (typeof val === 'object') {
@@ -26,10 +26,10 @@ export default class Disconnect {
   }
 
   remove() {
-    return promisify('onDisconnectRemove', FirestackDatabase)(this.ref.dbPath());
+    return promisify('onDisconnectRemove', FirestackDatabase)(this.ref._dbPath());
   }
 
   cancel() {
-    return promisify('onDisconnectCancel', FirestackDatabase)(this.ref.dbPath());
+    return promisify('onDisconnectCancel', FirestackDatabase)(this.ref._dbPath());
   }
 }

lib/modules/database/index.js

@@ -58,7 +58,7 @@ export default class Database extends Base {
    * @param path
    * @returns {Reference}
    */
-  ref(...path: Array<string>) {
+  ref(path: string) {
     return new Reference(this, path);
   }
 

lib/modules/database/query.js

@@ -6,9 +6,6 @@
 import { ReferenceBase } from './../base';
 import Reference from './reference.js';
 
-// TODO why randomly 1000000? comments?
-let uid = 1000000;
-
 /**
  * @class Query
  */
@@ -19,10 +16,9 @@ export default class Query extends ReferenceBase {
 
   ref: Reference;
 
-  constructor(ref: Reference, path: Array<string>, existingModifiers?: Array<string>) {
+  constructor(ref: Reference, path: string, existingModifiers?: Array<string>) {
     super(ref.db, path);
     this.log.debug('creating Query ', path, existingModifiers);
-    this.uid = uid++; // uuid.v4();
     this.ref = ref;
     this.modifiers = existingModifiers ? [...existingModifiers] : [];
   }

lib/modules/database/reference.js

@@ -21,7 +21,7 @@ export default class Reference extends ReferenceBase {
   db: FirestackDatabase;
   query: Query;
 
-  constructor(db: FirestackDatabase, path: Array<string>, existingModifiers?: Array<string>) {
+  constructor(db: FirestackDatabase, path: string, existingModifiers?: Array<string>) {
     super(db.firestack, path);
     this.db = db;
     this.namespace = 'firestack:db:ref';
@@ -77,9 +77,8 @@ export default class Reference extends ReferenceBase {
    */
   push(value: any, onComplete: Function) {
     if (value === null || value === undefined) {
-      // todo add server timestamp to push id call.
-      const _paths = this.path.concat([generatePushID(this.db.serverTimeOffset)]);
-      return new Reference(this.db, _paths);
+      const _path = this.path + '/' + generatePushID(this.db.serverTimeOffset);
+      return new Reference(this.db, _path);
     }
 
     const path = this._dbPath();
@@ -253,19 +252,12 @@ export default class Reference extends ReferenceBase {
     return newRef;
   }
 
-  // TODO why is this presence here on DB ref? its unrelated?
-  presence(path: string) {
-    const presence = this.firestack.presence;
-    const ref = path ? this.child(path) : this;
-    return presence.ref(ref, this._dbPath());
-  }
-
   onDisconnect() {
     return new Disconnect(this);
   }
 
   child(path: string) {
-    return new Reference(this.db, this.path.concat(path.split('/')));
+    return new Reference(this.db, this.path + '/' + path);
   }
 
   toString(): string {
@@ -276,22 +268,13 @@ export default class Reference extends ReferenceBase {
    * GETTERS
    */
 
-  /**
-   * Returns the current key of this ref - i.e. /foo/bar returns 'bar'
-   * @returns {*}
-   */
-  get key(): string|null {
-    if (!this.path.length) return null;
-    return this.path.slice(this.path.length - 1, this.path.length)[0];
-  }
-
   /**
    * Returns the parent ref of the current ref i.e. a ref of /foo/bar would return a new ref to '/foo'
    * @returns {*}
    */
   get parent(): Reference|null {
-    if (!this.path.length || this.path.length === 1) return null;
-    return new Reference(this.db, this.path.slice(0, -1));
+    if (this.path === '/') return null;
+    return new Reference(this.db, this.path.substring(0, this.path.lastIndexOf('/')));
   }
 
 
@@ -300,22 +283,15 @@ export default class Reference extends ReferenceBase {
    * @returns {Reference}
    */
   get root(): Reference {
-    return new Reference(this.db, []);
+    return new Reference(this.db, '/');
   }
 
   /**
    * INTERNALS
    */
 
-  _dbPath(paths?: Array<string>): string {
-    const path = paths || this.path;
-    const pathStr = (path.length > 0 ? path.join('/') : '/');
-
-    if (pathStr[0] !== '/') {
-      return `/${pathStr}`;
-    }
-
-    return pathStr;
+  _dbPath(): string {
+    return this.path;
   }
 
   /**

lib/modules/storage/index.js

@@ -18,12 +18,8 @@ export default class Storage extends Base {
     this.refs = {};
   }
 
-  ref(...path: Array<string>): StorageRef {
-    const key = this._pathKey(...path);
-    if (!this.refs[key]) {
-      this.refs[key] = new StorageRef(this, path);
-    }
-    return this.refs[key];
+  ref(path: string): StorageRef {
+    return new StorageRef(this, path);
   }
 
   /**

lib/modules/storage/reference.js

@@ -8,18 +8,16 @@ import Storage from './';
 const FirestackStorage = NativeModules.FirestackStorage;
 
 export default class StorageRef extends ReferenceBase {
-  constructor(storage: Storage, path: Array<string>) {
+  constructor(storage: Storage, path: string) {
     super(storage.firestack, path);
-
     this.storage = storage;
   }
 
   downloadUrl(): Promise<Object> {
-    const path = this.pathToString();
-    this.log.debug('downloadUrl(', path, ')');
-    return promisify('downloadUrl', FirestackStorage)(path)
+    this.log.debug('downloadUrl(', this.path, ')');
+    return promisify('downloadUrl', FirestackStorage)(this.path)
       .catch((err) => {
-        this.log.error('Error downloading URL for ', path, '.  Error: ', err);
+        this.log.error('Error downloading URL for ', this.path, '.  Error: ', err);
         throw err;
       });
   }
@@ -31,22 +29,21 @@ export default class StorageRef extends ReferenceBase {
    * @return {Promise}
    */
   download(downloadPath: string, listener: Function = noop): Promise<Object> {
-    const path = this.pathToString();
-    this.log.debug('download(', path, ') -> ', downloadPath);
+    this.log.debug('download(', this.path, ') -> ', downloadPath);
     const listeners = [
       this.storage._addListener('download_progress', listener),
       this.storage._addListener('download_paused', listener),
       this.storage._addListener('download_resumed', listener),
     ];
 
-    return promisify('downloadFile', FirestackStorage)(path, downloadPath)
+    return promisify('downloadFile', FirestackStorage)(this.path, downloadPath)
       .then((res) => {
         this.log.debug('res --->', res);
         listeners.forEach(l => l.remove());
         return res;
       })
       .catch((err) => {
-        this.log.error('Error downloading ', path, ' to ', downloadPath, '.  Error: ', err);
+        this.log.error('Error downloading ', this.path, ' to ', downloadPath, '.  Error: ', err);
         throw err;
       });
   }