Handle error display and fix system requirements validator

Author: Schmidely Stéphane

src/commands/export.ts

@@ -4,6 +4,7 @@ import { EOL } from 'os'
 // Our files - FIXME path import
 import { FLAGS, FORMATS, PROJECTS } from '../utils/commands/export/constants'
 import ExportUi from '../utils/commands/export/ui'
+import ExportUtils from '../utils/commands/export/utils'
 import ExportValidator from '../utils/commands/export/validators'
 
 export default class Export extends Command {
@@ -25,36 +26,33 @@ export default class Export extends Command {
    * Entrypoint of the `twe export` command
    */
   async run() {
-    let { flags } = this.parse(Export)
-    const availableFlags = this.availableFlags(FLAGS)
-    const missingFlags = availableFlags.filter(el => !(el in flags))
-    const availableFlagsValues = {
-      formats: FORMATS,
-      projects: PROJECTS
-    }
+    const utils = new ExportUtils()
     const validator = new ExportValidator()
 
     // Step 1 - check requirements
     const invalidRequirements = validator.checkRequirements()
     if (invalidRequirements.length !== 0) {
-      const plural = (invalidRequirements.length > 1) ? 's' : ''
-      let errorMessage = `missing requirement${plural} ${EOL}`
-      errorMessage += invalidRequirements.map((error: any) => {
-        return `• ${error}`
-      }).join(EOL)
-      this.error(errorMessage, { exit: 2 })
+      this.error(
+        utils.errorMessage('missing requirement', invalidRequirements),
+        { exit: 2 }
+      )
     }
 
+    // Prepare information
+    let { flags } = this.parse(Export)
+    const availableFlags = utils.availableFlags(FLAGS)
+    const missingFlags = availableFlags.filter(el => !(el in flags))
+    const availableFlagsValues = { formats: FORMATS, projects: PROJECTS }
+
     // Step 2 - check flags values (or exit)
     if (missingFlags.length !== 0) {
-      if (flags.interactive) {
-        const missingFlagsData = await new ExportUi().askMissingFlags(
-          missingFlags, availableFlagsValues
-        )
-        flags = { ...flags, ...missingFlagsData }
-      } else {
+      if (!flags.interactive) {
         this.error('Missing parameters', { exit: 3 })
       }
+      const missingFlagsData = await new ExportUi().askMissingFlags(
+        missingFlags, availableFlagsValues
+      )
+      flags = { ...flags, ...missingFlagsData }
     }
 
     // Step 2.1 - remove 'interactive' flag
@@ -63,26 +61,15 @@ export default class Export extends Command {
     // Step 3 - Verify params
     const invalidParams = validator.checkParams(params, availableFlagsValues)
     if (invalidParams.length !== 0) {
-      const plural = (invalidParams.length > 1) ? 's' : ''
-      let errorMessage = `invalid param${plural} ${EOL}`
-      errorMessage += invalidParams.map((invalidParam: string) => {
-        return `• ${invalidParam}`
-      }).join(EOL)
-      this.error(errorMessage, { exit: 2 })
+      this.error(
+        utils.errorMessage('invalid param', invalidParams),
+        { exit: 2 }
+      )
     }
 
     // (FIXME) Step 4 - Extract data
     // (FIXME) Step 5 - Filter data
     // (FIXME) Step 6 - Aggregate data
     // (FIXME) Step 7 - Save data
   }
-
-  /**
-   * CLI flags of 'export' commands
-   */
-  private availableFlags(flags: any) {
-    return Object.keys(flags).filter((el, _index, _array) => {
-      return el !== 'help'
-    })
-  }
 }

src/utils/commands/export/validators.ts

@@ -15,7 +15,7 @@ export default class ExportValidator {
   public checkRequirements(): Array<string> {
     return this.executables.reduce((acc: Array<any>, executable) => {
       const installed = new SystemRequirementValidator().isValid(executable)
-      return installed ? acc : acc.concat([executable])
+      return installed === true ? acc : acc.concat([installed])
     }, [])
   }
 

src/utils/commands/export/validators/system-requirement-validator.ts

@@ -7,7 +7,8 @@ import { Validator } from './validator'
  */
 export default class SystemRequirementValidator implements Validator {
   public isValid(executable: any) {
-    let valid: boolean | string = which(executable.cmd)
+    const path = which(executable.cmd)
+    let valid: boolean | string = (path !== null)
     if (!valid) {
       valid = `${executable.name} is not installed `
       valid += `(command '${executable.cmd}')`