Replace utility functions in Storage with firebase/util

Author: mmermerkaya

packages/storage/package.json

@@ -19,6 +19,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@firebase/storage-types": "0.2.11",
+    "@firebase/util": "0.2.15",
     "tslib": "1.9.3"
   },
   "peerDependencies": {

packages/storage/src/implementation/object.ts

@@ -25,7 +25,7 @@ import * as array from './array';
 import * as backoff from './backoff';
 import * as errorsExports from './error';
 import { FirebaseStorageError } from './error';
-import * as object from './object';
+import { clone } from '@firebase/util';
 import * as promiseimpl from './promise_external';
 import { RequestInfo } from './requestinfo';
 import * as type from './type';
@@ -291,7 +291,7 @@ export function makeRequest<T>(
 ): Request<T> {
   let queryPart = UrlUtils.makeQueryString(requestInfo.urlParams);
   let url = requestInfo.url + queryPart;
-  let headers = object.clone<Headers>(requestInfo.headers);
+  let headers = clone(requestInfo.headers);
   addAuthHeader_(headers, authToken);
   addVersionHeader_(headers);
   return new NetworkRequest<T>(

packages/storage/src/implementation/request.ts

@@ -28,7 +28,7 @@ import * as errorsExports from './error';
 import { FirebaseStorageError } from './error';
 import { Location } from './location';
 import * as MetadataUtils from './metadata';
-import * as object from './object';
+import { clone } from '@firebase/util';
 import { RequestInfo } from './requestinfo';
 import * as type from './type';
 import * as UrlUtils from './url';
@@ -218,7 +218,7 @@ export function metadataForUpload_(
   blob: FbsBlob,
   opt_metadata?: Metadata | null
 ): Metadata {
-  let metadata = object.clone<Metadata>(opt_metadata);
+  let metadata = clone(opt_metadata);
   metadata['fullPath'] = location.path;
   metadata['size'] = blob.size();
   if (!metadata['contentType']) {

packages/storage/src/implementation/requests.ts

@@ -18,13 +18,13 @@
 /**
  * @fileoverview Defines the Firebase Storage Reference class.
  */
+import { clone } from '@firebase/util';
 import * as args from './implementation/args';
 import { AuthWrapper } from './implementation/authwrapper';
 import { FbsBlob } from './implementation/blob';
 import * as errorsExports from './implementation/error';
 import { Location } from './implementation/location';
 import * as metadata from './implementation/metadata';
-import * as object from './implementation/object';
 import * as path from './implementation/path';
 import * as requests from './implementation/requests';
 import * as fbsString from './implementation/string';
@@ -173,7 +173,7 @@ export class Reference {
     );
     this.throwIfRoot_('putString');
     let data = fbsString.dataFromString(format, string);
-    let metadata = object.clone<Metadata>(opt_metadata);
+    let metadata = clone(opt_metadata);
     if (!type.isDef(metadata['contentType']) && type.isDef(data.contentType)) {
       metadata['contentType'] = data.contentType;
     }

packages/storage/src/reference.ts

@@ -16,9 +16,9 @@
  */
 import { expect } from 'chai';
 import { FirebaseApp } from '@firebase/app-types';
+import { contains, forEach } from '@firebase/util';
 import * as constants from '../src/implementation/constants';
 import { Code, FirebaseStorageError } from '../src/implementation/error';
-import * as objectUtils from '../src/implementation/object';
 import * as promiseimpl from '../src/implementation/promise_external';
 import * as type from '../src/implementation/type';
 import { Headers, XhrIo } from '../src/implementation/xhrio';
@@ -63,14 +63,14 @@ export function makePool(sendHook: SendHook): XhrIoPool {
  */
 export function fakeXhrIo(headers: Headers, status: number = 200): XhrIo {
   const lower: StringHeaders = {};
-  objectUtils.forEach(headers, function(key: string, val: string | number) {
+  forEach(headers, function(key: string, val: string | number) {
     lower[key.toLowerCase()] = val.toString();
   });
 
   const fakeXhrIo: any = {
     getResponseHeader: function(name: string): string {
       const lowerName = name.toLowerCase();
-      if (objectUtils.contains(lower, lowerName)) {
+      if (contains(lower, lowerName)) {
         return lower[lowerName];
       } else {
         throw new Error('No such header ' + name);
@@ -120,7 +120,7 @@ export function assertObjectIncludes(
   included: { [name: string]: any },
   obj: { [name: string]: any }
 ): void {
-  objectUtils.forEach(included, function(key, val) {
+  forEach(included, function(key, val) {
     expect(val).to.deep.equal(obj[key]);
   });
 }