fix(cli): add more exit checks to fail fast

Author: raymondfeng

packages/cli/generators/controller/index.js

@@ -62,6 +62,7 @@ module.exports = class ControllerGenerator extends ArtifactGenerator {
   }
 
   checkLoopBackProject() {
+    if (this.shouldExit()) return;
     return super.checkLoopBackProject();
   }
 

packages/cli/generators/datasource/index.js

@@ -68,6 +68,7 @@ module.exports = class DataSourceGenerator extends ArtifactGenerator {
    * Ensure CLI is being run in a LoopBack 4 project.
    */
   checkLoopBackProject() {
+    if (this.shouldExit()) return;
     return super.checkLoopBackProject();
   }
 

packages/cli/generators/model/index.js

@@ -83,6 +83,7 @@ module.exports = class ModelGenerator extends ArtifactGenerator {
   }
 
   checkLoopBackProject() {
+    if (this.shouldExit()) return;
     return super.checkLoopBackProject();
   }
 
@@ -95,6 +96,7 @@ module.exports = class ModelGenerator extends ArtifactGenerator {
 
   // Ask for Model base class
   async promptModelBaseClassName() {
+    if (this.shouldExit()) return;
     const availableModelBaseClasses = [];
 
     availableModelBaseClasses.push(...BASE_MODELS);

packages/cli/generators/repository/index.js

@@ -139,6 +139,7 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
   }
 
   checkLoopBackProject() {
+    if (this.shouldExit()) return;
     return super.checkLoopBackProject();
   }
 

packages/cli/generators/service/index.js

@@ -59,6 +59,7 @@ module.exports = class ServiceGenerator extends ArtifactGenerator {
   }
 
   checkLoopBackProject() {
+    if (this.shouldExit()) return;
     return super.checkLoopBackProject();
   }
 

packages/cli/test/integration/generators/model.integration.js

@@ -65,7 +65,7 @@ describe('lb4 model integration', () => {
       testUtils
         .executeGenerator(generator)
         .inDir(SANDBOX_PATH, () =>
-          testUtils.givenLBProject(SANDBOX_PATH, {excludeKeyword: true}),
+          testUtils.givenLBProject(SANDBOX_PATH, {excludeKeyword: false}),
         )
         .withArguments('myNewModel --base InvalidModel'),
     ).to.be.rejectedWith(/Model was not found in/);

packages/cli/test/integration/lib/base-generator.js

@@ -66,13 +66,27 @@ module.exports = function(generator) {
         assert.equal(gen.options.name, 'abc');
         assert.equal(gen.options.description, 'Test');
       });
+
+      it('fails fast if --config has invalid value', async () => {
+        const gen = testUtils.testSetUpGen(generator, {
+          args: ['--config', path.join(__dirname, 'base-config-invalid.json')],
+        });
+        await gen.setOptions();
+        assert(gen.exitGeneration instanceof Error);
+      });
     });
 
     describe('config from json value', () => {
       const jsonValue = `{
         "name": "xyz",
         "description": "Test"
       }`;
+
+      const invalidJsonValue = `{
+        name: "xyz",
+        "description": "Test"
+      }`;
+
       it('accepts --config', async () => {
         const gen = testUtils.testSetUpGen(generator, {
           args: ['--config', jsonValue],
@@ -91,6 +105,14 @@ module.exports = function(generator) {
         assert.equal(gen.options.name, 'abc');
         assert.equal(gen.options.description, 'Test');
       });
+
+      it('fails fast if --config has invalid value', async () => {
+        const gen = testUtils.testSetUpGen(generator, {
+          args: ['--config', invalidJsonValue],
+        });
+        await gen.setOptions();
+        assert(gen.exitGeneration instanceof Error);
+      });
     });
 
     describe('config from stdin', () => {