Move default export for helpers to named.

When an item uses the "dot name form"
(`collection-group/collection/name.ext`) and is not the default type for
that collection, change the default export to a named export for the
type.

Author: rwjblue

lib/engines/classic/template-file-info.js

@@ -70,13 +70,6 @@ var TemplateFileInfo = ClassicFileInfo.extend({
   detectRenderableInvocations: function() {
     this.renderablesInvoked = [];
 
-    var fullPath = path.join(this.projectRoot, this.sourceRelativePath);
-    if (!existsSync(fullPath)) {
-      return;
-    }
-
-    this._fileContents = fse.readFileSync(fullPath, { encoding: 'utf8' });
-
     try {
       compile(this._fileContents, {
         plugins: {
@@ -117,8 +110,8 @@ var TemplateFileInfo = ClassicFileInfo.extend({
 
     var fullPath = path.join(this.projectRoot, this.sourceRelativePath);
 
-    this._fileContents = fse.readFileSync(fullPath, { encoding: 'utf8' });
     fse.writeFileSync(fullPath, newContents, { encoding: 'utf-8' });
+    this._fileContents = fse.readFileSync(fullPath, { encoding: 'utf8' });
   }
 });
 

lib/models/file-info.js

@@ -1,7 +1,10 @@
 var path = require('path');
 var inflection = require('inflection');
 var CoreObject = require('core-object');
+var fse = require('fs-extra');
+var existsSync = require('exists-sync');
 var isTypeInSingleTypeCollection = require('../utils/is-type-in-single-type-collection');
+var defaultTypeForCollection = require('../utils/default-type-for-collection');
 var calculateCollectionInfo = require('../utils/calculate-collection-info');
 
 var FileInfo = CoreObject.extend({
@@ -35,6 +38,7 @@ var FileInfo = CoreObject.extend({
     this.populateName();
     this.populateCollection();
     this.populateBucket();
+    this.populateFileContents();
 
     this._fileInfoCollection.add(this);
   },
@@ -81,6 +85,15 @@ var FileInfo = CoreObject.extend({
     this.collectionGroup = values.collectionGroup;
   },
 
+  populateFileContents: function() {
+    var fullPath = path.join(this.projectRoot, this.sourceRelativePath);
+    if (!existsSync(fullPath)) {
+      return;
+    }
+
+    this._fileContents = fse.readFileSync(fullPath, { encoding: 'utf8' });
+  },
+
   repopulate: function() {
     var inComponentsCollection = this.collection === 'components';
     var renderableName = path.join(this.namespace, this.name);
@@ -101,6 +114,27 @@ var FileInfo = CoreObject.extend({
         }
       }
     }
+
+    var isDefaultTypeForCollection = defaultTypeForCollection(this.collection) === this.type;
+    var shouldUseDotFormNaming = this.shouldUseDotFormNaming();
+
+    if (!isDefaultTypeForCollection && shouldUseDotFormNaming) {
+      this.updateDefaultExportToNamed();
+    }
+  },
+
+  updateDefaultExportToNamed: function() {
+    if (this.ext !== '.js') { return; }
+    if (!this._fileContents) { return; }
+
+    var newContents = this._fileContents
+          .replace('export default ', 'export const ' + this.type + ' = ');
+
+
+    var fullPath = path.join(this.projectRoot, this.sourceRelativePath);
+
+    fse.writeFileSync(fullPath, newContents, { encoding: 'utf-8' });
+    this._fileContents = fse.readFileSync(fullPath, { encoding: 'utf8' });
   },
 
   shouldUseDotFormNaming: function() {

lib/utils/default-type-for-collection.js

@@ -0,0 +1,33 @@
+module.exports = function(collection) {
+  switch(collection) {
+  case 'models':
+    return 'model';
+
+  case 'components':
+    return 'component';
+
+  case 'initializers':
+    return 'initializer';
+
+  case 'instance-initializers':
+    return 'instance-initializer';
+
+  //case 'partials':
+  //  return 'partial';
+
+  case 'routes':
+    return 'route';
+
+  case 'services':
+    return 'service';
+
+  case 'transforms':
+    return 'transform';
+
+  case 'utils':
+    return 'util';
+
+  default:
+    return null;
+  }
+};

test/engines/classic-test.js

@@ -38,6 +38,8 @@ describe('classic engine', function() {
       }
 
       confirm('app/components/foo-bar.js', {type: 'component', name: 'foo-bar', namespace: '', collection: 'components', collectionGroup: 'ui'});
+      confirm('app/helpers/foo.js', {type: 'helper', name: 'foo', namespace: '', collection: 'components', collectionGroup: 'ui'});
+      confirm('app/helpers/foo/bar.js', {type: 'helper', name: 'bar', namespace: 'foo', collection: 'components', collectionGroup: 'ui'});
       confirm('app/components/foo-bar/component.js', {type: 'component', name: 'foo-bar', namespace: '', collection: 'components', collectionGroup: 'ui' });
       confirm('app/templates/components/foo-bar.hbs', {type: 'template', name: 'foo-bar', namespace: '', collection: 'components', collectionGroup: 'ui'});
       confirm('app/components/foo-bar/template.hbs', {type: 'template', name: 'foo-bar', namespace: '', collection: 'components', collectionGroup: 'ui'});

test/fixtures/classic-helper-exports/input.js

@@ -0,0 +1,16 @@
+module.exports = {
+  app: {
+    helpers: {
+      'titleize.js': 'export default helper(function() { });',
+      'capitalize.js': 'export default helper(function() { });'
+    }
+  },
+
+  tests: {
+    integration: {
+      helpers: {
+        'capitalize-test.js': 'capitalize helper test'
+      }
+    }
+  }
+};

test/fixtures/classic-helper-exports/output.js

@@ -0,0 +1,13 @@
+module.exports = {
+  src: {
+    ui: {
+      components: {
+        'titleize.js': 'export const helper = helper(function() { });',
+        'capitalize': {
+          'helper.js': 'export default helper(function() { });',
+          'helper-integration-test.js': 'capitalize helper test'
+        }
+      }
+    }
+  }
+};