Refactored migrator by creating skipTemplatesUsedAsPartial method

Author: ijlee2

lib/migrator.js

@@ -58,6 +58,35 @@ module.exports = class Migrator {
     return templateFilePaths;
   }
 
+  skipTemplatesUsedAsPartial(templateFilePaths) {
+    const componentsWithPartial = getPartialTemplates(this.findTemplates());
+
+    if (componentsWithPartial.length) {
+      componentsWithPartial.sort().forEach(component => {
+        console.info(`❌ Did not move '${component}' due to usage as a "partial"`);
+      });
+
+      templateFilePaths = templateFilePaths.filter(templateFilePath => {
+        // Extract '/app/templates/components/nested1/nested-component.hbs'
+        let filePathFromApp = templateFilePath.slice(this.projectRoot.length);
+
+        if (/\/\-[\w\-]+\.hbs/.test(filePathFromApp)) {
+          filePathFromApp = filePathFromApp.replace('/-', '/');
+        }
+
+        // Extract '/components/nested1/nested-component.hbs'
+        const filePathFromAppTemplates = filePathFromApp.slice('app/templates/'.length);
+
+        // Extract 'components/nested1/nested-component'
+        const classFilePath = filePathFromAppTemplates.slice(1).replace('.hbs', '');
+
+        return !componentsWithPartial.includes(classFilePath);
+      });
+    }
+
+    return templateFilePaths;
+  }
+
   async removeEmptyClassicComponentDirectories(removeOnlyEmptyDirectories) {
     const templateFolderPath = path.join(this.projectRoot, 'app/templates/components');
 
@@ -69,21 +98,9 @@ module.exports = class Migrator {
     let classFilePaths = this.findClassicComponentClasses();
 
     templateFilePaths = this.skipTemplatesUsedAsLayoutName(templateFilePaths);
+    templateFilePaths = this.skipTemplatesUsedAsPartial(templateFilePaths);
 
 
-    let sourceTemplateFilePaths = this.findTemplates();
-    let templatesInPartials = getPartialTemplates(sourceTemplateFilePaths);
-    if (templatesInPartials.length) {
-      templateFilePaths = templateFilePaths.filter(sourceTemplateFilePath => {
-        let sourceTemplatePathInApp = sourceTemplateFilePath.slice(this.projectRoot.length); // '/app/templates/components/nested1/nested-component.hbs'
-        if (/\/\-[\w\-]+\.hbs/.test(sourceTemplatePathInApp)) {
-          sourceTemplatePathInApp = sourceTemplatePathInApp.replace('/-', '/');
-        }
-        let templatePath = sourceTemplatePathInApp.slice('app/templates/'.length); // '/nested1/nested-component.hbs'
-        return !templatesInPartials.includes(templatePath.slice(1).replace('.hbs', ''));
-      });
-    }
-
     templateFilePaths.forEach(sourceTemplateFilePath => {
       let sourceTemplatePathInApp = sourceTemplateFilePath.slice(this.projectRoot.length); // '/app/templates/components/nested1/nested-component.hbs'
       let templatePath = sourceTemplatePathInApp.slice('app/templates/components/'.length); // '/nested1/nested-component.hbs'
@@ -93,11 +110,6 @@ module.exports = class Migrator {
 
 
     const templatesWithLayoutName = getLayoutNameTemplates(classFilePaths);
-
-    templatesInPartials.sort().forEach(template => {
-      console.info(`❌ Did not move '${template}' due to usage as a "partial"`);
-    });
-
     const removeOnlyEmptyDirectories = Boolean(templatesWithLayoutName.length);
     await this.removeEmptyClassicComponentDirectories(removeOnlyEmptyDirectories);
   }