@ember-data/store 5.4.0-alpha.9 → 5.4.0-beta.0

package/addon/-private.js

@@ -1 +1 @@
-export { f as AdapterPopulatedRecordArray, C as CacheHandler, h as IDENTIFIER_ARRAY_TAG, I as IdentifierArray, M as MUTATE, I as RecordArray, R as RecordArrayManager, g as SOURCE, S as Store, m as StoreMap, _ as _clearCaches, e as coerceId, j as fastPush, i as isStableIdentifier, n as notifyArray, p as peekCache, r as recordIdentifierFor, k as removeRecordDataFor, o as setCacheFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, l as setRecordIdentifier, s as storeFor } from "./store-service-fc1e0bd5";
+export { f as AdapterPopulatedRecordArray, C as CacheHandler, h as IDENTIFIER_ARRAY_TAG, I as IdentifierArray, M as MUTATE, I as RecordArray, R as RecordArrayManager, g as SOURCE, S as Store, m as StoreMap, _ as _clearCaches, e as coerceId, j as fastPush, i as isStableIdentifier, n as notifyArray, p as peekCache, r as recordIdentifierFor, k as removeRecordDataFor, o as setCacheFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, l as setRecordIdentifier, s as storeFor } from "./store-service-aee9dd76";

package/addon/index.js

@@ -1 +1 @@
-export { C as CacheHandler, S as default, r as recordIdentifierFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, s as storeFor } from "./store-service-fc1e0bd5";
+export { C as CacheHandler, S as default, r as recordIdentifierFor, c as setIdentifierForgetMethod, a as setIdentifierGenerationMethod, d as setIdentifierResetMethod, b as setIdentifierUpdateMethod, s as storeFor } from "./store-service-aee9dd76";

package/addon/{store-service-fc1e0bd5.js → store-service-aee9dd76.js}

@@ -2,9 +2,9 @@ import { macroCondition, getOwnConfig } from '@embroider/macros';
 import { getOwner } from '@ember/application';
 import { assert, deprecate, warn } from '@ember/debug';
 import EmberObject from '@ember/object';
-import { _backburner } from '@ember/runloop';
 import { tracked } from '@glimmer/tracking';
 import { dasherize } from '@ember/string';
+import { _backburner } from '@ember/runloop';
 import { addToTransaction, subscribe, addTransactionCB } from '@ember-data/tracking/-private';
 import { tagForProperty } from '@ember/-internals/metal';
 import { dependentKeyCompat } from '@ember/object/compat';
@@ -233,11 +233,12 @@ function maybeUpdateUiObjects(store, request, options, document, isFromCache) {
     return options.shouldHydrate ? doc : document;
   }
 }
+const MUTATION_OPS = new Set(['createRecord', 'updateRecord', 'deleteRecord']);
 function calcShouldFetch(store, request, hasCachedValue, identifier) {
   const {
     cacheOptions
   } = request;
-  return cacheOptions?.reload || !hasCachedValue || (store.lifetimes && identifier ? store.lifetimes.isHardExpired(identifier) : false);
+  return request.op && MUTATION_OPS.has(request.op) || cacheOptions?.reload || !hasCachedValue || (store.lifetimes && identifier ? store.lifetimes.isHardExpired(identifier) : false);
 }
 function calcShouldBackgroundFetch(store, request, willFetch, identifier) {
   const {
@@ -245,17 +246,31 @@ function calcShouldBackgroundFetch(store, request, willFetch, identifier) {
   } = request;
   return !willFetch && (cacheOptions?.backgroundReload || (store.lifetimes && identifier ? store.lifetimes.isSoftExpired(identifier) : false));
 }
+function isMutation(request) {
+  return Boolean(request.op && MUTATION_OPS.has(request.op));
+}
 function fetchContentAndHydrate(next, context, identifier, shouldFetch, shouldBackgroundFetch) {
   const {
     store
   } = context.request;
   const shouldHydrate = context.request[Symbol.for('ember-data:enable-hydration')] || false;
-  return next(context.request).then(document => {
+  let isMut = false;
+  if (isMutation(context.request)) {
+    isMut = true;
+    const record = context.request.data?.record;
+    assert(`Expected to receive a list of records included in the ${context.request.op} request`, record);
+    store.cache.willCommit(record, context);
+  }
+  const promise = next(context.request).then(document => {
     store.requestManager._pending.delete(context.id);
     store._enableAsyncFlush = true;
     let response;
     store._join(() => {
-      response = store.cache.put(document);
+      if (isMutation(context.request)) {
+        response = store.cache.didCommit(context.request.data.record, document);
+      } else {
+        response = store.cache.put(document);
+      }
       response = maybeUpdateUiObjects(store, context.request, {
         shouldHydrate,
         shouldFetch,
@@ -278,13 +293,22 @@ function fetchContentAndHydrate(next, context, identifier, shouldFetch, shouldBa
     store._enableAsyncFlush = true;
     let response;
     store._join(() => {
-      response = store.cache.put(error);
-      response = maybeUpdateUiObjects(store, context.request, {
-        shouldHydrate,
-        shouldFetch,
-        shouldBackgroundFetch,
-        identifier
-      }, response, false);
+      if (isMutation(context.request)) {
+        // TODO similar to didCommit we should spec this to be similar to cache.put for handling full response
+        // currently we let the response remain undefiend.
+        const errors = error && error.content && typeof error.content === 'object' && 'errors' in error.content && Array.isArray(error.content.errors) ? error.content.errors : undefined;
+        store.cache.commitWasRejected(context.request.data.record, errors);
+        // re-throw the original error to preserve `errors` property.
+        throw error;
+      } else {
+        response = store.cache.put(error);
+        response = maybeUpdateUiObjects(store, context.request, {
+          shouldHydrate,
+          shouldFetch,
+          shouldBackgroundFetch,
+          identifier
+        }, response, false);
+      }
     });
     store._enableAsyncFlush = null;
     if (!shouldBackgroundFetch) {
@@ -295,6 +319,19 @@ function fetchContentAndHydrate(next, context, identifier, shouldFetch, shouldBa
       store.notifications._flush();
     }
   });
+  if (!isMut) {
+    return promise;
+  }
+  assert(`Expected a mutation`, isMutation(context.request));
+
+  // for mutations we need to enqueue the promise with the requestStateService
+  return store._requestCache._enqueue(promise, {
+    data: [{
+      op: 'saveRecord',
+      recordIdentifier: context.request.data.record,
+      options: undefined
+    }]
+  });
 }
 function cloneError(error) {
   const cloned = new Error(error.message);
@@ -2879,7 +2916,7 @@ let IdentifierArray = (_class3 = class IdentifierArray {
     });
     if (macroCondition(getOwnConfig().env.DEBUG)) {
       const meta = Ember.meta(this);
-      meta.hasMixin = mixin => {
+      meta.addMixin = mixin => {
         assert(`Do not call A() on EmberData RecordArrays`);
       };
     }
@@ -4108,43 +4145,41 @@ class Store extends EmberObject {
     //
     //   to remove this, we would need to move to a new `async` API.
     let record;
-    _backburner.join(() => {
-      this._join(() => {
-        let normalizedModelName = normalizeModelName(modelName);
-        let properties = {
-          ...inputProperties
-        };
+    this._join(() => {
+      let normalizedModelName = normalizeModelName(modelName);
+      let properties = {
+        ...inputProperties
+      };
 
-        // If the passed properties do not include a primary key,
-        // give the adapter an opportunity to generate one. Typically,
-        // client-side ID generators will use something like uuid.js
-        // to avoid conflicts.
+      // If the passed properties do not include a primary key,
+      // give the adapter an opportunity to generate one. Typically,
+      // client-side ID generators will use something like uuid.js
+      // to avoid conflicts.
 
-        if (properties.id === null || properties.id === undefined) {
-          let adapter = this.adapterFor(modelName, true);
-          if (adapter && adapter.generateIdForRecord) {
-            properties.id = adapter.generateIdForRecord(this, modelName, properties);
-          } else {
-            properties.id = null;
-          }
+      if (properties.id === null || properties.id === undefined) {
+        let adapter = this.adapterFor(modelName, true);
+        if (adapter && adapter.generateIdForRecord) {
+          properties.id = adapter.generateIdForRecord(this, modelName, properties);
+        } else {
+          properties.id = null;
         }
+      }
 
-        // Coerce ID to a string
-        properties.id = coerceId(properties.id);
-        const resource = {
-          type: normalizedModelName,
-          id: properties.id
-        };
-        if (resource.id) {
-          const identifier = this.identifierCache.peekRecordIdentifier(resource);
-          assert(`The id ${String(properties.id)} has already been used with another '${normalizedModelName}' record.`, !identifier);
-        }
-        const identifier = this.identifierCache.createIdentifierForNewRecord(resource);
-        const cache = this.cache;
-        const createOptions = normalizeProperties(this, identifier, properties);
-        const resultProps = cache.clientDidCreate(identifier, createOptions);
-        record = this._instanceCache.getRecord(identifier, resultProps);
-      });
+      // Coerce ID to a string
+      properties.id = coerceId(properties.id);
+      const resource = {
+        type: normalizedModelName,
+        id: properties.id
+      };
+      if (resource.id) {
+        const identifier = this.identifierCache.peekRecordIdentifier(resource);
+        assert(`The id ${String(properties.id)} has already been used with another '${normalizedModelName}' record.`, !identifier);
+      }
+      const identifier = this.identifierCache.createIdentifierForNewRecord(resource);
+      const cache = this.cache;
+      const createOptions = normalizeProperties(this, identifier, properties);
+      const resultProps = cache.clientDidCreate(identifier, createOptions);
+      record = this._instanceCache.getRecord(identifier, resultProps);
     });
     return record;
   }
@@ -4172,9 +4207,7 @@ class Store extends EmberObject {
     this._join(() => {
       cache.setIsDeleted(identifier, true);
       if (cache.isNew(identifier)) {
-        _backburner.join(() => {
-          this._instanceCache.unloadRecord(identifier);
-        });
+        this._instanceCache.unloadRecord(identifier);
       }
     });
   }