@ember-data/store 4.12.0-beta.0 → 4.12.0-beta.2

package/addon/-private.js

@@ -1 +1 @@
-export { C as AdapterPopulatedRecordArray, h as IDENTIFIER_ARRAY_TAG, I as IdentifierArray, M as MUTATE, I as RecordArray, R as RecordArrayManager, g as SOURCE, a as Snapshot, k as SnapshotRecordArray, S as Store, f as coerceId, j as fastPush, i as isStableIdentifier, n as normalizeModelName, l as recordDataFor, r as recordIdentifierFor, m as removeRecordDataFor, d as setIdentifierForgetMethod, b as setIdentifierGenerationMethod, e as setIdentifierResetMethod, c as setIdentifierUpdateMethod, s as storeFor } from "./index-12e1fcb9";
+export { C as AdapterPopulatedRecordArray, j as IDENTIFIER_ARRAY_TAG, I as IdentifierArray, M as MUTATE, I as RecordArray, R as RecordArrayManager, h as SOURCE, a as Snapshot, l as SnapshotRecordArray, S as Store, f as coerceId, k as fastPush, i as isStableIdentifier, n as normalizeModelName, g as notifyArray, m as recordDataFor, r as recordIdentifierFor, o as removeRecordDataFor, d as setIdentifierForgetMethod, b as setIdentifierGenerationMethod, e as setIdentifierResetMethod, c as setIdentifierUpdateMethod, s as storeFor } from "./index-6511184b";

package/addon/{index-12e1fcb9.js → index-6511184b.js}

@@ -1,4 +1,4 @@
-import { macroCondition, getOwnConfig, isDevelopingApp, moduleExists, importSync } from '@embroider/macros';
+import { macroCondition, getOwnConfig, isDevelopingApp, dependencySatisfies, importSync } from '@embroider/macros';
 import { assert, warn, deprecate } from '@ember/debug';
 import { dasherize } from '@ember/string';
 import { getOwner, setOwner } from '@ember/application';
@@ -6,10 +6,12 @@ import { _backburner } from '@ember/runloop';
 import { registerWaiter, unregisterWaiter } from '@ember/test';
 import RSVP, { resolve, Promise as Promise$1, reject } from 'rsvp';
 import { tracked } from '@glimmer/tracking';
-import { subscribe, addToTransaction } from '@ember-data/tracking/-private';
+import { subscribe, addToTransaction, addTransactionCB } from '@ember-data/tracking/-private';
+import { tagForProperty } from '@ember/-internals/metal';
 import { get, set } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { compare } from '@ember/utils';
+import { dirtyTag } from '@glimmer/validator';
 import Ember from 'ember';
 import { reads } from '@ember/object/computed';
 import ArrayProxy from '@ember/array/proxy';
@@ -2433,7 +2435,7 @@ class Snapshot {
     // function without access to intimate API contracts between RecordData and Model.
     // This is a requirement we should fix as soon as the relationship layer does not require
     // this intimate API usage.
-    if (!moduleExists("@ember-data/json-api")) {
+    if (macroCondition(!dependencySatisfies("@ember-data/json-api", "*"))) {
       assert(`snapshot.belongsTo only supported when using the package @ember-data/json-api`);
     }
     const graphFor = importSync('@ember-data/graph/-private').graphFor;
@@ -2510,7 +2512,7 @@ class Snapshot {
     // function without access to intimate API contracts between RecordData and Model.
     // This is a requirement we should fix as soon as the relationship layer does not require
     // this intimate API usage.
-    if (!moduleExists("@ember-data/json-api")) {
+    if (macroCondition(!dependencySatisfies("@ember-data/json-api", "*"))) {
       assert(`snapshot.hasMany only supported when using the package @ember-data/json-api`);
     }
     const graphFor = importSync('@ember-data/graph/-private').graphFor;
@@ -2654,7 +2656,7 @@ function recordDataFor(instance) {
   return null;
 }
 let _peekGraph;
-if (moduleExists("@ember-data/graph")) {
+if (macroCondition(dependencySatisfies("@ember-data/graph", "*"))) {
   let __peekGraph;
   _peekGraph = wrapper => {
     let a = importSync('@ember-data/graph/-private').peekGraph;
@@ -2766,7 +2768,7 @@ class InstanceCache {
           record: staleIdentifier,
           value: keptIdentifier
         });
-      } else if (moduleExists("@ember-data/json-api")) {
+      } else if (macroCondition(dependencySatisfies("@ember-data/json-api", "*"))) {
         // TODO notify cache always, this requires it always being a singleton
         // and not ever specific to one record-data
         this.store.__private_singleton_recordData?.sync({
@@ -2910,7 +2912,7 @@ class InstanceCache {
   disconnect(identifier) {
     const record = this.__instances.record.get(identifier);
     assert('Cannot destroy record while it is still materialized', !record || record.isDestroyed || record.isDestroying);
-    if (moduleExists("@ember-data/graph")) {
+    if (macroCondition(dependencySatisfies("@ember-data/graph", "*"))) {
       let graph = _peekGraph(this.store);
       if (graph) {
         graph.remove(identifier);
@@ -3180,7 +3182,7 @@ function _isLoading(cache, identifier) {
   req.getPendingRequestsForRecord(identifier).some(req => req.type === 'query');
 }
 let _modelForMixin;
-if (moduleExists("@ember-data/model")) {
+if (macroCondition(dependencySatisfies("@ember-data/model", "*"))) {
   let _found;
   _modelForMixin = function () {
     if (!_found) {
@@ -3268,9 +3270,11 @@ function getModelFactory(store, cache, normalizedModelName) {
   if (!factory) {
     let owner = getOwner(store);
     factory = owner.factoryFor(`model:${normalizedModelName}`);
-    if (!factory && moduleExists("@ember-data/model")) {
-      //Support looking up mixins as base types for polymorphic relationships
-      factory = _modelForMixin(store, normalizedModelName);
+    if (macroCondition(dependencySatisfies("@ember-data/model", "*"))) {
+      if (!factory) {
+        //Support looking up mixins as base types for polymorphic relationships
+        factory = _modelForMixin(store, normalizedModelName);
+      }
     }
     if (!factory) {
       // we don't cache misses in case someone wants to register a missing model
@@ -3533,6 +3537,16 @@ function isArraySetter(prop) {
 const IDENTIFIER_ARRAY_TAG = Symbol('#tag');
 const SOURCE = Symbol('#source');
 const MUTATE = Symbol('#update');
+const NOTIFY = Symbol('#notify');
+function notifyArray(arr) {
+  arr[IDENTIFIER_ARRAY_TAG].ref = null;
+  if (macroCondition(getOwnConfig().deprecations.DEPRECATE_COMPUTED_CHAINS)) {
+    // eslint-disable-next-line
+    dirtyTag(tagForProperty(arr, 'length'));
+    // eslint-disable-next-line
+    dirtyTag(tagForProperty(arr, '[]'));
+  }
+}
 function convertToInt(prop) {
   if (typeof prop === 'symbol') return null;
   const num = Number(prop);
@@ -3611,12 +3625,15 @@ let IdentifierArray = (_class3 = class IdentifierArray {
     @type Boolean
   */
 
+  [NOTIFY]() {
+    notifyArray(this);
+  }
   destroy() {
     this.isDestroying = true;
     // changing the reference breaks the Proxy
     // this[SOURCE] = [];
     this[SOURCE].length = 0;
-    this[IDENTIFIER_ARRAY_TAG].ref = null;
+    this[NOTIFY]();
     this.isDestroyed = true;
   }
 
@@ -3627,6 +3644,14 @@ let IdentifierArray = (_class3 = class IdentifierArray {
   set length(value) {
     this[SOURCE].length = value;
   }
+
+  // here to support computed chains
+  // and {{#each}}
+  get '[]'() {
+    if (macroCondition(getOwnConfig().deprecations.DEPRECATE_COMPUTED_CHAINS)) {
+      return this;
+    }
+  }
   constructor(options) {
     _initializerDefineProperty(this, "isUpdating", _descriptor2, this);
     this.isLoaded = true;
@@ -3732,6 +3757,9 @@ let IdentifierArray = (_class3 = class IdentifierArray {
               return receiver[receiver.length - 1];
             }
           }
+          if (prop === NOTIFY || prop === IDENTIFIER_ARRAY_TAG || prop === SOURCE) {
+            return self[prop];
+          }
           let fn = boundFns.get(prop);
           if (fn) return fn;
           let outcome = self[prop];
@@ -3828,6 +3856,7 @@ let IdentifierArray = (_class3 = class IdentifierArray {
         assert(`Do not call A() on EmberData RecordArrays`);
       };
     }
+    this[NOTIFY] = this[NOTIFY].bind(proxy);
     return proxy;
   }
 
@@ -3956,7 +3985,7 @@ class Collection extends IdentifierArray {
 Collection.prototype.query = null;
 
 // Ensure instanceof works correctly
-// Object.setPrototypeOf(IdentifierArray.prototype, Array.prototype);
+//Object.setPrototypeOf(IdentifierArray.prototype, Array.prototype);
 
 if (macroCondition(getOwnConfig().deprecations.DEPRECATE_ARRAY_LIKE)) {
   IdentifierArray.prototype.DEPRECATED_CLASS_NAME = 'RecordArray';
@@ -4178,28 +4207,22 @@ if (macroCondition(getOwnConfig().deprecations.DEPRECATE_ARRAY_LIKE)) {
   IdentifierArray.prototype.arrayContentDidChange = function () {
     deprecateArrayLike(this.DEPRECATED_CLASS_NAME, 'arrayContentDidChange', 'derived state or reacting at the change source.');
   };
-
-  // @ts-expect-error
-  IdentifierArray.prototype.reject = function (key, value) {
+  IdentifierArray.prototype.reject = function (callback, target) {
     deprecateArrayLike(this.DEPRECATED_CLASS_NAME, 'reject', 'filter');
-    if (arguments.length === 2) {
-      return this.filter(value => {
-        return !get(value, key);
-      });
-    }
-    return this.filter(value => {
-      return !get(value, key);
+    assert('`reject` expects a function as first argument.', typeof callback === 'function');
+    return this.filter((...args) => {
+      return !callback.apply(target, args);
     });
   };
   IdentifierArray.prototype.rejectBy = function (key, value) {
     deprecateArrayLike(this.DEPRECATED_CLASS_NAME, 'rejectBy', 'filter');
     if (arguments.length === 2) {
-      return this.filter(value => {
-        return !get(value, key);
+      return this.filter(record => {
+        return get(record, key) !== value;
       });
     }
-    return this.filter(value => {
-      return !get(value, key);
+    return this.filter(record => {
+      return !get(record, key);
     });
   };
   IdentifierArray.prototype.setEach = function (key, value) {
@@ -4407,9 +4430,9 @@ class RecordArrayManager {
     let tag = array[IDENTIFIER_ARRAY_TAG];
     if (!tag.shouldReset) {
       tag.shouldReset = true;
-      addToTransaction(tag);
-    } else if (delta > 0 && tag.t) {
-      addToTransaction(tag);
+      addTransactionCB(array[NOTIFY]);
+    } else if (delta > 0 && !tag.t) {
+      addTransactionCB(array[NOTIFY]);
     }
   }
   _getPendingFor(identifier, includeManaged, isRemove) {
@@ -4466,7 +4489,7 @@ class RecordArrayManager {
     const old = source.slice();
     source.length = 0;
     fastPush(source, identifiers);
-    array[IDENTIFIER_ARRAY_TAG].ref = null;
+    notifyArray(array);
     array.meta = payload.meta || null;
     array.links = payload.links || null;
     array.isLoaded = true;
@@ -4950,12 +4973,14 @@ class FetchManager {
       });
       if (!recordData || recordData.isEmpty(identifier) || isLoading) {
         let isReleasable = true;
-        if (!recordData && moduleExists("@ember-data/graph")) {
-          const graphFor = importSync('@ember-data/graph/-private').graphFor;
-          const graph = graphFor(store);
-          isReleasable = graph.isReleasable(identifier);
-          if (!isReleasable) {
-            graph.unload(identifier, true);
+        if (macroCondition(dependencySatisfies("@ember-data/graph", "*"))) {
+          if (!recordData) {
+            const graphFor = importSync('@ember-data/graph/-private').graphFor;
+            const graph = graphFor(store);
+            isReleasable = graph.isReleasable(identifier);
+            if (!isReleasable) {
+              graph.unload(identifier, true);
+            }
           }
         }
         if (recordData || isReleasable) {
@@ -5642,7 +5667,7 @@ class Store {
    * @public
    */
   instantiateRecord(identifier, createRecordArgs, recordDataFor, notificationManager) {
-    if (moduleExists("@ember-data/model")) {
+    if (macroCondition(dependencySatisfies("@ember-data/model", "*"))) {
       let modelName = identifier.type;
       let recordData = this._instanceCache.getRecordData(identifier);
       // TODO deprecate allowing unknown args setting
@@ -5675,7 +5700,7 @@ class Store {
    * @param record
    */
   teardownRecord(record) {
-    if (moduleExists("@ember-data/model")) {
+    if (macroCondition(dependencySatisfies("@ember-data/model", "*"))) {
       assert(`expected to receive an instance of DSModel. If using a custom model make sure you implement teardownRecord`, 'destroy' in record);
       record.destroy();
     } else {
@@ -5694,10 +5719,12 @@ class Store {
    * @public
    */
   getSchemaDefinitionService() {
-    if (moduleExists("@ember-data/model") && !this._schemaDefinitionService) {
-      // it is potentially a mistake for the RFC to have not enabled chaining these services, though highlander rule is nice.
-      // what ember-m3 did via private API to allow both worlds to interop would be much much harder using this.
-      this._schemaDefinitionService = new DSModelSchemaDefinitionService(this);
+    if (macroCondition(dependencySatisfies("@ember-data/model", "*"))) {
+      if (!this._schemaDefinitionService) {
+        // it is potentially a mistake for the RFC to have not enabled chaining these services, though highlander rule is nice.
+        // what ember-m3 did via private API to allow both worlds to interop would be much much harder using this.
+        this._schemaDefinitionService = new DSModelSchemaDefinitionService(this);
+      }
     }
     assert(`You must registerSchemaDefinitionService with the store to use custom model classes`, this._schemaDefinitionService);
     return this._schemaDefinitionService;
@@ -5784,7 +5811,7 @@ class Store {
     }
     assert(`You need to pass a model name to the store's modelFor method`, modelName);
     assert(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${modelName}`, typeof modelName === 'string');
-    if (moduleExists("@ember-data/model")) {
+    if (macroCondition(dependencySatisfies("@ember-data/model", "*"))) {
       let normalizedModelName = normalizeModelName$1(modelName);
       let maybeFactory = getModelFactory(this, this._modelFactoryCache, normalizedModelName);
 
@@ -6868,7 +6895,7 @@ class Store {
         // destroy the graph before unloadAll
         // since then we avoid churning relationships
         // during unload
-        if (moduleExists("@ember-data/graph")) {
+        if (macroCondition(dependencySatisfies("@ember-data/graph", "*"))) {
           const peekGraph = importSync('@ember-data/graph/-private').peekGraph;
           let graph = peekGraph(this);
           if (graph) {
@@ -7266,7 +7293,7 @@ class Store {
    * @param storeWrapper
    */
   createRecordDataFor(identifier, storeWrapper) {
-    if (moduleExists("@ember-data/json-api")) {
+    if (macroCondition(dependencySatisfies("@ember-data/json-api", "*"))) {
       // we can't greedily use require as this causes
       // a cycle we can't easily fix (or clearly pin point) at present.
       //
@@ -7461,7 +7488,7 @@ class Store {
         serializer.destroy();
       }
     }
-    if (moduleExists("@ember-data/graph")) {
+    if (macroCondition(dependencySatisfies("@ember-data/graph", "*"))) {
       const peekGraph = importSync('@ember-data/graph/-private').peekGraph;
       let graph = peekGraph(this);
       if (graph) {
@@ -7499,7 +7526,10 @@ function isMaybeIdentifier(maybeIdentifier) {
   return Boolean(maybeIdentifier !== null && typeof maybeIdentifier === 'object' && ('id' in maybeIdentifier && 'type' in maybeIdentifier && maybeIdentifier.id && maybeIdentifier.type || maybeIdentifier.lid));
 }
 function isDSModel(record) {
-  return moduleExists("@ember-data/model") && !!record && 'constructor' in record && 'isModel' in record.constructor && record.constructor.isModel === true;
+  if (macroCondition(!dependencySatisfies("@ember-data/model", "*"))) {
+    return false;
+  }
+  return !!record && 'constructor' in record && 'isModel' in record.constructor && record.constructor.isModel === true;
 }
 function adapterDidInvalidate(store, identifier, error) {
   if (error && error.isAdapterError === true && error.code === 'InvalidError') {
@@ -7657,4 +7687,4 @@ function normalizeModelName(modelName) {
   }
   assert(`normalizeModelName support has been removed`);
 }
-export { Collection as C, IdentifierArray as I, MUTATE as M, RecordArrayManager as R, Store as S, Snapshot as a, setIdentifierGenerationMethod as b, setIdentifierUpdateMethod as c, setIdentifierForgetMethod as d, setIdentifierResetMethod as e, coerceId as f, SOURCE as g, IDENTIFIER_ARRAY_TAG as h, isStableIdentifier as i, fastPush as j, SnapshotRecordArray as k, recordDataFor as l, removeRecordDataFor as m, normalizeModelName as n, recordIdentifierFor as r, storeFor as s };
+export { Collection as C, IdentifierArray as I, MUTATE as M, RecordArrayManager as R, Store as S, Snapshot as a, setIdentifierGenerationMethod as b, setIdentifierUpdateMethod as c, setIdentifierForgetMethod as d, setIdentifierResetMethod as e, coerceId as f, notifyArray as g, SOURCE as h, isStableIdentifier as i, IDENTIFIER_ARRAY_TAG as j, fastPush as k, SnapshotRecordArray as l, recordDataFor as m, normalizeModelName as n, removeRecordDataFor as o, recordIdentifierFor as r, storeFor as s };