Cleanup

Author: schmidt-sebastian

common/api-review/storage.api.md

@@ -77,14 +77,15 @@ export class _FirebaseStorageImpl implements FirebaseStorage {
     _getAuthToken(): Promise<string | null>;
     get host(): string;
     set host(host: string);
+    // Warning: (ae-forgotten-export) The symbol "ConnectionType" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "RequestInfo" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "Connection" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "Request" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
-    _makeRequest<I, O>(requestInfo: RequestInfo_2<I, O>, requestFactory: () => Connection<I>, authToken: string | null, appCheckToken: string | null): Request_2<O>;
+    _makeRequest<I extends ConnectionType, O>(requestInfo: RequestInfo_2<I, O>, requestFactory: () => Connection<I>, authToken: string | null, appCheckToken: string | null): Request_2<O>;
     // (undocumented)
-    makeRequestWithTokens<I, O>(requestInfo: RequestInfo_2<I, O>, requestFactory: () => Connection<I>): Promise<O>;
+    makeRequestWithTokens<I extends ConnectionType, O>(requestInfo: RequestInfo_2<I, O>, requestFactory: () => Connection<I>): Promise<O>;
     _makeStorageReference(loc: _Location): _Reference;
     get maxOperationRetryTime(): number;
     set maxOperationRetryTime(time: number);

packages/storage/src/implementation/requests.ts

@@ -207,36 +207,11 @@ export function list(
   return requestInfo;
 }
 
-export function getBytes(
+export function getBytes<I extends ConnectionType>(
   service: FirebaseStorageImpl,
   location: Location,
   maxDownloadSizeBytes?: number
-): RequestInfo<ArrayBuffer, ArrayBuffer> {
-  return createDownloadRequest(location, service, maxDownloadSizeBytes);
-}
-
-export function getBlob(
-  service: FirebaseStorageImpl,
-  location: Location,
-  maxDownloadSizeBytes?: number
-): RequestInfo<Blob, Blob> {
-  return createDownloadRequest(location, service, maxDownloadSizeBytes);
-}
-
-export function getStream(
-  service: FirebaseStorageImpl,
-  location: Location,
-  maxDownloadSizeBytes?: number
-): RequestInfo<NodeJS.ReadableStream, NodeJS.ReadableStream> {
-  return createDownloadRequest(location, service, maxDownloadSizeBytes);
-}
-
-/** Creates a new request to download an object. */
-function createDownloadRequest<I extends ConnectionType>(
-  location: Location,
-  service: FirebaseStorageImpl,
-  maxDownloadSizeBytes?: number
-): RequestInfo<I, I> {
+): RequestInfo<I, I>  {
   const urlPart = location.fullServerUrl();
   const url = makeUrl(urlPart, service.host, service._protocol) + '?alt=media';
   const method = 'GET';

packages/storage/src/reference.ts

@@ -19,36 +19,34 @@
  * @fileoverview Defines the Firebase StorageReference class.
  */
 
-import { Transform, TransformOptions, PassThrough } from 'stream';
+import {PassThrough, Transform, TransformOptions} from 'stream';
 
-import { FbsBlob } from './implementation/blob';
-import { Location } from './implementation/location';
-import { getMappings } from './implementation/metadata';
-import { child, parent, lastComponent } from './implementation/path';
+import {FbsBlob} from './implementation/blob';
+import {Location} from './implementation/location';
+import {getMappings} from './implementation/metadata';
+import {child, lastComponent, parent} from './implementation/path';
 import {
-  list as requestsList,
-  getMetadata as requestsGetMetadata,
-  updateMetadata as requestsUpdateMetadata,
-  getDownloadUrl as requestsGetDownloadUrl,
   deleteObject as requestsDeleteObject,
-  multipartUpload,
   getBytes,
-  getBlob,
-  getStream
+  getDownloadUrl as requestsGetDownloadUrl,
+  getMetadata as requestsGetMetadata,
+  list as requestsList,
+  multipartUpload,
+  updateMetadata as requestsUpdateMetadata
 } from './implementation/requests';
-import { ListOptions, UploadResult } from './public-types';
-import { StringFormat, dataFromString } from './implementation/string';
-import { Metadata } from './metadata';
-import { FirebaseStorageImpl } from './service';
-import { ListResult } from './list';
-import { UploadTask } from './task';
-import { invalidRootOperation, noDownloadURL } from './implementation/error';
-import { validateNumber } from './implementation/type';
+import {ListOptions, UploadResult} from './public-types';
+import {dataFromString, StringFormat} from './implementation/string';
+import {Metadata} from './metadata';
+import {FirebaseStorageImpl} from './service';
+import {ListResult} from './list';
+import {UploadTask} from './task';
+import {invalidRootOperation, noDownloadURL} from './implementation/error';
+import {validateNumber} from './implementation/type';
 import {
-  newBytesConnection,
-  newTextConnection,
   newBlobConnection,
-  newStreamConnection
+  newBytesConnection,
+  newStreamConnection,
+  newTextConnection
 } from './platform/connection';
 
 /**
@@ -186,7 +184,7 @@ export function getBlobInternal(
   maxDownloadSizeBytes?: number
 ): Promise<Blob> {
   ref._throwIfRoot('getBlob');
-  const requestInfo = getBlob(ref.storage, ref._location, maxDownloadSizeBytes);
+  const requestInfo = getBytes(ref.storage, ref._location, maxDownloadSizeBytes);
   return ref.storage
     .makeRequestWithTokens(requestInfo, newBlobConnection)
     .then(blob =>
@@ -203,11 +201,7 @@ export function getStreamInternal(
   maxDownloadSizeBytes?: number
 ): NodeJS.ReadableStream {
   ref._throwIfRoot('getStream');
-  const requestInfo = getStream(
-    ref.storage,
-    ref._location,
-    maxDownloadSizeBytes
-  );
+  const requestInfo = getBytes(ref.storage, ref._location, maxDownloadSizeBytes);
 
   /** A transformer that passes through the first n bytes. */
   const newMaxSizeTransform: (n: number) => TransformOptions = n => {