New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix-#64 - Add option to avoid new folder #69

Merged

arminbro merged 2 commits into arminbro:main from xnivaxhzne:issue-64

Oct 4, 2022

xnivaxhzne commented Sep 29, 2022

Added an extra option -f or --flat to create the files in the same folder without creating new folder in the name of the component.

This will fix the feature request of #64


          fix-#64 - Add option to avoid new folder

71a5553

arminbro requested changes

View reviewed changes

Owner

arminbro left a comment

Hey @kavinkuma6, thanks for taking the time to contribute to GRC! 👏

This pr looks good, just a few minor changes. First, we can remove all the extra logic around checkIsFlat as it is unnecessary. We can use cmd.flat directly within the generateComponentUtils.js file, and it will automatically handle the -f alias case.

Once those changes are in, I would be more than happy to merge your PR. 😃

src/commands/generateComponent.js Outdated

@@ @@ -2,10 +2,12 @@ const { @@
                 generateComponent,
                 getComponentByType,
                 getCorrespondingComponentFileTypes,
+                checkIsFlat,

Owner

arminbro Oct 4, 2022

You can remove the checkIsFlat import. This function will not be needed as we can use cmd.flat directly within the generateComponentUtils.js file, and it will handle the -f alias for us automatically.

Suggested change

checkIsFlat,

src/commands/generateComponent.js Outdated

               } = require('../utils/generateComponentUtils');
               function initGenerateComponentCommand(args, cliConfigFile, program) {
                 const selectedComponentType = getComponentByType(args, cliConfigFile);
+                const isFlat = checkIsFlat(args);

Owner

arminbro Oct 4, 2022

You can remove this line for the reason mentioned above.

Suggested change

const isFlat = checkIsFlat(args);

src/commands/generateComponent.js Outdated

                 // Component command action.
                 componentCommand.action((componentNames, cmd) =>
-                  componentNames.forEach((componentName) => generateComponent(componentName, cmd, cliConfigFile))
+                  componentNames.forEach((componentName) => generateComponent(componentName, cmd, cliConfigFile, isFlat))

Owner

arminbro Oct 4, 2022

We don't need to pass isFlat to generateComponent for the reason mentioned above.

Suggested change

      
                componentNames.forEach((componentName) => generateComponent(componentName, cmd, cliConfigFile, isFlat))
          
                componentNames.forEach((componentName) => generateComponent(componentName, cmd, cliConfigFile))

src/utils/generateComponentUtils.js Outdated

                 }
               }
-              function componentTemplateGenerator({ cmd, componentName, cliConfigFile }) {
+              function componentTemplateGenerator({ cmd, componentName, cliConfigFile, isFlat }) {

Owner

arminbro Oct 4, 2022

Suggested change

      
            function componentTemplateGenerator({ cmd, componentName, cliConfigFile, isFlat }) {
          
            function componentTemplateGenerator({ cmd, componentName, cliConfigFile }) {

src/utils/generateComponentUtils.js Outdated

                 }
                 return {
-                  componentPath: `${cmd.path}/${componentName}/${filename}`,
+                  componentPath: `${cmd.path}${isFlat ? '' : `/${componentName}`}/${filename}`,

Owner

arminbro Oct 4, 2022

Suggested change

      
                componentPath: `${cmd.path}${isFlat ? '' : `/${componentName}`}/${filename}`,
          
                componentPath: `${cmd.path}${cmd.flat ? '' : `/${componentName}`}/${filename}`,

src/utils/generateComponentUtils.js Outdated

                 filename = customTemplateFilename;
                 return {
-                  componentPath: `${cmd.path}/${componentName}/${filename}`,
+                  componentPath: `${cmd.path}${isFlat ? '' : `/${componentName}`}/${filename}`,

Owner

arminbro Oct 4, 2022

Suggested change

      
                componentPath: `${cmd.path}${isFlat ? '' : `/${componentName}`}/${filename}`,
          
                componentPath: `${cmd.path}${cmd.flat ? '' : `/${componentName}`}/${filename}`,

src/utils/generateComponentUtils.js Outdated

@@ @@ -329,7 +329,7 @@ const componentTemplateGeneratorMap = { @@
                 [buildInComponentFileTypes.LAZY]: componentLazyTemplateGenerator,
               };
-              function generateComponent(componentName, cmd, cliConfigFile) {
+              function generateComponent(componentName, cmd, cliConfigFile, isFlat) {

Owner

arminbro Oct 4, 2022

Suggested change

      
            function generateComponent(componentName, cmd, cliConfigFile, isFlat) {
          
            function generateComponent(componentName, cmd, cliConfigFile) {

src/utils/generateComponentUtils.js Outdated

                       componentName,
                       cliConfigFile,
                       componentFileType,
+                      isFlat,

Owner

arminbro Oct 4, 2022

Suggested change

isFlat,

src/utils/generateComponentUtils.js Outdated

Comment on lines 432 to 435

+              function checkIsFlat(args) {
+                return args.find((arg) => arg.includes('-f') || arg.includes('--flat'));
+              }

Owner

arminbro Oct 4, 2022

Suggested change

      
            function checkIsFlat(args) {
          
              return args.find((arg) => arg.includes('-f') || arg.includes('--flat'));
          
            }

src/utils/generateComponentUtils.js Outdated

               module.exports = {
                 generateComponent,
                 getComponentByType,
                 getCorrespondingComponentFileTypes,
+                checkIsFlat,

Owner

arminbro Oct 4, 2022

Suggested change

checkIsFlat,


          Address feedback comments - remove redundancy for checking flat

c13fcd8

xnivaxhzne requested a review from arminbro

October 4, 2022 06:11

Author

xnivaxhzne commented Oct 4, 2022

hey @arminbro, I have done the changes as per your suggestions. Please review them.
Thank you..

arminbro approved these changes

View reviewed changes

Owner

arminbro left a comment

This looks good. Thanks again for contributing, @kavinkuma6.

arminbro merged commit 578aea6 into arminbro:main

github-actions bot commented Oct 4, 2022

🎉 This PR is included in version 7.4.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

github-actions bot added the released label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment