@warp-drive/core 5.9.0-alpha.16 → 5.9.0-alpha.18

package/dist/unpkg/prod-deprecated/graph/-private.js

@@ -827,8 +827,10 @@ function replaceRelatedRecord(graph, op, isRemote = false) {
   if (op.value === existingState) {
     // if we were empty before but now know we are empty this needs to be true
     state.hasReceivedData = true;
+
     // if this is a remote update we still sync
     if (isRemote) {
+      state.hasReceivedRemoteData = true;
       const {
         localState
       } = relationship;
@@ -858,6 +860,15 @@ function replaceRelatedRecord(graph, op, isRemote = false) {
   // update value to the new value
   relationship[prop] = op.value;
   state.hasReceivedData = true;
+  /**
+   * Local mutations never give us additional information about
+   * whether the relationship has received *remote* data. This is
+   * what `getRemoteRelationship` relies on to avoid reflecting
+   * local-only edits.
+   */
+  if (isRemote) {
+    state.hasReceivedRemoteData = true;
+  }
   state.isEmpty = op.value === null;
   state.isStale = false;
   state.hasFailedLoadAttempt = false;
@@ -1152,7 +1163,12 @@ function diffCollection(finalState, relationship, onAdd, onDel) {
   return _compare(priorLocalState, finalState, finalSet, remoteState, remoteMembers, onAdd, onDel, relationship.definition.resetOnRemoteUpdate);
 }
 function computeLocalState(storage) {
-  if (!storage.isDirty) {
+  // When the edge is clean and we already have a materialized localState we can
+  // return it directly. A clean edge can still have a `null` localState though:
+  // dematerializing an inverse member (e.g. when a route reloads its model)
+  // nulls out localState without dirtying the edge. In that case we fall through
+  // and recompute from remoteState rather than asserting.
+  if (!storage.isDirty && storage.localState) {
     return storage.localState;
   }
   const state = storage.remoteState.slice();
@@ -1374,6 +1390,7 @@ function rollbackRelationship(graph, key, field, relationship) {
 function createState() {
   return {
     hasReceivedData: false,
+    hasReceivedRemoteData: false,
     isEmpty: true,
     isStale: false,
     hasFailedLoadAttempt: false,
@@ -1478,13 +1495,10 @@ function legacyGetResourceRelationshipData(source, getRemoteState) {
   source.accessed = true;
   let data;
   const payload = {};
-  if (getRemoteState && source.remoteState) {
-    data = source.remoteState;
-  } else if (!getRemoteState && source.localState) {
-    data = source.localState;
-  }
-  if ((getRemoteState && source.remoteState === null || source.localState === null) && source.state.hasReceivedData) {
-    data = null;
+  if (getRemoteState && (source.remoteState || source.state.hasReceivedRemoteData)) {
+    data = source.remoteState ?? null;
+  } else if (!getRemoteState && (source.localState || source.state.hasReceivedData)) {
+    data = source.localState ?? null;
   }
   if (source.links) {
     payload.links = source.links;
@@ -1661,7 +1675,6 @@ function updateRelationshipOperation(graph, op) {
   const relationship = graph.get(op.record, op.field);
   const {
     definition,
-    state,
     identifier
   } = relationship;
   const {
@@ -1696,23 +1709,6 @@ function updateRelationshipOperation(graph, op) {
         value: payload.data ? graph.store.cacheKeyManager.upgradeIdentifier(payload.data) : null
       }, true);
     }
-  } else if (definition.isAsync === false && !state.hasReceivedData) {
-    hasRelationshipDataProperty = true;
-    if (isCollection) {
-      graph.update({
-        op: 'replaceRelatedRecords',
-        record: identifier,
-        field: op.field,
-        value: []
-      }, true);
-    } else {
-      graph.update({
-        op: 'replaceRelatedRecord',
-        record: identifier,
-        field: op.field,
-        value: null
-      }, true);
-    }
   }
   if (payload.links) {
     const originalLinks = relationship.links;
@@ -1747,6 +1743,7 @@ function updateRelationshipOperation(graph, op) {
     // we don't need to notify here as the update op we pushed in above will notify once
     // membership is in the correct state.
     relationship.state.hasReceivedData = true;
+    relationship.state.hasReceivedRemoteData = true;
     relationship.state.isStale = false;
     relationship.state.hasDematerializedInverse = false;
     relationship.state.isEmpty = relationshipIsEmpty;