Use the renderer to manage the view registry.

* Remove usage of `Ember.View.views`. This has not been exposed since 1.x.
* Use the renderer to update view registry.

Author: Robert Jackson

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

@@ -12,7 +12,6 @@ import Namespace, {
 } from 'ember-runtime/system/namespace';
 import { runLoadHooks } from 'ember-runtime/system/lazy_load';
 import run from 'ember-metal/run_loop';
-import EmberView from 'ember-views/views/view';
 import EventDispatcher from 'ember-views/system/event_dispatcher';
 import jQuery from 'ember-views/system/jquery';
 import Route from 'ember-routing/system/route';
@@ -403,10 +402,10 @@ const Application = Engine.extend({
 
     This is orthogonal to autoboot: the deprecated instance needs to
     be created at Application construction (not boot) time to expose
-    App.__container__ and the global Ember.View.views registry. If
-    autoboot sees that this instance exists, it will continue booting
-    it to avoid doing unncessary work (as opposed to building a new
-    instance at boot time), but they are otherwise unrelated.
+    App.__container__. If autoboot sees that this instance exists,
+    it will continue booting it to avoid doing unncessary work (as
+    opposed to building a new instance at boot time), but they are
+    otherwise unrelated.
 
     @private
     @method _buildDeprecatedInstance
@@ -419,10 +418,6 @@ const Application = Engine.extend({
     // on App that rely on a single, default instance.
     this.__deprecatedInstance__ = instance;
     this.__container__ = instance.__container__;
-
-    // For the default instance only, set the view registry to the global
-    // Ember.View.views hash for backwards-compatibility.
-    EmberView.views = instance.lookup('-view-registry:main');
   },
 
   /**

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

@@ -487,6 +487,8 @@ function commonSetupRegistry(registry) {
   registry.injection('service:-dom-helper', 'document', 'service:-document');
 
   registry.injection('view', '_viewRegistry', '-view-registry:main');
+  registry.injection('renderer', '_viewRegistry', '-view-registry:main');
+  registry.injection('event_dispatcher:main', '_viewRegistry', '-view-registry:main');
 
   registry.injection('route', '_topLevelViewTemplate', 'template:-outlet');
 

packages/ember-glimmer/lib/component.js

@@ -7,7 +7,6 @@ import AriaRoleSupport from 'ember-views/mixins/aria_role_support';
 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 EmberView from 'ember-views/views/view';
 import symbol from 'ember-metal/symbol';
 import EmptyObject from 'ember-metal/empty_object';
 import { get } from 'ember-metal/property_get';
@@ -48,7 +47,6 @@ const Component = CoreView.extend(
 
     init() {
       this._super(...arguments);
-      this._viewRegistry = this._viewRegistry || EmberView.views;
       this[DIRTY_TAG] = new DirtyableTag();
       this[ROOT_REF] = null;
       this[REFS] = new EmptyObject();

packages/ember-glimmer/lib/renderer.js

@@ -2,6 +2,8 @@ import { RootReference } from './utils/references';
 import run from 'ember-metal/run_loop';
 import { setHasViews } from 'ember-metal/tags';
 import { CURRENT_TAG, UNDEFINED_REFERENCE } from 'glimmer-reference';
+import fallbackViewRegistry from 'ember-views/compat/fallback-view-registry';
+import { assert } from 'ember-metal/debug';
 
 const { backburner } = run;
 
@@ -115,12 +117,13 @@ class Scheduler {
 }
 
 class Renderer {
-  constructor({ dom, env, destinedForDOM = false }) {
+  constructor({ dom, env, _viewRegistry, destinedForDOM = false }) {
     this._root = null;
     this._dom = dom;
     this._env = env;
     this._destinedForDOM = destinedForDOM;
     this._scheduler = new Scheduler();
+    this._viewRegistry = _viewRegistry || fallbackViewRegistry;
   }
 
   destroy() {
@@ -209,16 +212,25 @@ class Renderer {
     // TODO: Implement this
     // throw new Error('Something you did caused a view to re-render after it rendered but before it was inserted into the DOM.');
   }
+
+  _register(view) {
+    assert('Attempted to register a view with an id already in use: ' + view.elementId, !this._viewRegistry[this.elementId]);
+    this._viewRegistry[view.elementId] = view;
+  }
+
+  _unregister(view) {
+    delete this._viewRegistry[this.elementId];
+  }
 }
 
 export const InertRenderer = {
-  create({ dom, env }) {
-    return new Renderer({ dom, env, destinedForDOM: false });
+  create({ dom, env, _viewRegistry }) {
+    return new Renderer({ dom, env, _viewRegistry, destinedForDOM: false });
   }
 };
 
 export const InteractiveRenderer = {
-  create({ dom, env }) {
-    return new Renderer({ dom, env, destinedForDOM: true });
+  create({ dom, env, _viewRegistry }) {
+    return new Renderer({ dom, env, _viewRegistry, destinedForDOM: true });
   }
 };

packages/ember-glimmer/tests/integration/components/curly-components-test.js

@@ -1968,54 +1968,6 @@ moduleFor('Components test: curly components', class extends RenderingTest {
     assert.equal(outer.parentView, this.context, 'x-outer receives the ambient scope as its parentView');
   }
 
-  ['@htmlbars component should receive the viewRegistry from the parentView'](assert) {
-    let outer, innerTemplate, innerLayout;
-
-    let viewRegistry = {};
-
-    this.registerComponent('x-outer', {
-      ComponentClass: Component.extend({
-        init() {
-          this._super(...arguments);
-          outer = this;
-        }
-      }),
-      template: '{{x-inner-in-layout}}{{yield}}'
-    });
-
-    this.registerComponent('x-inner-in-template', {
-      ComponentClass: Component.extend({
-        init() {
-          this._super(...arguments);
-          innerTemplate = this;
-        }
-      })
-    });
-
-    this.registerComponent('x-inner-in-layout', {
-      ComponentClass: Component.extend({
-        init() {
-          this._super(...arguments);
-          innerLayout = this;
-        }
-      })
-    });
-
-    this.render('{{#x-outer}}{{x-inner-in-template}}{{/x-outer}}', {
-      _viewRegistry: viewRegistry
-    });
-
-    assert.equal(innerTemplate._viewRegistry, viewRegistry);
-    assert.equal(innerLayout._viewRegistry, viewRegistry);
-    assert.equal(outer._viewRegistry, viewRegistry);
-
-    this.runTask(() => this.rerender());
-
-    assert.equal(innerTemplate._viewRegistry, viewRegistry);
-    assert.equal(innerLayout._viewRegistry, viewRegistry);
-    assert.equal(outer._viewRegistry, viewRegistry);
-  }
-
   ['@htmlbars component should rerender when a property is changed during children\'s rendering'](assert) {
     expectDeprecation(/modified value twice in a single render/);
 

packages/ember-glimmer/tests/utils/abstract-test-case.js

@@ -319,6 +319,7 @@ export class AbstractRenderingTest extends TestCase {
     this.component = null;
 
     owner.register('event_dispatcher:main', EventDispatcher);
+    owner.inject('event_dispatcher:main', '_viewRegistry', '-view-registry:main');
     owner.lookup('event_dispatcher:main').setup(this.getCustomDispatcherEvents(), owner.element);
   }
 

packages/ember-glimmer/tests/utils/helpers.js

@@ -23,6 +23,9 @@ export function buildOwner(options) {
   owner.inject('service:-dom-helper', 'document', 'service:-document');
   owner.inject('component', 'renderer', 'renderer:-dom');
   owner.inject('template', 'env', 'service:-glimmer-environment');
+
+  owner.register('-view-registry:main', { create() { return {}; } });
+  owner.inject('renderer', '_viewRegistry', '-view-registry:main');
+
   return owner;
 }
-

packages/ember-htmlbars/lib/node-managers/component-node-manager.js

@@ -169,7 +169,6 @@ export function createComponent(_component, props, renderNode, env, attrs = {})
 
   setOwner(props, env.owner);
   props.renderer = props.parentView ? props.parentView.renderer : env.owner.lookup('renderer:-dom');
-  props._viewRegistry = props.parentView ? props.parentView._viewRegistry : env.owner.lookup('-view-registry:main');
 
   let component = _component.create(props);
 

packages/ember-htmlbars/lib/node-managers/view-node-manager.js

@@ -191,7 +191,6 @@ export function createOrUpdateComponent(component, options, createOptions, rende
 
     setOwner(props, owner);
     props.renderer = options.parentView ? options.parentView.renderer : owner && owner.lookup('renderer:-dom');
-    props._viewRegistry = options.parentView ? options.parentView._viewRegistry : owner && owner.lookup('-view-registry:main');
 
     if (proto.controller !== defaultController || hasSuppliedController) {
       delete props._context;

packages/ember-htmlbars/lib/renderer.js

@@ -7,8 +7,10 @@ import buildComponentTemplate from 'ember-htmlbars/system/build-component-templa
 import { environment } from 'ember-environment';
 import { internal } from 'htmlbars-runtime';
 import { renderHTMLBarsBlock } from 'ember-htmlbars/system/render-view';
+import fallbackViewRegistry from 'ember-views/compat/fallback-view-registry';
+import { assert } from 'ember-metal/debug';
 
-export function Renderer(domHelper, { destinedForDOM } = {}) {
+export function Renderer(domHelper, { destinedForDOM, _viewRegistry } = {}) {
   this._dom = domHelper;
 
   // This flag indicates whether the resulting rendered element will be
@@ -20,6 +22,8 @@ export function Renderer(domHelper, { destinedForDOM } = {}) {
   this._destinedForDOM = destinedForDOM === undefined ?
     environment.hasDOM :
     destinedForDOM;
+
+  this._viewRegistry = _viewRegistry || fallbackViewRegistry;
 }
 
 Renderer.prototype.prerenderTopLevelView =
@@ -281,14 +285,24 @@ Renderer.prototype.didDestroyElement = function (view) {
   }
 };
 
+
+Renderer.prototype._register = function Renderer_register(view) {
+  assert('Attempted to register a view with an id already in use: ' + view.elementId, !this._viewRegistry[this.elementId]);
+  this._viewRegistry[view.elementId] = view;
+};
+
+Renderer.prototype._unregister = function Renderer_unregister(view) {
+  delete this._viewRegistry[this.elementId];
+};
+
 export const InertRenderer = {
-  create({ dom }) {
-    return new Renderer(dom, { destinedForDOM: false });
+  create({ dom, _viewRegistry }) {
+    return new Renderer(dom, { destinedForDOM: false, _viewRegistry });
   }
 };
 
 export const InteractiveRenderer = {
-  create({ dom }) {
-    return new Renderer(dom, { destinedForDOM: true });
+  create({ dom, _viewRegistry }) {
+    return new Renderer(dom, { destinedForDOM: true, _viewRegistry });
   }
 };