feat: store answers in state

JeromeFitz · Jun 5, 2018 · 3110e94 · 3110e94
1 parent 5212e93
commit 3110e94
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 13 deletions.
diff --git a/lib/cli.js b/lib/cli.js
@@ -7,6 +7,8 @@ const main = async () => {
     const state = createState();
     const answers = await runInteractiveQuestions(state);
 
+    console.log(state);
+
     console.log(answers);
   } catch (error) {
     signale.fatal(error);

diff --git a/lib/createPrompter.js b/lib/createPrompter.js
@@ -1,9 +1,5 @@
 const fs = require('fs');
 const wrap = require('word-wrap');
-const {
-  getAllPackages,
-  getChangedPackages
-} = require('./lernaUtils');
 const runInteractiveQuestions = require('./runInteractiveQuestions');
 
 const MAX_LINE_WIDTH = 72;

diff --git a/lib/createState.js b/lib/createState.js
@@ -3,6 +3,15 @@ const getConfig = require('./getConfig');
 
 const createState = () => {
   const state = {
+    answers: {
+      body: '',
+      breaking: '',
+      issues: '',
+      lerna: '',
+      scope: '',
+      subject: '',
+      type: ''
+    },
     config: getConfig(),
     root: String(appRoot)
   };

diff --git a/lib/defaults.js b/lib/defaults.js
@@ -61,19 +61,21 @@ const list = [
 
 // https://github.com/angular/angular/blob/master/CONTRIBUTING.md#scope
 const scopes = [
-  '',
-  'init',
-  'runner',
-  'watcher',
+  'none',
+  'app',
+  'electron',
+  'server',
+  'lang',
   'config',
-  'web-server',
-  'changelog'
+  'changelog',
+  'runner',
+  'watcher'
 ];
 
 const questions = [
   'type',
   'scope',
-  'title',
+  'subject',
   'body',
   'breaking',
   'issues',

diff --git a/lib/questions/scope.js b/lib/questions/scope.js
@@ -16,7 +16,7 @@ exports.createQuestion = (state) => {
   const question = {
     choices: scopes,
     default: 0,
-    message: 'Select the scope this component affects:\n',
+    message: 'Select the scope this component affects:',
     name: 'scope',
     type: 'list'
   };

diff --git a/lib/questions/title.js → lib/questions/subject.js b/lib/questions/title.js → lib/questions/subject.js
diff --git a/lib/questions/type.js b/lib/questions/type.js
@@ -9,7 +9,7 @@ exports.createQuestion = (state) => {
   const {config} = state;
   const question = {
     choices: config.list.map((type) => typeToListItem(config.types[type])),
-    message: 'Select the type of change that you\'re committing:\n',
+    message: 'Select the type of change that you\'re committing:',
     name: 'type',
     type: 'list'
   };

diff --git a/lib/runInteractiveQuestions.js b/lib/runInteractiveQuestions.js
@@ -15,6 +15,12 @@ const runInteractiveQuestions = async (state) => {
   const questions = createQuestions(state);
   const answers = await inquirer.prompt(questions);
 
+  Object.keys(state.answers).forEach((key) => {
+    if (answers[key]) {
+      state.answers[key] = answers[key];
+    }
+  });
+
   return answers;
 };