Initial commit

Author: hsubox76

packages/storage/exp/index.ts

@@ -52,7 +52,7 @@ import {
   SettableMetadata,
   UploadMetadata,
   FullMetadata
-} from '@firebase/storage-types/exp';
+} from './public-types';
 import { Metadata as MetadataInternal } from '../src/metadata';
 import {
   uploadBytes as uploadBytesInternal,

packages/storage-types/exp/index.d.ts renamed to packages/storage/exp/public-types.ts

@@ -15,8 +15,15 @@
  * limitations under the License.
  */
 
-import { FirebaseApp, _FirebaseService } from '@firebase/app-types-exp';
-import { CompleteFn, FirebaseError, NextFn, Unsubscribe } from '@firebase/util';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { FirebaseApp } from '@firebase/app-exp';
+import {
+  CompleteFn,
+  FirebaseError,
+  NextFn,
+  Subscribe,
+  Unsubscribe
+} from '@firebase/util';
 
 /**
  * A Firebase Storage instance.
@@ -245,7 +252,7 @@ export type TaskState = 'running' | 'paused' | 'success' | 'canceled' | 'error';
  * An error returned by the Firebase Storage SDK.
  * @public
  */
-interface FirebaseStorageError extends FirebaseError {
+export interface FirebaseStorageError extends FirebaseError {
   /**
    * A server response message for the error, if applicable.
    */
@@ -276,7 +283,7 @@ export interface UploadTask {
   /**
    * Equivalent to calling `then(null, onRejected)`.
    */
-  catch(onRejected: (error: FirebaseStorageError) => any): Promise<any>;
+  catch(onRejected: (error: FirebaseStorageError) => unknown): Promise<unknown>;
   /**
    * Listens for events on this task.
    *
@@ -391,10 +398,10 @@ export interface UploadTask {
     nextOrObserver?:
       | StorageObserver<UploadTaskSnapshot>
       | null
-      | ((snapshot: UploadTaskSnapshot) => any),
-    error?: ((a: FirebaseStorageError) => any) | null,
+      | ((snapshot: UploadTaskSnapshot) => unknown),
+    error?: ((a: FirebaseStorageError) => unknown) | null,
     complete?: Unsubscribe | null
-  ): Function;
+  ): Unsubscribe | Subscribe<UploadTaskSnapshot>;
 
   /**
    * Pauses a currently running task. Has no effect on a paused or failed task.
@@ -419,9 +426,9 @@ export interface UploadTask {
    * @param onRejected - The rejection callback.
    */
   then(
-    onFulfilled?: ((snapshot: UploadTaskSnapshot) => any) | null,
-    onRejected?: ((error: FirebaseStorageError) => any) | null
-  ): Promise<any>;
+    onFulfilled?: ((snapshot: UploadTaskSnapshot) => unknown) | null,
+    onRejected?: ((error: FirebaseStorageError) => unknown) | null
+  ): Promise<unknown>;
 }
 
 /**

packages/storage/src/metadata.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FullMetadata } from '@firebase/storage-types/exp';
+import { FullMetadata } from '../exp/public-types';
 
 /**
  * @fileoverview Documentation for the metadata format.

packages/storage/src/reference.ts

@@ -31,7 +31,7 @@ import {
   deleteObject as requestsDeleteObject,
   multipartUpload
 } from './implementation/requests';
-import { ListOptions } from '@firebase/storage-types/exp';
+import { ListOptions } from '../exp/public-types';
 import { StringFormat, dataFromString } from './implementation/string';
 import { Metadata } from './metadata';
 import { StorageService } from './service';

packages/storage/test/integration/integration.exp.test.ts

@@ -34,7 +34,7 @@ import {
 
 import { use, expect } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
-import * as types from '@firebase/storage-types/exp';
+import * as types from '../../exp/public-types';
 
 use(chaiAsPromised);
 

scripts/exp/prepare-storage-for-exp-release.ts

@@ -37,10 +37,7 @@ export async function prepare() {
   // Update package.json
   const packageJson = await readPackageJson(packagePath);
   const expPackageJson = await readPackageJson(`${packagePath}/exp`);
-  const typesPackageJson = await readPackageJson(`${packagePath}-types`);
   packageJson.version = '0.0.900';
-  typesPackageJson.version = '0.0.900';
-  typesPackageJson.files = `['exp/index.d.ts']`;
 
   packageJson.peerDependencies = {
     '@firebase/app-exp': '0.x'
@@ -62,9 +59,4 @@ export async function prepare() {
     `${JSON.stringify(packageJson, null, 2)}\n`,
     { encoding: 'utf-8' }
   );
-  await writeFile(
-    `${packagePath}-types/package.json`,
-    `${JSON.stringify(typesPackageJson, null, 2)}\n`,
-    { encoding: 'utf-8' }
-  );
 }

scripts/exp/release.ts

@@ -75,7 +75,6 @@ async function publishExpPackages({ dryRun }: { dryRun: boolean }) {
 
     packagePaths.push(`${projectRoot}/packages/firestore`);
     packagePaths.push(`${projectRoot}/packages/storage`);
-    packagePaths.push(`${projectRoot}/packages/storage-types`);
     packagePaths.push(`${projectRoot}/packages/database`);
 
     /**