update database types

Author: Feiyang1

packages/database-types/index.d.ts

@@ -99,7 +99,7 @@ export interface Reference extends Query {
   key: string | null;
   onDisconnect(): OnDisconnect;
   parent: Reference | null;
-  push(value?: any, onComplete?: (a: Error | null) => any): ThenableReference;
+  push(value?: any, onComplete?: (a: Error | null) => any): Reference;
   remove(onComplete?: (a: Error | null) => any): Promise<any>;
   root: Reference;
   set(value: any, onComplete?: (a: Error | null) => any): Promise<any>;
@@ -132,3 +132,9 @@ export function enableLogging(
   logger?: boolean | ((a: string) => any),
   persistent?: boolean
 ): any;
+
+declare module '@firebase/component' {
+  interface NameServiceMapping {
+    'database': FirebaseDatabase;
+  }
+}

packages/database/index.node.ts

@@ -36,7 +36,7 @@ import {
   Provider,
   ComponentContainer
 } from '@firebase/component';
-import { FirebaseAuthInternal } from '@firebase/auth-interop-types';
+import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 
 setWebSocketImpl(Client);
 
@@ -64,7 +64,7 @@ export function initStandalone(app: FirebaseApp, url: string, version: string) {
    * ComponentContainer('database-admin') is just a placeholder that doesn't perform
    * any actual function.
    */
-  const authProvider = new Provider<FirebaseAuthInternal>(
+  const authProvider = new Provider<FirebaseAuthInternalName>(
     'auth-internal',
     new ComponentContainer('database-admin')
   );

packages/database/src/api/Database.ts

@@ -26,12 +26,13 @@ import { validateUrl } from '../core/util/validation';
 import { FirebaseApp } from '@firebase/app-types';
 import { FirebaseService } from '@firebase/app-types/private';
 import { RepoInfo } from '../core/RepoInfo';
+import { FirebaseDatabase } from '@firebase/database-types';
 
 /**
  * Class representing a firebase database.
  * @implements {FirebaseService}
  */
-export class Database implements FirebaseService {
+export class Database implements FirebaseService, FirebaseDatabase {
   INTERNAL: DatabaseInternals;
   private root_: Reference;
 

packages/database/src/api/Reference.ts

@@ -37,12 +37,13 @@ import { Deferred } from '@firebase/util';
 import { SyncPoint } from '../core/SyncPoint';
 import { Database } from './Database';
 import { DataSnapshot } from './DataSnapshot';
+import * as types from '@firebase/database-types';
 
 export interface ReferenceConstructor {
   new (repo: Repo, path: Path): Reference;
 }
 
-export class Reference extends Query {
+export class Reference extends Query implements types.Reference {
   public then: (a?: any) => Promise<any>;
   public catch: (a?: Error) => Promise<any>;
 

packages/database/src/core/AuthTokenProvider.ts

@@ -16,7 +16,7 @@
  */
 
 import { FirebaseAuthTokenData } from '@firebase/app-types/private';
-import { FirebaseAuthInternal } from '@firebase/auth-interop-types';
+import { FirebaseAuthInternal, FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { Provider } from '@firebase/component';
 import { log, warn } from './util/util';
 import { FirebaseApp } from '@firebase/app-types';
@@ -28,7 +28,7 @@ export class AuthTokenProvider {
   private auth_: FirebaseAuthInternal | null = null;
   constructor(
     private app_: FirebaseApp,
-    private authProvider_: Provider<FirebaseAuthInternal>
+    private authProvider_: Provider<FirebaseAuthInternalName>
   ) {
     this.auth_ = authProvider_.getImmediate({ optional: true });
     if (!this.auth_) {

packages/database/src/core/Repo.ts

@@ -44,7 +44,7 @@ import { EventRegistration } from './view/EventRegistration';
 import { StatsCollection } from './stats/StatsCollection';
 import { Event } from './view/Event';
 import { Node } from './snap/Node';
-import { FirebaseAuthInternal } from '@firebase/auth-interop-types';
+import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { Provider } from '@firebase/component';
 
 const INTERRUPT_REASON = 'repo_interrupt';
@@ -82,7 +82,7 @@ export class Repo {
     public repoInfo_: RepoInfo,
     forceRestClient: boolean,
     public app: FirebaseApp,
-    authProvider: Provider<FirebaseAuthInternal>
+    authProvider: Provider<FirebaseAuthInternalName>
   ) {
     const authTokenProvider = new AuthTokenProvider(app, authProvider);
 

packages/database/src/core/RepoManager.ts

@@ -24,7 +24,7 @@ import { validateUrl } from './util/validation';
 import './Repo_transaction';
 import { Database } from '../api/Database';
 import { RepoInfo } from './RepoInfo';
-import { FirebaseAuthInternal } from '@firebase/auth-interop-types';
+import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { Provider } from '@firebase/component';
 
 /** @const {string} */
@@ -93,7 +93,7 @@ export class RepoManager {
    */
   databaseFromApp(
     app: FirebaseApp,
-    authProvider: Provider<FirebaseAuthInternal>,
+    authProvider: Provider<FirebaseAuthInternalName>,
     url?: string
   ): Database {
     let dbUrl: string | undefined = url || app.options[DATABASE_URL_OPTION];
@@ -159,7 +159,7 @@ export class RepoManager {
   createRepo(
     repoInfo: RepoInfo,
     app: FirebaseApp,
-    authProvider: Provider<FirebaseAuthInternal>
+    authProvider: Provider<FirebaseAuthInternalName>
   ): Repo {
     let appRepos = safeGet(this.repos_, app.name);
 

packages/database/test/helpers/util.ts

@@ -59,7 +59,8 @@ let numDatabases = 0;
     () => ({
       getToken: () => Promise.resolve(null),
       addAuthTokenListener: () => {},
-      removeAuthTokenListener: () => {}
+      removeAuthTokenListener: () => {},
+      getUid: () => null
     }),
     ComponentType.PRIVATE
   )