Review

Author: schmidt-sebastian

packages/storage/src/implementation/metadata.ts

@@ -27,7 +27,6 @@ import * as type from './type';
 import * as UrlUtils from './url';
 import { Reference } from '../reference';
 import { StorageService } from '../service';
-import { Code, FirebaseStorageError } from './error';
 
 export function noXform_<T>(metadata: Metadata, value: T): T {
   return value;
@@ -206,26 +205,3 @@ export function toResourceString(
   }
   return JSON.stringify(resource);
 }
-
-export function validateMetadata(p: { [key: string]: unknown }): void {
-  for (const key in p) {
-    if (p.hasOwnProperty(key)) {
-      const val = p[key];
-      if (key === 'customMetadata') {
-        if (!type.isObject(val)) {
-          throw new FirebaseStorageError(
-            Code.INVALID_ARGUMENT,
-            "Expected object for 'customMetadata' mapping."
-          );
-        }
-      } else {
-        if (type.isNonNullObject(val)) {
-          throw new FirebaseStorageError(
-            Code.INVALID_ARGUMENT,
-            "Mapping for '" + key + "' cannot be an object."
-          );
-        }
-      }
-    }
-  }
-}

packages/storage/src/implementation/type.ts

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import { Code, FirebaseStorageError } from './error';
+
 /**
  * @return False if the object is undefined or null, true otherwise.
  */
@@ -31,16 +33,8 @@ export function isFunction(p: unknown): p is Function {
   return typeof p === 'function';
 }
 
-export function isObject(p: unknown): p is { [key: string]: unknown } | null {
-  return typeof p === 'object';
-}
-
-export function isNonNullObject(p: unknown): p is object {
-  return isObject(p) && p !== null;
-}
-
 export function isNonArrayObject(p: unknown): boolean {
-  return isObject(p) && !Array.isArray(p);
+  return typeof p === 'object' && !Array.isArray(p);
 }
 
 export function isString(p: unknown): p is string {
@@ -54,3 +48,23 @@ export function isNativeBlob(p: unknown): p is Blob {
 export function isNativeBlobDefined(): boolean {
   return typeof Blob !== 'undefined';
 }
+
+export function validateNumber(
+  argument: string,
+  minValue: number,
+  maxValue: number,
+  value: number
+): void {
+  if (value < minValue) {
+    throw new FirebaseStorageError(
+      Code.INVALID_ARGUMENT,
+      `Invalid value for '${argument}'. Expected ${minValue} or greater.`
+    );
+  }
+  if (value > maxValue) {
+    throw new FirebaseStorageError(
+      Code.INVALID_ARGUMENT,
+      `Invalid value for '${argument}'. Expected ${maxValue} or less.`
+    );
+  }
+}

packages/storage/src/reference.ts

@@ -24,14 +24,13 @@ import { Location } from './implementation/location';
 import * as metadata from './implementation/metadata';
 import * as path from './implementation/path';
 import * as requests from './implementation/requests';
-import { StringFormat, dataFromString } from './implementation/string';
+import { dataFromString, StringFormat } from './implementation/string';
 import * as type from './implementation/type';
+import { validateNumber } from './implementation/type';
 import { Metadata } from './metadata';
 import { StorageService } from './service';
 import { UploadTask } from './task';
 import { ListOptions, ListResult } from './list';
-import { Code, FirebaseStorageError } from './implementation/error';
-import { validateMetadata } from './implementation/metadata';
 
 /**
  * Provides methods to interact with a bucket in the Firebase Storage service.
@@ -295,7 +294,6 @@ export class Reference {
    *     @see firebaseStorage.Reference.prototype.getMetadata
    */
   updateMetadata(metadata: Metadata): Promise<Metadata> {
-    validateMetadata(metadata);
     this.throwIfRoot_('updateMetadata');
     return this.service.getAuthToken().then(authToken => {
       const requestInfo = requests.updateMetadata(
@@ -338,23 +336,3 @@ export class Reference {
     }
   }
 }
-
-export function validateNumber(
-  argument: string,
-  minValue: number,
-  maxValue: number,
-  value: number
-): void {
-  if (value < minValue) {
-    throw new FirebaseStorageError(
-      Code.INVALID_ARGUMENT,
-      `Invalid value for '${argument}'. Expected ${minValue} or greater.`
-    );
-  }
-  if (value > maxValue) {
-    throw new FirebaseStorageError(
-      Code.INVALID_ARGUMENT,
-      `Invalid value for '${argument}'. Expected ${maxValue} or less.`
-    );
-  }
-}

packages/storage/src/service.ts

@@ -21,13 +21,14 @@ import { FailRequest } from './implementation/failrequest';
 import { Request, makeRequest } from './implementation/request';
 import { RequestInfo } from './implementation/requestinfo';
 import { XhrIoPool } from './implementation/xhriopool';
-import { Reference, validateNumber } from './reference';
+import { Reference } from './reference';
 import { Provider } from '@firebase/component';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { FirebaseOptions } from '@firebase/app-types-exp';
 import * as constants from '../src/implementation/constants';
 import * as errorsExports from './implementation/error';
 import { Code, FirebaseStorageError } from './implementation/error';
+import { validateNumber } from './implementation/type';
 
 /**
  * A service that provides firebaseStorage.Reference instances.