feat: question support other type from inquirer (#51)

eggjs · Apr 17, 2019 · 36f2d86 · 36f2d86
1 parent c9dbae2
commit 36f2d86
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/lib/init_command.js b/lib/init_command.js
@@ -247,11 +247,12 @@ module.exports = class Command {
       return yield inquirer.prompt(keys.map(key => {
         const question = questions[key];
         return {
-          type: 'input',
+          type: question.type || 'input',
           name: key,
           message: question.description || question.desc,
           default: question.default,
           filter: question.filter,
+          choices: question.choices,
         };
       }));
     }

diff --git a/test/category.test.js b/test/category.test.js
@@ -44,7 +44,7 @@ describe('test/category.test', () => {
   });
 
   it('should work with prompt', function* () {
-    helper.mock([[ 'simple-app', 'this is xxx', 'TZ', helper.KEY_ENTER, 'test' ]]);
+    helper.mock([[ 'simple-app', 'this is xxx', 'TZ', helper.KEY_ENTER, 'test', helper.KEY_ENTER ]]);
     const boilerplatePath = path.join(__dirname, 'fixtures/simple-test');
     yield command.run(tmp, [ 'simple-app', '--force', '--template=' + boilerplatePath ]);
 

diff --git a/test/fixtures/simple-test/boilerplate/README.md b/test/fixtures/simple-test/boilerplate/README.md
@@ -6,6 +6,8 @@
 
 {{filterFn}}
 
+{{list}}
+
 ## QuickStart
 
 ### Development

diff --git a/test/fixtures/simple-test/index.js b/test/fixtures/simple-test/index.js
@@ -23,4 +23,9 @@ module.exports = {
       return 'filter-' + v;
     },
   },
+  list: {
+    type: 'list',
+    desc: 'choose',
+    choices: [ 'listA', 'listB' ],
+  },
 };
diff --git a/test/init.test.js b/test/init.test.js
@@ -42,7 +42,7 @@ describe('test/init.test.js', () => {
   });
 
   it('should work with prompt', function* () {
-    helper.mock([[ 'simple-app', 'this is xxx', 'TZ', helper.KEY_ENTER, 'test' ]]);
+    helper.mock([[ 'simple-app', 'this is xxx', 'TZ', helper.KEY_ENTER, 'test', helper.KEY_ENTER ]]);
     const boilerplatePath = path.join(__dirname, 'fixtures/simple-test');
     yield command.run(tmp, [ 'simple-app', '--force', '--template=' + boilerplatePath ]);
 
@@ -55,6 +55,7 @@ describe('test/init.test.js', () => {
     const content = fs.readFileSync(path.join(command.targetDir, 'README.md'), 'utf-8');
     assert(/default-simple-app/.test(content));
     assert(/filter-test/.test(content));
+    assert(/listA/.test(content));
   });
 
   it('should prompt', function* () {