Merge pull request #5541 from emberjs/proxy-fix-3.3

[BUGFIX] backport fix for belongsTo proxy update
emberjs · Jul 25, 2018 · b7acb78 · b7acb78
2 parents ce11414 + 531311e
commit b7acb78
Show file tree

Hide file tree

Showing 14 changed files with 709 additions and 425 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,7 +2,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module',
   },
   parser: 'babel-eslint',

diff --git a/addon/-private/system/many-array.js b/addon/-private/system/many-array.js
@@ -174,7 +174,7 @@ export default EmberObject.extend(MutableArray, Evented, {
       if (isInitialized && diff.addedCount > 0) {
         //notify only on additions
         //TODO only notify if unloaded
-        this.relationship.notifyHasManyChanged();
+        this.relationship.notifyHasManyChange();
       }
     }
   },

diff --git a/addon/-private/system/model/internal-model.js b/addon/-private/system/model/internal-model.js
@@ -858,9 +858,9 @@ export default class InternalModel {
     }
   }
 
-  notifyBelongsToChanged(key, record) {
+  notifyBelongsToChange(key, record) {
     if (this.hasRecord) {
-      this._record.notifyBelongsToChanged(key, record);
+      this._record.notifyBelongsToChange(key, record);
     }
   }
 

diff --git a/addon/-private/system/model/model.js b/addon/-private/system/model/model.js
@@ -1053,7 +1053,7 @@ const Model = EmberObject.extend(Evented, {
     };
   },
 
-  notifyBelongsToChanged(key) {
+  notifyBelongsToChange(key) {
     this.notifyPropertyChange(key);
   },
   /**

diff --git a/addon/-private/system/relationships/state/belongs-to.js b/addon/-private/system/relationships/state/belongs-to.js
@@ -34,6 +34,7 @@ export default class BelongsToRelationship extends Relationship {
     } else if (this.inverseInternalModel) {
       this.removeInternalModel(this.inverseInternalModel);
     }
+
     this.setHasAnyRelationshipData(true);
     this.setRelationshipIsStale(false);
     this.setRelationshipIsEmpty(false);
@@ -73,7 +74,7 @@ export default class BelongsToRelationship extends Relationship {
 
   inverseDidDematerialize() {
     super.inverseDidDematerialize(this.inverseInternalModel);
-    this.notifyBelongsToChanged();
+    this.notifyBelongsToChange();
   }
 
   removeCompletelyFromOwn(internalModel) {
@@ -85,7 +86,7 @@ export default class BelongsToRelationship extends Relationship {
 
     if (this.inverseInternalModel === internalModel) {
       this.inverseInternalModel = null;
-      this.notifyBelongsToChanged();
+      this.notifyBelongsToChange();
     }
   }
 
@@ -105,7 +106,7 @@ export default class BelongsToRelationship extends Relationship {
     if (this.inverseInternalModel !== this.canonicalState) {
       this.inverseInternalModel = this.canonicalState;
       this._promiseProxy = null;
-      this.notifyBelongsToChanged();
+      this.notifyBelongsToChange();
     }
 
     super.flushCanonical();
@@ -122,7 +123,7 @@ export default class BelongsToRelationship extends Relationship {
 
     this.inverseInternalModel = internalModel;
     super.addInternalModel(internalModel);
-    this.notifyBelongsToChanged();
+    this.notifyBelongsToChange();
   }
 
   setRecordPromise(belongsToPromise) {
@@ -143,18 +144,24 @@ export default class BelongsToRelationship extends Relationship {
     this.inverseInternalModel = null;
     this._promiseProxy = null;
     super.removeInternalModelFromOwn(internalModel);
-    this.notifyBelongsToChanged();
+    this.notifyBelongsToChange();
   }
 
   removeAllInternalModelsFromOwn() {
     super.removeAllInternalModelsFromOwn();
     this.inverseInternalModel = null;
     this._promiseProxy = null;
-    this.notifyBelongsToChanged();
+    this.notifyBelongsToChange();
   }
 
-  notifyBelongsToChanged() {
-    this.internalModel.notifyBelongsToChanged(this.key);
+  notifyBelongsToChange() {
+    if (this._promiseProxy !== null) {
+      let iM = this.inverseInternalModel;
+
+      this._updateLoadingPromise(proxyRecord(iM), iM ? iM.getRecord() : null);
+    }
+
+    this.internalModel.notifyBelongsToChange(this.key);
   }
 
   removeCanonicalInternalModelFromOwn(internalModel) {
@@ -229,9 +236,7 @@ export default class BelongsToRelationship extends Relationship {
 
     if (this.isAsync) {
       if (this._promiseProxy === null) {
-        let promise = resolve(this.inverseInternalModel).then(internalModel => {
-          return internalModel ? internalModel.getRecord() : null;
-        });
+        let promise = proxyRecord(this.inverseInternalModel);
         this._updateLoadingPromise(promise, record);
       }
 
@@ -270,6 +275,12 @@ export default class BelongsToRelationship extends Relationship {
   }
 }
 
+function proxyRecord(internalModel) {
+  return resolve(internalModel).then(resolvedInternalModel => {
+    return resolvedInternalModel ? resolvedInternalModel.getRecord() : null;
+  });
+}
+
 function handleCompletedFind(relationship, error) {
   let internalModel = relationship.inverseInternalModel;
 

diff --git a/addon/-private/system/relationships/state/has-many.js b/addon/-private/system/relationships/state/has-many.js
@@ -129,7 +129,7 @@ export default class ManyRelationship extends Relationship {
       }
       this._removeInternalModelFromManyArray(this._retainedManyArray, inverseInternalModel);
     }
-    this.notifyHasManyChanged();
+    this.notifyHasManyChange();
   }
 
   addInternalModel(internalModel, idx) {
@@ -385,7 +385,7 @@ export default class ManyRelationship extends Relationship {
     }
   }
 
-  notifyHasManyChanged() {
+  notifyHasManyChange() {
     this.internalModel.notifyHasManyAdded(this.key);
   }
 

diff --git a/addon/-private/system/relationships/state/relationship.js b/addon/-private/system/relationships/state/relationship.js
@@ -59,6 +59,7 @@ export default class Relationship {
     this.canonicalMembers = new OrderedSet();
     this.store = store;
     this.key = relationshipMeta.key;
+    this.kind = relationshipMeta.kind;
     this.inverseKey = inverseKey;
     this.internalModel = internalModel;
     this.isAsync = typeof async === 'undefined' ? true : async;
@@ -508,10 +509,21 @@ export default class Relationship {
 
   updateLink(link, initial) {
     heimdall.increment(updateLink);
-    warn(`You pushed a record of type '${this.internalModel.modelName}' with a relationship '${this.key}' configured as 'async: false'. You've included a link but no primary data, this may be an error in your payload.`, this.isAsync || this.hasAnyRelationshipData , {
-      id: 'ds.store.push-link-for-sync-relationship'
-    });
-    assert(`You have pushed a record of type '${this.internalModel.modelName}' with '${this.key}' as a link, but the value of that link is not a string.`, typeof link === 'string' || link === null);
+    warn(
+      `You pushed a record of type '${this.internalModel.modelName}' with a relationship '${
+        this.key
+      }' configured as 'async: false'. You've included a link but no primary data, this may be an error in your payload. EmberData will treat this relationship as known-to-be-empty.`,
+      this.isAsync || this.hasAnyRelationshipData,
+      {
+        id: 'ds.store.push-link-for-sync-relationship',
+      }
+    );
+    assert(
+      `You have pushed a record of type '${this.internalModel.modelName}' with '${
+        this.key
+      }' as a link, but the value of that link is not a string.`,
+      typeof link === 'string' || link === null
+    );
 
     this.link = link;
     this.fetchPromise = null;
@@ -670,6 +682,11 @@ export default class Relationship {
       this.updateData(payload.data, initial);
     } else if (payload._partialData !== undefined) {
       this.updateData(payload._partialData, initial);
+    } else if (this.isAsync === false) {
+      hasRelationshipDataProperty = true;
+      let data = this.kind === 'hasMany' ? [] : null;
+
+      this.updateData(data, initial);
     }
 
     if (payload.links && payload.links.related) {

diff --git a/addon/-private/system/store.js b/addon/-private/system/store.js
@@ -2920,9 +2920,15 @@ function setupRelationships(store, internalModel, data, modelNameToInverseMap) {
 
       if (relationshipData.links) {
         let isAsync = relationshipMeta.options && relationshipMeta.options.async !== false;
-        warn(`You pushed a record of type '${internalModel.type.modelName}' with a relationship '${relationshipName}' configured as 'async: false'. You've included a link but no primary data, this may be an error in your payload.`, isAsync || relationshipData.data , {
-          id: 'ds.store.push-link-for-sync-relationship'
-        });
+        warn(
+          `You pushed a record of type '${
+            internalModel.modelName
+          }' with a relationship '${relationshipName}' configured as 'async: false'. You've included a link but no primary data, this may be an error in your payload. EmberData will treat this relationship as known-to-be-empty.`,
+          isAsync || relationshipData.data,
+          {
+            id: 'ds.store.push-link-for-sync-relationship',
+          }
+        );
       } else if (relationshipData.data) {
         if (relationshipMeta.kind === 'belongsTo') {
           assert(`A ${internalModel.type.modelName} record was pushed into the store with the value of ${relationshipName} being ${inspect(relationshipData.data)}, but ${relationshipName} is a belongsTo relationship so the value must not be an array. You should probably check your data payload or serializer.`, !Array.isArray(relationshipData.data));

diff --git a/package.json b/package.json
@@ -53,10 +53,10 @@
     "silent-error": "^1.0.0"
   },
   "devDependencies": {
-    "babel-plugin-debug-macros": "^0.1.7",
     "@ember-decorators/babel-transforms": "^2.0.0",
     "@ember-decorators/data": "^2.1.0",
     "babel-eslint": "^8.0.0",
+    "babel-plugin-debug-macros": "^0.1.7",
     "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
     "babel-plugin-transform-es2015-classes": "^6.23.0",
     "babel-plugin-transform-es2015-computed-properties": "^6.22.0",
@@ -80,13 +80,11 @@
     "ember-cli-app-version": "^3.0.0",
     "ember-cli-blueprint-test-helpers": "^0.18.3",
     "ember-cli-dependency-checker": "^2.1.0",
-    "ember-cli-eslint": "1.3.0",
     "ember-cli-htmlbars": "^2.0.1",
     "ember-cli-htmlbars-inline-precompile": "^0.4.3",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-internal-test-helpers": "^0.8.1",
     "ember-cli-pretender": "^1.0.1",
-    "ember-qunit": "^3.4.0",
     "ember-cli-release": "^0.2.9",
     "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
@@ -99,6 +97,7 @@
     "ember-load-initializers": "^0.6.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-publisher": "0.0.7",
+    "ember-qunit": "^3.4.0",
     "ember-qunit-assert-helpers": "^0.2.1",
     "ember-resolver": "^4.1.0",
     "ember-source": "~3.0.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -1053,7 +1053,7 @@ const Model = EmberObject.extend(Evented, { @@
         };
       },
-      notifyBelongsToChanged(key) {
+      notifyBelongsToChange(key) {
         this.notifyPropertyChange(key);
       },
       /**
@@ Expand Down @@