Replace instances of Object.create(null) with new EmptyObject(). Fixes …

…emberjs#3642

CHANGELOG.md

@@ -831,7 +831,7 @@ correctly will need a shim for Object.create.
 * Refactor JSON serializer to use _getMappedKey
 * Don't normalize the key if not present in the hash
 * Add serializeIntoHash to the JSON Serializer
-* prefer Object.create(null) for typeMap backing stores. Cache misses are faster, and won’t collide with prototype pollution
+* prefer new EmptyObject() for typeMap backing stores. Cache misses are faster, and won’t collide with prototype pollution
 * since the recordArrayManager already maintains the uniq index, we can use that to simply push the record onto the record array without needing the safety of addRecords dupe guard. This prevents another O(n) operation
 * the string splitting in transitionTo is wasteful and for large payloads can be surprisingly costly. As they never actually change, we should simply cache and forget about them.
 * Coalesce find requests, add support for preloading data

packages/ember-data/lib/adapters/rest-adapter.js

@@ -926,7 +926,7 @@ var RESTAdapter =  Adapter.extend(BuildURLMixin, {
 });
 
 function parseResponseHeaders(headerStr) {
-  var headers = Object.create(null);
+  var headers = new EmptyObject();
   if (!headerStr) { return headers; }
 
   var headerPairs = headerStr.split('\u000d\u000a');

packages/ember-data/lib/system/clone-null.js

@@ -1,5 +1,5 @@
 export default function cloneNull(source) {
-  var clone = Object.create(null);
+  var clone = new EmptyObject();
   for (var key in source) {
     clone[key] = source[key];
   }

packages/ember-data/lib/system/model/internal-model.js

@@ -7,8 +7,8 @@ var Promise = Ember.RSVP.Promise;
 var get = Ember.get;
 var set = Ember.set;
 
-var _extractPivotNameCache = Object.create(null);
-var _splitOnDotCache = Object.create(null);
+var _extractPivotNameCache = new EmptyObject();
+var _splitOnDotCache = new EmptyObject();
 
 function splitOnDot(name) {
   return _splitOnDotCache[name] || (
@@ -48,13 +48,13 @@ export default function InternalModel(type, id, store, container, data) {
   this.id = id;
   this.store = store;
   this.container = container;
-  this._data = data || Object.create(null);
+  this._data = data || new EmptyObject();
   this.modelName = type.modelName;
   this.dataHasInitialized = false;
   //Look into making this lazy
   this._deferredTriggers = [];
-  this._attributes = Object.create(null);
-  this._inFlightAttributes = Object.create(null);
+  this._attributes = new EmptyObject();
+  this._inFlightAttributes = new EmptyObject();
   this._relationships = new Relationships(this);
   this.currentState = RootState.empty;
   this.isReloading = false;
@@ -87,7 +87,7 @@ export default function InternalModel(type, id, store, container, data) {
     would have a implicit post relationship in order to be do things like remove ourselves from the post
     when we are deleted
   */
-  this._implicitRelationships = Object.create(null);
+  this._implicitRelationships = new EmptyObject();
 }
 
 InternalModel.prototype = {
@@ -263,7 +263,7 @@ InternalModel.prototype = {
 
   flushChangedAttributes: function() {
     this._inFlightAttributes = this._attributes;
-    this._attributes = Object.create(null);
+    this._attributes = new EmptyObject();
   },
 
   /**
@@ -326,10 +326,10 @@ InternalModel.prototype = {
   rollbackAttributes: function() {
     var dirtyKeys = Object.keys(this._attributes);
 
-    this._attributes = Object.create(null);
+    this._attributes = new EmptyObject();
 
     if (get(this, 'isError')) {
-      this._inFlightAttributes = Object.create(null);
+      this._inFlightAttributes = new EmptyObject();
       this.didCleanError();
     }
 
@@ -346,7 +346,7 @@ InternalModel.prototype = {
     }
 
     if (this.isValid()) {
-      this._inFlightAttributes = Object.create(null);
+      this._inFlightAttributes = new EmptyObject();
     }
 
     this.send('rolledBack');
@@ -585,7 +585,7 @@ InternalModel.prototype = {
       merge(this._data, data);
     }
 
-    this._inFlightAttributes = Object.create(null);
+    this._inFlightAttributes = new EmptyObject();
 
     this.send('didCommit');
     this.updateRecordArraysLater();
@@ -656,7 +656,7 @@ InternalModel.prototype = {
         this._attributes[keys[i]] = this._inFlightAttributes[keys[i]];
       }
     }
-    this._inFlightAttributes = Object.create(null);
+    this._inFlightAttributes = new EmptyObject();
   },
 
   /**
@@ -708,7 +708,7 @@ InternalModel.prototype = {
       var keys = Object.keys(updates);
       var length = keys.length;
 
-      original = merge(Object.create(null), this._data);
+      original = merge(new EmptyObject(), this._data);
       original = merge(original, this._inFlightAttributes);
 
       for (i = 0; i < length; i++) {

packages/ember-data/lib/system/model/model.js

@@ -616,7 +616,7 @@ var Model = Ember.Object.extend(Ember.Evented, {
     var currentData = get(this._internalModel, '_attributes');
     var inFlightData = get(this._internalModel, '_inFlightAttributes');
     var newData = merge(copy(inFlightData), currentData);
-    var diffData = Object.create(null);
+    var diffData = new EmptyObject();
 
     var newDataKeys = Object.keys(newData);
 

packages/ember-data/lib/system/model/states.js

@@ -354,7 +354,7 @@ var DirtyState = {
     },
 
     exit: function(internalModel) {
-      internalModel._inFlightAttributes = Object.create(null);
+      internalModel._inFlightAttributes = new EmptyObject();
     }
   }
 };

packages/ember-data/lib/system/relationships/ext.js

@@ -185,7 +185,7 @@ Model.reopenClass({
   },
 
   inverseMap: Ember.computed(function() {
-    return Object.create(null);
+    return new EmptyObject();
   }),
 
   /**

packages/ember-data/lib/system/relationships/state/create.js

@@ -20,7 +20,7 @@ function createRelationshipFor(record, relationshipMeta, store) {
 
 export default function Relationships(record) {
   this.record = record;
-  this.initializedRelationships = Object.create(null);
+  this.initializedRelationships = new EmptyObject();
 }
 
 Relationships.prototype.has = function(key) {

packages/ember-data/lib/system/snapshot.js

@@ -12,11 +12,11 @@ var get = Ember.get;
   @param {DS.Model} internalModel The model to create a snapshot from
 */
 export default function Snapshot(internalModel) {
-  this._attributes = Object.create(null);
-  this._belongsToRelationships = Object.create(null);
-  this._belongsToIds = Object.create(null);
-  this._hasManyRelationships = Object.create(null);
-  this._hasManyIds = Object.create(null);
+  this._attributes = new EmptyObject();
+  this._belongsToRelationships = new EmptyObject();
+  this._belongsToIds = new EmptyObject();
+  this._hasManyRelationships = new EmptyObject();
+  this._hasManyIds = new EmptyObject();
 
   var record = internalModel.getRecord();
   this.record = record;
@@ -135,7 +135,7 @@ Snapshot.prototype = {
     @return {Object} All changed attributes of the current snapshot
   */
   changedAttributes: function() {
-    let changedAttributes = Object.create(null);
+    let changedAttributes = new EmptyObject();
     let changedAttributeKeys = Object.keys(this._changedAttributes);
 
     for (let i=0, length = changedAttributeKeys.length; i < length; i++) {

packages/ember-data/lib/system/store.js

@@ -319,7 +319,7 @@ Store = Service.extend({
   createRecord: function(modelName, inputProperties) {
     Ember.assert(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${Ember.inspect(modelName)}`, typeof modelName === 'string');
     var typeClass = this.modelFor(modelName);
-    var properties = copy(inputProperties) || Object.create(null);
+    var properties = copy(inputProperties) || new EmptyObject();
 
     // If the passed properties do not include a primary key,
     // give the adapter an opportunity to generate one. Typically,
@@ -1105,7 +1105,7 @@ Store = Service.extend({
         record.destroy(); // maybe within unloadRecord
       }
 
-      typeMap.metadata = Object.create(null);
+      typeMap.metadata = new EmptyObject();
     }
 
     function byType(entry) {
@@ -1421,9 +1421,9 @@ Store = Service.extend({
     if (typeMap) { return typeMap; }
 
     typeMap = {
-      idToRecord: Object.create(null),
+      idToRecord: new EmptyObject(),
       records: [],
-      metadata: Object.create(null),
+      metadata: new EmptyObject(),
       type: typeClass
     };
 

packages/ember-data/lib/system/store/container-instance-cache.js

@@ -20,10 +20,10 @@ import Ember from 'ember';
 */
 export default function ContainerInstanceCache(container) {
   this._container = container;
-  this._cache     = Object.create(null);
+  this._cache     = new EmptyObject();
 }
 
-ContainerInstanceCache.prototype = Object.create(null);
+ContainerInstanceCache.prototype = new EmptyObject();
 
 Ember.merge(ContainerInstanceCache.prototype, {
   get: function(type, preferredKey, fallbacks) {