Ensure private components in src/ui/components are not nested in -components.

Author: rwjblue

lib/models/file-info.js

@@ -141,7 +141,9 @@ Object.defineProperty(FileInfo.prototype, 'destRelativePath', {
 
     if (this._privateRenderableInvoker) {
       var invokerLocation = path.dirname(this._privateRenderableInvoker.destRelativePath);
-      var privateCollection = invokerLocation.indexOf('-components') > -1 ? '' : '-components';
+      var invokerInComponentsCollection = this._privateRenderableInvoker.collection === 'components';
+      var invokerInPrivateCollection = invokerLocation.indexOf('-components') > -1;
+      var privateCollection = invokerInPrivateCollection || invokerInComponentsCollection? '' : '-components';
 
       baseRelativePath = path.join(
         invokerLocation,

test/fixtures/classic-private-components/input.js

@@ -0,0 +1,18 @@
+module.exports = {
+  app: {
+    templates: {
+      components: {
+        'x-button.hbs': 'x-button template',
+        'x-foo.hbs': 'x-foo template: {{x-bar}}',
+        'x-bar.hbs': 'x-bar template'
+      },
+      posts: {
+        'edit.hbs': '{{x-button}}\n{{#x-button}}\n  foo\n{{/x-button}}'
+      }
+    }
+  },
+
+  tests: {
+
+  }
+};

test/fixtures/classic-private-components/output.js

@@ -0,0 +1,26 @@
+module.exports = {
+  src: {
+    ui: {
+      components: {
+        'x-foo': {
+          'template.hbs': 'x-foo template: {{x-bar}}',
+          'x-bar': {
+            'template.hbs': 'x-bar template'
+          }
+        }
+      },
+      routes: {
+        posts: {
+          edit: {
+            '-components': {
+              'x-button': {
+                'template.hbs': 'x-button template'
+              }
+            },
+            'template.hbs': '{{x-button}}\n{{#x-button}}\n  foo\n{{/x-button}}'
+          }
+        }
+      }
+    }
+  }
+};