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

package/dist/unpkg/dev/graph/-private.js

@@ -55,9 +55,14 @@ function assertValidRelationshipPayload(graph, op) {
     kind
   } = definition;
   if (payload.links) {
-    console.warn(`You pushed a record of type '${type}' with a relationship '${field}' configured as 'async: false'. You've included a link but no primary data, this may be an error in your payload. WarpDrive will treat this relationship as known-to-be-empty.`, isAsync || payload.data === null || !!payload.data || state.hasReceivedData, {
-      id: 'ds.store.push-link-for-sync-relationship'
-    });
+    // once JSON_API_CACHE_VALIDATION_ERRORS is active, this warning is instead
+    // the responsibility of the new document validator (see validateResourceRelationships
+    // in warp-drive-packages/json-api/src/-private/validator/1.1/7.2_resource-objects.ts)
+    {
+      console.warn(`You pushed a record of type '${type}' with a relationship '${field}' configured as 'async: false'. You've included a link but no primary data, this may be an error in your payload. WarpDrive will treat this relationship as known-to-be-empty.`, isAsync || payload.data === null || !!payload.data || state.hasReceivedData, {
+        id: 'ds.store.push-link-for-sync-relationship'
+      });
+    }
   } else if (payload.data) {
     if (kind === 'belongsTo') {
       (test => {
@@ -1355,8 +1360,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;
@@ -1379,6 +1386,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;
@@ -1585,12 +1601,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) {
-    (test => {
-      if (!test) {
-        throw new Error(`Expected localState to be present`);
-      }
-    })(Array.isArray(storage.localState));
+  // 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();
@@ -1890,8 +1906,30 @@ function rollbackRelationship(graph, key, field, relationship) {
   }
 }
 function createState() {
+  {
+    {
+      if (getGlobalConfig().WarpDrive.debug.LOG_GRAPH || globalThis.getWarpDriveRuntimeConfig().debug.LOG_GRAPH) {
+        let hasReceivedData = false;
+        return {
+          get hasReceivedData() {
+            return hasReceivedData;
+          },
+          set hasReceivedData(value) {
+            hasReceivedData = value;
+          },
+          hasReceivedRemoteData: false,
+          isEmpty: true,
+          isStale: false,
+          hasFailedLoadAttempt: false,
+          shouldForceReload: false,
+          hasDematerializedInverse: false
+        };
+      }
+    }
+  }
   return {
     hasReceivedData: false,
+    hasReceivedRemoteData: false,
     isEmpty: true,
     isStale: false,
     hasFailedLoadAttempt: false,
@@ -1996,13 +2034,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;
@@ -2216,7 +2251,6 @@ function updateRelationshipOperation(graph, op) {
   })(isHasMany(relationship) || isBelongsTo(relationship));
   const {
     definition,
-    state,
     identifier
   } = relationship;
   const {
@@ -2256,23 +2290,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;
@@ -2282,9 +2299,10 @@ function updateRelationshipOperation(graph, op) {
       const currentLink = originalLinks && originalLinks.related ? _normalizeLink(originalLinks.related) : null;
       const currentLinkHref = currentLink ? currentLink.href : null;
       if (relatedLink && relatedLink.href && relatedLink.href !== currentLinkHref) {
-        console.warn(`You pushed a record of type '${identifier.type}' with a relationship '${definition.key}' configured as 'async: false'. You've included a link but no primary data, this may be an error in your payload. WarpDrive will treat this relationship as known-to-be-empty.`, definition.isAsync || state.hasReceivedData, {
-          id: 'ds.store.push-link-for-sync-relationship'
-        });
+        // Note: the equivalent warning for this case is issued eagerly (and with a more
+        // complete condition, since it also accounts for `payload.data` being present) by
+        // `assertValidRelationshipPayload` in `-utils.ts`, which always runs immediately
+        // before this operation in DEBUG builds. Warning here too would double-warn.
         (test => {
           if (!test) {
             throw new Error(`You have pushed a record of type '${identifier.type}' with '${definition.key}' as a link, but the value of that link is not a string.`);
@@ -2315,6 +2333,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;

package/dist/unpkg/dev/{index-BZRBBa34.js → index-BZ6PKU-a.js}

@@ -2,13 +2,13 @@ import { D as Destroy, C as Context, S as SOURCE, a as Checkout, b as Commit } f
 import { d as defineGate, w as withSignalStore, n as notifyInternalSignal, p as peekInternalSignal, a as willSyncFlushWatchers, g as getOrCreateInternalSignal, c as consumeInternalSignal, b as createInternalSignal, A as ARRAY_SIGNAL, S as Signals, e as createSignalDescriptor, f as defineSignal, h as entangleSignal, i as entangleInitiallyStaleSignal, O as OBJECT_SIGNAL, j as createInternalMemo, o as waitFor } from "./-leaked-BohmerbH.js";
 import { EnableHydration, SkipCache, STRUCTURED } from './types/request.js';
 import { isResourceSchema } from './types/schema/fields.js';
+import { setLogging, getRuntimeConfig, setIsMaybeMirage } from './types/runtime.js';
 import { a as cloneResponseProperties, I as IS_CACHE_HANDLER, b as assertValidRequest, e as executeNextHandler, d as getRequestResult, u as upgradePromise, s as setPromiseResult, f as clearRequestResult } from "./future-DUuPqyLj.js";
 import { getOrSetGlobal, setTransient, peekTransient, peekUniversalTransient, setUniversalTransient } from './types/-private.js';
 import { DefaultCachePolicy } from './store.js';
 import { withBrand } from './request.js';
 import { CACHE_OWNER, DEBUG_STALE_CACHE_OWNER, DEBUG_KEY_TYPE, DEBUG_CLIENT_ORIGINATED } from './types/identifier.js';
 import { g as getGlobalConfig } from "./runtime-DGG4CvlW.js";
-import { setLogging, getRuntimeConfig } from './types/runtime.js';
 import { RecordStore, Type } from './types/symbols.js';
 function urlFromLink(link) {
   if (typeof link === 'string') return link;
@@ -6660,11 +6660,32 @@ function getBelongsToField(context) {
 }
 function setBelongsToField(context) {
   const {
+    field,
+    resourceKey,
     store
   } = context;
   const {
-    schema
+    schema,
+    cache
   } = store;
+
+  /**
+   * We currently only allow editing sync belongsTo relationships
+   * in PolarisMode
+   */
+  const isValidPolarisConfig = field.options.linksMode && !field.options.async;
+  if (!context.legacy && isValidPolarisConfig) {
+    const name = context.path.at(-1);
+    cache.mutate({
+      op: 'replaceRelatedRecord',
+      record: resourceKey,
+      field: name,
+      value: getResourceKey(context.value)
+    },
+    // @ts-expect-error
+    true);
+    return true;
+  }
   (test => {
     if (!test) {
       throw new Error(`Can only mutate belongsTo fields when the resource is in legacy mode`);
@@ -6673,6 +6694,12 @@ function setBelongsToField(context) {
   schema._kind('@legacy', 'belongsTo').set(store, context.record, context.resourceKey, context.field, context.value);
   return true;
 }
+function getResourceKey(record) {
+  if (!record) {
+    return null;
+  }
+  return recordIdentifierFor(record);
+}
 function getCollectionField(context) {
   entangleSignal(context.signals, context.record, context.path.at(-1), null);
   (test => {
@@ -7405,6 +7432,17 @@ function setSchemaObjectField(context) {
   // }
   return true;
 }
+
+/**
+ * A ReactiveResource context object passed to
+ * the get/set functions of a field kind implementation.
+ *
+ * This provides all the necessary information for
+ * the field kind to perform its operations.
+ *
+ * @internal
+ */
+
 const DefaultMode = {
   '@hash': {
     get: getHashField,
@@ -8198,6 +8236,14 @@ const TypeField = {
     key: 'type'
   }
 };
+const IdentifierField = {
+  type: '@identity',
+  name: '$key',
+  kind: 'derived',
+  options: {
+    key: '^'
+  }
+};
 const DefaultIdentityField = {
   name: 'id',
   kind: '@id'
@@ -8386,6 +8432,7 @@ function withDefaults(schema) {
   // we add TypeField to the beginning so that it will
   // appear right next to the identity field
   schema.fields.unshift(TypeField);
+  schema.fields.unshift(IdentifierField);
   schema.fields.push(ConstructorField);
   return schema;
 }
@@ -8875,9 +8922,33 @@ function cloneResponse(response, overrides) {
   const props = cloneResponseProperties(response);
   return new Response(response.body, Object.assign(props, overrides));
 }
+function withDateHeader(response) {
+  const headers = new Headers(response.headers);
+  headers.set('date', new Date().toUTCString());
+  return cloneResponse(response, {
+    headers
+  });
+}
+
+// Detects Mirage (or another Pretender-based fetch mock), whose `Response`
+// may (unlike a spec-compliant `fetch()`, whose Response headers are always
+// immutable) allow header mutation and may not support streaming reads.
+//
+// This is inherently a heuristic - many legitimate tools (APM/monitoring
+// agents, browser extensions, polyfills) also patch `window.fetch`, and can
+// produce false positives. `setWarpDriveIsMaybeMirage(value)` lets an app
+// declare the answer explicitly (`true` or `false`), overriding the
+// heuristic in either direction; leave it unset to keep the default
+// detection. See https://github.com/warp-drive-data/warp-drive/issues/10535
 let IS_MAYBE_MIRAGE = () => false;
 {
-  IS_MAYBE_MIRAGE = () => Boolean(typeof window !== 'undefined' && (window.server?.pretender || window.fetch.toString().replace(/\s+/g, '') !== 'function fetch() { [native code] }'.replace(/\s+/g, '')));
+  IS_MAYBE_MIRAGE = () => {
+    const override = getRuntimeConfig().mirage;
+    if (override !== undefined) {
+      return override;
+    }
+    return Boolean(typeof window !== 'undefined' && (window.server?.pretender || window.fetch.toString().replace(/\s+/g, '') !== 'function fetch() { [native code] }'.replace(/\s+/g, '')));
+  };
 }
 const MUTATION_OPS = new Set(['updateRecord', 'createRecord', 'deleteRecord']);
 const ERROR_STATUS_CODE_FOR = new Map([[400, 'Bad Request'], [401, 'Unauthorized'], [402, 'Payment Required'], [403, 'Forbidden'], [404, 'Not Found'], [405, 'Method Not Allowed'], [406, 'Not Acceptable'], [407, 'Proxy Authentication Required'], [408, 'Request Timeout'], [409, 'Conflict'], [410, 'Gone'], [411, 'Length Required'], [412, 'Precondition Failed'], [413, 'Payload Too Large'], [414, 'URI Too Long'], [415, 'Unsupported Media Type'], [416, 'Range Not Satisfiable'], [417, 'Expectation Failed'], [419, 'Page Expired'], [420, 'Enhance Your Calm'], [421, 'Misdirected Request'], [422, 'Unprocessable Entity'], [423, 'Locked'], [424, 'Failed Dependency'], [425, 'Too Early'], [426, 'Upgrade Required'], [428, 'Precondition Required'], [429, 'Too Many Requests'], [430, 'Request Header Fields Too Large'], [431, 'Request Header Fields Too Large'], [450, 'Blocked By Windows Parental Controls'], [451, 'Unavailable For Legal Reasons'], [500, 'Internal Server Error'], [501, 'Not Implemented'], [502, 'Bad Gateway'], [503, 'Service Unavailable'], [504, 'Gateway Timeout'], [505, 'HTTP Version Not Supported'], [506, 'Variant Also Negotiates'], [507, 'Insufficient Storage'], [508, 'Loop Detected'], [509, 'Bandwidth Limit Exceeded'], [510, 'Not Extended'], [511, 'Network Authentication Required']]);
@@ -8929,13 +9000,15 @@ const Fetch = {
     const isMutationOp = Boolean(op && MUTATION_OPS.has(op));
     if (!isError && !isMutationOp && response.status !== 204 && !response.headers.has('date')) {
       if (IS_MAYBE_MIRAGE()) {
-        response.headers.set('date', new Date().toUTCString());
+        try {
+          response.headers.set('date', new Date().toUTCString());
+        } catch {
+          // IS_MAYBE_MIRAGE() was a false positive, or the mock's headers
+          // are (correctly) immutable - fall back to cloning.
+          response = withDateHeader(response);
+        }
       } else {
-        const headers = new Headers(response.headers);
-        headers.set('date', new Date().toUTCString());
-        response = cloneResponse(response, {
-          headers
-        });
+        response = withDateHeader(response);
       }
     }
     context.setResponse(response);
@@ -9330,6 +9403,12 @@ class RequestManager {
   globalThis.getWarpDriveRuntimeConfig = getRuntimeConfig;
 }
 
+// Mirage (or another Pretender-based fetch mock) may be used outside of a
+// `TESTING` build (e.g. `ember serve` in dev mode), so this override is
+// exposed unconditionally rather than gated to the `TESTING` env.
+// @ts-expect-error adding to globalThis
+globalThis.setWarpDriveIsMaybeMirage = setIsMaybeMirage;
+
 /**
  * Options for setting up a Store instance with `useRecommendedStore`.
  */

package/dist/unpkg/dev/index.js

@@ -1,4 +1,4 @@
-export { C as CacheHandler, F as Fetch, y as RequestManager, S as Store, r as cacheKeyFor, r as recordIdentifierFor, D as setIdentifierForgetMethod, A as setIdentifierGenerationMethod, E as setIdentifierResetMethod, B as setIdentifierUpdateMethod, G as setKeyInfoForResource, s as storeFor, z as useRecommendedStore } from "./index-BZRBBa34.js";
+export { C as CacheHandler, F as Fetch, y as RequestManager, S as Store, r as cacheKeyFor, r as recordIdentifierFor, D as setIdentifierForgetMethod, A as setIdentifierGenerationMethod, E as setIdentifierResetMethod, B as setIdentifierUpdateMethod, G as setKeyInfoForResource, s as storeFor, z as useRecommendedStore } from "./index-BZ6PKU-a.js";
 import "./-private-sql1_mdx.js";
 import "./-leaked-BohmerbH.js";
 import './store.js';

package/dist/unpkg/dev/reactive.js

@@ -1,3 +1,3 @@
-export { q as SchemaService, o as checkout, x as commit, u as fromIdentity, p as instantiateRecord, v as registerDerivations, t as teardownRecord, w as withDefaults } from "./index-BZRBBa34.js";
+export { q as SchemaService, o as checkout, x as commit, u as fromIdentity, p as instantiateRecord, v as registerDerivations, t as teardownRecord, w as withDefaults } from "./index-BZ6PKU-a.js";
 export { a as Checkout } from "./-private-sql1_mdx.js";
 export { k as createRequestSubscription, m as getPromiseState, l as getRequestState } from "./-leaked-BohmerbH.js";

package/dist/unpkg/dev/store/-private.js

@@ -1,6 +1,6 @@
 import '../types/request.js';
-import { i as isResourceKey, c as coerceId } from "../index-BZRBBa34.js";
-export { C as CacheHandler, R as RecordArrayManager, S as Store, j as StoreMap, _ as _clearCaches, n as _deprecatingNormalize, g as assertPrivateCapabilities, b as assertPrivateStore, k as createLegacyManyArray, e as ensureStringId, f as fastPush, d as isPrivateStore, a as isRequestKey, l as log, m as logGroup, r as recordIdentifierFor, h as setRecordIdentifier, s as storeFor } from "../index-BZRBBa34.js";
+import { i as isResourceKey, c as coerceId } from "../index-BZ6PKU-a.js";
+export { C as CacheHandler, R as RecordArrayManager, S as Store, j as StoreMap, _ as _clearCaches, n as _deprecatingNormalize, g as assertPrivateCapabilities, b as assertPrivateStore, k as createLegacyManyArray, e as ensureStringId, f as fastPush, d as isPrivateStore, a as isRequestKey, l as log, m as logGroup, r as recordIdentifierFor, h as setRecordIdentifier, s as storeFor } from "../index-BZ6PKU-a.js";
 function isNonEmptyString(str) {
   return Boolean(str && typeof str === 'string');
 }

package/dist/unpkg/dev/types/-private.js

@@ -1,5 +1,5 @@
 const name = "@warp-drive/core";
-const version = "5.9.0-alpha.16";
+const version = "5.9.0-alpha.18";
 
 // in testing mode, we utilize globals to ensure only one copy exists of
 // these maps, due to bugs in ember-auto-import

package/dist/unpkg/dev/types/runtime.js

@@ -31,4 +31,23 @@ function setLogging(config) {
   Object.assign(RuntimeConfig.debug, config);
   storage?.setItem('WarpDriveRuntimeConfig', JSON.stringify(RuntimeConfig));
 }
-export { getRuntimeConfig, setLogging };
+
+/**
+ * Explicitly declares whether requests may be served by Mirage (or another
+ * Pretender-based fetch mock) instead of a native `fetch` implementation.
+ *
+ * The `Fetch` request handler otherwise infers this via a heuristic (the
+ * presence of `window.server.pretender`, or `window.fetch` appearing to be
+ * patched), which can be wrong in either direction: some Mirage setups don't
+ * expose `window.server`, while some unrelated tools (APM agents, browser
+ * extensions) also patch `fetch`. Call this to override that heuristic:
+ * `true` to force Mirage-compatible behavior on, `false` to force it off.
+ *
+ * globalThis.setWarpDriveIsMaybeMirage(true);
+ *
+ */
+function setIsMaybeMirage(value) {
+  RuntimeConfig.mirage = value;
+  storage?.setItem('WarpDriveRuntimeConfig', JSON.stringify(RuntimeConfig));
+}
+export { getRuntimeConfig, setIsMaybeMirage, setLogging };

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

@@ -59,9 +59,14 @@ function assertValidRelationshipPayload(graph, op) {
     kind
   } = definition;
   if (payload.links) {
-    console.warn(`You pushed a record of type '${type}' with a relationship '${field}' configured as 'async: false'. You've included a link but no primary data, this may be an error in your payload. WarpDrive will treat this relationship as known-to-be-empty.`, isAsync || payload.data === null || !!payload.data || state.hasReceivedData, {
-      id: 'ds.store.push-link-for-sync-relationship'
-    });
+    // once JSON_API_CACHE_VALIDATION_ERRORS is active, this warning is instead
+    // the responsibility of the new document validator (see validateResourceRelationships
+    // in warp-drive-packages/json-api/src/-private/validator/1.1/7.2_resource-objects.ts)
+    {
+      console.warn(`You pushed a record of type '${type}' with a relationship '${field}' configured as 'async: false'. You've included a link but no primary data, this may be an error in your payload. WarpDrive will treat this relationship as known-to-be-empty.`, isAsync || payload.data === null || !!payload.data || state.hasReceivedData, {
+        id: 'ds.store.push-link-for-sync-relationship'
+      });
+    }
   } else if (payload.data) {
     if (kind === 'belongsTo') {
       (test => {
@@ -1409,8 +1414,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;
@@ -1441,6 +1448,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;
@@ -1780,12 +1796,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) {
-    (test => {
-      if (!test) {
-        throw new Error(`Expected localState to be present`);
-      }
-    })(Array.isArray(storage.localState));
+  // 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();
@@ -2085,8 +2101,30 @@ function rollbackRelationship(graph, key, field, relationship) {
   }
 }
 function createState() {
+  {
+    {
+      if (getGlobalConfig().WarpDrive.debug.LOG_GRAPH || globalThis.getWarpDriveRuntimeConfig().debug.LOG_GRAPH) {
+        let hasReceivedData = false;
+        return {
+          get hasReceivedData() {
+            return hasReceivedData;
+          },
+          set hasReceivedData(value) {
+            hasReceivedData = value;
+          },
+          hasReceivedRemoteData: false,
+          isEmpty: true,
+          isStale: false,
+          hasFailedLoadAttempt: false,
+          shouldForceReload: false,
+          hasDematerializedInverse: false
+        };
+      }
+    }
+  }
   return {
     hasReceivedData: false,
+    hasReceivedRemoteData: false,
     isEmpty: true,
     isStale: false,
     hasFailedLoadAttempt: false,
@@ -2191,13 +2229,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;
@@ -2411,7 +2446,6 @@ function updateRelationshipOperation(graph, op) {
   })(isHasMany(relationship) || isBelongsTo(relationship));
   const {
     definition,
-    state,
     identifier
   } = relationship;
   const {
@@ -2451,23 +2485,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;
@@ -2477,9 +2494,10 @@ function updateRelationshipOperation(graph, op) {
       const currentLink = originalLinks && originalLinks.related ? _normalizeLink(originalLinks.related) : null;
       const currentLinkHref = currentLink ? currentLink.href : null;
       if (relatedLink && relatedLink.href && relatedLink.href !== currentLinkHref) {
-        console.warn(`You pushed a record of type '${identifier.type}' with a relationship '${definition.key}' configured as 'async: false'. You've included a link but no primary data, this may be an error in your payload. WarpDrive will treat this relationship as known-to-be-empty.`, definition.isAsync || state.hasReceivedData, {
-          id: 'ds.store.push-link-for-sync-relationship'
-        });
+        // Note: the equivalent warning for this case is issued eagerly (and with a more
+        // complete condition, since it also accounts for `payload.data` being present) by
+        // `assertValidRelationshipPayload` in `-utils.ts`, which always runs immediately
+        // before this operation in DEBUG builds. Warning here too would double-warn.
         (test => {
           if (!test) {
             throw new Error(`You have pushed a record of type '${identifier.type}' with '${definition.key}' as a link, but the value of that link is not a string.`);
@@ -2510,6 +2528,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;