Simplify

Author: schmidt-sebastian

packages/firestore/lite/index.node.ts

@@ -16,26 +16,15 @@
  */
 
 import { registerVersion, _registerComponent } from '@firebase/app-exp';
-import {
-  Firestore,
-  initializeFirestore,
-  getFirestore
-} from './src/api/database';
+import { Firestore } from './src/api/database';
 import { version } from '../package.json';
 import { Component, ComponentType } from '@firebase/component';
 
-import { makeConstructorPrivate } from '../src/util/api';
-
-export const PublicFirestore = makeConstructorPrivate(
+export {
   Firestore,
-  'Use getFirestore() instead.'
-);
-
-const firestoreNamespace = {
-  Firestore: PublicFirestore,
   initializeFirestore,
   getFirestore
-};
+} from './src/api/database';
 
 export function registerFirestore(): void {
   _registerComponent(
@@ -49,7 +38,7 @@ export function registerFirestore(): void {
         );
       },
       ComponentType.PUBLIC
-    ).setServiceProps({ ...firestoreNamespace })
+    )
   );
   registerVersion('firestore-lite', version, 'node');
 }

packages/firestore/lite/src/api/database.ts

@@ -96,10 +96,5 @@ export function initializeFirestore(
 }
 
 export function getFirestore(app: FirebaseApp): Firestore {
-  const firestore = _getProvider(
-    app,
-    'firestore/lite'
-  ).getImmediate() as Firestore;
-  firestore._ensureClientConfigured();
-  return firestore;
+  return _getProvider(app, 'firestore/lite').getImmediate() as Firestore;
 }

packages/firestore/lite/test/integration.test.ts

@@ -38,17 +38,4 @@ describe('Firestore', () => {
     const fs2 = getFirestore(app);
     expect(fs1 === fs2).to.be.true;
   });
-
-  it('cannot call initializeFirestore() after getFirestore()', () => {
-    const app = initializeApp(
-      { apiKey: 'fake-api-key', projectId: 'test-project' },
-      'test-app-getFirestore-initializeFirestore'
-    );
-    getFirestore(app);
-    expect(() => initializeFirestore(app, {})).to.throw(
-      'Firestore has already been started and its settings can no longer ' +
-        'be changed. initializeFirestore() cannot be called after calling ' +
-        'getFirestore().'
-    );
-  });
 });