Fix FirebaseApp overwriting FirebaseError name field

packages/app/src/errors.ts

@@ -28,19 +28,19 @@ export const enum AppError {
 
 const ERRORS: ErrorMap<AppError> = {
   [AppError.NO_APP]:
-    "No Firebase App '{$name}' has been created - " +
+    "No Firebase App '{$appName}' has been created - " +
     'call Firebase App.initializeApp()',
-  [AppError.BAD_APP_NAME]: "Illegal App name: '{$name}",
-  [AppError.DUPLICATE_APP]: "Firebase App named '{$name}' already exists",
-  [AppError.APP_DELETED]: "Firebase App named '{$name}' already deleted",
+  [AppError.BAD_APP_NAME]: "Illegal App name: '{$appName}",
+  [AppError.DUPLICATE_APP]: "Firebase App named '{$appName}' already exists",
+  [AppError.APP_DELETED]: "Firebase App named '{$appName}' already deleted",
   [AppError.DUPLICATE_SERVICE]:
-    "Firebase service named '{$name}' already registered",
+    "Firebase service named '{$appName}' already registered",
   [AppError.INVALID_APP_ARGUMENT]:
-    'firebase.{$name}() takes either no argument or a ' +
+    'firebase.{$appName}() takes either no argument or a ' +
     'Firebase App instance.'
 };
 
-type ErrorParams = { [key in AppError]: { name: string } };
+type ErrorParams = { [key in AppError]: { appName: string } };
 
 export const ERROR_FACTORY = new ErrorFactory<AppError, ErrorParams>(
   'app',

packages/app/src/firebaseApp.ts

@@ -203,7 +203,7 @@ export class FirebaseAppImpl implements FirebaseApp {
    */
   private checkDestroyed_(): void {
     if (this.isDeleted_) {
-      throw ERROR_FACTORY.create(AppError.APP_DELETED, { name: this.name_ });
+      throw ERROR_FACTORY.create(AppError.APP_DELETED, { appName: this.name_ });
     }
   }
 }

packages/app/src/firebaseNamespaceCore.ts

@@ -104,7 +104,7 @@ export function createFirebaseNamespaceCore(
   function app(name?: string): FirebaseApp {
     name = name || DEFAULT_ENTRY_NAME;
     if (!contains(apps, name)) {
-      throw ERROR_FACTORY.create(AppError.NO_APP, { name });
+      throw ERROR_FACTORY.create(AppError.NO_APP, { appName: name });
     }
     return apps[name];
   }
@@ -137,11 +137,13 @@ export function createFirebaseNamespaceCore(
     const { name } = config;
 
     if (typeof name !== 'string' || !name) {
-      throw ERROR_FACTORY.create(AppError.BAD_APP_NAME, { name: String(name) });
+      throw ERROR_FACTORY.create(AppError.BAD_APP_NAME, {
+        appName: String(name)
+      });
     }
 
     if (contains(apps, name)) {
-      throw ERROR_FACTORY.create(AppError.DUPLICATE_APP, { name });
+      throw ERROR_FACTORY.create(AppError.DUPLICATE_APP, { appName: name });
     }
 
     const app = new firebaseAppImpl(
@@ -180,7 +182,7 @@ export function createFirebaseNamespaceCore(
   ): FirebaseServiceNamespace<FirebaseService> {
     // Cannot re-register a service that already exists
     if (factories[name]) {
-      throw ERROR_FACTORY.create(AppError.DUPLICATE_SERVICE, { name });
+      throw ERROR_FACTORY.create(AppError.DUPLICATE_SERVICE, { appName: name });
     }
 
     // Capture the service factory for later service instantiation
@@ -203,7 +205,7 @@ export function createFirebaseNamespaceCore(
         // Invalid argument.
         // This happens in the following case: firebase.storage('gs:/')
         throw ERROR_FACTORY.create(AppError.INVALID_APP_ARGUMENT, {
-          name
+          appName: name
         });
       }
 

packages/app/src/lite/firebaseAppLite.ts

@@ -168,7 +168,7 @@ export class FirebaseAppLiteImpl implements FirebaseApp {
    */
   private checkDestroyed_(): void {
     if (this.isDeleted_) {
-      throw ERROR_FACTORY.create(AppError.APP_DELETED, { name: this.name_ });
+      throw ERROR_FACTORY.create(AppError.APP_DELETED, { appName: this.name_ });
     }
   }
 }