[FEATURE factory-for] Add symboled methods to container proxy

packages/container/lib/container.js

@@ -5,13 +5,18 @@ import {
   setOwner,
   OWNER,
   assign,
-  NAME_KEY
+  NAME_KEY,
+  HAS_NATIVE_PROXY
 } from 'ember-utils';
 import { ENV } from 'ember-environment';
-import { assert, deprecate, runInDebug, isFeatureEnabled } from 'ember-metal';
+import {
+  assert,
+  deprecate,
+  runInDebug,
+  isFeatureEnabled
+} from 'ember-metal';
 
 const CONTAINER_OVERRIDE = symbol('CONTAINER_OVERRIDE');
-const HAS_PROXY = typeof Proxy === 'function';
 export const FACTORY_FOR = symbol('FACTORY_FOR');
 export const LOOKUP_FACTORY = symbol('LOOKUP_FACTORY');
 
@@ -39,9 +44,6 @@ export default function Container(registry, options) {
   this.isDestroyed = false;
 }
 
-Container.__FACTORY_FOR__ = FACTORY_FOR;
-Container.__LOOKUP_FACTORY__ = LOOKUP_FACTORY;
-
 Container.prototype = {
   /**
    @private
@@ -232,7 +234,7 @@ Container.prototype = {
  * set on the manager.
  */
 function wrapManagerInDeprecationProxy(manager) {
-  if (HAS_PROXY) {
+  if (HAS_NATIVE_PROXY) {
     let validator = {
       get(obj, prop) {
         if (prop !== 'class' && prop !== 'create') {

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

@@ -10,7 +10,7 @@ import {
   RegistryProxyMixin,
   RSVP
 } from 'ember-runtime';
-import { Error as EmberError, assert, run, isFeatureEnabled } from 'ember-metal';
+import { Error as EmberError, assert, run } from 'ember-metal';
 import { Registry, FACTORY_FOR, LOOKUP_FACTORY, privatize as P } from 'container';
 import { getEngineParent, setEngineParent } from './engine-parent';
 
@@ -205,14 +205,6 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
   }
 });
 
-if (isFeatureEnabled('ember-factory-for')) {
-  EngineInstance.reopen({
-    factoryFor(fullName, options) {
-      return this.__container__.factoryFor(fullName, options);
-    }
-  });
-}
-
 EngineInstance.reopenClass({
   /**
    @private

packages/ember-glimmer/lib/environment.js

@@ -320,6 +320,9 @@ export default class Environment extends GlimmerEnvironment {
       if (helperFactory.class.isHelperInstance) {
         return (vm, args) => SimpleHelperReference.create(helperFactory.class.compute, args);
       } else if (helperFactory.class.isHelperFactory) {
+        if (!isFeatureEnabled('ember-no-double-extend')) {
+          helperFactory = helperFactory.create();
+        }
         return (vm, args) => ClassBasedHelperReference.create(helperFactory, vm, args);
       } else {
         throw new Error(`${nameParts} is not a helper`);

packages/ember-runtime/lib/mixins/container_proxy.js

@@ -6,6 +6,10 @@ import {
   Mixin,
   run
 } from 'ember-metal';
+import {
+  FACTORY_FOR,
+  LOOKUP_FACTORY
+} from 'container';
 
 /**
   ContainerProxyMixin is used to provide public access to specific
@@ -106,6 +110,14 @@ export default Mixin.create({
     return this.__container__.lookupFactory(fullName, options);
   },
 
+  [FACTORY_FOR]() {
+    return this.__container__[FACTORY_FOR](...arguments);
+  },
+
+  [LOOKUP_FACTORY]() {
+    return this.__container__[LOOKUP_FACTORY](...arguments);
+  },
+
   /**
    Given a name and a source path, resolve the fullName
 
@@ -130,5 +142,9 @@ export default Mixin.create({
     if (this.__container__) {
       run(this.__container__, 'destroy');
     }
+  },
+
+  factoryFor(fullName, options = {}) {
+    return this.__container__.factoryFor(fullName, options);
   }
 });

packages/ember-utils/lib/index.js

@@ -31,3 +31,4 @@ export { default as applyStr } from './apply-str';
 export { default as NAME_KEY } from './name';
 export { default as toString } from './to-string';
 export { HAS_NATIVE_WEAKMAP } from './weak-map-utils';
+export { HAS_NATIVE_PROXY } from './proxy-utils';

packages/ember-utils/lib/proxy-utils.js

@@ -0,0 +1 @@
+export const HAS_NATIVE_PROXY = typeof Proxy === 'function';

tests/node/helpers/build-owner.js

@@ -1,14 +1,5 @@
 module.exports = function buildOwner(Ember, resolver) {
-  var FACTORY_FOR = Ember.Container.__FACTORY_FOR__;
-  var LOOKUP_FACTORY = Ember.Container.__LOOKUP_FACTORY__;
-  var Owner = Ember.Object.extend(Ember._RegistryProxyMixin, Ember._ContainerProxyMixin, {
-    [FACTORY_FOR]() {
-      return this.__container__[FACTORY_FOR](...arguments);
-    },
-    [LOOKUP_FACTORY]() {
-      return this.__container__[LOOKUP_FACTORY](...arguments);
-    }
-  });
+  var Owner = Ember.Object.extend(Ember._RegistryProxyMixin, Ember._ContainerProxyMixin);
 
   var namespace = Ember.Object.create({
     Resolver: { create: function() { return resolver; } }