Created changeComponentStructureToNested method

Author: ijlee2

lib/migrator.js

@@ -106,6 +106,34 @@ module.exports = class Migrator {
     });
   }
 
+  changeComponentStructureToNested(templateFilePaths) {
+    const classFilePaths = this.findClassicComponentClasses();
+
+    templateFilePaths.forEach(templateFilePath => {
+      // Extract '/app/templates/components/nested1/nested-component.hbs'
+      const filePathFromApp = templateFilePath.slice(this.projectRoot.length);
+
+      // Extract '/nested1/nested-component.hbs'
+      const filePathFromAppTemplatesComponents = filePathFromApp.slice('app/templates/components/'.length);
+      const fileExtension = path.extname(filePathFromAppTemplatesComponents);
+
+      // Extract '/nested1/nested-component'
+      const targetPath = filePathFromAppTemplatesComponents.slice(0, -fileExtension.length);
+
+      // Build '[APP_PATH]/app/components/nested1/nested-component/index.hbs'
+      const newTemplateFilePath = path.join(this.projectRoot, 'app/components', targetPath, 'index.hbs');
+      moveFile(templateFilePath, newTemplateFilePath);
+
+      // Build '[APP_PATH]/app/components/nested1/nested-component/index.js'
+      const classFilePath = path.join(this.projectRoot, 'app/components', `${targetPath}.js`);
+
+      if (classFilePaths.includes(classFilePath)) {
+        const newClassFilePath = path.join(this.projectRoot, 'app/components', targetPath, 'index.js');
+        moveFile(classFilePath, newClassFilePath);
+      }
+    });
+  }
+
   async removeEmptyClassicComponentDirectories() {
     const templateFolderPath = path.join(this.projectRoot, 'app/templates/components');
 
@@ -123,6 +151,10 @@ module.exports = class Migrator {
 
     if (this.newComponentStructure === 'flat') {
       this.changeComponentStructureToFlat(templateFilePaths);
+
+    } else if (this.newComponentStructure === 'nested') {
+      this.changeComponentStructureToNested(templateFilePaths);
+
     }
 
     // Clean up

test/migrator-test.js

@@ -57,4 +57,53 @@ describe("Migrator", function() {
       });
     });
   });
+
+
+  describe('newComponentStructure = nested', function() {
+    var tmpPath = "tmp/process-files";
+    var fixturesPath = path.resolve(__dirname, "fixtures/classic-to-nested");
+
+    beforeEach(function() {
+      fse.mkdirsSync(tmpPath);
+    });
+
+    afterEach(function() {
+      fse.removeSync(tmpPath);
+    });
+
+    var entries = fse.readdirSync(fixturesPath);
+
+    entries.forEach(async function(entry) {
+      it(`should migrate ${entry} fixture properly`, async function() {
+        var fixturePath = path.join(fixturesPath, entry);
+        var input = require(fixturePath + "/input");
+        var expected = require(fixturePath + "/output");
+        var migratorConfig = {};
+        try {
+          migratorConfig = require(fixturePath + "/config");
+        } catch (e) {
+          // fixture uses default config...
+        }
+
+        fixturify.writeSync(tmpPath, input);
+
+        var migratorOptions = Object.assign(
+          {
+            projectRoot: tmpPath,
+            newComponentStructure: 'nested'
+          },
+          migratorConfig
+        );
+
+        var migrator = new Migrator(migratorOptions);
+        await migrator.execute();
+
+        var actual = fixturify.readSync(tmpPath);
+        assertDiff.deepEqual(actual, expected, "the codemod should work as expected");
+
+        await migrator.execute();
+        assertDiff.deepEqual(actual, expected, "the codemod should be idempotent");
+      });
+    });
+  });
 });