Refactor loading commands. Move check that project exists to middleware.

shower · May 5, 2019 · 3b6c2c1 · 3b6c2c1
1 parent 1c099fe
commit 3b6c2c1
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 33 deletions.
diff --git a/source/commands.js b/source/commands.js
@@ -34,10 +34,10 @@ async function applyCommand (name, env, options) {
   }
 }
 
-const list = {
-  create: {
+const list = [
+  {
+    command: 'create [<directory>]',
     aliases: ['new'],
-    meta: '[<directory>]',
     describe: 'Create a new project',
     builder: yargs => yargs
       .options({
@@ -48,13 +48,14 @@ const list = {
         }
       })
       .positional('directory', {
-        default: 'slides'
+        default: 'slides',
+        type: 'string'
       })
   },
 
-  pdf: {
+  {
+    command: 'pdf',
     describe: 'Converts the presentation to PDF',
-    usesExistingPresentation: true,
     builder: yargs => yargs
       .options({
         output: {
@@ -66,9 +67,9 @@ const list = {
       })
   },
 
-  serve: {
+  {
+    command: 'serve',
     describe: 'Serve the presentation in development mode',
-    usesExistingPresentation: true,
     builder: yargs => yargs
       .options({
         open: {
@@ -96,9 +97,9 @@ const list = {
       })
   },
 
-  prepare: {
+  {
+    command: 'prepare',
     describe: 'Gather the necessary files in a separate folder',
-    usesExistingPresentation: true,
     builder: yargs => yargs
       .options({
         output: {
@@ -116,9 +117,9 @@ const list = {
       })
   },
 
-  archive: {
+  {
+    command: 'archive',
     describe: 'Create an archive of the presentation',
-    usesExistingPresentation: true,
     builder: yargs => yargs
       .options({
         output: {
@@ -136,9 +137,9 @@ const list = {
       })
   },
 
-  publish: {
+  {
+    command: 'publish',
     describe: 'Publish your presentation to GitHub Pages',
-    usesExistingPresentation: true,
     builder: yargs => yargs
       .options({
         files: {
@@ -149,6 +150,6 @@ const list = {
         }
       })
   }
-}
+]
 
 module.exports = { list, apply: applyCommand }
diff --git a/source/index.js b/source/index.js
@@ -37,31 +37,33 @@ app.alias('v', 'version')
 
 const env = getEnv()
 
-for (const name in list) {
-  if (!list.hasOwnProperty(name)) {
-    continue
+const COMMANDS_REQUIRE_EXISTING_PRESENTATION = [
+  'pdf', 'serve', 'prepare', 'archive', 'publish'
+]
+
+app.middleware((argv, app) => {
+  const name = argv._[0]
+
+  if (COMMANDS_REQUIRE_EXISTING_PRESENTATION.includes(name) && !env.project) {
+    process.stdout.write(
+      chalk`{red Shower presentation not found}\n\n` +
+      chalk`Use {yellow shower create} to create a presentation\n` +
+      chalk`Run {yellow shower create --help} to learn more\n`
+    )
+
+    app.exit(1)
   }
+})
 
-  let command = list[name]
+for (const command of list) {
+  const name = command.command.split(' ')[0]
 
   app.command({
-    command: command.meta ? `${name} ${command.meta}` : name,
+    command: command.command,
     aliases: command.aliases,
     describe: chalk.yellow(command.describe),
     builder: command.builder,
-    handler (options) {
-      if (command.usesExistingPresentation && !env.project) {
-        process.stdout.write(
-          chalk`{red Shower presentation not found}\n\n` +
-          chalk`Use {yellow shower create} to create a presentation\n` +
-          chalk`Run {yellow shower create --help} to learn more\n`
-        )
-
-        return Promise.resolve()
-      }
-
-      return apply(name, env, options)
-    }
+    handler: apply.bind(null, name, env)
   })
 }