Merge pull request #4591 from emberjs/cleanup-record-array-manager

Cleanup record array manager
emberjs · Oct 19, 2016 · 8e6a753 · 8e6a753
2 parents a136f67 + 4b5fa40
commit 8e6a753
Show file tree

Hide file tree

Showing 14 changed files with 903 additions and 305 deletions.
diff --git a/addon/-private/system/promise-proxies.js b/addon/-private/system/promise-proxies.js
@@ -1,8 +1,7 @@
 import Ember from 'ember';
 import { assert } from "ember-data/-private/debug";
 
-var Promise = Ember.RSVP.Promise;
-var get = Ember.get;
+const { get , RSVP: { Promise }} = Ember;
 
 /**
   A `PromiseArray` is an object that acts like both an `Ember.Array`
@@ -33,7 +32,7 @@ var get = Ember.get;
   @extends Ember.ArrayProxy
   @uses Ember.PromiseProxyMixin
 */
-var PromiseArray = Ember.ArrayProxy.extend(Ember.PromiseProxyMixin);
+export const PromiseArray = Ember.ArrayProxy.extend(Ember.PromiseProxyMixin);
 
 /**
   A `PromiseObject` is an object that acts like both an `Ember.Object`
@@ -64,19 +63,19 @@ var PromiseArray = Ember.ArrayProxy.extend(Ember.PromiseProxyMixin);
   @extends Ember.ObjectProxy
   @uses Ember.PromiseProxyMixin
 */
-var PromiseObject = Ember.ObjectProxy.extend(Ember.PromiseProxyMixin);
+export const PromiseObject = Ember.ObjectProxy.extend(Ember.PromiseProxyMixin);
 
-var promiseObject = function(promise, label) {
+export function promiseObject(promise, label) {
   return PromiseObject.create({
     promise: Promise.resolve(promise, label)
   });
-};
+}
 
-var promiseArray = function(promise, label) {
+export function promiseArray(promise, label) {
   return PromiseArray.create({
     promise: Promise.resolve(promise, label)
   });
-};
+}
 
 /**
   A PromiseManyArray is a PromiseArray that also proxies certain method calls
@@ -96,14 +95,13 @@ var promiseArray = function(promise, label) {
   @extends Ember.ArrayProxy
 */
 
-function proxyToContent(method) {
+export function proxyToContent(method) {
   return function() {
-    var content = get(this, 'content');
-    return content[method].apply(content, arguments);
+    return get(this, 'content')[method](...arguments);
   };
 }
 
-var PromiseManyArray = PromiseArray.extend({
+export const PromiseManyArray = PromiseArray.extend({
   reload() {
     //I don't think this should ever happen right now, but worth guarding if we refactor the async relationships
     assert('You are trying to reload an async manyArray before it has been created', get(this, 'content'));
@@ -125,18 +123,8 @@ var PromiseManyArray = PromiseArray.extend({
   has: proxyToContent('has')
 });
 
-var promiseManyArray = function(promise, label) {
+export function promiseManyArray(promise, label) {
   return PromiseManyArray.create({
     promise: Promise.resolve(promise, label)
   });
-};
-
-
-export {
-  PromiseArray,
-  PromiseObject,
-  PromiseManyArray,
-  promiseArray,
-  promiseObject,
-  promiseManyArray
-};
+}
diff --git a/addon/-private/system/record-array-manager.js b/addon/-private/system/record-array-manager.js
@@ -102,7 +102,7 @@ export default Ember.Object.extend({
     this.changedRecords.forEach(internalModel => {
 
       if (internalModel.isDestroyed ||
-           internalModel.currentState.stateName === 'root.deleted.saved') {
+          internalModel.currentState.stateName === 'root.deleted.saved') {
         this._recordWasDeleted(internalModel);
       } else {
         this._recordWasChanged(internalModel);
@@ -123,7 +123,6 @@ export default Ember.Object.extend({
     record._recordArrays = null;
   },
 
-
   _recordWasChanged(record) {
     heimdall.increment(_recordWasChanged);
     let typeClass = record.type;
@@ -152,6 +151,7 @@ export default Ember.Object.extend({
       this._addRecordToRecordArray(liveRecordArray, record);
     }
   },
+
   /**
     Update an individual filter.
 

diff --git a/addon/-private/system/record-arrays/adapter-populated-record-array.js b/addon/-private/system/record-arrays/adapter-populated-record-array.js
@@ -6,7 +6,7 @@ import cloneNull from "ember-data/-private/system/clone-null";
   @module ember-data
 */
 
-var get = Ember.get;
+const { get } = Ember;
 
 /**
   Represents an ordered list of records whose order and membership is
@@ -19,11 +19,15 @@ var get = Ember.get;
   @extends DS.RecordArray
 */
 export default RecordArray.extend({
-  query: null,
+  init() {
+    this._super(...arguments);
+    this.query = this.query || null;
+    this.links = null;
+  },
 
   replace() {
-    var type = get(this, 'type').toString();
-    throw new Error("The result of a server query (on " + type + ") is immutable.");
+    let type = get(this, 'type').toString();
+    throw new Error(`The result of a server query (on ${type}) is immutable.`);
   },
 
   _update() {
@@ -43,7 +47,7 @@ export default RecordArray.extend({
   loadRecords(records, payload) {
     let token = heimdall.start('AdapterPopulatedRecordArray.loadRecords');
     //TODO Optimize
-    var internalModels = Ember.A(records).mapBy('_internalModel');
+    let internalModels = records.map(record => get(record, '_internalModel'));
     this.setProperties({
       content: Ember.A(internalModels),
       isLoaded: true,
@@ -53,7 +57,7 @@ export default RecordArray.extend({
 
     this.set('links', cloneNull(payload.links));
 
-    internalModels.forEach((record) => {
+    internalModels.forEach(record => {
       this.manager.recordArraysForRecord(record).add(this);
     });
 

diff --git a/addon/-private/system/record-arrays/filtered-record-array.js b/addon/-private/system/record-arrays/filtered-record-array.js
@@ -5,7 +5,7 @@ import RecordArray from "ember-data/-private/system/record-arrays/record-array";
   @module ember-data
 */
 
-var get = Ember.get;
+const { get } = Ember;
 
 /**
   Represents a list of records whose membership is determined by the
@@ -18,6 +18,12 @@ var get = Ember.get;
   @extends DS.RecordArray
 */
 export default RecordArray.extend({
+  init() {
+    this._super(...arguments);
+
+    this.set('filterFunction', this.get('filterFunction') || null);
+    this.isLoaded = true;
+  },
   /**
     The filterFunction is a function used to test records from the store to
     determine if they should be part of the record array.
@@ -44,21 +50,21 @@ export default RecordArray.extend({
     @param {DS.Model} record
     @return {Boolean} `true` if the record should be in the array
   */
-  filterFunction: null,
-  isLoaded: true,
 
   replace() {
-    var type = get(this, 'type').toString();
-    throw new Error("The result of a client-side filter (on " + type + ") is immutable.");
+    let type = get(this, 'type').toString();
+    throw new Error(`The result of a client-side filter (on ${type}) is immutable.`);
   },
 
   /**
     @method updateFilter
     @private
   */
   _updateFilter() {
-    var manager = get(this, 'manager');
-    manager.updateFilter(this, get(this, 'type'), get(this, 'filterFunction'));
+    if (get(this, 'isDestroying') || get(this, 'isDestroyed')) {
+      return;
+    }
+    get(this, 'manager').updateFilter(this, get(this, 'type'), get(this, 'filterFunction'));
   },
 
   updateFilter: Ember.observer('filterFunction', function() {