fix(barrel): alphabetized barrel exports

Fixes angular#582

Author: phillipgreenii

addon/ng2/utilities/barrel-management.js

@@ -1,8 +1,17 @@
 var path = require('path');
+var fs = require('fs');
 var EOL = require('os').EOL;
 
 module.exports = addBarrelRegistration;
 
+function sortBarrel(contents) {
+    var parts = contents.split(EOL).filter(function(l){
+      return l.trim().length > 0;
+    });
+    parts.sort();
+    return parts.join(EOL) + EOL;
+}
+
 function addBarrelRegistration(blueprint, installationDir, fileName) {
   var parts = installationDir.split(path.sep);
 
@@ -21,5 +30,14 @@ function addBarrelRegistration(blueprint, installationDir, fileName) {
   return blueprint.insertIntoFile(
     sharedDir + path.sep + 'index.ts',
     `export * from '${importFrom}';${EOL}`
-  );
+  ).then(function(r){
+    var contents = fs.readFileSync(r.path, 'utf8');
+    
+    contents = sortBarrel(contents);
+    
+    fs.writeFileSync(r.path, contents, 'utf8');
+    
+    r.contents = contents;
+    return r;
+  });
 }

tests/acceptance/barrel-management.spec.js

@@ -9,7 +9,7 @@ var EOL = require('os').EOL;
 
 var Blueprint = require('ember-cli/lib/models/blueprint');
 
-describe.only('barrel-management', () => {
+describe('barrel-management', () => {
   var blueprint;
   var installationDirectory;
 
@@ -92,7 +92,7 @@ describe.only('barrel-management', () => {
         var mockDrive = {
             '/src/app/shared' : {
                 'my-component': {},
-                'index.ts': `export * from './other-component${EOL}`
+                'index.ts': `export * from './another-component${EOL}export * from './other-component${EOL}`
             }
         };
         mockFs(mockDrive);
@@ -110,7 +110,7 @@ describe.only('barrel-management', () => {
         var barrelPath = path.join(installationDirectory, '..', 'index.ts');
         expect(existsSync(barrelPath)).to.equal(true);
         var contents = fs.readFileSync(barrelPath, 'utf8');
-        var expectedContents = `export * from './other-component${EOL}export * from './my-component';${EOL}`;
+        var expectedContents = `export * from './another-component${EOL}export * from './my-component';${EOL}export * from './other-component${EOL}`;
         expect(contents).to.equal(expectedContents);
      });
    });
@@ -121,7 +121,7 @@ describe.only('barrel-management', () => {
         var barrelPath = path.join(installationDirectory, '..', 'index.ts');
         expect(existsSync(barrelPath)).to.equal(true);
         var contents = fs.readFileSync(barrelPath, 'utf8');
-        var expectedContents = `export * from './other-component${EOL}export * from './my-component/my-smaller-component';${EOL}`;
+        var expectedContents = `export * from './another-component${EOL}export * from './my-component/my-smaller-component';${EOL}export * from './other-component${EOL}`;
         expect(contents).to.equal(expectedContents);
      });
    });
@@ -134,7 +134,7 @@ describe.only('barrel-management', () => {
         var mockDrive = {
             '/src/app/shared' : {
                 'my-component': {},
-                'index.ts': `export * from './other-component${EOL}export * from './my-component';${EOL}export * from './my-component/my-smaller-component';${EOL}`
+                'index.ts': `export * from './other-component${EOL}export * from './my-component';${EOL}export * from './another-component${EOL}export * from './my-component/my-smaller-component';${EOL}`
             }
         };
         mockFs(mockDrive);
@@ -146,25 +146,24 @@ describe.only('barrel-management', () => {
         mockFs.restore();
     }); 
 
-      
-   it('update barrel from installation dir should do nothing', () => {
+   it('update barrel from installation dir should add nothing', () => {
      return addBarrelRegistration(blueprint, installationDirectory).then(() => {
          var fs = require('fs');
         var barrelPath = path.join(installationDirectory, '..', 'index.ts');
         expect(existsSync(barrelPath)).to.equal(true);
         var contents = fs.readFileSync(barrelPath, 'utf8');
-        var expectedContents = `export * from './other-component${EOL}export * from './my-component';${EOL}export * from './my-component/my-smaller-component';${EOL}`;
+        var expectedContents = `export * from './another-component${EOL}export * from './my-component';${EOL}export * from './my-component/my-smaller-component';${EOL}export * from './other-component${EOL}`;
         expect(contents).to.equal(expectedContents);
      });
    });
 
-   it('update barrel from installation dir with file name should do nothing', () => {
+   it('update barrel from installation dir with file name should add nothing', () => {
      return addBarrelRegistration(blueprint, installationDirectory, 'my-smaller-component').then(() => {
          var fs = require('fs');
         var barrelPath = path.join(installationDirectory, '..', 'index.ts');
         expect(existsSync(barrelPath)).to.equal(true);
         var contents = fs.readFileSync(barrelPath, 'utf8');
-        var expectedContents = `export * from './other-component${EOL}export * from './my-component';${EOL}export * from './my-component/my-smaller-component';${EOL}`;
+        var expectedContents = `export * from './another-component${EOL}export * from './my-component';${EOL}export * from './my-component/my-smaller-component';${EOL}export * from './other-component${EOL}`;
         expect(contents).to.equal(expectedContents);
      });
    });