WIP

Author: maneesht

packages/database/src/core/Repo.ts

@@ -48,10 +48,13 @@ import {
   statsManagerGetOrCreateReporter
 } from './stats/StatsManager';
 import { StatsReporter, statsReporterIncludeStat } from './stats/StatsReporter';
+import { syncPointGetView, syncPointViewExistsForQuery, syncPointViewForQuery } from './SyncPoint';
 import {
+  createNewTag,
   SyncTree,
   syncTreeAckUserWrite,
   syncTreeAddEventRegistration,
+  syncTreeAddToPath,
   syncTreeApplyServerMerge,
   syncTreeApplyServerOverwrite,
   syncTreeApplyTaggedQueryMerge,
@@ -60,7 +63,9 @@ import {
   syncTreeApplyUserOverwrite,
   syncTreeCalcCompleteEventCache,
   syncTreeGetServerValue,
-  syncTreeRemoveEventRegistration
+  syncTreeMakeQueryKey_,
+  syncTreeRemoveEventRegistration,
+  syncTreeTagForQuery_
 } from './SyncTree';
 import { Indexable } from './util/misc';
 import {
@@ -466,15 +471,30 @@ export function repoGetValue(repo: Repo, query: QueryContext): Promise<Node> {
   }
   return repo.server_.get(query).then(
     payload => {
-      const node = nodeFromJSON(payload as string).withIndex(
+      const node = nodeFromJSON(payload).withIndex(
         query._queryParams.getIndex()
       );
-      const events = syncTreeApplyServerOverwrite(
-        repo.serverSyncTree_,
-        query._path,
-        node
-      );
-      eventQueueRaiseEventsAtPath(repo.eventQueue_, query._path, events);
+      // if this is not a filtered query, then overwrite at path
+      if(query._queryParams.loadsAllData()) {
+        const events = syncTreeApplyServerOverwrite(
+          repo.serverSyncTree_,
+          query._path,
+          node
+        );
+        eventQueueRaiseEventsAtPath(repo.eventQueue_, query._path, events);
+      } else {
+        // Otherwise, only overwrite for query
+        console.log('query')
+        syncTreeAddToPath(query, repo.serverSyncTree_);
+        const tag = syncTreeTagForQuery_(repo.serverSyncTree_, query);
+        const events = syncTreeApplyTaggedQueryOverwrite(
+          repo.serverSyncTree_,
+          query._path,
+          node,
+          tag
+        );
+        eventQueueRaiseEventsAtPath(repo.eventQueue_, query._path, events);
+      }
       return Promise.resolve(node);
     },
     err => {

packages/database/src/core/SyncTree.ts

@@ -482,16 +482,14 @@ export function syncTreeApplyTaggedQueryMerge(
   }
 }
 
-/**
- * Add an event callback for the specified query.
- *
- * @returns Events to raise.
- */
-export function syncTreeAddEventRegistration(
-  syncTree: SyncTree,
-  query: QueryContext,
-  eventRegistration: EventRegistration
-): Event[] {
+export function createNewTag(syncTree: SyncTree, queryKey: string) {
+  const tag = syncTreeGetNextQueryTag_();
+  syncTree.queryToTagMap.set(queryKey, tag);
+  syncTree.tagToQueryMap.set(tag, queryKey);
+  return tag;
+}
+
+export function syncTreeAddToPath(query: QueryContext, syncTree: SyncTree) {
   const path = query._path;
 
   let serverCache: Node | null = null;
@@ -537,6 +535,7 @@ export function syncTreeAddEventRegistration(
     });
   }
 
+  
   const viewAlreadyExists = syncPointViewExistsForQuery(syncPoint, query);
   if (!viewAlreadyExists && !query._queryParams.loadsAllData()) {
     // We need to track a tag for this query
@@ -545,11 +544,26 @@ export function syncTreeAddEventRegistration(
       !syncTree.queryToTagMap.has(queryKey),
       'View does not exist, but we have a tag'
     );
-    const tag = syncTreeGetNextQueryTag_();
-    syncTree.queryToTagMap.set(queryKey, tag);
-    syncTree.tagToQueryMap.set(tag, queryKey);
+    createNewTag(syncTree, queryKey);
   }
   const writesCache = writeTreeChildWrites(syncTree.pendingWriteTree_, path);
+  // TODO: break this down so you do the minimal amount
+  return { syncPoint, writesCache, serverCache, serverCacheComplete, foundAncestorDefaultView, viewAlreadyExists };
+}
+
+/**
+ * Add an event callback for the specified query.
+ *
+ * @returns Events to raise.
+ */
+export function syncTreeAddEventRegistration(
+  syncTree: SyncTree,
+  query: QueryContext,
+  eventRegistration: EventRegistration
+): Event[] {
+
+  const { syncPoint, serverCache, writesCache, serverCacheComplete, viewAlreadyExists, foundAncestorDefaultView } = syncTreeAddToPath(query, syncTree);
+
   let events = syncPointAddEventRegistration(
     syncPoint,
     query,
@@ -803,7 +817,7 @@ function syncTreeCreateListenerForView_(
 /**
  * Return the tag associated with the given query.
  */
-function syncTreeTagForQuery_(
+export function syncTreeTagForQuery_(
   syncTree: SyncTree,
   query: QueryContext
 ): number | null {
@@ -814,7 +828,7 @@ function syncTreeTagForQuery_(
 /**
  * Given a query, computes a "queryKey" suitable for use in our queryToTagMap_.
  */
-function syncTreeMakeQueryKey_(query: QueryContext): string {
+export function syncTreeMakeQueryKey_(query: QueryContext): string {
   return query._path.toString() + '$' + query._queryIdentifier;
 }