feat: command改为使用commander的实现方式

能借用commander强大的提示能力

packages/fes-compiler/package.json

@@ -31,6 +31,7 @@
     "joi": "17.3.0",
     "readline": "^1.3.0",
     "set-value": "3.0.2",
-    "tapable": "2.0.0"
+    "tapable": "2.0.0",
+    "commander": "^6.2.1"
   }
 }

packages/fes-compiler/src/service/index.js

@@ -3,7 +3,8 @@ import { EventEmitter } from 'events';
 import assert from 'assert';
 import { AsyncSeriesWaterfallHook } from 'tapable';
 import { existsSync } from 'fs';
-import { BabelRegister, lodash } from '@umijs/utils';
+import { BabelRegister, lodash, chalk } from '@umijs/utils';
+import { Command } from 'commander';
 import { resolvePresets, pathToObj, resolvePlugins } from './utils/pluginUtils';
 import loadDotEnv from './utils/loadDotEnv';
 import isPromise from './utils/isPromise';
@@ -87,6 +88,8 @@ export default class Service extends EventEmitter {
         // repoDir should be the root dir of repo
         this.pkg = opts.pkg || this.resolvePackage();
         this.env = opts.env || process.env.NODE_ENV;
+        this.fesPkg = opts.fesPkg || {};
+
 
         assert(existsSync(this.cwd), `cwd ${this.cwd} does not exist.`);
 
@@ -111,6 +114,10 @@ export default class Service extends EventEmitter {
             env: this.env
         });
 
+        this.program = new Command();
+
+        this.initCommand();
+
         // setup initial plugins
         const baseOpts = {
             pkg: this.pkg,
@@ -479,12 +486,28 @@ export default class Service extends EventEmitter {
         }
     }
 
-    async run({ name, args = {} }) {
-        args._ = args._ || [];
-        // shift the command itself
-        if (args._[0] === name) args._.shift();
+    initCommand() {
+        this.program
+            .usage('<command> [options]')
+            .version(`@webank/fes ${this.fesPkg.version}`, '-v, --vers', 'output the current version')
+            .description('一个好用的前端解决方案');
+    }
 
-        this.args = args;
+    parseCommand() {
+        this.program.on('--help', () => {
+            console.log();
+            console.log(
+                `  Run ${chalk.cyan(
+                    'fes <command> --help'
+                )} for detailed usage of given command.`
+            );
+            console.log();
+        });
+        this.program.commands.forEach(c => c.on('--help', () => console.log()));
+        this.program.parse(process.argv);
+    }
+
+    async run({ rawArgv = {}, args = {} }) {
         await this.init();
 
         this.setStage(ServiceStage.run);
@@ -496,27 +519,28 @@ export default class Service extends EventEmitter {
             }
         });
 
-        return this.runCommand({
-            name,
-            args
-        });
+        this.runCommand({ rawArgv, args });
     }
 
-    async runCommand({ name, args = {} }) {
+    async runCommand({ rawArgv = {}, args = {} }) {
         assert(this.stage >= ServiceStage.init, 'service is not initialized.');
 
-        args._ = args._ || [];
-        // shift the command itself
-        if (args._[0] === name) args._.shift();
-
-        const command = typeof this.commands[name] === 'string'
-            ? this.commands[this.commands[name]]
-            : this.commands[name];
-        assert(command, `run command failed, command ${name} does not exists.`);
-
-        const { fn } = command;
-        return fn({
-            args
+        Object.keys(this.commands).forEach((command) => {
+            const commandOption = this.commands[command];
+            const program = this.program;
+            let c = program.command(command).description(commandOption.description);
+            if (commandOption.options) {
+                Object.keys(commandOption.options).forEach((option) => {
+                    c = c.option(option, commandOption.options[option]);
+                });
+            }
+            if (commandOption.fn) {
+                c.action(async () => {
+                    await commandOption.fn({ rawArgv, args, program });
+                });
+            }
         });
+
+        this.parseCommand();
     }
 }

packages/fes-compiler/src/service/pluginAPI.js

@@ -3,6 +3,7 @@ import * as utils from '@umijs/utils';
 import { isValidPlugin, pathToObj } from './utils/pluginUtils';
 import { EnableBy, PluginType, ServiceStage } from './enums';
 import Logger from '../logger';
+
 // TODO
 // 标准化 logger
 export default class PluginAPI {
@@ -62,16 +63,21 @@ export default class PluginAPI {
         ).concat(hook);
     }
 
-    registerCommand(command) {
-        const { name, alias } = command;
+    registerCommand(commandOption) {
+        const { command, fn } = commandOption;
         assert(
-            !this.service.commands[name],
-            `api.registerCommand() failed, the command ${name} is exists.`
+            !this.service.commands[command],
+            `api.registerCommand() failed, the command ${command} is exists.`
         );
-        this.service.commands[name] = command;
-        if (alias) {
-            this.service.commands[alias] = name;
-        }
+        assert(
+            typeof command === 'string',
+            'api.registerCommand() failed, the command must be String.'
+        );
+        assert(
+            typeof fn === 'function',
+            'api.registerCommand() failed, the fn must be function.'
+        );
+        this.service.commands[command] = commandOption;
     }
 
     // 在 preset 初始化阶段放后面，在插件注册阶段放前面

packages/fes-plugin-unit-jest/src/index.js

@@ -12,19 +12,13 @@ export default function (api) {
     const { utils: { mergeConfig }, cwd } = api;
 
     api.registerCommand({
-        name: 'test:unit',
-        usage: 'fes test:unit [options] <regexForTestFiles>',
+        command: 'test:unit',
         description: 'run unit tests with jest',
         options: {
             '--watch': 'run tests in watch mode',
             '--debug': 'debug'
         },
-        details:
-            'All jest command line options are supported.\n'
-            + 'See https://facebook.github.io/jest/docs/en/cli.html for more details.',
         async fn({ args }) {
-            console.log(args);
-
             process.env.NODE_ENV = 'test';
 
             args.debug && logger.log(`args: ${JSON.stringify(args)}`);

packages/fes-preset-built-in/package.json

@@ -38,6 +38,7 @@
     "vue-loader": "^16.1.2",
     "webpack-bundle-analyzer": "4.3.0",
     "babel-plugin-import": "1.13.3",
-    "hard-source-webpack-plugin": "0.13.1"
+    "hard-source-webpack-plugin": "0.13.1",
+    "envinfo": "^7.7.3"
   }
 }

packages/fes-preset-built-in/src/index.js

@@ -53,7 +53,9 @@ export default function () {
 
             // commands
             require.resolve('./plugins/commands/build'),
-            require.resolve('./plugins/commands/dev')
+            require.resolve('./plugins/commands/dev'),
+            require.resolve('./plugins/commands/help'),
+            require.resolve('./plugins/commands/info')
         ]
     };
 }

packages/fes-preset-built-in/src/plugins/commands/build/index.js

@@ -17,7 +17,7 @@ export default function (api) {
     } = api;
 
     api.registerCommand({
-        name: 'build',
+        command: 'build',
         description: 'build application for production',
         async fn() {
             cleanTmpPathExceptCache({

packages/fes-preset-built-in/src/plugins/commands/dev/index.js

@@ -29,8 +29,12 @@ export default (api) => {
     }
 
     api.registerCommand({
-        name: 'dev',
-        description: 'start a dev server for development',
+        command: 'dev',
+        description: 'start a local http service for development',
+        options: {
+            '--port': 'http service port, like 8080',
+            '--https': 'whether to turn on the https service'
+        },
         async fn({ args = {} }) {
             const defaultPort = process.env.PORT || args.port || api.config.devServer?.port;
             port = await portfinder.getPortPromise({

packages/fes-preset-built-in/src/plugins/commands/help/index.js

@@ -0,0 +1,11 @@
+
+
+export default function (api) {
+    api.registerCommand({
+        command: 'help',
+        description: 'show command helps',
+        async fn({ program }) {
+            program.outputHelp();
+        }
+    });
+}

packages/fes-preset-built-in/src/plugins/commands/info/index.js

@@ -0,0 +1,27 @@
+
+
+import envinfo from 'envinfo';
+
+export default function (api) {
+    api.registerCommand({
+        command: 'info',
+        description: 'print debugging information about your environment',
+        async fn() {
+            envinfo.run(
+                {
+                    System: ['OS', 'CPU'],
+                    Binaries: ['Node', 'Yarn', 'npm'],
+                    Browsers: ['Chrome', 'Edge', 'Firefox', 'Safari'],
+                    npmPackages: '/**/{typescript,*vue*,@webank/*/}',
+                    npmGlobalPackages: ['@webank/fes']
+                },
+                {
+                    showNotFound: true,
+                    duplicates: true,
+                    fullTree: true
+                }
+            )
+                .then(console.log);
+        }
+    });
+}

packages/fes/package.json

@@ -43,8 +43,6 @@
         "@webank/fes-compiler": "^2.0.0-alpha.2",
         "@webank/fes-preset-built-in": "^2.0.0-alpha.2",
         "@webank/fes-runtime": "^2.0.0-alpha.2",
-        "commander": "^6.2.1",
-        "envinfo": "^7.7.3",
         "resolve-cwd": "^3.0.0"
     },
     "engines": {

packages/fes/src/cli.js

@@ -1,5 +1,4 @@
 import { chalk, yParser, semver } from '@umijs/utils';
-import program from 'commander';
 import { Service } from './serviceWithBuiltIn';
 import fork from './utils/fork';
 import getCwd from './utils/getCwd';
@@ -24,18 +23,13 @@ function checkNodeVersion(wanted, id) {
 checkNodeVersion(requiredVersion, '@webank/fes');
 
 // process.argv: [node, fes.js, command, args]
-const args = yParser(process.argv.slice(2));
+const rawArgv = process.argv.slice(2);
+const args = yParser(rawArgv);
 
-program
-    .version(`@webank/fes ${fesPkg.version}`, '-v, --vers', 'output the current version')
-    .usage('<command> [options]')
-    .description(fesPkg.description);
-
-program
-    .command('dev')
-    .description('run local http service for development')
-    .action(() => {
-        try {
+(async () => {
+    try {
+        const command = args._[0];
+        if (command === 'dev') {
             const child = fork({
                 scriptPath: require.resolve('./forkedDev')
             });
@@ -49,91 +43,22 @@ program
                 child.kill('SIGTERM');
                 process.exit(1);
             });
-        } catch (e) {
-            console.error(chalk.red(e.message));
-            console.error(e.stack);
-            process.exit(1);
-        }
-    });
-
-program
-    .command('build')
-    .description('compile and package code')
-    .action(async () => {
-        try {
-            process.env.NODE_ENV = 'production';
+        } else {
+            if (command === 'build') {
+                process.env.NODE_ENV = 'production';
+            }
             await new Service({
                 cwd: getCwd(),
-                pkg: getPkg(process.cwd())
+                pkg: getPkg(process.cwd()),
+                fesPkg
             }).run({
-                name: 'build',
-                args
+                args,
+                rawArgv
             });
-        } catch (e) {
-            console.error(chalk.red(e.message));
-            console.error(e.stack);
-            process.exit(1);
         }
-    });
-
-program
-    .command('info')
-    .description('print debugging information about your environment')
-    .action(() => {
-        console.log(chalk.bold('\nEnvironment Info:'));
-        require('envinfo')
-            .run(
-                {
-                    System: ['OS', 'CPU'],
-                    Binaries: ['Node', 'Yarn', 'npm'],
-                    Browsers: ['Chrome', 'Edge', 'Firefox', 'Safari'],
-                    npmPackages: '/**/{typescript,*vue*,@webank/*/}',
-                    npmGlobalPackages: ['@webank/fes']
-                },
-                {
-                    showNotFound: true,
-                    duplicates: true,
-                    fullTree: true
-                }
-            )
-            .then(console.log);
-    });
-
-program
-    .arguments('[command]')
-    .option('--debug', 'Skip prompts and use default preset')
-    .action(async (cmd) => {
-        if (cmd) {
-            try {
-                await new Service({
-                    cwd: getCwd(),
-                    pkg: getPkg(process.cwd())
-                }).run({
-                    name: cmd,
-                    args
-                });
-            } catch (e) {
-                console.error(chalk.red(e.message));
-                console.error(e.stack);
-                process.exit(1);
-            }
-        }
-    });
-
-program.on('--help', () => {
-    console.log();
-    console.log(
-        `  Run ${chalk.cyan(
-            'fes <command> --help'
-        )} for detailed usage of given command.`
-    );
-    console.log();
-});
-
-program.commands.forEach(c => c.on('--help', () => console.log()));
-
-program.parse(process.argv);
-
-if (!process.argv.slice(2).length) {
-    program.outputHelp();
-}
+    } catch (e) {
+        console.error(chalk.red(e.message));
+        console.error(e.stack);
+        process.exit(1);
+    }
+})();

packages/fes/src/forkedDev.js

@@ -2,6 +2,7 @@ import { chalk, yParser } from '@umijs/utils';
 import { Service } from './serviceWithBuiltIn';
 import getCwd from './utils/getCwd';
 import getPkg from './utils/getPkg';
+import fesPkg from '../package.json';
 
 const args = yParser(process.argv.slice(2));
 
@@ -26,7 +27,8 @@ function onSignal(signal, service) {
         process.env.NODE_ENV = 'development';
         const service = new Service({
             cwd: getCwd(),
-            pkg: getPkg(process.cwd())
+            pkg: getPkg(process.cwd()),
+            fesPkg
         });
         await service.run({
             name: 'dev',