erii 2.0.1 → 2.0.4

package/dist/index.d.ts

@@ -0,0 +1,108 @@
+export interface Command {
+    name: string | string[];
+    description?: string;
+    argument?: Argument;
+    alias?: string[];
+    redirect?: string;
+    options?: Option[];
+    handler?: (ctx: CommandCtx, options?: object) => any;
+}
+export interface Option {
+    name: string | string[];
+    description?: string;
+    command?: string;
+    argument?: Argument;
+}
+export interface CommandMap {
+    [key: string]: Command;
+}
+export interface CommandCtx {
+    showVersion: () => void;
+    showHelp: () => void;
+    getArgument: (commandName?: string) => string;
+}
+export interface Argument {
+    name: string;
+    description: string;
+    validate?: string | ((value: any, logger: (message: string) => void) => boolean);
+}
+export declare class Erii {
+    rawArguments: string[];
+    parsedArguments: {
+        _?: string[];
+        [key: string]: string | string[];
+    };
+    private version;
+    private name;
+    commands: CommandMap;
+    commonOptions: Option[];
+    validator: any;
+    alwaysHandler: () => void;
+    defaultHandler: () => void;
+    constructor();
+    /**
+     * 绑定命令处理函数
+     * @param config
+     * @param handler
+     */
+    bind(config: Command, handler: (ctx: CommandCtx, ...extraArguments: any[]) => any): void;
+    /**
+     * 总是执行
+     * @param handler
+     */
+    always(handler: () => any): void;
+    /**
+     *
+     */
+    default(handler: () => any): void;
+    /**
+     * 增加设置项
+     * @param config
+     */
+    addOption(config: Option): void;
+    /**
+     *
+     * @param command
+     */
+    private commandCtx;
+    /**
+     * 设定基础信息
+     * @param metaInfo
+     */
+    setMetaInfo({ version, name }?: {
+        version?: string;
+        name?: string;
+    }): void;
+    /**
+     * 显示帮助信息
+     */
+    showHelp(command?: string): void;
+    /**
+     * 显示版本号
+     */
+    showVersion(): void;
+    /**
+     * 启动
+     */
+    start(): void;
+    /**
+     * 执行命令担当函数
+     * @param command
+     * @param extraArguments
+     */
+    private exec;
+    validateArgument(argumentValue: any, argument: Argument): any;
+    /**
+     * 获得命令的参数
+     * @param commandName
+     * @param followRedirect 是否遵循重定向
+     */
+    getArgument(commandName: string, followRedirect?: boolean): string;
+    /**
+     * 启动
+     * エリイ 起きてます❤
+     */
+    okite(): void;
+}
+declare const _default: Erii;
+export default _default;

package/dist/index.js

@@ -0,0 +1,345 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Erii = void 0;
+const yargs = require('yargs-parser');
+const CLI = require('clui'), clc = require('cli-color');
+const chalk = require('chalk');
+const validator = require('validator');
+const convert_1 = require("./utils/convert");
+;
+class Erii {
+    constructor() {
+        this.parsedArguments = {};
+        this.version = "1.0.0";
+        this.name = "Erii";
+        this.commands = {};
+        this.commonOptions = [];
+        this.rawArguments = process.argv.slice(2);
+        this.parsedArguments = yargs(process.argv.slice(2));
+        this.validator = validator;
+        // 不响应-后第二个字符起的命令
+        for (const key of Object.keys(this.parsedArguments)) {
+            if (key !== "_" && (!this.rawArguments.includes('--' + key) && !this.rawArguments.includes('-' + key))) {
+                delete this.parsedArguments[key];
+            }
+        }
+    }
+    /**
+     * 绑定命令处理函数
+     * @param config
+     * @param handler
+     */
+    bind(config, handler) {
+        if (config.name === undefined) {
+            return console.error(chalk.red("Invalid command binding, ignored."));
+        }
+        const { name, description, argument } = config;
+        const mainCommand = Array.isArray(name) ? name.shift() : name;
+        this.commands[mainCommand] = {
+            name: mainCommand,
+            description,
+            argument,
+            alias: [],
+            options: [],
+            handler
+        };
+        if (Array.isArray(name)) {
+            for (const alias of name) {
+                this.commands[mainCommand].alias.push(alias);
+                this.commands[alias] = {
+                    name: alias,
+                    redirect: mainCommand
+                };
+            }
+        }
+    }
+    /**
+     * 总是执行
+     * @param handler
+     */
+    always(handler) {
+        this.alwaysHandler = handler;
+    }
+    /**
+     *
+     */
+    default(handler) {
+        this.defaultHandler = handler;
+    }
+    /**
+     * 增加设置项
+     * @param config
+     */
+    addOption(config) {
+        config.name = Array.isArray(config.name) ? config.name : [config.name];
+        if (!config.command) {
+            this.commonOptions.push(config);
+        }
+        else {
+            if (!(config.command in this.commands)) {
+                return console.error(chalk.red(`Command for option [${config.name.join(', ')}] not found, ignored.`));
+            }
+            this.commands[config.command].options.push(config);
+        }
+    }
+    /**
+     *
+     * @param command
+     */
+    commandCtx(command) {
+        return {
+            showVersion: () => {
+                this.showVersion();
+            },
+            showHelp: () => {
+                this.showHelp();
+            },
+            getArgument: (commandName = command) => {
+                return this.getArgument(commandName);
+            }
+        };
+    }
+    /**
+     * 设定基础信息
+     * @param metaInfo
+     */
+    setMetaInfo({ version = "", name = "" } = {}) {
+        this.version = version;
+        this.name = name;
+    }
+    /**
+     * 显示帮助信息
+     */
+    showHelp(command) {
+        this.showVersion();
+        console.log('\nHelp:');
+        const Line = CLI.Line;
+        new Line()
+            .padding(5)
+            .column('Commands', 30, [clc.cyan])
+            .column('Description', 30, [clc.cyan])
+            .column('Alias', 20, [clc.cyan])
+            .output();
+        new Line().output();
+        for (const key of Object.keys(this.commands)) {
+            if (this.commands[key].redirect) {
+                continue;
+            }
+            let commandText = '--' + key;
+            let aliasText = '';
+            if (this.commands[key].argument) {
+                commandText += ` <${this.commands[key].argument.name}>`;
+            }
+            if (this.commands[key].alias.length > 0) {
+                const aliasWithPrefixes = this.commands[key].alias.map(alias => alias.length === 1 ? `-${alias}` : `--${alias}`);
+                aliasText += aliasWithPrefixes.join(' / ');
+            }
+            new Line()
+                .padding(5)
+                .column(commandText, 30)
+                .column(this.commands[key].description, 30)
+                .column(aliasText, 20)
+                .output();
+            if (this.commands[key].argument) {
+                // 参数说明
+                new Line()
+                    .padding(9)
+                    .column(`<${this.commands[key].argument.name}>`, 26)
+                    .column(this.commands[key].argument.description, 30)
+                    .output();
+            }
+            if (this.commands[key].options.length > 0) {
+                // 设置项说明
+                for (const option of this.commands[key].options) {
+                    let optionsText = '';
+                    const optionName = Array.isArray(option.name) ? option.name : [option.name];
+                    if (option.argument) {
+                        optionsText += `--${optionName.join(', ')} <${option.argument.name}>`;
+                    }
+                    else {
+                        optionsText += `--${optionName.join(', ')}`;
+                    }
+                    ;
+                    new Line()
+                        .padding(9)
+                        .column(optionsText, 26)
+                        .column(option.description || '')
+                        .output();
+                    if (option.argument) {
+                        // 设置项参数说明
+                        new Line()
+                            .padding(13)
+                            .column(`<${option.argument.name}>`, 22)
+                            .column(option.argument.description || '')
+                            .output();
+                    }
+                }
+            }
+        }
+        new Line().output();
+        if (this.commonOptions.length > 0) {
+            // 通用设置项说明
+            console.log('Options:\n');
+            new Line()
+                .padding(5)
+                .column('Options', 30, [clc.cyan])
+                .column('Description', 30, [clc.cyan])
+                .output();
+            for (const option of this.commonOptions) {
+                let optionsText = '';
+                const optionName = Array.isArray(option.name) ? option.name : [option.name];
+                if (option.argument) {
+                    optionsText += `--${optionName.join(', ')} <${option.argument.name}>`;
+                }
+                else {
+                    optionsText += `--${optionName.join(', ')}`;
+                }
+                ;
+                new Line()
+                    .padding(5)
+                    .column(optionsText, 30)
+                    .column(option.description || '')
+                    .output();
+                if (option.argument) {
+                    // 设置项参数说明
+                    new Line()
+                        .padding(9)
+                        .column(`<${option.argument.name}>`, 26)
+                        .column(option.argument.description || '')
+                        .output();
+                }
+            }
+        }
+    }
+    /**
+     * 显示版本号
+     */
+    showVersion() {
+        console.log(`${this.name} / ${this.version}`);
+    }
+    /**
+     * 启动
+     */
+    start() {
+        if (this.alwaysHandler) {
+            this.alwaysHandler();
+        }
+        if (this.defaultHandler) {
+            if (this.parsedArguments['_'].length === 0 && Object.keys(this.parsedArguments).length === 1) {
+                this.defaultHandler();
+            }
+        }
+        for (const key of Object.keys(this.parsedArguments)) {
+            if (key in this.commands) {
+                this.exec(key);
+            }
+        }
+        for (const key of this.parsedArguments['_']) {
+            if (key in this.commands) {
+                this.exec(key);
+            }
+        }
+    }
+    /**
+     * 执行命令担当函数
+     * @param command
+     * @param extraArguments
+     */
+    exec(command) {
+        if (this.commands[command].redirect) {
+            // 别名重定向
+            this.exec(this.commands[command].redirect);
+        }
+        else {
+            // 传递绑定的设置及通用设置
+            const options = {};
+            const bandOptions = this.commands[command].options.concat(this.commonOptions);
+            for (const option of bandOptions) {
+                for (const name of option.name) {
+                    if (name in this.parsedArguments) {
+                        // do option argument validation
+                        if (this.validateArgument(this.parsedArguments[name], option.argument)) {
+                            options[option.name[0]] = this.parsedArguments[name];
+                        }
+                        else {
+                            console.error(chalk.red(`Argument validation failed for option '${name}'.`));
+                            if (typeof option.argument.validate === 'string') {
+                                console.error(chalk.red(`<${option.argument.name}> should be a/an ${option.argument.validate.slice(2)}.`));
+                            }
+                        }
+                    }
+                }
+            }
+            // do command argument validation
+            if (this.validateArgument(this.parsedArguments[command], this.commands[command].argument)) {
+                this.commands[command].handler(this.commandCtx(command), convert_1.createCamelProxifiedObject(options));
+            }
+            else {
+                console.error(chalk.red(`Argument validation failed for command ${command}`));
+                const validateMethod = this.commands[command].argument.validate;
+                if (typeof validateMethod === 'string') {
+                    console.error(chalk.red(`<${this.commands[command].argument.name}> should be a/an ${validateMethod.slice(2)}.`));
+                }
+            }
+        }
+    }
+    validateArgument(argumentValue, argument) {
+        if (!argument || !argument.validate) {
+            // no need to validate
+            return true;
+        }
+        if (typeof argument.validate === "string") {
+            if (argument.validate in this.validator) {
+                return this.validator[argument.validate](argumentValue.toString());
+            }
+            else {
+                console.error(chalk.red(`Unknown validate method for ${argument.name}.`));
+                return true;
+            }
+        }
+        else {
+            // custom validator
+            return argument.validate(argumentValue, (message) => {
+                console.log(chalk.red(message));
+            });
+        }
+    }
+    /**
+     * 获得命令的参数
+     * @param commandName
+     * @param followRedirect 是否遵循重定向
+     */
+    getArgument(commandName, followRedirect = true) {
+        if (this.commands[commandName]) {
+            if (this.commands[commandName].redirect) {
+                return this.getArgument(this.commands[commandName].redirect);
+            }
+            else {
+                if (Object.keys(this.parsedArguments).includes(commandName) && commandName !== '_') {
+                    return this.parsedArguments[commandName];
+                }
+                else {
+                    for (const alias of this.commands[commandName].alias) {
+                        if (Object.keys(this.parsedArguments).includes(alias)) {
+                            return this.parsedArguments[alias];
+                        }
+                    }
+                    console.error(chalk.red(`Command ${commandName} not found.`));
+                }
+            }
+        }
+        else {
+            console.error(chalk.red(`Command ${commandName} not found.`));
+        }
+    }
+    /**
+     * 启动
+     * エリイ 起きてます❤
+     */
+    okite() {
+        return this.start();
+    }
+}
+exports.Erii = Erii;
+exports.default = new Erii();
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACtC,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACxD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACvC,6CAA6D;AAoB5D,CAAC;AAcF,MAAa,IAAI;IAeb;QAbA,oBAAe,GAGX,EAAE,CAAC;QACC,YAAO,GAAW,OAAO,CAAC;QAC1B,SAAI,GAAW,MAAM,CAAC;QAE9B,aAAQ,GAAe,EAAE,CAAC;QAC1B,kBAAa,GAAa,EAAE,CAAC;QAMzB,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,iBAAiB;QACjB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YACjD,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,EAAE;gBACpG,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;aACpC;SACJ;IACL,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,MAAe,EAAE,OAAoD;QACtE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;YAC3B,OAAO,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC,CAAC;SACxE;QAED,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAE/C,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAE9D,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG;YACzB,IAAI,EAAE,WAAW;YACjB,WAAW;YACX,QAAQ;YACR,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,EAAE;YACX,OAAO;SACV,CAAC;QAEF,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACrB,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE;gBACtB,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC7C,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG;oBACnB,IAAI,EAAE,KAAK;oBACX,QAAQ,EAAE,WAAW;iBACxB,CAAC;aACL;SACJ;IACL,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,OAAkB;QACrB,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,OAAkB;QACtB,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;IAClC,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,MAAc;QACpB,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACnC;aAAM;YACH,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAC;gBACnC,OAAO,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAuB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;aACzG;YACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACtD;IACL,CAAC;IAED;;;OAGG;IACK,UAAU,CAAC,OAAe;QAC9B,OAAO;YACH,WAAW,EAAE,GAAG,EAAE;gBACd,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,CAAC;YACD,QAAQ,EAAE,GAAG,EAAE;gBACX,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,CAAC;YACD,WAAW,EAAE,CAAC,cAAsB,OAAO,EAAE,EAAE;gBAC3C,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YACzC,CAAC;SACJ,CAAA;IACL,CAAC;IAED;;;OAGG;IACH,WAAW,CAAC,EACR,OAAO,GAAG,EAAE,EACZ,IAAI,GAAG,EAAE,EACZ,GAAG,EAAE;QACF,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,QAAQ,CAAC,OAAgB;QACrB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QAEtB,IAAI,IAAI,EAAE;aACL,OAAO,CAAC,CAAC,CAAC;aACV,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aAClC,MAAM,CAAC,aAAa,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACrC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aAC/B,MAAM,EAAE,CAAC;QACd,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC1C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;gBAC7B,SAAS;aACZ;YACD,IAAI,WAAW,GAAG,IAAI,GAAG,GAAG,CAAC;YAC7B,IAAI,SAAS,GAAG,EAAE,CAAC;YACnB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;gBAC7B,WAAW,IAAI,KAAK,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC;aAC3D;YACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrC,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;gBACjH,SAAS,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC9C;YACD,IAAI,IAAI,EAAE;iBACL,OAAO,CAAC,CAAC,CAAC;iBACV,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;iBACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;iBAC1C,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC;iBACrB,MAAM,EAAE,CAAC;YACd,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;gBAC7B,OAAO;gBACP,IAAI,IAAI,EAAE;qBACL,OAAO,CAAC,CAAC,CAAC;qBACV,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC;qBACnD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;qBACnD,MAAM,EAAE,CAAC;aACjB;YACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvC,QAAQ;gBACR,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE;oBAC7C,IAAI,WAAW,GAAG,EAAE,CAAC;oBACrB,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC5E,IAAI,MAAM,CAAC,QAAQ,EAAE;wBACjB,WAAW,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC;qBACzE;yBAAM;wBACH,WAAW,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;qBAC9C;oBAAA,CAAC;oBACF,IAAI,IAAI,EAAE;yBACL,OAAO,CAAC,CAAC,CAAC;yBACV,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;yBACvB,MAAM,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;yBAChC,MAAM,EAAE,CAAC;oBACd,IAAI,MAAM,CAAC,QAAQ,EAAE;wBACjB,UAAU;wBACV,IAAI,IAAI,EAAE;6BACT,OAAO,CAAC,EAAE,CAAC;6BACX,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC;6BACvC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,IAAI,EAAE,CAAC;6BACzC,MAAM,EAAE,CAAC;qBACb;iBACJ;aACJ;SACJ;QACD,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;QACpB,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,UAAU;YACV,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAC1B,IAAI,IAAI,EAAE;iBACT,OAAO,CAAC,CAAC,CAAC;iBACV,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;iBACjC,MAAM,CAAC,aAAa,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;iBACrC,MAAM,EAAE,CAAC;YACV,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,aAAa,EAAE;gBACrC,IAAI,WAAW,GAAG,EAAE,CAAC;gBACrB,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC5E,IAAI,MAAM,CAAC,QAAQ,EAAE;oBACjB,WAAW,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC;iBACzE;qBAAM;oBACH,WAAW,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;iBAC9C;gBAAA,CAAC;gBACF,IAAI,IAAI,EAAE;qBACL,OAAO,CAAC,CAAC,CAAC;qBACV,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;qBACvB,MAAM,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;qBAChC,MAAM,EAAE,CAAC;gBACd,IAAI,MAAM,CAAC,QAAQ,EAAE;oBACjB,UAAU;oBACV,IAAI,IAAI,EAAE;yBACT,OAAO,CAAC,CAAC,CAAC;yBACV,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC;yBACvC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,IAAI,EAAE,CAAC;yBACzC,MAAM,EAAE,CAAC;iBACb;aACJ;SACJ;IACL,CAAC;IAED;;OAEG;IACH,WAAW;QACP,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAClD,CAAC;IACD;;OAEG;IACH,KAAK;QACD,IAAI,IAAI,CAAC,aAAa,EAAE;YACpB,IAAI,CAAC,aAAa,EAAE,CAAC;SACxB;QACD,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1F,IAAI,CAAC,cAAc,EAAE,CAAC;aACzB;SACJ;QACD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YACjD,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACtB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAClB;SACJ;QACD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;YACzC,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACtB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAClB;SACJ;IACL,CAAC;IAED;;;;OAIG;IACK,IAAI,CAAC,OAAO;QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;YACjC,QAAQ;YACR,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC9C;aAAM;YACH,eAAe;YACf,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC9E,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE;gBAC9B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE;oBAC5B,IAAI,IAAI,IAAI,IAAI,CAAC,eAAe,EAAE;wBAC9B,gCAAgC;wBAChC,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE;4BACpE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;yBACxD;6BAAM;4BACH,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,0CAA0C,IAAI,IAAI,CAAC,CAAC,CAAC;4BAC7E,IAAI,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,KAAK,QAAQ,EAAE;gCAC9C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,oBAAoB,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;6BAC7G;yBACJ;qBACJ;iBACJ;aACJ;YACD,iCAAiC;YACjC,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE;gBACvF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,oCAA0B,CAAC,OAAO,CAAC,CAAC,CAAC;aACjG;iBAAM;gBACH,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,0CAA0C,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC9E,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAChE,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;oBACpC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,oBAAoB,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;iBACnH;aACJ;SACJ;IACL,CAAC;IAED,gBAAgB,CAAC,aAAkB,EAAE,QAAkB;QACnD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;YACjC,sBAAsB;YACtB,OAAO,IAAI,CAAC;SACf;QACD,IAAI,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ,EAAE;YACvC,IAAI,QAAQ,CAAC,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;gBACrC,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;aACtE;iBAAM;gBACH,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,+BAA+B,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;gBAC1E,OAAO,IAAI,CAAC;aACf;SACJ;aAAM;YACH,mBAAmB;YACnB,OAAO,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAe,EAAE,EAAE;gBACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;YACnC,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,WAAmB,EAAE,cAAc,GAAG,IAAI;QAClD,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC5B,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE;gBACrC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC;aAChE;iBAAM;gBACH,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,WAAW,KAAK,GAAG,EAAE;oBAChF,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAW,CAAC;iBACtD;qBAAM;oBACH,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE;wBAClD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;4BACnD,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAW,CAAC;yBAChD;qBACJ;oBACD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,WAAW,aAAa,CAAC,CAAC,CAAC;iBACjE;aACJ;SACJ;aAAM;YACH,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,WAAW,aAAa,CAAC,CAAC,CAAC;SACjE;IACL,CAAC;IAED;;;OAGG;IACH,KAAK;QACD,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACJ;AA7VD,oBA6VC;AAED,kBAAe,IAAI,IAAI,EAAE,CAAC"}

package/dist/utils/convert.d.ts

@@ -0,0 +1,12 @@
+export declare function toCamelCase(str: string): string;
+export declare function toKebabCase(str: string): string;
+export declare function convertObjectKey(before: {
+    [index: string]: any;
+}): {
+    [k: string]: any;
+};
+export declare function createCamelProxifiedObject(before: {
+    [index: string]: any;
+}): {
+    [index: string]: any;
+};

package/dist/utils/convert.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCamelProxifiedObject = exports.convertObjectKey = exports.toKebabCase = exports.toCamelCase = void 0;
+function toCamelCase(str) {
+    return str.replace(/([-_][a-z])/gi, ($1) => {
+        return $1.toUpperCase().replace("-", "");
+    });
+}
+exports.toCamelCase = toCamelCase;
+function toKebabCase(str) {
+    return str[0].toLowerCase() +
+        str
+            .slice(1, str.length)
+            .replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
+}
+exports.toKebabCase = toKebabCase;
+function convertObjectKey(before) {
+    return Object.fromEntries(Object.entries(before).map(([key, value]) => [toCamelCase(key), value]));
+}
+exports.convertObjectKey = convertObjectKey;
+function createCamelProxifiedObject(before) {
+    return new Proxy(before, {
+        get: (target, key) => {
+            var _a;
+            return (_a = target[key]) !== null && _a !== void 0 ? _a : target[toKebabCase(key)];
+        },
+    });
+}
+exports.createCamelProxifiedObject = createCamelProxifiedObject;
+//# sourceMappingURL=convert.js.map

package/dist/utils/convert.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/utils/convert.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW,CAAC,GAAW;IACnC,OAAO,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,EAAE;QACvC,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACP,CAAC;AAJD,kCAIC;AAED,SAAgB,WAAW,CAAC,GAAW;IACnC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;QACvB,GAAG;aACE,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;aACpB,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AACvE,CAAC;AALD,kCAKC;AAED,SAAgB,gBAAgB,CAAC,MAAgC;IAC7D,OAAO,MAAM,CAAC,WAAW,CACrB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAC1E,CAAC;AACN,CAAC;AAJD,4CAIC;AAED,SAAgB,0BAA0B,CAAC,MAAgC;IACvE,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;QACrB,GAAG,EAAE,CAAC,MAAqB,EAAE,GAAW,EAAE,EAAE;;YACxC,aAAO,MAAM,CAAC,GAAG,CAAC,mCAAI,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QACnD,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAND,gEAMC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "erii",
-  "version": "2.0.1",
+  "version": "2.0.4",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,8 +20,8 @@
   "dependencies": {
     "chalk": "^2.4.1",
     "clui": "^0.3.6",
-    "validator": "^10.2.0",
-    "yargs-parser": "^13.1.2"
+    "validator": "^13.7.0",
+    "yargs-parser": "^21.0.0"
   },
   "devDependencies": {
     "@types/node": "^10.17.48",

package/src/utils/convert.ts

@@ -20,7 +20,7 @@ export function convertObjectKey(before: { [index: string]: any }) {
 export function createCamelProxifiedObject(before: { [index: string]: any }) {
     return new Proxy(before, {
         get: (target: typeof before, key: string) => {
-            return target[key] || target[toKebabCase(key)];
+            return target[key] ?? target[toKebabCase(key)];
         },
     });
 }