Merge pull request #14 from emberjs/generated-controllers

Fix generated controllers to use proxying controllers

index.js

@@ -19,18 +19,20 @@ module.exports = {
 
     if (!this.shouldInclude) { return; }
 
+    // grab the original _findHost, before ember-engines can muck with it
+    let proto = Object.getPrototypeOf(this);
+    let host = proto._findHost.call(this);
+
+    // using `app.import` here because we need to ensure this ends up in the
+    // top level vendor.js (not engine-vendor.js as would happen with
+    // this.import inside an engine)
+    host.import('vendor/patch-generate-controller/index.js');
+
     let config = this.project.config(process.env.EMBER_ENV);
 
     this.hasLegacyViewSupport = config.EmberENV._ENABLE_LEGACY_VIEW_SUPPORT;
 
     if (this.hasLegacyViewSupport) {
-      // grab the original _findHost, before ember-engines can muck with it
-      let proto = Object.getPrototypeOf(this);
-      let host = proto._findHost.call(this);
-
-      // using `app.import` here because we need to ensure this ends up in the
-      // top level vendor.js (not engine-vendor.js as would happen with
-      // this.import inside an engine)
       host.import('vendor/legacy-each-view-item-controller-support/index.js');
     }
   },
@@ -42,20 +44,16 @@ module.exports = {
   },
 
   treeForVendor(rawVendorTree) {
-    if (!this.shouldInclude) { return; }
+    let babelAddon = this.addons.find(addon => addon.name === 'ember-cli-babel');
 
-    if (this.hasLegacyViewSupport) {
-      let babelAddon = this.addons.find(addon => addon.name === 'ember-cli-babel');
-
-      let transpiledVendorTree = babelAddon.transpileTree(rawVendorTree, {
-        babel: this.options.babel,
+    let transpiledVendorTree = babelAddon.transpileTree(rawVendorTree, {
+      babel: this.options.babel,
 
-        'ember-cli-babel': {
-          compileModules: false,
-        },
-      });
+      'ember-cli-babel': {
+        compileModules: false,
+      },
+    });
 
-      return transpiledVendorTree;
-    }
+    return transpiledVendorTree;
   },
 };

package.json

@@ -36,7 +36,6 @@
     "ember-cli-uglify": "^3.0.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
-    "ember-legacy-views": "^0.2.0",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^4.6.0",

tests/acceptance/generated-controller-test.js

@@ -0,0 +1,17 @@
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import { visit } from '@ember/test-helpers';
+
+module('Generated controllers', function(hooks) {
+  setupApplicationTest(hooks);
+
+  test('object controllers are generated correctly', async function(assert) {
+    await visit('/generated-object-controller-test');
+    assert.dom('[data-test-target]').hasText('Alice');
+  });
+
+  test('array controllers are generated correctly', async function(assert) {
+    await visit('/generated-array-controller-test');
+    assert.dom('[data-test-target]').hasText('Alice');
+  });
+});

tests/dummy/app/router.js

@@ -6,6 +6,8 @@ var Router = Ember.Router.extend({
 });
 
 Router.map(function() {
+  this.route('generated-object-controller-test');
+  this.route('generated-array-controller-test');
 });
 
 export default Router;

tests/dummy/app/routes/generated-array-controller-test.js

@@ -0,0 +1,8 @@
+import Route from '@ember/routing/route';
+import { A } from '@ember/array';
+
+export default Route.extend({
+  model() {
+    return A([{ name: 'Alice' }]);
+  }
+});

tests/dummy/app/routes/generated-object-controller-test.js

@@ -0,0 +1,7 @@
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+  model() {
+    return { name: 'Alice' };
+  }
+});

tests/dummy/app/templates/generated-array-controller-test.hbs

@@ -0,0 +1 @@
+<div data-test-target>{{firstObject.name}}</div>

tests/dummy/app/templates/generated-object-controller-test.hbs

@@ -0,0 +1 @@
+<div data-test-target>{{name}}</div>

vendor/patch-generate-controller/index.js

@@ -0,0 +1,46 @@
+import Ember from 'ember';
+import { get } from '@ember/object';
+
+function generateControllerFactory(owner, controllerName, context) {
+  let controllerType;
+
+  if (context && Array.isArray(context)) {
+    controllerType = 'array';
+  } else if (context) {
+    controllerType = 'object';
+  } else {
+    controllerType = 'basic';
+  }
+
+  let factoryName = `controller:${controllerType}`;
+
+  let Factory = owner._lookupFactory(factoryName).extend({
+    isGenerated: true,
+    toString() {
+      return `(generated ${controllerName} controller)`;
+    }
+  });
+
+  let fullName = `controller:${controllerName}`;
+
+  owner.register(fullName, Factory);
+
+  return Factory;
+}
+
+function generateController(owner, controllerName, context) {
+  generateControllerFactory(owner, controllerName, context);
+  let fullName = `controller:${controllerName}`;
+  let instance = owner.lookup(fullName);
+
+  if (get(instance, 'namespace.LOG_ACTIVE_GENERATION')) {
+    Ember.Logger.info(`generated -> ${fullName}`, { fullName: fullName });
+  }
+
+  return instance;
+}
+
+// Patch Ember's internal modules
+let generateControllerModule = Ember.__loader.require('ember-routing/system/generate_controller');
+generateControllerModule.generateControllerFactory = generateControllerFactory;
+generateControllerModule.default = generateController;

yarn.lock

@@ -2234,11 +2234,6 @@ bower-endpoint-parser@0.2.2:
   resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
   integrity sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=
 
-bower@^1.8.2:
-  version "1.8.8"
-  resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.8.tgz#82544be34a33aeae7efb8bdf9905247b2cffa985"
-  integrity sha512-1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A==
-
 boxen@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"