Improved error handling

- The generator will run in directory mentioned in argument,
whether the directory exists or not.
- Changed tests accordingly
- Removed bug which showed the "directoryName" question even when
user wished to switch the source of importing file

Author: Nikhil-Vats

__tests__/app.js

@@ -13,7 +13,6 @@ describe("generator-biojs-webcomponents:app - Make a new Web Component", () => {
       toolNameHuman: "Biojs test component"
     });
   });
-
   it("creates expected files", () => {
     assert.file([
       "examples/index.html",
@@ -79,21 +78,24 @@ describe("generator-biojs-webcomponents:app - Make a new Web Component", () => {
 });
 
 describe("generator-biojs-webcomponents:app - Upgrade an existing component by importing build file locally", () => {
+  it("runs the generator in the directory passed in arguments", async () => {
+    await validators.storeArg("test-component").then(() => {
+      assert.file("test-component");
+    });
+  });
   it("makes a new directory named - component-dist", async () => {
     await validators
       .directoryName("component-dist")
-      .then(() => assert.file(["component-dist"]));
+      .then(() => assert.file(["test-component/component-dist"]));
   });
   it("imports the build file", async () => {
-    await validators.storeArg("web-component").then(async () => {
-      await validators
-        .importBuildFileLocally(
-          path.join(__dirname, "../generators/app/validator.js")
-        )
-        .then(() => {
-          assert.file(["web-component/component-dist/validator.js"]);
-        });
-    });
+    await validators
+      .importBuildFileLocally(
+        path.join(__dirname, "../generators/app/validator.js")
+      )
+      .then(() => {
+        assert.file(["test-component/component-dist/validator.js"]);
+      });
   });
   it("throws an error if user enters an empty string as path of build file", async () => {
     assert.equal(

generators/app/index.js

@@ -163,6 +163,13 @@ module.exports = class extends Generator {
         message:
           "The build file will be imported in a separate directory in the project's root. Enter the name of this directory or press Enter if you like to go with default.",
         validate: validators.directoryName,
+        when: function(responses) {
+          if (responses.confirmPackageName) {
+            return true; // Show this prompt if user says that package description is correct
+          }
+
+          return false; // Don't show this prompt if user says that package description is incorrect
+        },
         default: "component-dist"
       },
       {
@@ -251,7 +258,6 @@ module.exports = class extends Generator {
               ); // Call the function recursively
             }
 
-            // If user chooses to install component from npm after starting over
             return this.prompt(commonPrompts).then(props => {
               this.props = props;
               this.props.toolNameCamel = toCamelCase(props.toolNameHuman);
@@ -283,30 +289,20 @@ module.exports = class extends Generator {
               ); // Call the function recursively
             }
 
-            // If user chooses to import from npm after starting over
             return this.prompt(commonPrompts).then(props => {
               this.props = props;
               this.props.toolNameCamel = toCamelCase(props.toolNameHuman);
             });
           });
         }
-
-        // If user chooses to import file locally when package description is incorrect
-        return this.prompt(localPrompts).then(() => {
-          return this.prompt(commonPrompts).then(props => {
-            this.props = props;
-            this.props.toolNameCamel = toCamelCase(props.toolNameHuman);
-          });
-        });
       }
 
       // Normal (initial) prompt execution
       return this.prompt(initialPrompts).then(props => {
-        // To access props later use this.props.someAnswer;
         // If user chooses to upgrade an existing component
         if (props.upgradeOrMake === initialPrompts[1].choices[0]) {
           return this.prompt(upgradeComponentPrompts).then(props => {
-            // If user chooses to import file locally from computer
+            // If user chooses to install component as npm package
             if (props.importFrom === upgradeComponentPrompts[0].choices[0]) {
               return this.prompt(installNpmPackagePrompts).then(props => {
                 // If user chooses to go back and choose source of importing file again
@@ -316,14 +312,14 @@ module.exports = class extends Generator {
                   ); // Call the function recursively
                 }
 
-                // If user chooses to install component from npm initially
                 return this.prompt(commonPrompts).then(props => {
                   this.props = props;
                   this.props.toolNameCamel = toCamelCase(props.toolNameHuman);
                 });
               });
             }
 
+            // If user chooses to import build file locally
             if (props.importFrom === upgradeComponentPrompts[0].choices[1]) {
               return this.prompt(localPrompts).then(() => {
                 return this.prompt(commonPrompts).then(props => {
@@ -333,17 +329,16 @@ module.exports = class extends Generator {
               });
             }
 
+            // If user chooses to import build file from npm package
             if (props.importFrom === upgradeComponentPrompts[0].choices[2]) {
-              // If user chooses to import file from npm
               return this.prompt(npmPrompts).then(props => {
-                // If user chooses to go back and choose source of importing file again
+                // If user chooses to go back and choose source of importing again
                 if (props.changeImportSourceFromNpmBuildFile) {
                   return recursivePromptExecution(
                     props.changeImportSourceFromNpmBuildFile
                   ); // Call the function recursively
                 }
 
-                // If user chooses to import from npm initially
                 return this.prompt(commonPrompts).then(props => {
                   this.props = props;
                   this.props.toolNameCamel = toCamelCase(props.toolNameHuman);

generators/app/validator.js

@@ -15,12 +15,22 @@ validators.storeArg = async function(props) {
 
   var res = await executeCommand("mkdir " + projectDirectory)
     .then(() => true)
-    .catch(err => {
-      return chalk.red(
-        `Oops! We encountered an error. Please see below for the more details - \n${chalk.yellow(
-          err
-        )}\nIf the directory whose path you entered already exists and you want that to be your project directory, cd into that directory and run ${chalk.cyan("`yo @biojs/biojs-webcomponents .`")}.`
-      );
+    .catch(async () => {
+      var tryAgain = await executeCommand(
+        "ls " + projectDirectory,
+        "checkDirExistence"
+      )
+        .then(() => true)
+        .catch(err => {
+          return chalk.red(
+            `Oops! We encountered an error. Please see below for the more details - \n${chalk.yellow(
+              err
+            )}\n.Try this - cd into that directory and run ${chalk.cyan(
+              "`yo @biojs/biojs-webcomponents .`"
+            )}.`
+          );
+        });
+      return tryAgain;
     });
   return res;
 };
@@ -90,7 +100,13 @@ validators.checkVersionAndInstallComponent = async function(props, answers) {
     var res = await executeCommand(command, "version")
       .then(async () => {
         var res = await executeCommand(
-          "cd " + projectDirectory + " && npm i " + answers.packageNameToInstallComponent + "@" + props + " --save-exact",
+          "cd " +
+            projectDirectory +
+            " && npm i " +
+            answers.packageNameToInstallComponent +
+            "@" +
+            props +
+            " --save-exact",
           "checkVersionAndInstallComponent"
         )
           .then(() => true)
@@ -125,7 +141,7 @@ validators.checkVersionAndInstallComponent = async function(props, answers) {
 validators.directoryName = async props => {
   var res;
   if (props.trim() === "o") {
-    res = await executeCommand(`rm -rf ${buildDirectory}/*`)
+    res = await executeCommand(`rm -rf ${projectDirectory}/${buildDirectory}/*`)
       .then(() => true)
       .catch(err => {
         return chalk.red(
@@ -139,13 +155,13 @@ validators.directoryName = async props => {
 
   if (props) {
     buildDirectory = props;
-    res = await executeCommand("mkdir " + props)
+    res = await executeCommand("mkdir " + projectDirectory + "/" + props)
       .then(() => true)
       .catch(err => {
         return chalk.red(
           "Uh oh! There already exists a directory with the same name. Enter a new name again or enter " +
             chalk.cyan("o") +
-            " if you want to overwrite the contents of this directory and then import the build file. please see the log below for more details.\n" +
+            " if you want to overwrite the contents of this directory and then import the build file. Please see the log below for more details.\n" +
             chalk.yellow(err)
         );
       });
@@ -275,6 +291,9 @@ function executeCommand(command, type) {
           spinner.stop();
           reject(err);
         }
+      } else if (type === "checkDirExistence") {
+          spinner.stop();
+          resolve(true);
       } else if (stdout) {
         process.stdout.write(`\n ${stdout} \n`); // If there is an output display it
         spinner.stop();