fix misc things

Author: Feiyang1

common/api-review/storage.api.md

@@ -6,14 +6,32 @@
 
 import { CompleteFn } from '@firebase/util';
 import { FirebaseApp } from '@firebase/app';
+import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { FirebaseError } from '@firebase/util';
+import { _FirebaseService } from '@firebase/app';
 import { NextFn } from '@firebase/util';
+import { Provider } from '@firebase/component';
 import { Subscribe } from '@firebase/util';
 import { Unsubscribe } from '@firebase/util';
 
 // @public
 export function deleteObject(ref: StorageReference): Promise<void>;
 
+// @internal (undocumented)
+export class _FbsBlob {
+    constructor(data: Blob | Uint8Array | ArrayBuffer, elideCopy?: boolean);
+    // (undocumented)
+    static getBlob(...args: Array<string | _FbsBlob>): _FbsBlob | null;
+    // (undocumented)
+    size(): number;
+    // (undocumented)
+    slice(startByte: number, endByte: number): _FbsBlob | null;
+    // (undocumented)
+    type(): string;
+    // (undocumented)
+    uploadData(): Blob | Uint8Array;
+}
+
 // @public
 export interface FirebaseStorageError extends FirebaseError {
     serverResponse: string | null;
@@ -33,6 +51,9 @@ export interface FullMetadata extends UploadMetadata {
     updated: string;
 }
 
+// @internal (undocumented)
+export function _getChild(ref: StorageReference, childPath: string): _Reference;
+
 // @public
 export function getDownloadURL(ref: StorageReference): Promise<string>;
 
@@ -61,12 +82,50 @@ export interface ListResult {
     prefixes: StorageReference[];
 }
 
+// @internal
+export class _Location {
+    constructor(bucket: string, path: string);
+    // (undocumented)
+    readonly bucket: string;
+    // (undocumented)
+    bucketOnlyServerUrl(): string;
+    // (undocumented)
+    fullServerUrl(): string;
+    // (undocumented)
+    get isRoot(): boolean;
+    // (undocumented)
+    static makeFromBucketSpec(bucketString: string): _Location;
+    // (undocumented)
+    static makeFromUrl(url: string): _Location;
+    // (undocumented)
+    get path(): string;
+    }
+
 // @public
 export function ref(storage: StorageService, url?: string): StorageReference;
 
 // @public
 export function ref(storageOrRef: StorageService | StorageReference, path?: string): StorageReference;
 
+// @internal
+export class _Reference {
+    // Warning: (ae-forgotten-export) The symbol "StorageService" needs to be exported by the entry point index.d.ts
+    constructor(_service: StorageService_2, location: string | _Location);
+    get bucket(): string;
+    get fullPath(): string;
+    // (undocumented)
+    _location: _Location;
+    get name(): string;
+    // (undocumented)
+    protected _newRef(service: StorageService_2, location: _Location): _Reference;
+    get parent(): _Reference | null;
+    get root(): _Reference;
+    get storage(): StorageService_2;
+    _throwIfRoot(name: string): void;
+    // @override
+    toString(): string;
+}
+
 // @public
 export interface SettableMetadata {
     cacheControl?: string | undefined;
@@ -101,7 +160,7 @@ export interface StorageReference {
 }
 
 // @public
-export interface StorageService {
+export interface StorageService extends _FirebaseService {
     readonly app: FirebaseApp;
     maxOperationRetryTime: number;
     maxUploadRetryTime: number;
@@ -158,6 +217,32 @@ export interface UploadTask {
     then(onFulfilled?: ((snapshot: UploadTaskSnapshot) => unknown) | null, onRejected?: ((error: FirebaseStorageError) => unknown) | null): Promise<unknown>;
 }
 
+// @internal
+export class _UploadTask {
+    constructor(ref: _Reference, blob: _FbsBlob, metadata?: Metadata | null);
+    _blob: _FbsBlob;
+    cancel(): boolean;
+    catch<T>(onRejected: (p1: FirebaseStorageError_2) => T | Promise<T>): Promise<T>;
+    // Warning: (ae-forgotten-export) The symbol "Metadata" needs to be exported by the entry point index.d.ts
+    _metadata: Metadata | null;
+    // Warning: (ae-forgotten-export) The symbol "TaskEvent" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "StorageObserver" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "ErrorFn" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "CompleteFn" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "Unsubscribe" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "Subscribe" needs to be exported by the entry point index.d.ts
+    on(type: TaskEvent_2, nextOrObserver?: StorageObserver_2<UploadTaskSnapshot_2> | ((a: UploadTaskSnapshot_2) => unknown), error?: ErrorFn, completed?: CompleteFn_2): Unsubscribe_2 | Subscribe_2<UploadTaskSnapshot_2>;
+    pause(): boolean;
+    resume(): boolean;
+    // Warning: (ae-forgotten-export) The symbol "UploadTaskSnapshot" needs to be exported by the entry point index.d.ts
+    get snapshot(): UploadTaskSnapshot_2;
+    // Warning: (ae-forgotten-export) The symbol "InternalTaskState" needs to be exported by the entry point index.d.ts
+    _state: InternalTaskState;
+    // Warning: (ae-forgotten-export) The symbol "FirebaseStorageError" needs to be exported by the entry point index.d.ts
+    then<U>(onFulfilled?: ((value: UploadTaskSnapshot_2) => U | Promise<U>) | null, onRejected?: ((error: FirebaseStorageError_2) => U | Promise<U>) | null): Promise<U>;
+    _transferred: number;
+    }
+
 // @public
 export interface UploadTaskSnapshot {
     bytesTransferred: number;

packages/storage/compat/index.ts

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import firebase from '@firebase/app-compat';
 import { _FirebaseNamespace } from '@firebase/app-types/private';
 import { StringFormat } from '../src/implementation/string';

packages/storage/exp/api.ts

@@ -16,7 +16,6 @@
  */
 
 import {
-  _registerComponent,
   _getProvider,
   FirebaseApp
   // eslint-disable-next-line import/no-extraneous-dependencies

packages/storage/exp/index.ts

@@ -18,7 +18,6 @@
 import {
   _registerComponent,
   registerVersion,
-  _getProvider,
   SDK_VERSION
   // eslint-disable-next-line import/no-extraneous-dependencies
 } from '@firebase/app-exp';

packages/storage/package.json

@@ -12,9 +12,10 @@
     "exp/dist"
   ],
   "scripts": {
+    "bundle": "rollup -c",
     "lint": "eslint -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
     "lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
-    "build": "rollup -c rollup.config.js && yarn build:exp",
+    "build": "run-p 'bundle rollup.config.js' build:exp build:compat",
     "build:exp": "rollup -c rollup.config.exp.js ; yarn api-report",
     "build:compat": "rollup -c rollup.config.compat.js",
     "build:exp:release": "run-p build:exp build:compat",

packages/storage/src/task.ts

@@ -57,7 +57,7 @@ import { Reference } from './reference';
 /**
  * Represents a blob being uploaded. Can be used to pause/resume/cancel the
  * upload and manage callbacks for various events.
- * @public
+ * @internal
  */
 export class UploadTask {
   private _ref: Reference;