Cleanup

Author: jamesdaniels

common/api-review/storage.api.md

@@ -11,7 +11,6 @@ import { FirebaseApp } from '@firebase/app';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { FirebaseError } from '@firebase/util';
 import { _FirebaseService } from '@firebase/app';
-import { getDefaultEmulatorHost } from '@firebase/util';
 import { NextFn } from '@firebase/util';
 import { Provider } from '@firebase/component';
 import { Subscribe } from '@firebase/util';
@@ -123,8 +122,6 @@ export function getBytes(ref: StorageReference, maxDownloadSizeBytes?: number):
 // @internal (undocumented)
 export function _getChild(ref: StorageReference, childPath: string): _Reference;
 
-export { getDefaultEmulatorHost }
-
 // @public
 export function getDownloadURL(ref: StorageReference): Promise<string>;
 

common/api-review/util.api.md

@@ -4,6 +4,11 @@
 
 ```ts
 
+// Warning: (ae-missing-release-tag) "__PRIVATE_getDefaultEmulatorHost" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const __PRIVATE_getDefaultEmulatorHost: (name: string) => string | undefined;
+
 // Warning: (ae-missing-release-tag) "areCookiesEnabled" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public

packages/app/src/api.ts

@@ -199,7 +199,13 @@ export function initializeApp(
  * @public
  */
 export function getApp(name: string = DEFAULT_ENTRY_NAME): FirebaseApp {
-  return _apps.get(name) || initializeApp();
+  const app = _apps.get(name);
+  if (!app && name === DEFAULT_ENTRY_NAME) return initializeApp();
+  if (!app) {
+    throw ERROR_FACTORY.create(AppError.NO_APP, { appName: name });
+  }
+
+  return app;
 }
 
 /**

packages/storage/src/api.ts

@@ -51,10 +51,10 @@ import {
   getBytesInternal
 } from './reference';
 import { STORAGE_TYPE } from './constants';
-import { EmulatorMockTokenOptions, getModularInstance } from '@firebase/util';
+import { EmulatorMockTokenOptions, getModularInstance, getDefaultEmulatorHost } from '@firebase/util';
 import { StringFormat } from './implementation/string';
 
-export { EmulatorMockTokenOptions, getDefaultEmulatorHost } from '@firebase/util';
+export { EmulatorMockTokenOptions } from '@firebase/util';
 
 /**
  * Public types.

packages/util/src/defaults.ts

@@ -1,3 +1,4 @@
+
 import { base64Decode } from "./crypt";
 import { getGlobal } from "./environment";
 
@@ -11,9 +12,7 @@ declare global {
     var __FIREBASE_DEFAULTS__: FirebaseDefaults|undefined;
 }
 
-const getDefaultsFromGlobal = (): FirebaseDefaults|undefined => {
-    return getGlobal().__FIREBASE_DEFAULTS__;
-};
+const getDefaultsFromGlobal = (): FirebaseDefaults|undefined => getGlobal().__FIREBASE_DEFAULTS__;
 
 const getDefaultsFromEnvVariable = (): FirebaseDefaults|undefined => {
     if (typeof process === 'undefined') return;
@@ -38,14 +37,16 @@ const getDefaultsFromCookie = (): FirebaseDefaults|undefined => {
     }
 };
 
-const getDefaults = () => {
-    return getDefaultsFromGlobal() ||
-      getDefaultsFromEnvVariable() ||
-      getDefaultsFromCookie();
-};
+const getDefaults = () => getDefaultsFromGlobal() ||
+    getDefaultsFromEnvVariable() ||
+    getDefaultsFromCookie();
 
 export const getDefaultEmulatorHost = (name:string) => getDefaults()?.emulatorHosts?.[name];
 
+// I don't know why I can't get firestore to reconigze this in the externs...
+// adding the __PRIVATE_ prefix for now
+export const __PRIVATE_getDefaultEmulatorHost = getDefaultEmulatorHost;
+
 export const getDefaultAppConfig = () => getDefaults()?.config;
 
 // TODO fix the type