refactor: Asking unanswered questions

Author: byawitz

templates/cli/lib/commands/init.js.twig

@@ -40,14 +40,22 @@ const initProject = async ({ organizationId, projectId, projectName } = {}) => {
         log('You must login first')
         await loginCommand();
     }
+
     let answers = {};
 
-    if (organizationId && projectId && projectName) {
-        answers = {
-            project: { id: projectId, name: projectName },
-            organization: { id: organizationId },
-            start: 'existing'
+    if (!organizationId && !projectId && !projectName) {
+        answers = await inquirer.prompt(questionsInitProject)
+        if (answers.override === false) {
+            process.exit(1)
         }
+    } else {
+        answers.start = 'existing';
+        answers.project = {};
+        answers.organization = {};
+
+        answers.organization.id = organizationId ?? (await inquirer.prompt(questionsInitProject[2])).organization;
+        answers.project.name = projectName ?? (await inquirer.prompt(questionsInitProject[3])).project;
+        answers.project.id = projectId ?? (await inquirer.prompt(questionsInitProject[4])).id;
 
         try {
             await projectsGet({ projectId, parseOutput: false });
@@ -60,15 +68,8 @@ const initProject = async ({ organizationId, projectId, projectName } = {}) => {
                 throw e;
             }
         }
-
-    } else {
-        answers = await inquirer.prompt(questionsInitProject)
-        if (answers.override === false) {
-            process.exit(1)
-        }
     }
 
-
     if (answers.start === 'new') {
         response = await projectsCreate({
             projectId: answers.id,
@@ -170,7 +171,6 @@ const initFunction = async () => {
     }
 
 
-
     fs.mkdirSync(functionDir, "777");
     fs.mkdirSync(templatesDir, "777");
 

templates/cli/lib/questions.js.twig

@@ -171,14 +171,14 @@ const questionsInitProject = [
         name: "project",
         message: "What would you like to name your project?",
         default: "My Awesome Project",
-        when: (answer) => answer.start === 'new'
+        when: (answer) => answer.start !== 'existing'
     },
     {
         type: "input",
         name: "id",
         message: "What ID would you like to have for your project?",
         default: "unique()",
-        when: (answer) => answer.start === 'new'
+        when: (answer) => answer.start !== 'existing'
     },
     {
         type: "list",