ember-data-model-fragments 6.0.0 → 6.0.2

package/CHANGELOG.md

@@ -9,6 +9,33 @@
 
 
 
+
+
+## v6.0.2 (2023-07-15)
+
+#### :bug: Bug Fix
+* [#474](https://github.com/adopted-ember-addons/ember-data-model-fragments/pull/474) fix(polymorphism): fix regression introduced with ember-data-model-fragments 6.0.0 where owner is not passed to typeKey function ([@VincentMolinie](https://github.com/VincentMolinie))
+* [#472](https://github.com/adopted-ember-addons/ember-data-model-fragments/pull/472) Ensure changing arrays are notified. ([@deanmarano](https://github.com/deanmarano))
+* [#469](https://github.com/adopted-ember-addons/ember-data-model-fragments/pull/469) Fix issue with reloading array records. ([@deanmarano](https://github.com/deanmarano))
+
+#### :house: Internal
+* [#473](https://github.com/adopted-ember-addons/ember-data-model-fragments/pull/473) chore(deps): bump semver from 5.7.1 to 5.7.2 ([@dependabot[bot]](https://github.com/apps/dependabot))
+
+#### Committers: 2
+- Dean Marano ([@deanmarano](https://github.com/deanmarano))
+- Vincent Molinié ([@VincentMolinie](https://github.com/VincentMolinie))
+
+## v6.0.1 (2023-05-30)
+
+#### :bug: Bug Fix
+* [#466](https://github.com/adopted-ember-addons/ember-data-model-fragments/pull/466) Fix glimmer render error when creating fragment arrays ([@dwickern](https://github.com/dwickern))
+
+#### :house: Internal
+* [#465](https://github.com/adopted-ember-addons/ember-data-model-fragments/pull/465) chore(deps): bump socket.io-parser from 4.2.2 to 4.2.3 ([@dependabot[bot]](https://github.com/apps/dependabot))
+
+#### Committers: 1
+- Derek Wickern ([@dwickern](https://github.com/dwickern))
+
 ## v6.0.0 (2023-05-26)
 
 #### :boom: Breaking Change

package/addon/array/stateful.js

@@ -81,6 +81,20 @@ const StatefulArray = EmberObject.extend(MutableArray, Copyable, {
     return this._length;
   },
 
+  /**
+   * Unlike `setObjects`, this method avoids setting up auto-tracking,
+   * which prevents a glimmer rendering error in some circumstances.
+   * @see https://github.com/adopted-ember-addons/ember-data-model-fragments/pull/466
+   * @param objects the new array contents
+   * @private
+   */
+  _setFragments(objects) {
+    if (this._isDirty) {
+      this.retrieveLatest();
+    }
+    this.replace(0, this._length, objects);
+  },
+
   objectAt(index) {
     if (this._isDirty) {
       this.retrieveLatest();
@@ -97,6 +111,10 @@ const StatefulArray = EmberObject.extend(MutableArray, Copyable, {
       'The third argument to replace needs to be an array.',
       isArray(items)
     );
+    if (deleteCount === 0 && items.length === 0) {
+      // array is unchanged
+      return;
+    }
     const data = this.currentState.slice();
     data.splice(
       start,

package/addon/attributes/array.js

@@ -90,7 +90,7 @@ export default function array(type, options) {
         });
         recordData._fragmentArrayCache[key] = array;
       }
-      array.setObjects(value);
+      array._setFragments(value);
       return array;
     },
   }).meta(meta);

package/addon/attributes/fragment-array.js

@@ -102,7 +102,7 @@ export default function fragmentArray(type, options) {
         });
         recordData._fragmentArrayCache[key] = fragmentArray;
       }
-      fragmentArray.setObjects(value);
+      fragmentArray._setFragments(value);
       return fragmentArray;
     },
   }).meta(meta);

package/addon/record-data.js

@@ -1,5 +1,6 @@
 // eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import { RecordData } from 'ember-data/-private';
+import { diffArray } from '@ember-data/model/-private';
 import { recordDataFor } from '@ember-data/store/-private';
 import { assert } from '@ember/debug';
 import { typeOf } from '@ember/utils';
@@ -603,7 +604,8 @@ export default class FragmentRecordData extends RecordData {
     const type = getActualFragmentType(
       definition.modelName,
       definition.options,
-      attributes
+      attributes,
+      this._fragmentGetRecord()
     );
     const recordData = this.storeWrapper.recordDataFor(type);
     recordData.setFragmentOwner(this, definition.name);
@@ -692,7 +694,11 @@ export default class FragmentRecordData extends RecordData {
       if (this._fragments[key]) {
         continue;
       }
-      if ((updates[key] === null) !== (original[key] === null)) {
+      const eitherIsNull = original[key] === null || updates[key] === null;
+      if (
+        eitherIsNull ||
+        diffArray(original[key], updates[key]).firstChangeIndex !== null
+      ) {
         changedKeys.push(key);
       }
     }
@@ -701,12 +707,13 @@ export default class FragmentRecordData extends RecordData {
 
   pushData(data, calculateChange) {
     let changedFragmentKeys;
+
+    const subFragmentsToProcess = [];
     if (data.attributes) {
       // copy so that we don't mutate the caller's data
       const attributes = Object.assign({}, data.attributes);
       data = Object.assign({}, data, { attributes });
 
-      const newCanonicalFragments = {};
       for (const [key, behavior] of Object.entries(this._fragmentBehavior)) {
         const canonical = data.attributes[key];
         if (canonical === undefined) {
@@ -715,25 +722,41 @@ export default class FragmentRecordData extends RecordData {
         // strip fragments from the attributes so the super call does not process them
         delete data.attributes[key];
 
+        subFragmentsToProcess.push({ key, behavior, canonical, attributes });
+      }
+    }
+
+    // Wee need first the attributes to be setup before the fragment, to be able to access them (for polymorphic fragments for example)
+    const changedAttributeKeys = super.pushData(data, calculateChange);
+
+    if (data.attributes) {
+      const newCanonicalFragments = {};
+
+      subFragmentsToProcess.forEach(({ key, behavior, canonical }) => {
         const current =
           key in this._fragmentData
             ? this._fragmentData[key]
             : this._getFragmentDefault(key);
         newCanonicalFragments[key] = behavior.pushData(current, canonical);
-      }
+      });
+
       if (calculateChange) {
         changedFragmentKeys = this._changedFragmentKeys(newCanonicalFragments);
       }
+
       Object.assign(this._fragmentData, newCanonicalFragments);
+      // update fragment arrays
+      changedFragmentKeys?.forEach((key) =>
+        this._fragmentArrayCache[key]?.notify()
+      );
     }
 
-    const changedAttributeKeys = super.pushData(data, calculateChange);
     const changedKeys = mergeArrays(changedAttributeKeys, changedFragmentKeys);
     if (gte('ember-data', '4.5.0') && changedKeys?.length > 0) {
       internalModelFor(this).notifyAttributes(changedKeys);
     }
     // on ember-data 2.8 - 4.4, InternalModel.setupData will notify
-    return changedKeys;
+    return changedKeys || [];
   }
 
   willCommit() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-model-fragments",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "Ember Data addon to support nested JSON documents",
   "keywords": [
     "ember-addon",