Fix types in packages

Author: mmermerkaya

packages/database/src/core/PersistentConnection.ts

@@ -948,8 +948,8 @@ export class PersistentConnection extends ServerActions {
 
     // Puts depend on having received the corresponding data update from the server before they complete, so we must
     // make sure to send listens before puts.
-    forEach(this.listens_, (pathString: string, queries: Object) => {
-      forEach(queries, (key: string, listenSpec: ListenSpec) => {
+    forEach(this.listens_, (_, queries) => {
+      forEach(queries, (_, listenSpec) => {
         this.sendListen_(listenSpec);
       });
     });

packages/database/src/core/SparseSnapshotTree.ts

@@ -17,7 +17,6 @@
 
 import { Path } from './util/Path';
 import { PRIORITY_INDEX } from './snap/indexes/PriorityIndex';
-import { CountedSet } from './util/CountedSet';
 import { Node } from './snap/Node';
 
 /**
@@ -34,9 +33,8 @@ export class SparseSnapshotTree {
 
   /**
    * @private
-   * @type {CountedSet}
    */
-  private children_: CountedSet<string, SparseSnapshotTree> | null = null;
+  private children_: Map<string, SparseSnapshotTree> | null = null;
 
   /**
    * Gets the node stored at the given path if one exists.
@@ -50,8 +48,8 @@ export class SparseSnapshotTree {
     } else if (!path.isEmpty() && this.children_ != null) {
       const childKey = path.getFront();
       path = path.popFront();
-      if (this.children_.contains(childKey)) {
-        const childTree = this.children_.get(childKey) as SparseSnapshotTree;
+      if (this.children_.has(childKey)) {
+        const childTree = this.children_.get(childKey);
         return childTree.find(path);
       } else {
         return null;
@@ -76,12 +74,12 @@ export class SparseSnapshotTree {
       this.value_ = this.value_.updateChild(path, data);
     } else {
       if (this.children_ == null) {
-        this.children_ = new CountedSet<string, SparseSnapshotTree>();
+        this.children_ = new Map<string, SparseSnapshotTree>();
       }
 
       const childKey = path.getFront();
-      if (!this.children_.contains(childKey)) {
-        this.children_.add(childKey, new SparseSnapshotTree());
+      if (!this.children_.has(childKey)) {
+        this.children_.set(childKey, new SparseSnapshotTree());
       }
 
       const child = this.children_.get(childKey) as SparseSnapshotTree;
@@ -120,16 +118,16 @@ export class SparseSnapshotTree {
       } else if (this.children_ !== null) {
         const childKey = path.getFront();
         path = path.popFront();
-        if (this.children_.contains(childKey)) {
+        if (this.children_.has(childKey)) {
           const safeToRemove = (this.children_.get(
             childKey
           ) as SparseSnapshotTree).forget(path);
           if (safeToRemove) {
-            this.children_.remove(childKey);
+            this.children_.delete(childKey);
           }
         }
 
-        if (this.children_.isEmpty()) {
+        if (this.children_.size === 0) {
           this.children_ = null;
           return true;
         } else {
@@ -166,7 +164,7 @@ export class SparseSnapshotTree {
    */
   forEachChild(func: (a: string, b: SparseSnapshotTree) => void) {
     if (this.children_ !== null) {
-      this.children_.each((key, tree) => {
+      this.children_.forEach((tree, key) => {
         func(key, tree);
       });
     }

packages/database/src/core/snap/IndexMap.ts

@@ -75,7 +75,7 @@ export class IndexMap {
       // regular child map
       return null;
     } else {
-      return sortedMap;
+      return sortedMap as SortedMap<NamedNode, Node>;
     }
   }
 

packages/database/src/core/snap/Node.ts

@@ -119,7 +119,7 @@ export interface Node {
    * @param {boolean=} exportFormat True for export format (also wire protocol format).
    * @return {*} Value of this node as JSON.
    */
-  val(exportFormat?: boolean): Object;
+  val(exportFormat?: boolean): any;
 
   /**
    * @return {string} hash representing the node contents.

packages/database/src/core/snap/nodeFromJSON.ts

@@ -113,9 +113,8 @@ export function nodeFromJSON(
     }
   } else {
     let node: Node = ChildrenNode.EMPTY_NODE;
-    const jsonObj = json as object;
-    forEach(jsonObj, (key: string, childData: any) => {
-      if (contains(jsonObj, key)) {
+    forEach(json, (key, childData) => {
+      if (contains(json, key)) {
         if (key.substring(0, 1) !== '.') {
           // ignore metadata nodes.
           const childNode = nodeFromJSON(childData);

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

@@ -24,7 +24,6 @@ import {
   LUIDGenerator,
   splitStringBySize
 } from '../core/util/util';
-import { CountedSet } from '../core/util/CountedSet';
 import { StatsManager } from '../core/stats/StatsManager';
 import { PacketReceiver } from './polling/PacketReceiver';
 import {
@@ -395,10 +394,7 @@ export interface IFrameElement extends HTMLIFrameElement {
 export class FirebaseIFrameScriptHolder {
   //We maintain a count of all of the outstanding requests, because if we have too many active at once it can cause
   //problems in some browsers.
-  /**
-   * @type {CountedSet.<number, number>}
-   */
-  outstandingRequests = new CountedSet<number, number>();
+  outstandingRequests = new Set<number>();
 
   //A queue of the pending segments waiting for transmission to the server.
   pendingSegs: { seg: number; ts: number; d: any }[] = [];
@@ -591,7 +587,7 @@ export class FirebaseIFrameScriptHolder {
     if (
       this.alive &&
       this.sendNewPolls &&
-      this.outstandingRequests.count() < (this.pendingSegs.length > 0 ? 2 : 1)
+      this.outstandingRequests.size < (this.pendingSegs.length > 0 ? 2 : 1)
     ) {
       //construct our url
       this.currentSerial++;
@@ -670,10 +666,10 @@ export class FirebaseIFrameScriptHolder {
    */
   private addLongPollTag_(url: string, serial: number) {
     //remember that we sent this request.
-    this.outstandingRequests.add(serial, 1);
+    this.outstandingRequests.add(serial);
 
     const doNewRequest = () => {
-      this.outstandingRequests.remove(serial);
+      this.outstandingRequests.delete(serial);
       this.newRequest_();
     };
 

packages/database/src/realtime/BrowserPollConnection.ts

@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as object from './object';
-import * as RequestExports from './request';
+import { forEach } from '@firebase/util';
 import { Request } from './request';
 import * as constants from './constants';
 
@@ -51,7 +50,7 @@ export class RequestMap {
    * Cancels all registered requests.
    */
   clear() {
-    object.forEach(this.map_, (key: string, val: Request<any>) => {
+    forEach(this.map_, (key: string, val: Request<any>) => {
       if (val) {
         val.cancel(true);
       }

packages/storage/src/implementation/requestmap.ts

@@ -18,7 +18,7 @@
 /**
  * @fileoverview Functions to create and manipulate URLs for the server API.
  */
-import * as object from './object';
+import { forEach } from '@firebase/util';
 import { DEFAULT_HOST } from './constants';
 
 export function makeUrl(urlPart: string): string {
@@ -28,7 +28,7 @@ export function makeUrl(urlPart: string): string {
 export function makeQueryString(params: { [key: string]: string }): string {
   let encode = encodeURIComponent;
   let queryPart = '?';
-  object.forEach(params, function(key, val) {
+  forEach(params, function(key, val) {
     let nextPart = encode(key) + '=' + encode(val);
     queryPart = queryPart + nextPart + '&';
   });

packages/storage/src/implementation/url.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import * as errorsExports from './error';
-import * as object from './object';
+import { forEach } from '@firebase/util';
 import * as promiseimpl from './promise_external';
 import * as type from './type';
 import * as XhrIoExports from './xhrio';
@@ -65,7 +65,7 @@ export class NetworkXhrIo implements XhrIo {
     this.xhr_.open(method, url, true);
     if (type.isDef(opt_headers)) {
       const headers = opt_headers as Headers;
-      object.forEach(headers, (key, val) => {
+      forEach(headers, (key, val) => {
         this.xhr_.setRequestHeader(key, val.toString());
       });
     }