Use composition

Author: schmidt-sebastian

packages/firebase/firestore/memory/index.ts

@@ -15,4 +15,4 @@
  * limitations under the License.
  */
 
-import '@firbease/firestore/memory';
+import '../../../firestore/dist/index.memory.esm';

packages/firestore/index.memory.ts

@@ -18,15 +18,19 @@
 import firebase from '@firebase/app';
 import { FirebaseNamespace } from '@firebase/app-types';
 
+import {MemoryPersistenceProvider} from "./src/local/memory_persistence";
 import { configureForFirebase } from './src/platform/config';
+
 import './register-module';
 import './src/platform_browser/browser_init';
 
 import { name, version } from './package.json';
-import { Firestore, PublicMemoryFirestore } from './src/api/database';
 
+/**
+ * Registers the memory-only Firestore build with the components framework.
+ */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  configureForFirebase(instance, PublicMemoryFirestore, Firestore);
+  configureForFirebase(instance, () => new MemoryPersistenceProvider());
   instance.registerVersion(name, version);
 }
 

packages/firestore/index.node.memory.ts

@@ -18,15 +18,19 @@
 import firebase from '@firebase/app';
 import { FirebaseNamespace } from '@firebase/app-types';
 
+import {MemoryPersistenceProvider} from "./src/local/memory_persistence";
 import { configureForFirebase } from './src/platform/config';
 import './register-module';
 import './src/platform_node/node_init';
 
 import { name, version } from './package.json';
-import { Firestore, PublicMemoryFirestore } from './src/api/database';
 
+/**
+ * Registers the memory-only Firestore build for Node with the components 
+ * framework.
+ */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  configureForFirebase(instance, PublicMemoryFirestore, Firestore);
+  configureForFirebase(instance, () => new MemoryPersistenceProvider());
   instance.registerVersion(name, version);
 }
 

packages/firestore/index.node.ts

@@ -15,22 +15,24 @@
  * limitations under the License.
  */
 import firebase from '@firebase/app';
+import { FirebaseNamespace } from '@firebase/app-types';
+
+import {IndexedDbPersistenceProvider} from "./src/local/indexeddb_persistence";
 import { configureForFirebase } from './src/platform/config';
+
 import './register-module';
 import './src/platform_node/node_init';
-import { FirebaseNamespace } from '@firebase/app-types';
 
 import { name, version } from './package.json';
-import {
-  PersistenceFirestore,
-  PublicPersistenceFirestore
-} from './src/api/persistence';
 
+/**
+ * Registers the main Firestore Node build with the components framework.
+ * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
+ */
 export function registerFirestore(instance: FirebaseNamespace): void {
   configureForFirebase(
     instance,
-    PublicPersistenceFirestore,
-    PersistenceFirestore
+    () => new IndexedDbPersistenceProvider()
   );
   instance.registerVersion(name, version, 'node');
 }

packages/firestore/index.ts

@@ -16,23 +16,22 @@
  */
 
 import firebase from '@firebase/app';
-import { configureForFirebase } from './src/platform/config';
-import './register-module';
-import './src/platform_browser/browser_init';
-
 import { FirebaseNamespace } from '@firebase/app-types';
 
+import {IndexedDbPersistenceProvider} from "./src/local/indexeddb_persistence";
+import { configureForFirebase } from './src/platform/config';
 import { name, version } from './package.json';
-import {
-  PersistenceFirestore,
-  PublicPersistenceFirestore
-} from './src/api/persistence';
 
+import './register-module';
+import './src/platform_browser/browser_init';
+
+/**
+ * Registers the main Firestore build with the components framework.
+ * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
+ */
 export function registerFirestore(instance: FirebaseNamespace): void {
   configureForFirebase(
-    instance,
-    PublicPersistenceFirestore,
-    PersistenceFirestore
+    instance, () => new IndexedDbPersistenceProvider()
   );
   instance.registerVersion(name, version);
 }

packages/firestore/rollup.config.js

@@ -31,7 +31,6 @@ import memoryPkg from './memory/package.json';
 import {
   appendPrivatePrefixTransformers,
   manglePrivatePropertiesOptions,
-  resolveMemoryExterns
 } from './terser.config';
 
 // This Firestore Rollup configuration provides a number of different builds:
@@ -55,10 +54,49 @@ const browserDeps = Object.keys(
   Object.assign({}, pkg.peerDependencies, pkg.dependencies)
 );
 
+const nodeDeps = [...browserDeps, 'util', 'path'];
+
+/** Resolves the external dependencies for the browser build. */
 function resolveBrowserExterns(id) {
   return browserDeps.some(dep => id === dep || id.startsWith(`${dep}/`));
 }
 
+/** Resolves the external dependencies for the NOde build. */
+function resolveNodeExterns(id) {
+  return nodeDeps.some(dep => id === dep || id.startsWith(`${dep}/`));
+}
+
+/**
+ * Resolves the external dependencies for the Memory-based Firestore 
+ * implementation. Verifies that no persistence sources are used by Firestore's 
+ * memory-only implementation.
+ */
+export function resolveMemoryExterns(deps, externsId, referencedBy) {
+  const externalRef = path
+    .resolve(path.dirname(referencedBy), externsId)
+    .replace('.ts', '');
+
+  const persistenceRef = [
+    'local/indexeddb_persistence.ts',
+    'local/indexeddb_index_manager.ts',
+    'local/indexeddb_mutation_queue.ts',
+    'local/indexeddb_remote_document_cache.ts',
+    'local/indexeddb_schema.ts',
+    'local/indexeddb_target_cache.ts',
+    'local/local_serializer.ts',
+    'local/lru_garbage_collector.ts',
+    'local/simple_db.ts',
+    'api/persistence.ts'
+  ].map(p => path.resolve(__dirname, 'src', p));
+
+  if (persistenceRef.indexOf(externalRef) !== -1) {
+    throw new Error('Unexpected reference in Memory-only client on ' + id);
+  }
+
+  return deps.some(dep => externsId === dep || externsId.startsWith(`${dep}/`));
+}
+
+
 const es5BuildPlugins = [
   typescriptPlugin({
     typescript,
@@ -151,12 +189,6 @@ const browserBuilds = [
 
 // MARK: Node builds
 
-const nodeDeps = [...browserDeps, 'util', 'path'];
-
-function resolveNodeExterns(id) {
-  return nodeDeps.some(dep => id === dep || id.startsWith(`${dep}/`));
-}
-
 const nodeBuildPlugins = [
   ...es5BuildPlugins,
   // Needed as we also use the *.proto files