@ember-data/store 5.4.0-beta.18 → 5.4.0-beta.19

package/dist/{many-array-uP6jS6_J.js → many-array-BwVo-2vv.js}

@@ -4,7 +4,7 @@ import { EnableHydration, SkipCache } from '@warp-drive/core-types/request';
 import { setLogging, getRuntimeConfig } from '@warp-drive/core-types/runtime';
 import { getOrSetGlobal, peekTransient, setTransient } from '@warp-drive/core-types/-private';
 import { _backburner } from '@ember/runloop';
-import { defineSignal, createSignal, subscribe, createArrayTags, addToTransaction, addTransactionCB } from '@ember-data/tracking/-private';
+import { defineSubscription, notifySignal, defineSignal, createSignal, subscribe, createArrayTags, addToTransaction, addTransactionCB } from '@ember-data/tracking/-private';
 import { CACHE_OWNER, DEBUG_STALE_CACHE_OWNER, DEBUG_IDENTIFIER_BUCKET, DEBUG_CLIENT_ORIGINATED } from '@warp-drive/core-types/identifier';
 import { dasherize } from '@ember-data/request-utils/string';
 import { compat } from '@ember-data/tracking';
@@ -902,6 +902,309 @@ function _log(scope, prefix, subScop1, subScop2, subScop3, subScop4) {
   return [];
 }
 
+/**
+ * @module @ember-data/store
+ */
+function urlFromLink(link) {
+  if (typeof link === 'string') return link;
+  return link.href;
+}
+
+/**
+ * A Document is a class that wraps the response content from a request to the API
+ * returned by `Cache.put` or `Cache.peek`, converting resource-identifiers into
+ * record instances.
+ *
+ * It is not directly instantiated by the user, and its properties should not
+ * be directly modified. Whether individual properties are mutable or not is
+ * determined by the record instance itself.
+ *
+ * @public
+ * @class ReactiveDocument
+ */
+class ReactiveDocument {
+  /**
+   * The links object for this document, if any
+   *
+   * e.g.
+   *
+   * ```
+   * {
+   *   self: '/articles?page[number]=3',
+   * }
+   * ```
+   *
+   * @property links
+   * @type {object|undefined} - a links object
+   * @public
+   */
+
+  /**
+   * The primary data for this document, if any.
+   *
+   * If this document has no primary data (e.g. because it is an error document)
+   * this property will be `undefined`.
+   *
+   * For collections this will be an array of record instances,
+   * for single resource requests it will be a single record instance or null.
+   *
+   * @property data
+   * @public
+   * @type {object|Array<object>|null|undefined} - a data object
+   */
+
+  /**
+   * The errors returned by the API for this request, if any
+   *
+   * @property errors
+   * @public
+   * @type {object|undefined} - an errors object
+   */
+
+  /**
+   * The meta object for this document, if any
+   *
+   * @property meta
+   * @public
+   * @type {object|undefined} - a meta object
+   */
+
+  /**
+   * The identifier associated with this document, if any
+   *
+   * @property identifier
+   * @public
+   * @type {StableDocumentIdentifier|null}
+   */
+
+  constructor(store, identifier, localCache) {
+    this._store = store;
+    this._localCache = localCache;
+    this.identifier = identifier;
+
+    // TODO if we ever enable auto-cleanup of the cache, we will need to tear this down
+    // in a destroy method
+    if (identifier) {
+      store.notifications.subscribe(identifier, (_identifier, type) => {
+        switch (type) {
+          case 'updated':
+            // FIXME in the case of a collection we need to notify it's length
+            // and have it recalc
+            notifySignal(this, 'data');
+            notifySignal(this, 'links');
+            notifySignal(this, 'meta');
+            notifySignal(this, 'errors');
+            break;
+        }
+      });
+    }
+  }
+  async #request(link, options) {
+    const href = this.links?.[link];
+    if (!href) {
+      return null;
+    }
+    options.method = options.method || 'GET';
+    Object.assign(options, {
+      url: urlFromLink(href)
+    });
+    const response = await this._store.request(options);
+    return response.content;
+  }
+
+  /**
+   * Fetches the related link for this document, returning a promise that resolves
+   * with the document when the request completes. If no related link is present,
+   * will fallback to the self link if present
+   *
+   * @method fetch
+   * @public
+   * @param {object} options
+   * @return Promise<Document>
+   */
+  fetch(options = {}) {
+    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      if (!test) {
+        throw new Error(`No self or related link`);
+      }
+    })(this.links?.related || this.links?.self) : {};
+    options.cacheOptions = options.cacheOptions || {};
+    options.cacheOptions.key = this.identifier?.lid;
+    return this.#request(this.links.related ? 'related' : 'self', options);
+  }
+
+  /**
+   * Fetches the next link for this document, returning a promise that resolves
+   * with the new document when the request completes, or null  if there is no
+   * next link.
+   *
+   * @method next
+   * @public
+   * @param {object} options
+   * @return Promise<Document | null>
+   */
+  next(options = {}) {
+    return this.#request('next', options);
+  }
+
+  /**
+   * Fetches the prev link for this document, returning a promise that resolves
+   * with the new document when the request completes, or null if there is no
+   * prev link.
+   *
+   * @method prev
+   * @public
+   * @param {object} options
+   * @return Promise<Document | null>
+   */
+  prev(options = {}) {
+    return this.#request('prev', options);
+  }
+
+  /**
+   * Fetches the first link for this document, returning a promise that resolves
+   * with the new document when the request completes, or null if there is no
+   * first link.
+   *
+   * @method first
+   * @public
+   * @param {object} options
+   * @return Promise<Document | null>
+   */
+  first(options = {}) {
+    return this.#request('first', options);
+  }
+
+  /**
+   * Fetches the last link for this document, returning a promise that resolves
+   * with the new document when the request completes, or null if there is no
+   * last link.
+   *
+   * @method last
+   * @public
+   * @param {object} options
+   * @return Promise<Document | null>
+   */
+  last(options = {}) {
+    return this.#request('last', options);
+  }
+
+  /**
+   * Implemented for `JSON.stringify` support.
+   *
+   * Returns the JSON representation of the document wrapper.
+   *
+   * This is a shallow serialization, it does not deeply serialize
+   * the document's contents, leaving that to the individual record
+   * instances to determine how to do, if at all.
+   *
+   * @method toJSON
+   * @public
+   * @return
+   */
+  toJSON() {
+    const data = {};
+    data.identifier = this.identifier;
+    if (this.data !== undefined) {
+      data.data = this.data;
+    }
+    if (this.links !== undefined) {
+      data.links = this.links;
+    }
+    if (this.errors !== undefined) {
+      data.errors = this.errors;
+    }
+    if (this.meta !== undefined) {
+      data.meta = this.meta;
+    }
+    return data;
+  }
+}
+defineSubscription(ReactiveDocument.prototype, 'errors', {
+  get() {
+    const {
+      identifier
+    } = this;
+    if (!identifier) {
+      const {
+        document
+      } = this._localCache;
+      if ('errors' in document) {
+        return document.errors;
+      }
+      return;
+    }
+    const doc = this._store.cache.peek(identifier);
+    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      if (!test) {
+        throw new Error(`No cache data was found for the document '${identifier.lid}'`);
+      }
+    })(doc) : {};
+    return 'errors' in doc ? doc.errors : undefined;
+  }
+});
+defineSubscription(ReactiveDocument.prototype, 'data', {
+  get() {
+    const {
+      identifier,
+      _localCache
+    } = this;
+    const doc = identifier ? this._store.cache.peek(identifier) : _localCache.document;
+    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      if (!test) {
+        throw new Error(`No cache data was found for the document '${identifier?.lid ?? '<uncached document>'}'`);
+      }
+    })(doc) : {};
+    const data = 'data' in doc ? doc.data : undefined;
+    if (Array.isArray(data)) {
+      return this._store.recordArrayManager.getCollection({
+        type: identifier ? identifier.lid : _localCache.request.url,
+        identifiers: data.slice(),
+        doc: identifier ? undefined : doc,
+        identifier: identifier ?? null
+      });
+    } else if (data) {
+      return this._store.peekRecord(data);
+    } else {
+      return data;
+    }
+  }
+});
+defineSubscription(ReactiveDocument.prototype, 'links', {
+  get() {
+    const {
+      identifier
+    } = this;
+    if (!identifier) {
+      return this._localCache.document.links;
+    }
+    const data = this._store.cache.peek(identifier);
+    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      if (!test) {
+        throw new Error(`No cache data was found for the document '${identifier.lid}'`);
+      }
+    })(data) : {};
+    return data.links;
+  }
+});
+defineSubscription(ReactiveDocument.prototype, 'meta', {
+  get() {
+    const {
+      identifier
+    } = this;
+    if (!identifier) {
+      return this._localCache.document.meta;
+    }
+    const data = this._store.cache.peek(identifier);
+    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      if (!test) {
+        throw new Error(`No cache data was found for the document '${identifier.lid}'`);
+      }
+    })(data) : {};
+    return data.meta;
+  }
+});
+
 /**
   @module @ember-data/store
 */
@@ -1282,12 +1585,13 @@ function storeFor(record) {
   return store;
 }
 class InstanceCache {
-  __instances = {
-    record: new Map(),
-    reference: new WeakMap()
-  };
   constructor(store) {
     this.store = store;
+    this.__instances = {
+      record: new Map(),
+      reference: new WeakMap(),
+      document: new Map()
+    };
     this._storeWrapper = new CacheCapabilitiesManager(this.store);
     store.identifierCache.__configureMerge((identifier, matchedIdentifier, resourceData) => {
       let keptIdentifier = identifier;
@@ -1342,6 +1646,14 @@ class InstanceCache {
   peek(identifier) {
     return this.__instances.record.get(identifier);
   }
+  getDocument(identifier) {
+    let doc = this.__instances.document.get(identifier);
+    if (!doc) {
+      doc = new ReactiveDocument(this.store, identifier, null);
+      this.__instances.document.set(identifier, doc);
+    }
+    return doc;
+  }
   getRecord(identifier, properties) {
     let record = this.__instances.record.get(identifier);
     if (!record) {
@@ -2678,6 +2990,7 @@ class IdentifierArray {
   isDestroying = false;
   isDestroyed = false;
   _updatingPromise = null;
+  identifier;
   [IS_COLLECTION] = true;
   [SOURCE];
   [NOTIFY]() {
@@ -2716,6 +3029,7 @@ class IdentifierArray {
     this.modelName = options.type;
     this.store = options.store;
     this._manager = options.manager;
+    this.identifier = options.identifier || null;
     this[SOURCE] = options.identifiers;
     this[ARRAY_SIGNAL] = createSignal(this, 'length');
     const store = options.store;
@@ -3172,6 +3486,12 @@ class RecordArrayManager {
     this._identifiers = new Map();
     this._set = new Map();
     this._visibilitySet = new Map();
+    this._subscription = this.store.notifications.subscribe('document', (identifier, type) => {
+      if (type === 'updated' && this._keyedArrays.has(identifier.lid)) {
+        const array = this._keyedArrays.get(identifier.lid);
+        this.dirtyArray(array, 0, true);
+      }
+    });
     this._subscription = this.store.notifications.subscribe('resource', (identifier, type) => {
       if (type === 'added') {
         this._visibilitySet.set(identifier, true);
@@ -3186,11 +3506,35 @@ class RecordArrayManager {
   }
   _syncArray(array) {
     const pending = this._pending.get(array);
-    if (!pending || this.isDestroying || this.isDestroyed) {
+    const isRequestArray = isCollection(array);
+    if (!isRequestArray && !pending || this.isDestroying || this.isDestroyed) {
       return;
     }
-    sync(array, pending, this._set.get(array));
-    this._pending.delete(array);
+
+    // first flush any staged changes
+    if (pending) {
+      sync(array, pending, this._set.get(array));
+      this._pending.delete(array);
+    }
+
+    // then pull new state if required
+    if (isRequestArray) {
+      const tag = array[ARRAY_SIGNAL];
+      if (tag.reason === 'cache-sync') {
+        tag.reason = null;
+        const doc = this.store.cache.peek(array.identifier);
+        macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+          if (!test) {
+            throw new Error(`Expected to find a document for ${array.identifier.lid} but found none`);
+          }
+        })(doc) : {};
+        const data = !('data' in doc) || !Array.isArray(doc.data) ? [] : doc.data;
+        // TODO technically we should destroy here if
+        // !('data' in doc) || !Array.isArray(doc.data)
+        // is true.
+        this.populateManagedArray(array, data, null);
+      }
+    }
   }
   mutate(mutation) {
     this.store.cache.mutate(mutation);
@@ -3229,9 +3573,13 @@ class RecordArrayManager {
     }
     return array;
   }
-  createArray(config) {
+  getCollection(config) {
+    if (config.identifier && this._keyedArrays.has(config.identifier.lid)) {
+      return this._keyedArrays.get(config.identifier.lid);
+    }
     const options = {
       type: config.type,
+      identifier: config.identifier || null,
       links: config.doc?.links || null,
       meta: config.doc?.meta || null,
       query: config.query || null,
@@ -3244,16 +3592,22 @@ class RecordArrayManager {
     const array = new Collection(options);
     this._managed.add(array);
     this._set.set(array, new Set(options.identifiers || []));
+    if (config.identifier) {
+      this._keyedArrays.set(config.identifier.lid, array);
+    }
     if (config.identifiers) {
       associate(this._identifiers, array, config.identifiers);
     }
     return array;
   }
-  dirtyArray(array, delta) {
+  dirtyArray(array, delta, shouldSyncFromCache) {
     if (array === FAKE_ARR) {
       return;
     }
     const tag = array[ARRAY_SIGNAL];
+    if (shouldSyncFromCache) {
+      tag.reason = 'cache-sync';
+    }
     if (!tag.shouldReset) {
       tag.shouldReset = true;
       addTransactionCB(array[NOTIFY]);
@@ -3312,13 +3666,18 @@ class RecordArrayManager {
   populateManagedArray(array, identifiers, payload) {
     this._pending.delete(array);
     const source = array[SOURCE];
+    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      if (!test) {
+        throw new Error(`The new state of the collection should not be using the same array reference as the original state.`);
+      }
+    })(source !== identifiers) : {};
     const old = source.slice();
     source.length = 0;
     fastPush(source, identifiers);
     this._set.set(array, new Set(identifiers));
     notifyArray(array);
-    array.meta = payload.meta || null;
-    array.links = payload.links || null;
+    array.meta = payload?.meta || null;
+    array.links = payload?.links || null;
     array.isLoaded = true;
     disassociate(this._identifiers, array, old);
     associate(this._identifiers, array, identifiers);
@@ -3332,7 +3691,7 @@ class RecordArrayManager {
           changes.delete(identifier);
         } else {
           changes.set(identifier, 'add');
-          this.dirtyArray(array, changes.size);
+          this.dirtyArray(array, changes.size, false);
         }
       });
     }
@@ -3346,7 +3705,7 @@ class RecordArrayManager {
           changes.delete(identifier);
         } else {
           changes.set(identifier, 'del');
-          this.dirtyArray(array, changes.size);
+          this.dirtyArray(array, changes.size, false);
         }
       });
     }
@@ -3451,6 +3810,9 @@ function sync(array, changes, arraySet) {
     */
   }
 }
+function isCollection(array) {
+  return array.identifier !== null;
+}
 
 /**
  * @module @ember-data/store
@@ -3889,6 +4251,7 @@ const app = new EmberApp(defaults, {
     id: 'ember-data:deprecate-store-extends-ember-object',
     until: '6.0',
     for: 'ember-data',
+    url: 'https://deprecations.emberjs.com/id/ember-data-deprecate-store-extends-ember-object',
     since: {
       available: '4.13',
       enabled: '5.4'
@@ -4036,7 +4399,6 @@ class Store extends BaseClass {
     // private
     this._requestCache = new RequestStateService(this);
     this._instanceCache = new InstanceCache(this);
-    this._documentCache = new Map();
     this.isDestroying = false;
     this.isDestroyed = false;
   }
@@ -5483,18 +5845,6 @@ class Store extends BaseClass {
     if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
       assertDestroyingStore(this, '_push');
     }
-    if (macroCondition(getGlobalConfig().WarpDrive.activeLogging.LOG_PAYLOADS)) {
-      if (getGlobalConfig().WarpDrive.debug.LOG_PAYLOADS || globalThis.getWarpDriveRuntimeConfig().debug.LOG_PAYLOADS) {
-        try {
-          const data = JSON.parse(JSON.stringify(jsonApiDoc));
-          // eslint-disable-next-line no-console
-          console.log('EmberData | Payload - push', data);
-        } catch {
-          // eslint-disable-next-line no-console
-          console.log('EmberData | Payload - push', jsonApiDoc);
-        }
-      }
-    }
     if (asyncFlush) {
       this._enableAsyncFlush = true;
     }
@@ -5755,212 +6105,6 @@ function extractIdentifierFromRecord$1(recordOrPromiseRecord) {
   const extract = recordIdentifierFor;
   return extract(recordOrPromiseRecord);
 }
-
-/**
- * @module @ember-data/store
- */
-function urlFromLink(link) {
-  if (typeof link === 'string') return link;
-  return link.href;
-}
-
-/**
- * A Document is a class that wraps the response content from a request to the API
- * returned by `Cache.put` or `Cache.peek`, converting resource-identifiers into
- * record instances.
- *
- * It is not directly instantiated by the user, and its properties should not
- * be directly modified. Whether individual properties are mutable or not is
- * determined by the record instance itself.
- *
- * @public
- * @class Document
- */
-class Document {
-  /**
-   * The links object for this document, if any
-   *
-   * e.g.
-   *
-   * ```
-   * {
-   *   self: '/articles?page[number]=3',
-   * }
-   * ```
-   *
-   * @property links
-   * @type {object|undefined} - a links object
-   * @public
-   */
-
-  /**
-   * The primary data for this document, if any.
-   *
-   * If this document has no primary data (e.g. because it is an error document)
-   * this property will be `undefined`.
-   *
-   * For collections this will be an array of record instances,
-   * for single resource requests it will be a single record instance or null.
-   *
-   * @property data
-   * @public
-   * @type {object|Array<object>|null|undefined} - a data object
-   */
-
-  /**
-   * The errors returned by the API for this request, if any
-   *
-   * @property errors
-   * @public
-   * @type {object|undefined} - an errors object
-   */
-
-  /**
-   * The meta object for this document, if any
-   *
-   * @property meta
-   * @public
-   * @type {object|undefined} - a meta object
-   */
-
-  /**
-   * The identifier associated with this document, if any
-   *
-   * @property identifier
-   * @public
-   * @type {StableDocumentIdentifier|null}
-   */
-
-  #store;
-  constructor(store, identifier) {
-    this.#store = store;
-    this.identifier = identifier;
-  }
-  async #request(link, options) {
-    const href = this.links?.[link];
-    if (!href) {
-      return null;
-    }
-    options.method = options.method || 'GET';
-    Object.assign(options, {
-      url: urlFromLink(href)
-    });
-    const response = await this.#store.request(options);
-    return response.content;
-  }
-
-  /**
-   * Fetches the related link for this document, returning a promise that resolves
-   * with the document when the request completes. If no related link is present,
-   * will fallback to the self link if present
-   *
-   * @method fetch
-   * @public
-   * @param {object} options
-   * @return Promise<Document>
-   */
-  fetch(options = {}) {
-    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
-      if (!test) {
-        throw new Error(`No self or related link`);
-      }
-    })(this.links?.related || this.links?.self) : {};
-    options.cacheOptions = options.cacheOptions || {};
-    options.cacheOptions.key = this.identifier?.lid;
-    return this.#request(this.links.related ? 'related' : 'self', options);
-  }
-
-  /**
-   * Fetches the next link for this document, returning a promise that resolves
-   * with the new document when the request completes, or null  if there is no
-   * next link.
-   *
-   * @method next
-   * @public
-   * @param {object} options
-   * @return Promise<Document | null>
-   */
-  next(options = {}) {
-    return this.#request('next', options);
-  }
-
-  /**
-   * Fetches the prev link for this document, returning a promise that resolves
-   * with the new document when the request completes, or null if there is no
-   * prev link.
-   *
-   * @method prev
-   * @public
-   * @param {object} options
-   * @return Promise<Document | null>
-   */
-  prev(options = {}) {
-    return this.#request('prev', options);
-  }
-
-  /**
-   * Fetches the first link for this document, returning a promise that resolves
-   * with the new document when the request completes, or null if there is no
-   * first link.
-   *
-   * @method first
-   * @public
-   * @param {object} options
-   * @return Promise<Document | null>
-   */
-  first(options = {}) {
-    return this.#request('first', options);
-  }
-
-  /**
-   * Fetches the last link for this document, returning a promise that resolves
-   * with the new document when the request completes, or null if there is no
-   * last link.
-   *
-   * @method last
-   * @public
-   * @param {object} options
-   * @return Promise<Document | null>
-   */
-  last(options = {}) {
-    return this.#request('last', options);
-  }
-
-  /**
-   * Implemented for `JSON.stringify` support.
-   *
-   * Returns the JSON representation of the document wrapper.
-   *
-   * This is a shallow serialization, it does not deeply serialize
-   * the document's contents, leaving that to the individual record
-   * instances to determine how to do, if at all.
-   *
-   * @method toJSON
-   * @public
-   * @return
-   */
-  toJSON() {
-    const data = {};
-    data.identifier = this.identifier;
-    if (this.data !== undefined) {
-      data.data = this.data;
-    }
-    if (this.links !== undefined) {
-      data.links = this.links;
-    }
-    if (this.errors !== undefined) {
-      data.errors = this.errors;
-    }
-    if (this.meta !== undefined) {
-      data.meta = this.meta;
-    }
-    return data;
-  }
-}
-defineSignal(Document.prototype, 'data');
-defineSignal(Document.prototype, 'links');
-defineSignal(Document.prototype, 'errors');
-defineSignal(Document.prototype, 'meta');
 const MUTATION_OPS = new Set(['createRecord', 'updateRecord', 'deleteRecord']);
 function calcShouldFetch(store, request, hasCachedValue, identifier) {
   const {
@@ -5977,17 +6121,6 @@ function calcShouldBackgroundFetch(store, request, willFetch, identifier) {
 function isMutation(request) {
   return Boolean(request.op && MUTATION_OPS.has(request.op));
 }
-function copyDocumentProperties(target, source) {
-  if ('links' in source) {
-    target.links = source.links;
-  }
-  if ('meta' in source) {
-    target.meta = source.meta;
-  }
-  if ('errors' in source) {
-    target.errors = source.errors;
-  }
-}
 function isCacheAffecting(document) {
   if (!isMutation(document.request)) {
     return true;
@@ -6015,9 +6148,6 @@ function cloneError(error) {
   Object.assign(cloned, error);
   return cloned;
 }
-function isErrorDocument(document) {
-  return 'errors' in document;
-}
 function getPriority(identifier, deduped, priority) {
   if (identifier) {
     const existing = deduped.get(identifier);
@@ -6147,10 +6277,10 @@ const CacheHandler = {
     const shouldHydrate = context.request[EnableHydration] || false;
     context.setResponse(peeked.response);
     if ('error' in peeked) {
-      const content = shouldHydrate ? maybeUpdateErrorUiObjects(store, {
+      const content = shouldHydrate ? maybeUpdateUiObjects(store, context.request, {
         shouldHydrate,
         identifier
-      }, peeked.content, true) : peeked.content;
+      }, peeked.content) : peeked.content;
       const newError = cloneError(peeked);
       newError.content = content;
       throw newError;
@@ -6158,15 +6288,15 @@ const CacheHandler = {
     const result = shouldHydrate ? maybeUpdateUiObjects(store, context.request, {
       shouldHydrate,
       identifier
-    }, peeked.content, true) : peeked.content;
+    }, peeked.content) : peeked.content;
     return result;
   }
 };
-function maybeUpdateUiObjects(store, request, options, document, isFromCache) {
+function maybeUpdateUiObjects(store, request, options, document) {
   const {
     identifier
   } = options;
-  if (!document) {
+  if (!document || !options.shouldHydrate) {
     macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
       if (!test) {
         throw new Error(`The CacheHandler expected response content but none was found`);
@@ -6174,97 +6304,16 @@ function maybeUpdateUiObjects(store, request, options, document, isFromCache) {
     })(!options.shouldHydrate) : {};
     return document;
   }
-  if (Array.isArray(document.data)) {
-    const {
-      recordArrayManager
-    } = store;
-    if (!identifier) {
-      if (!options.shouldHydrate) {
-        return document;
-      }
-      const data = recordArrayManager.createArray({
-        type: request.url,
-        identifiers: document.data,
-        doc: document,
-        query: request
-      });
-      const doc = new Document(store, null);
-      doc.data = data;
-      doc.meta = document.meta;
-      doc.links = document.links;
-      return doc;
-    }
-    let managed = recordArrayManager._keyedArrays.get(identifier.lid);
-    if (!managed) {
-      managed = recordArrayManager.createArray({
-        type: identifier.lid,
-        identifiers: document.data,
-        doc: document
-      });
-      recordArrayManager._keyedArrays.set(identifier.lid, managed);
-      const doc = new Document(store, identifier);
-      doc.data = managed;
-      doc.meta = document.meta;
-      doc.links = document.links;
-      store._documentCache.set(identifier, doc);
-      return options.shouldHydrate ? doc : document;
-    } else {
-      const doc = store._documentCache.get(identifier);
-      if (!isFromCache) {
-        recordArrayManager.populateManagedArray(managed, document.data, document);
-        doc.data = managed;
-        doc.meta = document.meta;
-        doc.links = document.links;
-      }
-      return options.shouldHydrate ? doc : document;
-    }
-  } else {
-    if (!identifier && !options.shouldHydrate) {
-      return document;
-    }
-    const data = document.data ? store.peekRecord(document.data) : null;
-    let doc;
-    if (identifier) {
-      doc = store._documentCache.get(identifier);
-    }
-    if (!doc) {
-      doc = new Document(store, identifier);
-      doc.data = data;
-      copyDocumentProperties(doc, document);
-      if (identifier) {
-        store._documentCache.set(identifier, doc);
-      }
-    } else if (!isFromCache) {
-      doc.data = data;
-      copyDocumentProperties(doc, document);
-    }
-    return options.shouldHydrate ? doc : document;
-  }
-}
-function maybeUpdateErrorUiObjects(store, options, document, isFromCache) {
-  const {
-    identifier
-  } = options;
-
-  // TODO investigate why ResourceErrorDocument is insufficient for expressing all error types
-  if (!isErrorDocument(document) || !identifier && !options.shouldHydrate) {
-    return document;
-  }
-  let doc;
   if (identifier) {
-    doc = store._documentCache.get(identifier);
+    return store._instanceCache.getDocument(identifier);
   }
-  if (!doc) {
-    doc = new Document(store, identifier);
-    copyDocumentProperties(doc, document);
-    if (identifier) {
-      store._documentCache.set(identifier, doc);
-    }
-  } else if (!isFromCache) {
-    doc.data = undefined;
-    copyDocumentProperties(doc, document);
-  }
-  return options.shouldHydrate ? doc : document;
+
+  // if we don't have an identifier, we give the document
+  // its own local cache
+  return new ReactiveDocument(store, null, {
+    request,
+    document
+  });
 }
 function updateCacheForSuccess(store, request, options, document) {
   let response = null;
@@ -6282,7 +6331,7 @@ function updateCacheForSuccess(store, request, options, document) {
   } else {
     response = store.cache.put(document);
   }
-  return maybeUpdateUiObjects(store, request, options, response, false);
+  return maybeUpdateUiObjects(store, request, options, response);
 }
 function handleFetchSuccess(store, context, options, document) {
   const {
@@ -6315,7 +6364,7 @@ function updateCacheForError(store, context, options, error) {
     store.cache.commitWasRejected(record, errors);
   } else {
     response = store.cache.put(error);
-    return maybeUpdateErrorUiObjects(store, options, response, false);
+    return maybeUpdateUiObjects(store, context.request, options, response);
   }
 }
 function handleFetchError(store, context, options, error) {
@@ -6820,7 +6869,7 @@ function assertNoDuplicates(collection, target, callback, reason) {
 }
 function mutateAddToRelatedRecords(collection, operationInfo, _SIGNAL) {
   mutate(collection, {
-    op: 'addToRelatedRecords',
+    op: 'add',
     record: collection.identifier,
     field: collection.key,
     ...operationInfo
@@ -6828,7 +6877,7 @@ function mutateAddToRelatedRecords(collection, operationInfo, _SIGNAL) {
 }
 function mutateRemoveFromRelatedRecords(collection, operationInfo, _SIGNAL) {
   mutate(collection, {
-    op: 'removeFromRelatedRecords',
+    op: 'remove',
     record: collection.identifier,
     field: collection.key,
     ...operationInfo
@@ -6867,4 +6916,4 @@ function mutate(collection, mutation, _SIGNAL) {
   collection._manager.mutate(mutation);
   addToTransaction(_SIGNAL);
 }
-export { ARRAY_SIGNAL as A, CacheHandler as C, IdentifierArray as I, MUTATE as M, RecordArrayManager as R, Store as S, _clearCaches as _, setIdentifierGenerationMethod as a, setIdentifierUpdateMethod as b, setIdentifierForgetMethod as c, setIdentifierResetMethod as d, setKeyInfoForResource as e, constructResource as f, coerceId as g, ensureStringId as h, isStableIdentifier as i, Collection as j, SOURCE as k, fastPush as l, removeRecordDataFor as m, notifyArray as n, setRecordIdentifier as o, peekCache as p, StoreMap as q, recordIdentifierFor as r, storeFor as s, setCacheFor as t, normalizeModelName as u, RelatedCollection as v, log as w, logGroup as x };
+export { ARRAY_SIGNAL as A, CacheHandler as C, IdentifierArray as I, MUTATE as M, RecordArrayManager as R, Store as S, _clearCaches as _, setIdentifierGenerationMethod as a, setIdentifierUpdateMethod as b, setIdentifierForgetMethod as c, setIdentifierResetMethod as d, setKeyInfoForResource as e, isDocumentIdentifier as f, constructResource as g, coerceId as h, isStableIdentifier as i, ensureStringId as j, Collection as k, SOURCE as l, fastPush as m, notifyArray as n, removeRecordDataFor as o, peekCache as p, setRecordIdentifier as q, recordIdentifierFor as r, storeFor as s, StoreMap as t, setCacheFor as u, normalizeModelName as v, RelatedCollection as w, log as x, logGroup as y };