Roll back database changes

Author: hsubox76

packages/database/index.node.ts

@@ -81,7 +81,7 @@ export function registerDatabase(instance: FirebaseNamespace) {
       ServerValue,
       TEST_ACCESS
     },
-    undefined,
+    null,
     true
   );
 

packages/database/src/api/Database.ts

@@ -32,7 +32,7 @@ import { RepoInfo } from '../core/RepoInfo';
  * @implements {FirebaseService}
  */
 export class Database implements FirebaseService {
-  INTERNAL?: DatabaseInternals;
+  INTERNAL: DatabaseInternals;
   private root_: Reference;
 
   static readonly ServerValue = {
@@ -141,7 +141,7 @@ export class Database implements FirebaseService {
 
 export class DatabaseInternals {
   /** @param {!Database} database */
-  constructor(public database?: Database) {}
+  constructor(public database: Database) {}
 
   /** @return {Promise<void>} */
   async delete(): Promise<void> {
@@ -150,9 +150,7 @@ export class DatabaseInternals {
 
     (this.database as any).repo_ = null;
     (this.database as any).root_ = null;
-    if (this.database) {
-      this.database.INTERNAL = undefined;
-    }
-    this.database = undefined;
+    this.database.INTERNAL = null;
+    this.database = null;
   }
 }

packages/database/src/api/Query.ts

@@ -254,7 +254,7 @@ export class Query {
     const container = new ChildEventRegistration(
       callbacks,
       cancelCallback,
-      context || undefined
+      context
     );
     this.repo.addEventCallbackForQuery(this, container);
   }
@@ -270,7 +270,7 @@ export class Query {
     context?: Object | null
   ): void {
     validateArgCount('Query.off', 0, 3, arguments.length);
-    validateEventType('Query.off', 1, eventType || '', true);
+    validateEventType('Query.off', 1, eventType, true);
     validateCallback('Query.off', 2, callback, true);
     validateContextObject('Query.off', 3, context, true);
 
@@ -288,7 +288,7 @@ export class Query {
         callbacks = {};
         callbacks[eventType] = callback;
       }
-      container = new ChildEventRegistration(callbacks, null, context || undefined);
+      container = new ChildEventRegistration(callbacks, null, context || null);
     }
     this.repo.removeEventCallbackForQuery(this, container);
   }
@@ -498,7 +498,7 @@ export class Query {
   ): Query {
     validateArgCount('Query.startAt', 0, 2, arguments.length);
     validateFirebaseDataArg('Query.startAt', 1, value, this.path, true);
-    validateKey('Query.startAt', 2, name || undefined, true);
+    validateKey('Query.startAt', 2, name, true);
 
     const newParams = this.queryParams_.startAt(value, name);
     Query.validateLimit_(newParams);
@@ -529,7 +529,7 @@ export class Query {
   ): Query {
     validateArgCount('Query.endAt', 0, 2, arguments.length);
     validateFirebaseDataArg('Query.endAt', 1, value, this.path, true);
-    validateKey('Query.endAt', 2, name || undefined, true);
+    validateKey('Query.endAt', 2, name, true);
 
     const newParams = this.queryParams_.endAt(value, name);
     Query.validateLimit_(newParams);

packages/database/src/core/Repo.ts

@@ -132,7 +132,7 @@ export class Repo {
     }
 
     authTokenProvider.addTokenChangeListener(token => {
-      token && this.server_.refreshAuthToken(token);
+      this.server_.refreshAuthToken(token);
     });
 
     // In the case of multiple Repos for the same repoInfo (i.e. there are multiple Firebase.Contexts being used),
@@ -240,7 +240,7 @@ export class Repo {
     data = this.interceptServerDataCallback_
       ? this.interceptServerDataCallback_(pathString, data)
       : data;
-    let events: Array<Event> = [];
+    let events = [];
     if (tag) {
       if (isMerge) {
         const taggedChildren = map(data as { [k: string]: any }, (raw: any) =>
@@ -602,7 +602,7 @@ export class Repo {
    */
   removeEventCallbackForQuery(
     query: Query,
-    eventRegistration: EventRegistration | null
+    eventRegistration: EventRegistration
   ) {
     // These are guaranteed not to raise events, since we're not passing in a cancelError. However, we can future-proof
     // a little bit by handling the return values anyways.

packages/database/src/core/RepoManager.ts

@@ -80,7 +80,7 @@ export class RepoManager {
    * @return {!Database}
    */
   databaseFromApp(app: FirebaseApp, url?: string): Database {
-    const dbUrl: string | undefined = url || app.options[DATABASE_URL_OPTION];
+    const dbUrl: string = url || app.options[DATABASE_URL_OPTION];
     if (dbUrl === undefined) {
       fatal(
         "Can't determine Firebase Database URL.  Be sure to include " +
@@ -89,7 +89,7 @@ export class RepoManager {
       );
     }
 
-    const parsedUrl = parseRepoInfo(dbUrl || '');
+    const parsedUrl = parseRepoInfo(dbUrl);
     const repoInfo = parsedUrl.repoInfo;
 
     validateUrl('Invalid Firebase Database URL', 1, parsedUrl);

packages/database/src/core/SparseSnapshotTree.ts

@@ -48,7 +48,7 @@ export class SparseSnapshotTree {
     if (this.value_ != null) {
       return this.value_.getChild(path);
     } else if (!path.isEmpty() && this.children_ != null) {
-      const childKey = path.getFront() || '';
+      const childKey = path.getFront();
       path = path.popFront();
       if (this.children_.contains(childKey)) {
         const childTree = this.children_.get(childKey) as SparseSnapshotTree;
@@ -79,7 +79,7 @@ export class SparseSnapshotTree {
         this.children_ = new CountedSet<string, SparseSnapshotTree>();
       }
 
-      const childKey = path.getFront() || '';
+      const childKey = path.getFront();
       if (!this.children_.contains(childKey)) {
         this.children_.add(childKey, new SparseSnapshotTree());
       }
@@ -118,7 +118,7 @@ export class SparseSnapshotTree {
           return this.forget(path);
         }
       } else if (this.children_ !== null) {
-        const childKey = path.getFront() || '';
+        const childKey = path.getFront();
         path = path.popFront();
         if (this.children_.contains(childKey)) {
           const safeToRemove = (this.children_.get(

packages/database/src/core/SyncPoint.ts

@@ -149,7 +149,7 @@ export class SyncPoint {
           false
         ),
         new CacheNode(
-          /** @type {!Node} */ (serverCache as Node),
+          /** @type {!Node} */ (serverCache),
           serverCacheComplete,
           false
         )

packages/database/src/core/SyncTree.ts

@@ -163,7 +163,7 @@ export class SyncTree {
   ackUserWrite(writeId: number, revert: boolean = false) {
     const write = this.pendingWriteTree_.getWrite(writeId);
     const needToReevaluate = this.pendingWriteTree_.removeWrite(writeId);
-    if (!needToReevaluate || !write) {
+    if (!needToReevaluate) {
       return [];
     } else {
       let affectedTree = ImmutableTree.Empty;
@@ -350,7 +350,7 @@ export class SyncTree {
       const subtree = this.syncPointTree_.subtree(path);
       subtree.foreachChild(function(childName, childSyncPoint) {
         const completeCache = childSyncPoint.getCompleteServerCache(Path.Empty);
-        if (completeCache && serverCache) {
+        if (completeCache) {
           serverCache = serverCache.updateImmediateChild(
             childName,
             completeCache
@@ -381,7 +381,7 @@ export class SyncTree {
       serverCacheComplete
     );
     if (!viewAlreadyExists && !foundAncestorDefaultView) {
-      const view /** @type !View */ = syncPoint.viewForQuery(query) as View;
+      const view /** @type !View */ = syncPoint.viewForQuery(query);
       events = events.concat(this.setupListener_(query, view));
     }
     return events;
@@ -530,7 +530,7 @@ export class SyncTree {
     });
     return writeTree.calcCompleteEventCache(
       path,
-      serverCache || null,
+      serverCache,
       writeIdsToExclude,
       includeHiddenSets
     );
@@ -551,7 +551,7 @@ export class SyncTree {
       (relativePath, maybeChildSyncPoint, childMap) => {
         if (maybeChildSyncPoint && maybeChildSyncPoint.hasCompleteView()) {
           const completeView = maybeChildSyncPoint.getCompleteView();
-          return [completeView as View];
+          return [completeView];
         } else {
           // No complete view here, flatten any deeper listens into an array
           let views: View[] = [];
@@ -628,12 +628,10 @@ export class SyncTree {
     // The root of this subtree has our query. We're here because we definitely need to send a listen for that, but we
     // may need to shadow other listens as well.
     if (tag) {
-      if (subtree.value) {
-        assert(
-          !subtree.value.hasCompleteView(),
-          "If we're adding a query, it shouldn't be shadowed"
-        );
-      }
+      assert(
+        !subtree.value.hasCompleteView(),
+        "If we're adding a query, it shouldn't be shadowed"
+      );
     } else {
       // Shadow everything at or below this location, this is a default listener.
       const queriesToStop = subtree.fold<Query[]>(function(
@@ -646,7 +644,7 @@ export class SyncTree {
           maybeChildSyncPoint &&
           maybeChildSyncPoint.hasCompleteView()
         ) {
-          return [(maybeChildSyncPoint.getCompleteView() as View).getQuery()];
+          return [maybeChildSyncPoint.getCompleteView().getQuery()];
         } else {
           // No default listener here, flatten any deeper queries into an array
           let queries: Query[] = [];
@@ -789,7 +787,7 @@ export class SyncTree {
     queryPath: Path,
     operation: Operation
   ): Event[] {
-    const syncPoint = this.syncPointTree_.get(queryPath) as SyncPoint;
+    const syncPoint = this.syncPointTree_.get(queryPath);
     assert(syncPoint, "Missing sync point for query tag that we're tracking");
     const writesCache = this.pendingWriteTree_.childWrites(queryPath);
     return syncPoint.applyOperation(
@@ -857,7 +855,7 @@ export class SyncTree {
       }
 
       let events: Event[] = [];
-      const childName = operation.path.getFront() || '';
+      const childName = operation.path.getFront();
       const childOperation = operation.operationForChild(childName);
       const childTree = syncPointTree.children.get(childName);
       if (childTree && childOperation) {

packages/database/src/core/WriteTree.ts

@@ -278,7 +278,7 @@ export class WriteTree {
               (!writeIdsToExclude ||
                 !~writeIdsToExclude.indexOf(write.writeId)) &&
               (write.path.contains(treePath) || treePath.contains(write.path))
-            ) || false;
+            );
           };
           const mergeAtPath = WriteTree.layerTree_(
             this.allWrites_,
@@ -398,15 +398,15 @@ export class WriteTree {
       const childMerge = this.visibleWrites_.childCompoundWrite(path);
       if (childMerge.isEmpty()) {
         // We're not shadowing at all. Case 1
-        return (existingServerSnap as Node).getChild(childPath);
+        return existingServerSnap.getChild(childPath);
       } else {
         // This could be more efficient if the serverNode + updates doesn't change the eventSnap
         // However this is tricky to find out, since user updates don't necessary change the server
         // snap, e.g. priority updates on empty nodes, or deep deletes. Another special case is if the server
         // adds nodes, but doesn't change any existing writes. It is therefore not enough to
         // only check if the updates change the serverNode.
         // Maybe check if the merge tree contains these special cases and only do a full overwrite in that case?
-        return childMerge.apply((existingServerSnap as Node).getChild(childPath));
+        return childMerge.apply(existingServerSnap.getChild(childPath));
       }
     }
   }
@@ -486,7 +486,7 @@ export class WriteTree {
     }
     toIterate = toIterate.withIndex(index);
     if (!toIterate.isEmpty() && !toIterate.isLeafNode()) {
-      const nodes: Array<NamedNode> = [];
+      const nodes = [];
       const cmp = index.getCompare();
       const iter = reverse
         ? (toIterate as ChildrenNode).getReverseIteratorFrom(startPost, index)

packages/database/src/core/util/Path.ts

@@ -131,7 +131,7 @@ export class Path {
   parent(): Path | null {
     if (this.pieceNum_ >= this.pieces_.length) return null;
 
-    const pieces: Array<string> = [];
+    const pieces = [];
     for (let i = this.pieceNum_; i < this.pieces_.length - 1; i++)
       pieces.push(this.pieces_[i]);
 
@@ -143,7 +143,7 @@ export class Path {
    * @return {!Path}
    */
   child(childPathObj: string | Path): Path {
-    const pieces: Array<string> = [];
+    const pieces = [];
     for (let i = this.pieceNum_; i < this.pieces_.length; i++)
       pieces.push(this.pieces_[i]);
 

packages/database/src/core/util/ServerValues.ts

@@ -94,6 +94,7 @@ export const resolveDeferredValueSnapshot = function(
   const rawPri = node.getPriority().val() as
     | object
     | boolean
+    | null
     | number
     | string;
   const priority = resolveDeferredValue(rawPri, serverValues);

packages/database/src/core/util/SortedMap.ts

@@ -91,13 +91,10 @@ export class SortedMapIterator<K, V, T> {
     }
   }
 
-  getNext(): T | null {
+  getNext(): T {
     if (this.nodeStack_.length === 0) return null;
 
     let node = this.nodeStack_.pop();
-
-    if (!node) return null;
-
     let result: T;
     if (this.resultGenerator_)
       result = this.resultGenerator_(node.key, node.value);
@@ -124,7 +121,7 @@ export class SortedMapIterator<K, V, T> {
     return this.nodeStack_.length > 0;
   }
 
-  peek(): T | null {
+  peek(): T {
     if (this.nodeStack_.length === 0) return null;
 
     const node = this.nodeStack_[this.nodeStack_.length - 1];
@@ -262,9 +259,9 @@ export class LLRBNode<K, V> {
   }
 
   /**
-   * @return {K} The maximum key in the tree.
+   * @return {!K} The maximum key in the tree.
    */
-  maxKey(): K | null {
+  maxKey(): K {
     if (this.right.isEmpty()) {
       return this.key;
     } else {
@@ -673,7 +670,7 @@ export class SortedMap<K, V> {
   getPredecessorKey(key: K): K | null {
     let cmp,
       node = this.root_,
-      rightParent: LLRBNode<K, V> | LLRBEmptyNode<K, V> | null = null;
+      rightParent = null;
     while (!node.isEmpty()) {
       cmp = this.comparator_(key, node.key);
       if (cmp === 0) {
@@ -760,7 +757,7 @@ export class SortedMap<K, V> {
    */
   getIterator<T>(
     resultGenerator?: (k: K, v: V) => T
-  ): SortedMapIterator<K | null, V, T> {
+  ): SortedMapIterator<K, V, T> {
     return new SortedMapIterator(
       this.root_,
       null,
@@ -773,7 +770,7 @@ export class SortedMap<K, V> {
   getIteratorFrom<T>(
     key: K,
     resultGenerator?: (k: K, v: V) => T
-  ): SortedMapIterator<K | null, V, T> {
+  ): SortedMapIterator<K, V, T> {
     return new SortedMapIterator(
       this.root_,
       key,
@@ -786,7 +783,7 @@ export class SortedMap<K, V> {
   getReverseIteratorFrom<T>(
     key: K,
     resultGenerator?: (k: K, v: V) => T
-  ): SortedMapIterator<K | null, V, T> {
+  ): SortedMapIterator<K, V, T> {
     return new SortedMapIterator(
       this.root_,
       key,
@@ -798,7 +795,7 @@ export class SortedMap<K, V> {
 
   getReverseIterator<T>(
     resultGenerator?: (k: K, v: V) => T
-  ): SortedMapIterator<K | null, V, T> {
+  ): SortedMapIterator<K, V, T> {
     return new SortedMapIterator(
       this.root_,
       null,