address comments

Author: Feiyang1

packages/analytics-types/index.d.ts

@@ -201,3 +201,10 @@ export interface Promotion {
   id?: string;
   name?: string;
 }
+
+
+declare module '@firebase/component' {
+  interface NameServiceMapping {
+    'analytics': FirebaseAnalytics;
+  }
+}

packages/analytics/index.ts

@@ -60,7 +60,7 @@ export function registerAnalytics(instance: _FirebaseNamespace): void {
             .getImmediate();
           return {
             logEvent: analytics.logEvent
-          } as FirebaseAnalyticsInternal;
+          };
         } catch (e) {
           throw ERROR_FACTORY.create(
             AnalyticsError.INTEROP_COMPONENT_REG_FAILED,
@@ -88,9 +88,3 @@ declare module '@firebase/app-types' {
     analytics(): FirebaseAnalytics;
   }
 }
-
-declare module '@firebase/component' {
-  interface NameServiceMapping {
-    'analytics': FirebaseAnalytics;
-  }
-}

packages/app-types/index.d.ts

@@ -101,3 +101,9 @@ export interface FirebaseNamespace {
   // The current SDK version.
   SDK_VERSION: string;
 }
+
+declare module '@firebase/component' {
+  interface NameServiceMapping {
+    'app': FirebaseApp;
+  }
+}

packages/app/index.node.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FirebaseNamespace, FirebaseApp } from '@firebase/app-types';
+import { FirebaseNamespace } from '@firebase/app-types';
 import { _FirebaseNamespace } from '@firebase/app-types/private';
 import { firebase as _firebase } from './src/firebaseNamespace';
 // Node specific packages.
@@ -38,9 +38,3 @@ export const firebase = _firebase as FirebaseNamespace;
 
 // eslint-disable-next-line import/no-default-export
 export default firebase;
-
-declare module '@firebase/component' {
-  interface NameServiceMapping {
-    'app': FirebaseApp;
-  }
-}

packages/app/index.rn.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FirebaseNamespace, FirebaseApp } from '@firebase/app-types';
+import { FirebaseNamespace } from '@firebase/app-types';
 import { _FirebaseNamespace } from '@firebase/app-types/private';
 import { firebase as _firebase } from './src/firebaseNamespace';
 /**
@@ -38,9 +38,3 @@ export const firebase = _firebase as FirebaseNamespace;
 
 // eslint-disable-next-line import/no-default-export
 export default firebase;
-
-declare module '@firebase/component' {
-  interface NameServiceMapping {
-    'app': FirebaseApp;
-  }
-}

packages/app/index.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FirebaseNamespace, FirebaseApp } from '@firebase/app-types';
+import { FirebaseNamespace } from '@firebase/app-types';
 import { firebase as firebaseNamespace } from './src/firebaseNamespace';
 import { isNode, isBrowser } from '@firebase/util';
 import { logger } from './src/logger';
@@ -69,9 +69,3 @@ export const firebase = firebaseNamespace;
 
 // eslint-disable-next-line import/no-default-export
 export default firebase;
-
-declare module '@firebase/component' {
-  interface NameServiceMapping {
-    'app': FirebaseApp;
-  }
-}

packages/app/src/firebaseApp.ts

@@ -29,7 +29,8 @@ import { deepCopy } from '@firebase/util';
 import {
   ComponentContainer,
   Component,
-  ComponentType
+  ComponentType,
+  Name
 } from '@firebase/component';
 import { AppError, ERROR_FACTORY } from './errors';
 import { DEFAULT_ENTRY_NAME } from './constants';
@@ -125,8 +126,7 @@ export class FirebaseAppImpl implements FirebaseApp {
     // getImmediate will always succeed because _getService is only called for registered components.
     return (
       (this.container
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        .getProvider(name as any)
+        .getProvider(name as Name)
         .getImmediate({
           identifier: instanceIdentifier
         }) as unknown) as FirebaseService

packages/component/index.ts

@@ -22,5 +22,6 @@ export {
   ComponentType,
   InstanceFactory,
   InstantiationMode,
-  NameServiceMapping
+  NameServiceMapping,
+  Name
 } from './src/types';

packages/component/src/component_container.ts

@@ -23,7 +23,7 @@ import { Name } from './types';
  * ComponentContainer that provides Providers for service name T, e.g. `auth`, `auth-internal`
  */
 export class ComponentContainer {
-  private readonly providers = new Map<string, Provider>();
+  private readonly providers = new Map<string, Provider<Name>>();
 
   constructor(private readonly name: string) {}
 
@@ -76,7 +76,7 @@ export class ComponentContainer {
     return provider as Provider<T>;
   }
 
-  getProviders(): Provider[] {
+  getProviders(): Array<Provider<Name>> {
     return Array.from(this.providers.values());
   }
 }

packages/component/src/provider.ts

@@ -23,12 +23,12 @@ import { Component } from './component';
 
 /**
  * Provider for instance for service name T, e.g. 'auth', 'auth-internal'
- * U is an alias for the type of the instance
+ * NameServiceMapping[T] is an alias for the type of the instance
  */
-export class Provider<T extends Name = Name, U = NameServiceMapping[T]> {
+export class Provider<T extends Name> {
   private component: Component<T> | null = null;
-  private readonly instances: Map<string, U> = new Map();
-  private readonly instancesDeferred: Map<string, Deferred<U>> = new Map();
+  private readonly instances: Map<string, NameServiceMapping[T]> = new Map();
+  private readonly instancesDeferred: Map<string, Deferred<NameServiceMapping[T]>> = new Map();
 
   constructor(
     private readonly name: T,
@@ -39,12 +39,12 @@ export class Provider<T extends Name = Name, U = NameServiceMapping[T]> {
    * @param identifier A provider can provide mulitple instances of a service
    * if this.component.multipleInstances is true.
    */
-  get(identifier: string = DEFAULT_ENTRY_NAME): Promise<U> {
+  get(identifier: string = DEFAULT_ENTRY_NAME): Promise<NameServiceMapping[T]> {
     // if multipleInstances is not supported, use the default name
     const normalizedIdentifier = this.normalizeInstanceIdentifier(identifier);
 
     if (!this.instancesDeferred.has(normalizedIdentifier)) {
-      const deferred = new Deferred<U>();
+      const deferred = new Deferred<NameServiceMapping[T]>();
       this.instancesDeferred.set(normalizedIdentifier, deferred);
       // If the service instance is available, resolve the promise with it immediately
       const instance = this.getOrInitializeService(normalizedIdentifier);
@@ -64,12 +64,12 @@ export class Provider<T extends Name = Name, U = NameServiceMapping[T]> {
    * the service is not immediately available.
    * If optional is true, the method returns null if the service is not immediately available.
    */
-  getImmediate(options: { identifier?: string; optional: true }): U | null;
-  getImmediate(options?: { identifier?: string; optional?: false }): U;
+  getImmediate(options: { identifier?: string; optional: true }): NameServiceMapping[T] | null;
+  getImmediate(options?: { identifier?: string; optional?: false }): NameServiceMapping[T];
   getImmediate(options?: {
     identifier?: string;
     optional?: boolean;
-  }): U | null {
+  }): NameServiceMapping[T] | null {
     const { identifier, optional } = {
       identifier: DEFAULT_ENTRY_NAME,
       optional: false,
@@ -147,13 +147,13 @@ export class Provider<T extends Name = Name, U = NameServiceMapping[T]> {
     return this.component != null;
   }
 
-  private getOrInitializeService(identifier: string): U | null {
+  private getOrInitializeService(identifier: string): NameServiceMapping[T] | null {
     let instance = this.instances.get(identifier);
     if (!instance && this.component) {
       instance = this.component.instanceFactory(
         this.container,
         normalizeIdentifierForFactory(identifier)
-      ) as U;
+      ) as NameServiceMapping[T];
       this.instances.set(identifier, instance);
     }
 

packages/component/src/types.ts

@@ -56,9 +56,7 @@ export interface Dictionary {
  * This interface will be extended by Firebase SDKs to provide service name and service type mapping.
  * It is used as a generic constraint to ensure type safety.
  */
-export interface NameServiceMapping {
-  'app': string;
-}
+export interface NameServiceMapping { }
 
 export type Name = keyof NameServiceMapping;
 export type Service = NameServiceMapping[Name];