Check for the JSON property within the generation rather than utils

Author: haydncomley

src/commands/generateComponent.js

@@ -24,7 +24,11 @@ export default function initGenerateComponentCommand(args, cliConfigFile, progra
       'Describe the component you want GRC to generate (e.g., Create a counter component that increments by one when I click on the increment button).',
       null
     )
-    .option('-f, --flat', 'Generate the files in the mentioned path insted of creating new folder for it', false)
+    .option(
+      '-f, --flat',
+      'Generate the files in the mentioned path instead of creating new folder for it',
+      selectedComponentType.flat || false
+    )
     .option('-dr, --dry-run', 'Show what will be generated without writing to disk');
 
   // Dynamic component command option defaults.

src/utils/generateComponentUtils.js

@@ -82,10 +82,9 @@ Please make sure you're pointing to the right custom template path in your gener
 
 function componentTemplateGenerator({ cmd, componentName, cliConfigFile }) {
   const { cssPreprocessor, testLibrary, usesCssModule, usesTypeScript } = cliConfigFile;
-  const { customTemplates, flat } = cliConfigFile.component[cmd.type];
+  const { customTemplates } = cliConfigFile.component[cmd.type];
   let template = null;
   let filename = null;
-  const isFlat = flat || cmd.flat;
 
   // Check for a custom component template.
 
@@ -134,17 +133,16 @@ function componentTemplateGenerator({ cmd, componentName, cliConfigFile }) {
   }
 
   return {
-    componentPath: `${cmd.path}${isFlat ? '' : `/${componentName}`}/${filename}`,
+    componentPath: `${cmd.path}${cmd.flat ? '' : `/${componentName}`}/${filename}`,
     filename,
     template,
   };
 }
 
 function componentStyleTemplateGenerator({ cliConfigFile, cmd, componentName }) {
-  const { customTemplates, flat } = cliConfigFile.component[cmd.type];
+  const { customTemplates } = cliConfigFile.component[cmd.type];
   let template = null;
   let filename = null;
-  const isFlat = flat || cmd.flat;
 
   // Check for a custom style template.
 
@@ -170,18 +168,17 @@ function componentStyleTemplateGenerator({ cliConfigFile, cmd, componentName })
   }
 
   return {
-    componentPath: `${cmd.path}${isFlat ? '' : `/${componentName}`}/${filename}`,
+    componentPath: `${cmd.path}${cmd.flat ? '' : `/${componentName}`}/${filename}`,
     filename,
     template,
   };
 }
 
 function componentTestTemplateGenerator({ cliConfigFile, cmd, componentName }) {
-  const { customTemplates, flat } = cliConfigFile.component[cmd.type];
+  const { customTemplates } = cliConfigFile.component[cmd.type];
   const { testLibrary, usesTypeScript } = cliConfigFile;
   let template = null;
   let filename = null;
-  const isFlat = flat || cmd.flat;
 
   // Check for a custom test template.
 
@@ -210,18 +207,17 @@ function componentTestTemplateGenerator({ cliConfigFile, cmd, componentName }) {
   }
 
   return {
-    componentPath: `${cmd.path}${isFlat ? '' : `/${componentName}`}/${filename}`,
+    componentPath: `${cmd.path}${cmd.flat ? '' : `/${componentName}`}/${filename}`,
     filename,
     template,
   };
 }
 
 function componentStoryTemplateGenerator({ cliConfigFile, cmd, componentName }) {
   const { usesTypeScript } = cliConfigFile;
-  const { customTemplates, flat } = cliConfigFile.component[cmd.type];
+  const { customTemplates } = cliConfigFile.component[cmd.type];
   let template = null;
   let filename = null;
-  const isFlat = flat || cmd.flat;
 
   // Check for a custom story template.
 
@@ -243,18 +239,17 @@ function componentStoryTemplateGenerator({ cliConfigFile, cmd, componentName })
   }
 
   return {
-    componentPath: `${cmd.path}${isFlat ? '' : `/${componentName}`}/${filename}`,
+    componentPath: `${cmd.path}${cmd.flat ? '' : `/${componentName}`}/${filename}`,
     filename,
     template,
   };
 }
 
 function componentLazyTemplateGenerator({ cmd, componentName, cliConfigFile }) {
   const { usesTypeScript } = cliConfigFile;
-  const { customTemplates, flat } = cliConfigFile.component[cmd.type];
+  const { customTemplates } = cliConfigFile.component[cmd.type];
   let template = null;
   let filename = null;
-  const isFlat = flat || cmd.flat;
 
   // Check for a custom lazy template.
 
@@ -276,18 +271,17 @@ function componentLazyTemplateGenerator({ cmd, componentName, cliConfigFile }) {
   }
 
   return {
-    componentPath: `${cmd.path}${isFlat ? '' : `/${componentName}`}/${filename}`,
+    componentPath: `${cmd.path}${cmd.flat ? '' : `/${componentName}`}/${filename}`,
     filename,
     template,
   };
 }
 
 function customFileTemplateGenerator({ componentName, cmd, cliConfigFile, componentFileType }) {
-  const { customTemplates, flat } = cliConfigFile.component[cmd.type];
+  const { customTemplates } = cliConfigFile.component[cmd.type];
   const fileType = camelCase(componentFileType.split('with')[1]);
   let filename = null;
   let template = null;
-  const isFlat = flat || cmd.flat;
 
   // Check for a valid custom template for the corresponding custom component file.
 
@@ -315,7 +309,7 @@ Please make sure you're pointing to the right custom template path in your gener
   filename = customTemplateFilename;
 
   return {
-    componentPath: `${cmd.path}${isFlat ? '' : `/${componentName}`}/${filename}`,
+    componentPath: `${cmd.path}${cmd.flat ? '' : `/${componentName}`}/${filename}`,
     filename,
     template,
   };