Merge pull request #11966 from ef4/meta-sanity

[BUGFIX canary] Meta refactor

packages/ember-application/lib/system/application.js

@@ -9,6 +9,7 @@ import Ember from 'ember-metal'; // Ember.deprecate, Ember.assert, Ember.librari
 import isEnabled from 'ember-metal/features';
 import { get } from 'ember-metal/property_get';
 import { set } from 'ember-metal/property_set';
+import EmptyObject from 'ember-metal/empty_object';
 import { runLoadHooks } from 'ember-runtime/system/lazy_load';
 import Namespace from 'ember-runtime/system/namespace';
 import DefaultResolver from 'ember-application/system/resolver';
@@ -722,8 +723,8 @@ if (isEnabled('ember-application-visit')) {
 }
 
 Application.reopenClass({
-  initializers: Object.create(null),
-  instanceInitializers: Object.create(null),
+  initializers: new EmptyObject(),
+  instanceInitializers: new EmptyObject(),
 
   /**
     Initializer receives an object which has the following attributes:

packages/ember-htmlbars/lib/helpers.js

@@ -8,8 +8,9 @@
  @property helpers
 */
 import Ember from 'ember-metal/core';
+import EmptyObject from 'ember-metal/empty_object';
 
-var helpers = Object.create(null);
+var helpers = new EmptyObject();
 
 /**
 @module ember

packages/ember-metal/lib/alias.js

@@ -7,10 +7,8 @@ import {
   defineProperty
 } from 'ember-metal/properties';
 import { ComputedProperty } from 'ember-metal/computed';
-import {
-  meta,
-  inspect
-} from 'ember-metal/utils';
+import { inspect } from 'ember-metal/utils';
+import { meta } from 'ember-metal/meta';
 import {
   addDependentKeys,
   removeDependentKeys
@@ -47,14 +45,14 @@ AliasedProperty.prototype.didUnwatch = function(obj, keyName) {
 AliasedProperty.prototype.setup = function(obj, keyName) {
   Ember.assert(`Setting alias '${keyName}' on self`, this.altKey !== keyName);
   var m = meta(obj);
-  if (m.watching[keyName]) {
+  if (m.peekWatching(keyName)) {
     addDependentKeys(this, obj, keyName, m);
   }
 };
 
 AliasedProperty.prototype.teardown = function(obj, keyName) {
   var m = meta(obj);
-  if (m.watching[keyName]) {
+  if (m.peekWatching(keyName)) {
     removeDependentKeys(this, obj, keyName, m);
   }
 };

packages/ember-metal/lib/chains.js

@@ -1,7 +1,8 @@
 import Ember from 'ember-metal/core'; // warn, assert, etc;
 import { get, normalizeTuple } from 'ember-metal/property_get';
-import { meta as metaFor } from 'ember-metal/utils';
+import { meta as metaFor } from 'ember-metal/meta';
 import { watchKey, unwatchKey } from 'ember-metal/watch_key';
+import EmptyObject from 'ember-metal/empty_object';
 
 var FIRST_KEY = /^([^\.]+)/;
 
@@ -19,7 +20,7 @@ function isVolatile(obj) {
 
 function Chains() { }
 
-Chains.prototype = Object.create(null);
+Chains.prototype = new EmptyObject();
 
 function ChainWatchers(obj) {
   // this obj would be the referencing chain node's parent node's value
@@ -131,19 +132,17 @@ export function flushPendingChains() {
   );
 }
 
+function makeChainWatcher(obj) {
+  return new ChainWatchers(obj);
+}
+
 function addChainWatcher(obj, keyName, node) {
   if (!isObject(obj)) {
     return;
   }
 
   let m = metaFor(obj);
-
-  if (m.chainWatchers === undefined || m.chainWatchers.obj !== obj) {
-    m.chainWatchers = new ChainWatchers(obj);
-  }
-
-  m.chainWatchers.add(keyName, node);
-
+  m.writableChainWatchers(makeChainWatcher).add(keyName, node);
   watchKey(obj, keyName, m);
 }
 
@@ -154,15 +153,14 @@ function removeChainWatcher(obj, keyName, node) {
 
   let m = obj.__ember_meta__;
 
-  if (!m ||
-      m.chainWatchers === undefined || m.chainWatchers.obj !== obj) {
+  if (!m || !m.readableChainWatchers()) {
     return;
   }
 
   // make meta writable
   m = metaFor(obj);
 
-  m.chainWatchers.remove(keyName, node);
+  m.readableChainWatchers().remove(keyName, node);
 
   unwatchKey(obj, keyName, m);
 }
@@ -222,8 +220,9 @@ function lazyGet(obj, key) {
     return get(obj, key);
   // Otherwise attempt to get the cached value of the computed property
   } else {
-    if (meta.cache && key in meta.cache) {
-      return meta.cache[key];
+    let cache = meta.readableCache();
+    if (cache && key in cache) {
+      return cache[key];
     }
   }
 }
@@ -423,16 +422,17 @@ export function finishChains(obj) {
   // We only create meta if we really have to
   let m = obj.__ember_meta__;
   if (m) {
+    m = metaFor(obj);
+
     // finish any current chains node watchers that reference obj
-    let chainWatchers = m.chainWatchers;
+    let chainWatchers = m.readableChainWatchers();
     if (chainWatchers) {
       chainWatchers.revalidateAll();
     }
-    // copy chains from prototype
-    let chains = m.chains;
-    if (chains && chains.value() !== obj) {
-      // need to check if meta is writable
-      metaFor(obj).chains = chains.copy(obj);
+    // ensure that if we have inherited any chains they have been
+    // copied onto our own meta.
+    if (m.readableChains()) {
+      m.writableChains();
     }
   }
 }

packages/ember-metal/lib/computed.js

@@ -1,9 +1,7 @@
 import Ember from 'ember-metal/core';
 import { set } from 'ember-metal/property_set';
-import {
-  meta,
-  inspect
-} from 'ember-metal/utils';
+import { inspect } from 'ember-metal/utils';
+import { meta } from 'ember-metal/meta';
 import expandProperties from 'ember-metal/expand_properties';
 import EmberError from 'ember-metal/error';
 import {
@@ -266,9 +264,10 @@ ComputedPropertyPrototype.didChange = function(obj, keyName) {
   // _suspended is set via a CP.set to ensure we don't clear
   // the cached value set by the setter
   if (this._cacheable && this._suspended !== obj) {
-    var meta = metaFor(obj);
-    if (meta.cache && meta.cache[keyName] !== undefined) {
-      meta.cache[keyName] = undefined;
+    let meta = metaFor(obj);
+    let cache = meta.readableCache();
+    if (cache && cache[keyName] !== undefined) {
+      cache[keyName] = undefined;
       removeDependentKeys(this, obj, keyName, meta);
     }
   }
@@ -305,9 +304,9 @@ ComputedPropertyPrototype.get = function(obj, keyName) {
   var ret, cache, meta;
   if (this._cacheable) {
     meta = metaFor(obj);
-    cache = meta.cache;
+    cache = meta.writableCache();
 
-    var result = cache && cache[keyName];
+    var result = cache[keyName];
 
     if (result === UNDEFINED) {
       return undefined;
@@ -316,18 +315,16 @@ ComputedPropertyPrototype.get = function(obj, keyName) {
     }
 
     ret = this._getter.call(obj, keyName);
-    cache = meta.cache;
-    if (!cache) {
-      cache = meta.cache = {};
-    }
+
     if (ret === undefined) {
       cache[keyName] = UNDEFINED;
     } else {
       cache[keyName] = ret;
     }
 
-    if (meta.chainWatchers) {
-      meta.chainWatchers.revalidate(keyName);
+    let chainWatchers = meta.readableChainWatchers();
+    if (chainWatchers) {
+      chainWatchers.revalidate(keyName);
     }
     addDependentKeys(this, obj, keyName, meta);
   } else {
@@ -401,7 +398,7 @@ ComputedPropertyPrototype._set = function computedPropertySet(obj, keyName, valu
   var cacheable      = this._cacheable;
   var setter         = this._setter;
   var meta           = metaFor(obj, cacheable);
-  var cache          = meta.cache;
+  var cache          = meta.readableCache();
   var hadCachedValue = false;
 
   var cachedValue, ret;
@@ -427,7 +424,7 @@ ComputedPropertyPrototype._set = function computedPropertySet(obj, keyName, valu
 
   if (hadCachedValue && cachedValue === ret) { return; }
 
-  var watched = meta.watching[keyName];
+  var watched = meta.peekWatching(keyName);
   if (watched) {
     propertyWillChange(obj, keyName);
   }
@@ -441,7 +438,7 @@ ComputedPropertyPrototype._set = function computedPropertySet(obj, keyName, valu
       addDependentKeys(this, obj, keyName, meta);
     }
     if (!cache) {
-      cache = meta.cache = {};
+      cache = meta.writableCache();
     }
     if (ret === undefined) {
       cache[keyName] = UNDEFINED;
@@ -460,13 +457,13 @@ ComputedPropertyPrototype._set = function computedPropertySet(obj, keyName, valu
 /* called before property is overridden */
 ComputedPropertyPrototype.teardown = function(obj, keyName) {
   var meta = metaFor(obj);
-
-  if (meta.cache) {
-    if (keyName in meta.cache) {
+  let cache = meta.readableCache();
+  if (cache) {
+    if (keyName in cache) {
       removeDependentKeys(this, obj, keyName, meta);
     }
 
-    if (this._cacheable) { delete meta.cache[keyName]; }
+    if (this._cacheable) { delete cache[keyName]; }
   }
 
   return null; // no value to restore
@@ -560,7 +557,7 @@ export default function computed(func) {
 */
 function cacheFor(obj, key) {
   var meta = obj['__ember_meta__'];
-  var cache = meta && meta.cache;
+  var cache = meta && meta.readableCache();
   var ret = cache && cache[key];
 
   if (ret === UNDEFINED) {

packages/ember-metal/lib/dependent_keys.js

@@ -17,50 +17,19 @@ import {
 // DEPENDENT KEYS
 //
 
-// data structure:
-//  meta.deps = {
-//    'depKey': {
-//      'keyName': count,
-//    }
-//  }
-
-/*
-  This function returns a map of unique dependencies for a
-  given object and key.
-*/
-function keysForDep(depsMeta, depKey) {
-  var keys = depsMeta[depKey];
-  if (!keys) {
-    // if there are no dependencies yet for a the given key
-    // create a new empty list of dependencies for the key
-    keys = depsMeta[depKey] = {};
-  } else if (!depsMeta.hasOwnProperty(depKey)) {
-    // otherwise if the dependency list is inherited from
-    // a superclass, clone the hash
-    keys = depsMeta[depKey] = Object.create(keys);
-  }
-  return keys;
-}
-
-function metaForDeps(meta) {
-  return keysForDep(meta, 'deps');
-}
-
 export function addDependentKeys(desc, obj, keyName, meta) {
   // the descriptor has a list of dependent keys, so
   // add all of its dependent keys.
-  var depsMeta, idx, len, depKey, keys;
+  var idx, len, depKey, keys;
   var depKeys = desc._dependentKeys;
   if (!depKeys) {
     return;
   }
 
-  depsMeta = metaForDeps(meta);
-
   for (idx = 0, len = depKeys.length; idx < len; idx++) {
     depKey = depKeys[idx];
     // Lookup keys meta for depKey
-    keys = keysForDep(depsMeta, depKey);
+    keys = meta.writableDeps(depKey);
     // Increment the number of times depKey depends on keyName.
     keys[keyName] = (keys[keyName] || 0) + 1;
     // Watch the depKey
@@ -72,17 +41,15 @@ export function removeDependentKeys(desc, obj, keyName, meta) {
   // the descriptor has a list of dependent keys, so
   // remove all of its dependent keys.
   var depKeys = desc._dependentKeys;
-  var depsMeta, idx, len, depKey, keys;
+  var idx, len, depKey, keys;
   if (!depKeys) {
     return;
   }
 
-  depsMeta = metaForDeps(meta);
-
   for (idx = 0, len = depKeys.length; idx < len; idx++) {
     depKey = depKeys[idx];
     // Lookup keys meta for depKey
-    keys = keysForDep(depsMeta, depKey);
+    keys = meta.writableDeps(depKey);
     // Decrement the number of times depKey depends on keyName.
     keys[keyName] = (keys[keyName] || 0) - 1;
     // Unwatch the depKey

packages/ember-metal/lib/empty_object.js

@@ -0,0 +1,19 @@
+// This exists because `Object.create(null)` is absurdly slow compared
+// to `new EmptyObject()`. In either case, you want a null prototype
+// when you're treating the object instances as arbitrary dictionaries
+// and don't want your keys colliding with build-in methods on the
+// default object prototype.
+
+var proto = Object.create(null, {
+  // without this, we will always still end up with (new
+  // EmptyObject()).constructor === Object
+  constructor: {
+    value: undefined,
+    enumerable: false,
+    writable: true
+  }
+});
+
+function EmptyObject() {}
+EmptyObject.prototype = proto;
+export default EmptyObject;