fix: make sure --applicationName is honored

loopbackio · Jun 8, 2018 · db3600e · db3600e
1 parent 50d99ce
commit db3600e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/docs/site/Application-generator.md b/docs/site/Application-generator.md
@@ -18,7 +18,7 @@ lb4 [app] [options] [<name>]
 
 ### Options
 
-`--applicationName` : Application name.
+`--applicationName` : Application class name.
 
 `--description` : Description of the application.
 

diff --git a/packages/cli/generators/app/index.js b/packages/cli/generators/app/index.js
@@ -18,14 +18,27 @@ module.exports = class AppGenerator extends ProjectGenerator {
 
     this.option('applicationName', {
       type: String,
-      description: 'Application name',
+      description: 'Application class name',
     });
 
     return super._setupGenerator();
   }
 
-  setOptions() {
-    return super.setOptions();
+  async setOptions() {
+    await super.setOptions();
+    if (this.shouldExit()) return;
+    if (this.options.applicationName) {
+      const clsName = utils.toClassName(this.options.applicationName);
+      if (typeof clsName === 'string') {
+        this.projectInfo.applicationName = clsName;
+      } else if (clsName instanceof Error) {
+        throw clsName;
+      }
+      const msg = utils.validateClassName(clsName);
+      if (msg !== true) {
+        throw new Error(msg);
+      }
+    }
   }
 
   promptProjectName() {
@@ -45,12 +58,15 @@ module.exports = class AppGenerator extends ProjectGenerator {
         message: 'Application class name:',
         default: utils.pascalCase(this.projectInfo.name) + 'Application',
         validate: utils.validateClassName,
+        when: this.projectInfo.applicationName == null,
       },
     ];
 
     return this.prompt(prompts).then(props => {
       props.applicationName = utils.toClassName(props.applicationName);
-      Object.assign(this.projectInfo, props);
+      if (typeof props.applicationName === 'string') {
+        this.projectInfo.applicationName = props.applicationName;
+      }
     });
   }
 

diff --git a/packages/cli/test/integration/generators/app.integration.js b/packages/cli/test/integration/generators/app.integration.js
@@ -10,7 +10,7 @@ const assert = require('yeoman-assert');
 const helpers = require('yeoman-test');
 const generator = path.join(__dirname, '../../../generators/app');
 const props = {
-  name: 'myApp',
+  name: 'my-app',
   description: 'My app for LoopBack 4',
 };
 
@@ -56,7 +56,21 @@ describe('app-generator specific files', () => {
       'src/controllers/ping.controller.ts',
       /\'\@loopback\/openapi\-v3\'/,
     );
+  });
+});
 
-    assert.file;
+describe('app-generator with --applicationName', () => {
+  before(() => {
+    return helpers
+      .run(generator)
+      .withOptions({applicationName: 'MyApp'})
+      .withPrompts(props);
+  });
+  it('generates all the proper files', () => {
+    assert.file('src/application.ts');
+    assert.fileContent(
+      'src/application.ts',
+      /class MyApp extends BootMixin\(RestApplication/,
+    );
   });
 });