ongoing work on run command

nuxt · pi0 · Dec 20, 2018 · Nov 11, 2018 · Nov 11, 2018 · Nov 11, 2018
commit 7b88c1a313b3764338fcd2380dff25b21d4c787f
diff --git a/packages/cli/src/command.js b/packages/cli/src/command.js
@@ -1,6 +1,9 @@
+
+import { resolve, join, parse } from 'path'
+import { readdirSync, existsSync } from 'fs'
 import parseArgs from 'minimist'
 import { name, version } from '../package.json'
-import { loadNuxtConfig } from './utils'
+import { requireModule, loadNuxtConfig } from './utils'
 import { indent, foldLines, startSpaces, optionSpaces, colorize } from './utils/formatting'
 import * as commands from './commands'
 import * as imports from './imports'
@@ -14,15 +17,31 @@ export default class NuxtCommand {
     this._run = run
   }
 
-  static async load(name) {
-    if (name in commands) {
-      const cmd = await commands[name]() // eslint-disable-line import/namespace
-        .then(m => m.default)
-      return NuxtCommand.from(cmd)
-    } else {
-      // TODO dynamic module loading
-      throw new Error('Command ' + name + ' could not be loaded!')
+  static exists(cmd, dir = null) {
+    if (dir === null) {
+      return cmd in commands
+    }
+    const cmdsRoot = resolve(dir, 'commands')
+    if (existsSync(cmdsRoot)) {
+      return readdirSync(cmdsRoot)
+        .filter(c => c.endsWith('.js'))
+        .includes(`${cmd}.js`)
+    }
+  }
+
+  static async load(name, dir = null) {
+    if (dir !== null) {
+      const cmdPath = resolve(dir, 'commands', `${name}.js`)
+      if (!existsSync(cmdPath)) {
+        throw new Error(`Command ${name} could not be loaded!`)
+      }
+      return NuxtCommand.from(requireModule(cmdPath).default)
     }
+    if (!(name in commands)) {
+      throw new Error(`Command ${name} could not be loaded!`)
+    } 
+    const cmd = await commands[name]().then(m => m.default)
+    return NuxtCommand.from(cmd)
   }
 
   static from(options) {

diff --git a/packages/cli/src/commands/run.js b/packages/cli/src/commands/run.js
@@ -0,0 +1,15 @@
+import fs from 'fs'
+import path from 'path'
+import consola from 'consola'
+import { common, server } from '../options'
+import { showBanner } from '../utils'
+
+export default {
+  name: 'run',
+  description: 'Run locally defined commands in the root Nuxt project directory',
+  usage: 'run <custom-cmd>',
+  async run(cmd) {
+    const argv = cmd.getArgv()
+
+  }
+}
diff --git a/packages/cli/src/local.js b/packages/cli/src/local.js
diff --git a/packages/cli/src/run.js b/packages/cli/src/run.js
@@ -3,17 +3,16 @@ import NuxtCommand from './command'
 import * as commands from './commands'
 import setup from './setup'
 import listCommands from './list'
-import { existsLocalCommand, loadLocalCommand } from './local'
 
 export default function run() {
   const defaultCommand = 'dev'
   let cmd = process.argv[2]
+  let dir = null
 
-  if (commands[cmd]) { // eslint-disable-line import/namespace
+  if (NuxtCommand.exists(cmd)) { // eslint-disable-line import/namespace
     process.argv.splice(2, 1)
-  } else if (existsLocalCommand(cmd)) {
-    return loadLocalCommand(cmd).run()
-      .catch(error => consola.fatal(error))
+  } else if (NuxtCommand.exists(cmd, '.')) {
+    dir = '.'
   } else {
     if (process.argv.includes('--help') || process.argv.includes('-h')) {
       listCommands().then(() => process.exit(0))
@@ -27,7 +26,7 @@ export default function run() {
     dev: cmd === 'dev'
   })
 
-  return NuxtCommand.load(cmd)
+  return NuxtCommand.load(cmd, dir)
     .then(command => command.run())
     .catch(error => consola.fatal(error))
 }