[GLIMMER2] Move child ref caching into RootReference

Author: chancancode

packages/ember-glimmer/lib/component.js

@@ -8,17 +8,10 @@ import ViewMixin from 'ember-views/mixins/view_support';
 import ActionSupport from 'ember-views/mixins/action_support';
 import TargetActionSupport from 'ember-runtime/mixins/target_action_support';
 import symbol from 'ember-metal/symbol';
-import EmptyObject from 'ember-metal/empty_object';
 import { get } from 'ember-metal/property_get';
 import { PROPERTY_DID_CHANGE } from 'ember-metal/property_events';
 import { getAttrFor } from 'ember-views/compat/attrs-proxy';
-import {
-  UPDATE,
-  TO_ROOT_REFERENCE,
-  REFERENCE_FOR_KEY,
-  RootReference,
-  RootPropertyReference
-} from './utils/references';
+import { UPDATE, RootReference } from './utils/references';
 import { DirtyableTag } from 'glimmer-reference';
 import { readDOMAttr } from 'glimmer-runtime';
 import { assert, deprecate } from 'ember-metal/debug';
@@ -28,7 +21,6 @@ import { getOwner } from 'container/owner';
 export const DIRTY_TAG = symbol('DIRTY_TAG');
 export const ARGS = symbol('ARGS');
 export const ROOT_REF = symbol('ROOT_REF');
-export const REFS = symbol('REFS');
 export const IS_DISPATCHING_ATTRS = symbol('IS_DISPATCHING_ATTRS');
 export const HAS_BLOCK = symbol('HAS_BLOCK');
 
@@ -49,8 +41,7 @@ const Component = CoreView.extend(
       this._super(...arguments);
       this[IS_DISPATCHING_ATTRS] = false;
       this[DIRTY_TAG] = new DirtyableTag();
-      this[ROOT_REF] = null;
-      this[REFS] = new EmptyObject();
+      this[ROOT_REF] = new RootReference(this);
 
       // If a `defaultLayout` was specified move it to the `layout` prop.
       // `layout` is no longer a CP, so this just ensures that the `defaultLayout`
@@ -117,27 +108,6 @@ const Component = CoreView.extend(
 
     readDOMAttr(name) {
       return readDOMAttr(this.element, name);
-    },
-
-    [TO_ROOT_REFERENCE]() {
-      let ref = this[ROOT_REF];
-
-      if (!ref) {
-        ref = this[ROOT_REF] = new RootReference(this);
-      }
-
-      return ref;
-    },
-
-    [REFERENCE_FOR_KEY](key) {
-      let refs = this[REFS];
-      let ref = refs[key];
-
-      if (ref) {
-        return ref;
-      } else {
-        return refs[key] = new RootPropertyReference(this, key);
-      }
     }
   }
 );

packages/ember-glimmer/lib/syntax/curly-component.js

@@ -1,7 +1,6 @@
 import { StatementSyntax, ValueReference, EvaluatedArgs, EvaluatedNamedArgs, EvaluatedPositionalArgs } from 'glimmer-runtime';
-import { TO_ROOT_REFERENCE } from '../utils/references';
 import { AttributeBinding, ClassNameBinding, IsVisibleBinding } from '../utils/bindings';
-import { DIRTY_TAG, IS_DISPATCHING_ATTRS, HAS_BLOCK } from '../component';
+import { ROOT_REF, DIRTY_TAG, IS_DISPATCHING_ATTRS, HAS_BLOCK } from '../component';
 import { assert, runInDebug } from 'ember-metal/debug';
 import processArgs from '../utils/process-args';
 import { privatize as P } from 'container/registry';
@@ -224,7 +223,7 @@ class CurlyComponentManager {
   }
 
   getSelf({ component }) {
-    return component[TO_ROOT_REFERENCE]();
+    return component[ROOT_REF];
   }
 
   didCreateElement({ component, classRef }, element, operations) {

packages/ember-glimmer/lib/utils/bindings.js

@@ -1,15 +1,15 @@
 import { assert } from 'ember-metal/debug';
 import { dasherize } from 'ember-runtime/system/string';
 import { CachedReference, map, referenceFromParts } from 'glimmer-reference';
-import { REFERENCE_FOR_KEY, TO_ROOT_REFERENCE } from './references';
+import { ROOT_REF } from '../component';
 import { htmlSafe, isHTMLSafe } from './string';
 
 function referenceForKey(component, key) {
-  return component[REFERENCE_FOR_KEY](key);
+  return component[ROOT_REF].get(key);
 }
 
 function referenceForParts(component, parts) {
-  return referenceFromParts(component[TO_ROOT_REFERENCE](), parts);
+  return referenceFromParts(component[ROOT_REF], parts);
 }
 
 export const AttributeBinding = {

packages/ember-glimmer/lib/utils/references.js

@@ -3,6 +3,7 @@ import { set } from 'ember-metal/property_set';
 import { tagFor } from 'ember-metal/tags';
 import { didRender } from 'ember-metal/transaction';
 import symbol from 'ember-metal/symbol';
+import EmptyObject from 'ember-metal/empty_object';
 import { CONSTANT_TAG, ConstReference, DirtyableTag, UpdatableTag, combine, isConst } from 'glimmer-reference';
 import { ConditionalReference as GlimmerConditionalReference, NULL_REFERENCE, UNDEFINED_REFERENCE } from 'glimmer-runtime';
 import emberToBool from './to-bool';
@@ -13,8 +14,6 @@ import isEnabled from 'ember-metal/features';
 import { isProxy } from 'ember-runtime/mixins/-proxy';
 
 export const UPDATE = symbol('UPDATE');
-export const TO_ROOT_REFERENCE = symbol('TO_ROOT_REFERENCE');
-export const REFERENCE_FOR_KEY = symbol('REFERENCE_FOR_KEY');
 
 // @implements PathReference
 export class PrimitiveReference extends ConstReference {
@@ -64,10 +63,19 @@ export class CachedReference extends EmberPathReference {
 
 // @implements PathReference
 export class RootReference extends ConstReference {
+  constructor(value) {
+    super(value);
+    this.children = new EmptyObject();
+  }
+
   get(propertyKey) {
-    let self = this.value();
-    let ref = self[REFERENCE_FOR_KEY] && self[REFERENCE_FOR_KEY](propertyKey);
-    return ref || PropertyReference.create(this, propertyKey);
+    let ref = this.children[propertyKey];
+
+    if (!ref) {
+      ref = this.children[propertyKey] = PropertyReference.create(this, propertyKey);
+    }
+
+    return ref;
   }
 }