ember-data-source 2.18.0 → 2.18.1

data/dist/globals/ember-data.prod.js

@@ -6,7 +6,7 @@
  * @copyright Copyright 2011-2017 Tilde Inc. and contributors.
  *            Portions Copyright 2011 LivingSocial Inc.
  * @license   Licensed under MIT license (see license.js)
- * @version   2.18.0
+ * @version   2.18.1
  */
 
 var loader, define, requireModule, require, requirejs;
@@ -2689,12 +2689,24 @@ define('ember-data/-private/system/model/internal-model', ['exports', 'ember-dat
     return true;
   }
 
+  // Handle dematerialization for relationship `rel`.  In all cases, notify the
+  // relatinoship of the dematerialization: this is done so the relationship can
+  // notify its inverse which needs to update state
+  //
+  // If the inverse is sync, unloading this record is treated as a client-side
+  // delete, so we remove the inverse records from this relationship to
+  // disconnect the graph.  Because it's not async, we don't need to keep around
+  // the internalModel as an id-wrapper for references and because the graph is
+  // disconnected we can actually destroy the internalModel when checking for
+  // orphaned models.
   function destroyRelationship(rel) {
-    if (rel._inverseIsAsync()) {
-      rel.removeInternalModelFromInverse(rel.inverseInternalModel);
-      rel.removeInverseRelationships();
-    } else {
-      rel.removeCompletelyFromInverse();
+    rel.internalModelDidDematerialize();
+
+    if (rel._inverseIsSync()) {
+      // disconnect the graph so that the sync inverse relationship does not
+      // prevent us from cleaning up during `_cleanupOrphanedInternalModels`
+      rel.removeAllInternalModelsFromOwn();
+      rel.removeAllCanonicalInternalModelsFromOwn();
     }
   }
   // this (and all heimdall instrumentation) will be stripped by a babel transform
@@ -2911,6 +2923,7 @@ define('ember-data/-private/system/model/internal-model', ['exports', 'ember-dat
 
     InternalModel.prototype._directlyRelatedInternalModels = function _directlyRelatedInternalModels() {
       var array = [];
+
       this._relationships.forEach(function (name, rel) {
         array = array.concat(rel.members.list, rel.canonicalMembers.list);
       });
@@ -3308,10 +3321,7 @@ define('ember-data/-private/system/model/internal-model', ['exports', 'ember-dat
       this.__implicitRelationships = null;
       Object.keys(implicitRelationships).forEach(function (key) {
         var rel = implicitRelationships[key];
-
         destroyRelationship(rel);
-
-        rel.destroy();
       });
     };
 
@@ -8544,6 +8554,7 @@ define('ember-data/-private/system/relationships/state/belongs-to', ['exports',
     };
 
     BelongsToRelationship.prototype.inverseDidDematerialize = function inverseDidDematerialize() {
+      _Relationship.prototype.inverseDidDematerialize.call(this, this.inverseInternalModel);
       this.notifyBelongsToChanged();
     };
 
@@ -8560,6 +8571,12 @@ define('ember-data/-private/system/relationships/state/belongs-to', ['exports',
       }
     };
 
+    BelongsToRelationship.prototype.removeCompletelyFromInverse = function removeCompletelyFromInverse() {
+      _Relationship.prototype.removeCompletelyFromInverse.call(this);
+
+      this.inverseInternalModel = null;
+    };
+
     BelongsToRelationship.prototype.flushCanonical = function flushCanonical() {
       //temporary fix to not remove newly created records if server returned null.
       //TODO remove once we have proper diffing
@@ -8604,6 +8621,12 @@ define('ember-data/-private/system/relationships/state/belongs-to', ['exports',
       this.notifyBelongsToChanged();
     };
 
+    BelongsToRelationship.prototype.removeAllInternalModelsFromOwn = function removeAllInternalModelsFromOwn() {
+      _Relationship.prototype.removeAllInternalModelsFromOwn.call(this);
+      this.inverseInternalModel = null;
+      this.notifyBelongsToChanged();
+    };
+
     BelongsToRelationship.prototype.notifyBelongsToChanged = function notifyBelongsToChanged() {
       this.internalModel.notifyBelongsToChanged(this.key);
     };
@@ -8616,6 +8639,11 @@ define('ember-data/-private/system/relationships/state/belongs-to', ['exports',
       _Relationship.prototype.removeCanonicalInternalModelFromOwn.call(this, internalModel);
     };
 
+    BelongsToRelationship.prototype.removeAllCanonicalInternalModelsFromOwn = function removeAllCanonicalInternalModelsFromOwn() {
+      _Relationship.prototype.removeAllCanonicalInternalModelsFromOwn.call(this);
+      this.canonicalState = null;
+    };
+
     BelongsToRelationship.prototype.findRecord = function findRecord() {
       if (this.inverseInternalModel) {
         return this.store._findByInternalModel(this.inverseInternalModel);
@@ -8876,7 +8904,12 @@ define('ember-data/-private/system/relationships/state/has-many', ['exports', 'e
       _this.belongsToType = relationshipMeta.type;
       _this.canonicalState = [];
       _this.isPolymorphic = relationshipMeta.options.polymorphic;
+      // The ManyArray for this relationship
       _this._manyArray = null;
+      // The previous ManyArray for this relationship.  It will be destroyed when
+      // we create a new many array, but in the interim it will be updated if
+      // inverse internal models are unloaded.
+      _this._retainedManyArray = null;
       _this.__loadingPromise = null;
       return _this;
     }
@@ -8928,10 +8961,14 @@ define('ember-data/-private/system/relationships/state/has-many', ['exports', 'e
       _Relationship.prototype.addCanonicalInternalModel.call(this, internalModel, idx);
     };
 
-    ManyRelationship.prototype.inverseDidDematerialize = function inverseDidDematerialize() {
-      if (this._manyArray) {
-        this._manyArray.destroy();
-        this._manyArray = null;
+    ManyRelationship.prototype.inverseDidDematerialize = function inverseDidDematerialize(inverseInternalModel) {
+      _Relationship.prototype.inverseDidDematerialize.call(this, inverseInternalModel);
+      if (this.isAsync) {
+        if (this._manyArray) {
+          this._retainedManyArray = this._manyArray;
+          this._manyArray = null;
+        }
+        this._removeInternalModelFromManyArray(this._retainedManyArray, inverseInternalModel);
       }
       this.notifyHasManyChanged();
     };
@@ -8960,6 +8997,12 @@ define('ember-data/-private/system/relationships/state/has-many', ['exports', 'e
       _Relationship.prototype.removeCanonicalInternalModelFromOwn.call(this, internalModel, idx);
     };
 
+    ManyRelationship.prototype.removeAllCanonicalInternalModelsFromOwn = function removeAllCanonicalInternalModelsFromOwn() {
+      _Relationship.prototype.removeAllCanonicalInternalModelsFromOwn.call(this);
+      this.canonicalMembers.clear();
+      this.canonicalState.splice(0, this.canonicalState.length);
+    };
+
     ManyRelationship.prototype.removeCompletelyFromOwn = function removeCompletelyFromOwn(internalModel) {
       _Relationship.prototype.removeCompletelyFromOwn.call(this, internalModel);
 
@@ -8992,7 +9035,33 @@ define('ember-data/-private/system/relationships/state/has-many', ['exports', 'e
         return;
       }
       _Relationship.prototype.removeInternalModelFromOwn.call(this, internalModel, idx);
-      var manyArray = this.manyArray;
+      // note that ensuring the many array is created, via `this.manyArray`
+      // (instead of `this._manyArray`) is intentional.
+      //
+      // Because we're removing from local, and not canonical, state, it is
+      // important that the many array is initialized now with those changes,
+      // otherwise it will be initialized with canonical state and we'll have
+      // lost the fact that this internalModel was removed.
+      this._removeInternalModelFromManyArray(this.manyArray, internalModel, idx);
+      this._removeInternalModelFromManyArray(this._retainedManyArray, internalModel, idx);
+    };
+
+    ManyRelationship.prototype.removeAllInternalModelsFromOwn = function removeAllInternalModelsFromOwn() {
+      _Relationship.prototype.removeAllInternalModelsFromOwn.call(this);
+      // as with removeInternalModelFromOwn, we make sure the many array is
+      // instantiated, or we'll lose local removals, as we're not updating
+      // canonical state here.
+      this.manyArray.clear();
+      if (this._retainedManyArray) {
+        this._retainedManyArray.clear();
+      }
+    };
+
+    ManyRelationship.prototype._removeInternalModelFromManyArray = function _removeInternalModelFromManyArray(manyArray, internalModel, idx) {
+      if (manyArray === null) {
+        return;
+      }
+
       if (idx !== undefined) {
         //TODO(Igor) not used currently, fix
         manyArray.currentState.removeAt(idx);
@@ -9154,12 +9223,14 @@ define('ember-data/-private/system/relationships/state/has-many', ['exports', 'e
       var manyArray = this._manyArray;
       if (manyArray) {
         manyArray.destroy();
+        this._manyArray = null;
       }
 
       var proxy = this.__loadingPromise;
 
       if (proxy) {
         proxy.destroy();
+        this.__loadingPromise = null;
       }
     };
 
@@ -9171,6 +9242,9 @@ define('ember-data/-private/system/relationships/state/has-many', ['exports', 'e
     }, {
       key: 'manyArray',
       get: function () {
+        (false && Ember.assert('Error: relationship ' + this.parentType + ':' + this.key + ' has both many array and retained many array', this._manyArray === null || this._retainedManyArray === null));
+
+
         if (!this._manyArray) {
           this._manyArray = _manyArray.default.create({
             canonicalState: this.canonicalState,
@@ -9181,7 +9255,13 @@ define('ember-data/-private/system/relationships/state/has-many', ['exports', 'e
             meta: this.meta,
             isPolymorphic: this.isPolymorphic
           });
+
+          if (this._retainedManyArray !== null) {
+            this._retainedManyArray.destroy();
+            this._retainedManyArray = null;
+          }
         }
+
         return this._manyArray;
       }
     }]);
@@ -9234,6 +9314,7 @@ define('ember-data/-private/system/relationships/state/relationship', ['exports'
   }();
 
   var guidFor = Ember.guidFor;
+  var get = Ember.get;
 
   var Relationship = function () {
     function Relationship(store, internalModel, inverseKey, relationshipMeta) {
@@ -9255,34 +9336,52 @@ define('ember-data/-private/system/relationships/state/relationship', ['exports'
       this.meta = null;
       this.hasData = false;
       this.hasLoaded = false;
+      this.__inverseMeta = undefined;
     }
 
     Relationship.prototype._inverseIsAsync = function _inverseIsAsync() {
-      if (!this.inverseKey || !this.inverseInternalModel) {
+      var inverseMeta = this._inverseMeta;
+      if (!inverseMeta) {
         return false;
       }
-      return this.inverseInternalModel._relationships.get(this.inverseKey).isAsync;
+
+      var inverseAsync = inverseMeta.options.async;
+      return typeof inverseAsync === 'undefined' ? true : inverseAsync;
     };
 
-    Relationship.prototype.removeInverseRelationships = function removeInverseRelationships() {
+    Relationship.prototype._inverseIsSync = function _inverseIsSync() {
+      var inverseMeta = this._inverseMeta;
+      if (!inverseMeta) {
+        return false;
+      }
+
+      var inverseAsync = inverseMeta.options.async;
+      return typeof inverseAsync === 'undefined' ? false : !inverseAsync;
+    };
+
+    Relationship.prototype.internalModelDidDematerialize = function internalModelDidDematerialize() {
+      var _this = this;
+
       if (!this.inverseKey) {
         return;
       }
 
-      var allMembers =
-      // we actually want a union of members and canonicalMembers
-      // they should be disjoint but currently are not due to a bug
-      this.members.list.concat(this.canonicalMembers.list);
+      this.forAllMembers(function (inverseInternalModel) {
+        var relationship = inverseInternalModel._relationships.get(_this.inverseKey);
+        relationship.inverseDidDematerialize(_this.internalModel);
+      });
+    };
 
-      for (var i = 0; i < allMembers.length; i++) {
-        var inverseInternalModel = allMembers[i];
-        var relationship = inverseInternalModel._relationships.get(this.inverseKey);
-        relationship.inverseDidDematerialize();
+    Relationship.prototype.inverseDidDematerialize = function inverseDidDematerialize(inverseInternalModel) {
+      if (!this.isAsync) {
+        // unloading inverse of a sync relationship is treated as a client-side
+        // delete, so actually remove the models don't merely invalidate the cp
+        // cache.
+        this.removeInternalModelFromOwn(inverseInternalModel);
+        this.removeCanonicalInternalModelFromOwn(inverseInternalModel);
       }
     };
 
-    Relationship.prototype.inverseDidDematerialize = function inverseDidDematerialize() {};
-
     Relationship.prototype.updateMeta = function updateMeta(meta) {
       this.meta = meta;
     };
@@ -9302,19 +9401,29 @@ define('ember-data/-private/system/relationships/state/relationship', ['exports'
       }
     };
 
+    Relationship.prototype.removeAllInternalModelsFromOwn = function removeAllInternalModelsFromOwn() {
+      this.members.clear();
+      this.internalModel.updateRecordArrays();
+    };
+
+    Relationship.prototype.removeAllCanonicalInternalModelsFromOwn = function removeAllCanonicalInternalModelsFromOwn() {
+      this.canonicalMembers.clear();
+      this.flushCanonicalLater();
+    };
+
     Relationship.prototype.removeInternalModels = function removeInternalModels(internalModels) {
-      var _this = this;
+      var _this2 = this;
 
       internalModels.forEach(function (internalModel) {
-        return _this.removeInternalModel(internalModel);
+        return _this2.removeInternalModel(internalModel);
       });
     };
 
     Relationship.prototype.addInternalModels = function addInternalModels(internalModels, idx) {
-      var _this2 = this;
+      var _this3 = this;
 
       internalModels.forEach(function (internalModel) {
-        _this2.addInternalModel(internalModel, idx);
+        _this3.addInternalModel(internalModel, idx);
         if (idx !== undefined) {
           idx++;
         }
@@ -9357,7 +9466,7 @@ define('ember-data/-private/system/relationships/state/relationship', ['exports'
         var _relationships = internalModel._implicitRelationships;
         var _relationship = _relationships[this.inverseKeyForImplicit];
         if (!_relationship) {
-          _relationship = _relationships[this.inverseKeyForImplicit] = new Relationship(this.store, internalModel, this.key, { options: { async: this.isAsync } });
+          _relationship = _relationships[this.inverseKeyForImplicit] = new Relationship(this.store, internalModel, this.key, { options: { async: this.isAsync }, type: this.parentType });
         }
         _relationship.addCanonicalInternalModel(this.internalModel);
       }
@@ -9395,7 +9504,7 @@ define('ember-data/-private/system/relationships/state/relationship', ['exports'
           internalModel._relationships.get(this.inverseKey).addInternalModel(this.internalModel);
         } else {
           if (!internalModel._implicitRelationships[this.inverseKeyForImplicit]) {
-            internalModel._implicitRelationships[this.inverseKeyForImplicit] = new Relationship(this.store, internalModel, this.key, { options: { async: this.isAsync } });
+            internalModel._implicitRelationships[this.inverseKeyForImplicit] = new Relationship(this.store, internalModel, this.key, { options: { async: this.isAsync }, type: this.parentType });
           }
           internalModel._implicitRelationships[this.inverseKeyForImplicit].addInternalModel(this.internalModel);
         }
@@ -9444,7 +9553,7 @@ define('ember-data/-private/system/relationships/state/relationship', ['exports'
     };
 
     Relationship.prototype.removeCompletelyFromInverse = function removeCompletelyFromInverse() {
-      var _this3 = this;
+      var _this4 = this;
 
       if (!this.inverseKey) {
         return;
@@ -9459,7 +9568,7 @@ define('ember-data/-private/system/relationships/state/relationship', ['exports'
         var id = guidFor(inverseInternalModel);
 
         if (seen[id] === undefined) {
-          var relationship = inverseInternalModel._relationships.get(_this3.inverseKey);
+          var relationship = inverseInternalModel._relationships.get(_this4.inverseKey);
           relationship.removeCompletelyFromOwn(internalModel);
           seen[id] = true;
         }
@@ -9467,6 +9576,32 @@ define('ember-data/-private/system/relationships/state/relationship', ['exports'
 
       this.members.forEach(unload);
       this.canonicalMembers.forEach(unload);
+
+      if (!this.isAsync) {
+        this.clear();
+      }
+    };
+
+    Relationship.prototype.forAllMembers = function forAllMembers(callback) {
+      var seen = Object.create(null);
+
+      for (var i = 0; i < this.members.list.length; i++) {
+        var inverseInternalModel = this.members.list[i];
+        var id = guidFor(inverseInternalModel);
+        if (!seen[id]) {
+          seen[id] = true;
+          callback(inverseInternalModel);
+        }
+      }
+
+      for (var _i = 0; _i < this.canonicalMembers.list.length; _i++) {
+        var _inverseInternalModel = this.canonicalMembers.list[_i];
+        var _id = guidFor(_inverseInternalModel);
+        if (!seen[_id]) {
+          seen[_id] = true;
+          callback(_inverseInternalModel);
+        }
+      }
     };
 
     Relationship.prototype.removeCompletelyFromOwn = function removeCompletelyFromOwn(internalModel) {
@@ -9489,8 +9624,8 @@ define('ember-data/-private/system/relationships/state/relationship', ['exports'
 
       //TODO(Igor) make this less abysmally slow
       this.members = this.canonicalMembers.copy();
-      for (var _i = 0; _i < newInternalModels.length; _i++) {
-        this.members.add(newInternalModels[_i]);
+      for (var _i2 = 0; _i2 < newInternalModels.length; _i2++) {
+        this.members.add(newInternalModels[_i2]);
       }
     };
 
@@ -9591,6 +9726,23 @@ define('ember-data/-private/system/relationships/state/relationship', ['exports'
     Relationship.prototype.destroy = function destroy() {};
 
     _createClass(Relationship, [{
+      key: '_inverseMeta',
+      get: function () {
+        if (this.__inverseMeta === undefined) {
+          var inverseMeta = null;
+
+          if (this.inverseKey) {
+            var inverseModelClass = this.store.modelFor(this.relationshipMeta.type);
+            var inverseRelationships = get(inverseModelClass, 'relationshipsByName');
+            inverseMeta = inverseRelationships.get(this.inverseKey);
+          }
+
+          this.__inverseMeta = inverseMeta;
+        }
+
+        return this.__inverseMeta;
+      }
+    }, {
       key: 'parentType',
       get: function () {
         return this.internalModel.modelName;
@@ -18217,7 +18369,7 @@ define("ember-data/version", ["exports"], function (exports) {
   "use strict";
 
   exports.__esModule = true;
-  exports.default = "2.18.0";
+  exports.default = "2.18.1";
 });
 define("ember-inflector", ["module", "exports", "ember-inflector/lib/system", "ember-inflector/lib/ext/string"], function (module, exports, _system) {
   "use strict";

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data",
-  "version": "2.18.0",
+  "version": "2.18.1",
   "description": "A data layer for your Ember applications.",
   "repository": "git://github.com/emberjs/data.git",
   "directories": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-data-source
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.18.1
 platform: ruby
 authors:
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ember-source