Review

Author: schmidt-sebastian

packages/firestore/lite/index.d.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FirebaseApp } from '@firebase/app-types';
+import { FirebaseApp } from '@firebase/app-types-exp';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 

packages/firestore/lite/index.node.ts

@@ -15,16 +15,15 @@
  * limitations under the License.
  */
 
-import firebase from '@firebase/app';
-import { FirebaseNamespace } from '@firebase/app-types';
+import { registerVersion } from '@firebase/app-exp';
 import {
   Firestore,
   initializeFirestore,
   getFirestore
 } from './src/api/database';
 import { version } from '../package.json';
 import { Component, ComponentType } from '@firebase/component';
-import { _FirebaseNamespace } from '@firebase/app-types/private';
+import { _registerComponent } from '@firebase/app-exp';
 import { makeConstructorPrivate } from '../src/util/api';
 
 export const PublicFirestore = makeConstructorPrivate(
@@ -38,12 +37,12 @@ const firestoreNamespace = {
   getFirestore
 };
 
-export function registerFirestore(instance: FirebaseNamespace): void {
-  (instance as _FirebaseNamespace).INTERNAL.registerComponent(
+export function registerFirestore(): void {
+  _registerComponent(
     new Component(
       'firestore/lite',
       container => {
-        const app = container.getProvider('app').getImmediate()!;
+        const app = container.getProvider('app-exp').getImmediate()!;
         return ((app, auth) => new Firestore(app, auth))(
           app,
           container.getProvider('auth-internal')
@@ -52,7 +51,7 @@ export function registerFirestore(instance: FirebaseNamespace): void {
       ComponentType.PUBLIC
     ).setServiceProps({ ...firestoreNamespace })
   );
-  instance.registerVersion('@firebase/firestore/lite', version, 'node');
+  registerVersion('firestore-lite', version, 'node');
 }
 
-registerFirestore(firebase);
+registerFirestore();

packages/firestore/lite/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@firebase/firestore/lite",
+  "description": "A lite version of the Firestore SDK",
+  "main": "../dist/list/index.node.cjs.js"
+}

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,8 @@
 import * as firestore from '../../';
 
 import { _getProvider } from '@firebase/app-exp';
+import { FirebaseApp } from '@firebase/app-types-exp';
 import { Provider } from '@firebase/component';
-import { FirebaseApp } from '@firebase/app-types';
-import { FirebaseService } from '@firebase/app-types/private';
 
 import { Code, FirestoreError } from '../../../src/util/error';
 import { DatabaseId } from '../../../src/core/database_info';
@@ -30,10 +29,12 @@ import {
   FirebaseCredentialsProvider
 } from '../../../src/api/credentials';
 
+// TODO(firestorelite): Depend on FirebaseService once #3112 is merged
+
 /**
  * The root reference to the Firestore Lite database.
  */
-export class Firestore implements firestore.FirebaseFirestore, FirebaseService {
+export class Firestore implements firestore.FirebaseFirestore {
   readonly _databaseId: DatabaseId;
   private readonly _firebaseApp: FirebaseApp;
   private readonly _credentials: CredentialsProvider;

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

@@ -17,20 +17,20 @@
 
 import { expect } from 'chai';
 
-import firebase from '../../test/integration/util/firebase_export';
+import { initializeApp } from '@firebase/app-exp';
 import { getFirestore, initializeFirestore } from '../src/api/database';
 
 describe('Firestore', () => {
   it('can provide setting', () => {
-    const app = firebase.initializeApp(
+    const app = initializeApp(
       { apiKey: 'fake-api-key', projectId: 'test-project' },
       'test-app-initializeFirestore'
     );
     initializeFirestore(app, { host: 'localhost', ssl: false });
   });
 
   it('returns same instance', () => {
-    const app = firebase.initializeApp(
+    const app = initializeApp(
       { apiKey: 'fake-api-key', projectId: 'test-project' },
       'test-app-getFirestore'
     );

packages/firestore/package.json

@@ -37,7 +37,6 @@
     "test:lite":  "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'lite/test/**/*.test.ts' --file lite/index.node.ts --config ../../config/mocharc.node.js",
     "prepare": "yarn build"
   },
-  "lite": "dist/lite/index.node.cjs.js",
   "main": "dist/index.node.cjs.js",
   "main-esm2017": "dist/index.node.esm2017.js",
   "browser": "dist/index.cjs.js",
@@ -61,7 +60,8 @@
   },
   "peerDependencies": {
     "@firebase/app": "0.x",
-    "@firebase/app-types": "0.x"
+    "@firebase/app-types": "0.x",
+    "@firebase/app-types-ext": "0.x"
   },
   "devDependencies": {
     "@types/json-stable-stringify": "1.0.32",

packages/firestore/rollup.config.lite.js

@@ -21,7 +21,7 @@ import typescript from 'typescript';
 
 import { resolveNodeExterns } from './rollup.shared';
 
-import pkg from './package.json';
+import pkg from './lite/package.json';
 
 const defaultPlugins = [
   typescriptPlugin({
@@ -40,7 +40,7 @@ const nodeBuilds = [
   {
     input: 'lite/index.node.ts',
     output: {
-      file: pkg.lite,
+      file: pkg.main,
       format: 'es'
     },
     plugins: defaultPlugins,
@@ -51,4 +51,6 @@ const nodeBuilds = [
   }
 ];
 
+// TODO(firestorelite): Add browser builds
+
 export default [...nodeBuilds];