Kill ContainerProxyMixin

Author: wagenet

broccoli/amd-compat-entrypoints/ember.debug.js

@@ -56,24 +56,6 @@ d('@ember/-internals/runtime/index', emberinternalsRuntimeIndex);
 import * as emberinternalsRuntimeLibExtRsvp from '@ember/-internals/runtime/lib/ext/rsvp';
 d('@ember/-internals/runtime/lib/ext/rsvp', emberinternalsRuntimeLibExtRsvp);
 
-import * as emberinternalsRuntimeLibMixinsproxy from '@ember/-internals/runtime/lib/mixins/-proxy';
-d('@ember/-internals/runtime/lib/mixins/-proxy', emberinternalsRuntimeLibMixinsproxy);
-
-import * as emberinternalsRuntimeLibMixinsActionHandler from '@ember/-internals/runtime/lib/mixins/action_handler';
-d(
-  '@ember/-internals/runtime/lib/mixins/action_handler',
-  emberinternalsRuntimeLibMixinsActionHandler
-);
-
-import * as emberinternalsRuntimeLibMixinsComparable from '@ember/-internals/runtime/lib/mixins/comparable';
-d('@ember/-internals/runtime/lib/mixins/comparable', emberinternalsRuntimeLibMixinsComparable);
-
-import * as emberinternalsRuntimeLibMixinsContainerProxy from '@ember/-internals/runtime/lib/mixins/container_proxy';
-d(
-  '@ember/-internals/runtime/lib/mixins/container_proxy',
-  emberinternalsRuntimeLibMixinsContainerProxy
-);
-
 import * as emberinternalsRuntimeLibMixinsRegistryProxy from '@ember/-internals/runtime/lib/mixins/registry_proxy';
 d(
   '@ember/-internals/runtime/lib/mixins/registry_proxy',

package.json

@@ -209,10 +209,6 @@
       "@ember/-internals/routing/index.js": "ember-source/@ember/-internals/routing/index.js",
       "@ember/-internals/runtime/index.js": "ember-source/@ember/-internals/runtime/index.js",
       "@ember/-internals/runtime/lib/ext/rsvp.js": "ember-source/@ember/-internals/runtime/lib/ext/rsvp.js",
-      "@ember/-internals/runtime/lib/mixins/-proxy.js": "ember-source/@ember/-internals/runtime/lib/mixins/-proxy.js",
-      "@ember/-internals/runtime/lib/mixins/action_handler.js": "ember-source/@ember/-internals/runtime/lib/mixins/action_handler.js",
-      "@ember/-internals/runtime/lib/mixins/comparable.js": "ember-source/@ember/-internals/runtime/lib/mixins/comparable.js",
-      "@ember/-internals/runtime/lib/mixins/container_proxy.js": "ember-source/@ember/-internals/runtime/lib/mixins/container_proxy.js",
       "@ember/-internals/runtime/lib/mixins/registry_proxy.js": "ember-source/@ember/-internals/runtime/lib/mixins/registry_proxy.js",
       "@ember/-internals/runtime/lib/mixins/target_action_support.js": "ember-source/@ember/-internals/runtime/lib/mixins/target_action_support.js",
       "@ember/-internals/string/index.js": "ember-source/@ember/-internals/string/index.js",

packages/@ember/-internals/runtime/index.ts

@@ -1,4 +1,3 @@
 export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
-export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
 
 export { default as RSVP, onerrorDefault } from './lib/ext/rsvp'; // just for side effect of extending Ember.RSVP

packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts

@@ -3,13 +3,15 @@
 */
 
 import EmberObject from '@ember/object';
+import { schedule, join } from '@ember/runloop';
 import { RSVP } from '@ember/-internals/runtime';
 import { assert } from '@ember/debug';
+import type { Container } from '@ember/-internals/container';
 import { Registry, privatize as P } from '@ember/-internals/container';
 import { guidFor } from '@ember/-internals/utils';
 import { ENGINE_PARENT, getEngineParent, setEngineParent } from './parent';
-import { ContainerProxyMixin, RegistryProxyMixin } from '@ember/-internals/runtime';
-import type { InternalOwner } from '@ember/-internals/owner';
+import { RegistryProxyMixin } from '@ember/-internals/runtime';
+import type { ContainerProxy, InternalOwner, RegisterOptions } from '@ember/-internals/owner';
 import type Owner from '@ember/-internals/owner';
 import { type FullName, isFactory } from '@ember/-internals/owner';
 import type Engine from '@ember/engine';
@@ -41,18 +43,21 @@ export interface EngineInstanceOptions {
   @class EngineInstance
   @extends EmberObject
   @uses RegistryProxyMixin
-  @uses ContainerProxyMixin
 */
 
+// TODO: Update this comment
 // Note on types: since `EngineInstance` uses `RegistryProxyMixin` and
 // `ContainerProxyMixin`, which respectively implement the same `RegistryMixin`
 // and `ContainerMixin` types used to define `InternalOwner`, this is the same
 // type as `InternalOwner` from TS's POV. The point of the explicit `extends`
 // clauses for `InternalOwner` and `Owner` is to keep us honest: if this stops
 // type checking, we have broken part of our public API contract. Medium-term,
 // the goal here is to `EngineInstance` simple be `Owner`.
-interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin, InternalOwner, Owner {}
-class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerProxyMixin) {
+interface EngineInstance extends RegistryProxyMixin, InternalOwner, Owner {}
+class EngineInstance
+  extends EmberObject.extend(RegistryProxyMixin)
+  implements ContainerProxy, InternalOwner, Owner
+{
   /**
    @private
    @method setupRegistry
@@ -256,6 +261,47 @@ class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerPro
       this.register(key, singleton, { instantiate: false });
     });
   }
+
+  // Container Proxy
+
+  /**
+   The container stores state.
+
+   @private
+   @property {Ember.Container} __container__
+   */
+  declare __container__: Container;
+
+  ownerInjection() {
+    return this.__container__.ownerInjection();
+  }
+
+  destroy() {
+    let container = this.__container__;
+
+    if (container) {
+      join(() => {
+        container.destroy();
+        schedule('destroy', container, 'finalizeDestroy');
+      });
+    }
+
+    return super.destroy();
+  }
 }
 
+// MEGAHAX: This is really nasty, but if we don't define the functions this way, we need to provide types.
+// If we provide types, for reasons I don't understand, they somehow break the interface.
+// Adding the methods this way allows us to keep the types defined by the interface.
+
+// @ts-expect-error This is a huge hack to avoid type issues.
+EngineInstance.prototype.lookup = function lookup(fullName: FullName, options?: RegisterOptions) {
+  return this.__container__.lookup(fullName, options);
+};
+
+// @ts-expect-error This is a huge hack to avoid type issues
+EngineInstance.prototype.factoryFor = function factoryFor(fullName: FullName) {
+  return this.__container__.factoryFor(fullName);
+};
+
 export default EngineInstance;

packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js

@@ -41,14 +41,7 @@ import {
   sendEvent as emberSendEvent,
 } from '@ember/object/events';
 
-import {
-  RegistryProxyMixin,
-  ContainerProxyMixin,
-  _ProxyMixin as internalProxyMixin,
-  RSVP as _RSVP,
-  Comparable as InternalComparable,
-  ActionHandler as InternalActionHandler,
-} from '@ember/-internals/runtime';
+import { RegistryProxyMixin, RSVP as _RSVP } from '@ember/-internals/runtime';
 import {
   componentCapabilities,
   modifierCapabilities,
@@ -179,8 +172,6 @@ namespace Ember {
   export const libraries = metal.libraries;
 
   // ****@ember/-internals/runtime****
-  export const _ContainerProxyMixin = ContainerProxyMixin;
-  export const _ProxyMixin = internalProxyMixin;
   export const _RegistryProxyMixin = RegistryProxyMixin;
   export const ActionHandler = InternalActionHandler;
   export type ActionHandler = InternalActionHandler;

packages/@ember/engine/instance.ts

@@ -338,7 +338,6 @@ let allExports = [
   ],
   ['_Input', '@ember/-internals/glimmer', 'Input', test56],
   ['_RegistryProxyMixin', '@ember/-internals/runtime', 'RegistryProxyMixin', test57],
-  ['_ContainerProxyMixin', '@ember/-internals/runtime', 'ContainerProxyMixin', test57],
   ['controllerFor', '@ember/-internals/routing', null, test58],
   ['generateControllerFactory', '@ember/-internals/routing', null, test58],
   ['generateController', '@ember/-internals/routing', null, test58],

packages/ember/barrel.ts

@@ -1,5 +1,5 @@
 module.exports = function buildOwner(Ember, resolver) {
-  let Owner = Ember.Object.extend(Ember._RegistryProxyMixin, Ember._ContainerProxyMixin);
+  let Owner = Ember.Object.extend(Ember._RegistryProxyMixin);
 
   let namespace = Ember.Object.create({
     Resolver: {