[PERF] make internal model lazier

addon/-private/system/model/model.js

@@ -8,13 +8,17 @@ import { HasManyMixin } from 'ember-data/-private/system/relationships/has-many'
 import { DidDefinePropertyMixin, RelationshipsClassMethodsMixin, RelationshipsInstanceMethodsMixin } from 'ember-data/-private/system/relationships/ext';
 import { AttrClassMethodsMixin, AttrInstanceMethodsMixin } from 'ember-data/-private/system/model/attr';
 import isEnabled from 'ember-data/-private/features';
+import RootState from 'ember-data/-private/system/model/states';
+
+const {
+  get,
+  computed
+} = Ember;
 
 /**
   @module ember-data
 */
 
-var get = Ember.get;
-
 function intersection (array1, array2) {
   var result = [];
   array1.forEach((element) => {
@@ -30,7 +34,7 @@ var RESERVED_MODEL_PROPS = [
   'currentState', 'data', 'store'
 ];
 
-var retrieveFromCurrentState = Ember.computed('currentState', function(key) {
+var retrieveFromCurrentState = computed('currentState', function(key) {
   return get(this._internalModel.currentState, key);
 }).readOnly();
 
@@ -122,7 +126,7 @@ var Model = Ember.Object.extend(Ember.Evented, {
     @type {Boolean}
     @readOnly
   */
-  hasDirtyAttributes: Ember.computed('currentState.isDirty', function() {
+  hasDirtyAttributes: computed('currentState.isDirty', function() {
     return this.get('currentState.isDirty');
   }),
   /**
@@ -305,6 +309,7 @@ var Model = Ember.Object.extend(Ember.Evented, {
     @private
     @type {Object}
   */
+  currentState: RootState.empty,
 
   /**
     When the record is in the `invalid` state this object will contain
@@ -357,7 +362,7 @@ var Model = Ember.Object.extend(Ember.Evented, {
     @property errors
     @type {DS.Errors}
   */
-  errors: Ember.computed(function() {
+  errors: computed(function() {
     let errors = Errors.create();
 
     errors._registerHandlers(this._internalModel,

addon/-private/system/model/states.js

@@ -1,10 +1,8 @@
 /**
   @module ember-data
 */
-import Ember from 'ember';
 import { assert } from "ember-data/-private/debug";
 
-const { get } = Ember;
 /*
   This file encapsulates the various states that a record can transition
   through during its lifecycle.
@@ -257,7 +255,7 @@ const DirtyState = {
       heimdall.stop(token);
     },
 
-    becomeDirty() { },
+    becomeDirty() {},
 
     willCommit(internalModel) {
       internalModel.transitionTo('inFlight');
@@ -430,7 +428,7 @@ createdState.uncommitted.pushedData = function(internalModel) {
   internalModel.triggerLater('didLoad');
 };
 
-createdState.uncommitted.propertyWasReset = Ember.K;
+createdState.uncommitted.propertyWasReset = function() {};
 
 function assertAgainstUnloadRecord(internalModel) {
   assert("You can only unload a record which is not inFlight. `" + internalModel + "`", false);
@@ -581,9 +579,7 @@ const RootState = {
         internalModel.transitionTo('deleted.saved');
       },
 
-      didCommit(internalModel) {
-        internalModel.send('invokeLifecycleCallbacks', get(internalModel, 'lastDirtyType'));
-      },
+      didCommit() {},
 
       // loaded.saved.notFound would be triggered by a failed
       // `reload()` on an unchanged record
@@ -715,7 +711,6 @@ const RootState = {
       deleteRecord()  { },
       willCommit()    { },
 
-
       rolledBack(internalModel) {
         internalModel.clearErrorMessages();
         internalModel.transitionTo('loaded.saved');

addon/-private/system/record-array-manager.js

@@ -8,9 +8,14 @@ import {
   FilteredRecordArray,
   AdapterPopulatedRecordArray
 } from "ember-data/-private/system/record-arrays";
-const { get, MapWithDefault } = Ember;
 import OrderedSet from "ember-data/-private/system/ordered-set";
 
+const {
+  get,
+  MapWithDefault,
+  run: emberRun
+} = Ember;
+
 const {
   _addRecordToRecordArray,
   _recordWasChanged,
@@ -78,7 +83,7 @@ export default Ember.Object.extend({
     heimdall.increment(recordDidChange);
     if (this.changedRecords.push(record) !== 1) { return; }
 
-    Ember.run.schedule('actions', this, this.updateRecordArrays);
+    emberRun.schedule('actions', this, this.updateRecordArrays);
   },
 
   recordArraysForRecord(record) {

addon/-private/system/store.js

@@ -7,9 +7,7 @@ import Model from 'ember-data/model';
 import { instrument, assert, warn, runInDebug } from "ember-data/-private/debug";
 import _normalizeLink from "ember-data/-private/system/normalize-link";
 import normalizeModelName from "ember-data/-private/system/normalize-model-name";
-import {
-  InvalidError
-} from 'ember-data/adapters/errors';
+import { InvalidError } from 'ember-data/adapters/errors';
 
 import {
   promiseArray,
@@ -22,13 +20,8 @@ import {
   _objectIsAlive
 } from "ember-data/-private/system/store/common";
 
-import {
-  normalizeResponseHelper
-} from "ember-data/-private/system/store/serializer-response";
-
-import {
-  serializerForAdapter
-} from "ember-data/-private/system/store/serializers";
+import { normalizeResponseHelper } from "ember-data/-private/system/store/serializer-response";
+import { serializerForAdapter } from "ember-data/-private/system/store/serializers";
 
 import {
   _find,
@@ -40,25 +33,27 @@ import {
   _queryRecord
 } from "ember-data/-private/system/store/finders";
 
-import {
-  getOwner
-} from 'ember-data/-private/utils';
-
+import { getOwner } from 'ember-data/-private/utils';
 import coerceId from "ember-data/-private/system/coerce-id";
-
 import RecordArrayManager from "ember-data/-private/system/record-array-manager";
 import ContainerInstanceCache from 'ember-data/-private/system/store/container-instance-cache';
-
 import InternalModel from "ember-data/-private/system/model/internal-model";
-
 import EmptyObject from "ember-data/-private/system/empty-object";
-
 import isEnabled from 'ember-data/-private/features';
 
 export let badIdFormatAssertion = '`id` passed to `findRecord()` has to be non-empty string or number';
 
-const Backburner = Ember._Backburner;
-var Map = Ember.Map;
+const {
+  _Backburner: Backburner,
+  copy,
+  get,
+  isNone,
+  isPresent,
+  Map,
+  run: emberRun,
+  set,
+  Service
+} = Ember;
 
 //Get the materialized model from the internalModel/promise that returns
 //an internal model and return it in a promiseObject. Useful for returning
@@ -68,19 +63,9 @@ function promiseRecord(internalModel, label) {
   return promiseObject(toReturn, label);
 }
 
-var once = Ember.run.once;
-var Promise = Ember.RSVP.Promise;
-var Store;
+const Promise = Ember.RSVP.Promise;
 
-const {
-  copy,
-  get,
-  GUID_KEY,
-  isNone,
-  isPresent,
-  set,
-  Service
-} = Ember;
+let Store;
 
 // Implementors Note:
 //
@@ -807,7 +792,7 @@ Store = Service.extend({
     } else {
       this._pendingFetch.get(typeClass).push(pendingFetchItem);
     }
-    Ember.run.scheduleOnce('afterRender', this, this.flushAllPendingFetches);
+    emberRun.scheduleOnce('afterRender', this, this.flushAllPendingFetches);
 
     return promise;
   },
@@ -1784,7 +1769,7 @@ Store = Service.extend({
       snapshot: snapshot,
       resolver: resolver
     });
-    once(this, 'flushPendingSave');
+    emberRun.once(this, this.flushPendingSave);
   },
 
   /**
@@ -1839,7 +1824,7 @@ Store = Service.extend({
     }
     if (data) {
       // normalize relationship IDs into records
-      this._backburner.schedule('normalizeRelationships', this, '_setupRelationships', internalModel, data);
+      this._backburner.schedule('normalizeRelationships', this, this._setupRelationships, internalModel, data);
       this.updateId(internalModel, data);
     } else {
       assert(`Your ${internalModel.type.modelName} record was saved to the server, but the response does not have an id and no id has been set client side. Records must have ids. Please update the server response to provide an id in the response or generate the id on the client side either before saving the record or while normalizing the response.`, internalModel.id);
@@ -1893,7 +1878,7 @@ Store = Service.extend({
     var id = coerceId(data.id);
 
     // ID absolutely can't be missing if the oldID is empty (missing Id in response for a new record)
-    assert(`'${internalModel.type.modelName}:${internalModel[GUID_KEY]}' was saved to the server, but the response does not have an id and your record does not either.`, !(id === null && oldId === null));
+    assert(`'${internalModel.type.modelName}' was saved to the server, but the response does not have an id and your record does not either.`, !(id === null && oldId === null));
 
     // ID absolutely can't be different than oldID if oldID is not null
     assert(`'${internalModel.type.modelName}:${oldId}' was saved to the server, but the response returned the new id '${id}'. The store cannot assign a new id to a record that already has an id.`, !(oldId !== null && id !== oldId));
@@ -2262,7 +2247,7 @@ Store = Service.extend({
     var internalModel = this._load(data);
 
     this._backburner.join(() => {
-      this._backburner.schedule('normalizeRelationships', this, '_setupRelationships', internalModel, data);
+      this._backburner.schedule('normalizeRelationships', this, this._setupRelationships, internalModel, data);
     });
 
     return internalModel;

ember-cli-build.js

@@ -23,7 +23,7 @@ module.exports = function(defaults) {
     babel: {
       plugins: [
         // while ember-data strips itself, ember does not currently
-        {transformer: stripClassCallCheck, position: 'after'}
+        { transformer: stripClassCallCheck, position: 'after' }
       ]
     }
   });

lib/babel-build.js

@@ -16,7 +16,8 @@ function babelOptions(libraryName, _options) {
       'es6.properties.shorthand',
       'es6.blockScoping',
       'es6.constants',
-      'es6.modules'
+      'es6.modules',
+      'es6.classes'
     ],
     sourceMaps: false,
     modules: 'amdStrict',

lib/stripped-build-plugins.js

@@ -3,6 +3,7 @@ var path          = require('path');
 var filterImports = require('babel-plugin-filter-imports');
 var featureFlags  = require('babel-plugin-feature-flags');
 var stripHeimdall = require('babel5-plugin-strip-heimdall');
+var stripClassCallCheck = require('babel5-plugin-strip-class-callcheck');
 
 function uniqueAdd(obj, key, values) {
   var a = obj[key] = obj[key] || [];
@@ -32,7 +33,8 @@ module.exports = function(environment) {
     featureFlags({
       import: { module: 'ember-data/-private/features' },
       features: features
-    })
+    }),
+    { transformer: stripClassCallCheck, position: 'after' }
   ];
 
   if (process.env.INSTRUMENT_HEIMDALL === 'false') {

tests/unit/store/unload-test.js

@@ -55,7 +55,7 @@ testInDebug("unload a dirty record asserts", function(assert) {
 
       assert.expectAssertion(function() {
         record.unloadRecord();
-      }, "You can only unload a record which is not inFlight. `" + Ember.inspect(record) + "`", "can not unload dirty record");
+      }, "You can only unload a record which is not inFlight. `" + record._internalModel.toString() + "`", "can not unload dirty record");
 
       // force back into safe to unload mode.
       run(function() {