upd

Author: Robin Radic

.gitignore

@@ -11,3 +11,4 @@ src/**/*.js.map
 /console.iml
 /bin
 /gulpfile.js
+/vpproject

.nyc_output/4dc3205058f65d44995fec56c161e72b.json

@@ -0,0 +1 @@
+{}

.nyc_output/96f89356ebb132b8c1aa8aa82b2d5887.json

@@ -3,7 +3,7 @@ import * as fs from "fs-extra";
 import * as tsc from "gulp-typescript";
 import { resolve } from "path";
 import * as _ from 'lodash'
-
+import * as ts from 'typescript'
 const c = {
  src : [ 'src/**/*.ts' ],
  fileName : 'console',
@@ -18,11 +18,6 @@ let parsedNode = cli.resolve()
 
 cli.handle(parsedNode);`
 
-const tsProject = {
- lib : tsc.createProject("tsconfig.json", { module: "es2015", declaration: true, typescript: require("typescript") }),
- src : tsc.createProject("tsconfig.json", { typescript: require("typescript") }),
- test: tsc.createProject("tsconfig.json", { typescript: require("typescript") })
-};
 
 
 const
@@ -41,6 +36,12 @@ const
  ghPages = require("gulp-gh-pages")
 ;
 
+const tsProject = {
+ lib : tsc.createProject("tsconfig.json", { module: "es2015", declaration: true, typescript: ts }),
+ src : tsc.createProject("tsconfig.json", { typescript: ts}),
+ test: tsc.createProject("tsconfig.json", { target: "es6", sourceMap: true, typescript: ts })
+};
+
 gulp.task('clean', [ 'clean:src', 'clean:build' ]);
 
 gulp.task('clean:build', () => gulp.src([ 'dist', 'dts', 'es', 'lib', 'umd', 'coverage', '.publish', 'docs' ]).pipe(clean()));
@@ -98,13 +99,13 @@ gulp.task("build:src", () => {
 
 gulp.task("build:test", () => {
  return gulp.src([
- "spec/**/*.ts"
+ "tests/**/*.ts"
  ])
  .pipe(tsProject.test())
  .on("error", function (err) {
  process.exit(1);
  })
- .js.pipe(gulp.dest("spec/"));
+ .js.pipe(gulp.dest("tests/"));
 });
 
 gulp.task("build", (cb) => {

gulpfile.ts

@@ -1,6 +1,6 @@
 {
  "name": "@radic/console",
- "version": "0.0.13",
+ "version": "0.0.12",
  "description": "Console ",
  "main": "src/index.js",
  "typings": "lib/index.d.ts",
@@ -26,7 +26,7 @@
  },
  "dependencies": {
  "@radic/console-colors": "^0.9.5",
- "@radic/util": "^1.7.5",
+ "@radic/util": "^1.7.3",
  "archy": "^1.0.0",
  "async": "^2.4.0",
  "axios": "^0.16.1",

package.json

@@ -68,6 +68,7 @@ export class Cli {
 
  this.events.fire(new CliParseEvent(config, this.globalOptions))
  let transformedOptions = transformOptions(this.globalOptions);
+ transformedOptions.configuration = this.config('parser.yargs')
  let result = parser(config.args, transformedOptions) as YargsParserArgv;
  this.events.fire(new CliParsedEvent(config, result, this.globalOptions))
  this._parsedCommands.push(config);
@@ -106,6 +107,7 @@ export class Cli {
  this.events.fire(new CliExecuteCommandParseEvent(config, optionConfigs))
 
  let transformedOptions = transformOptions(this.globalOptions.concat(optionConfigs));
+ transformedOptions.configuration = this.config('parser.yargs')
  let argv = parser(config.args, transformedOptions) as YargsParserArgv;
 
  if ( ! isAlwaysRun )

src/core/Cli.ts

@@ -27,7 +27,7 @@ export const defaults = {
  'camel-case-expansion' : true,
  'dot-notation' : true,
  'parse-numbers' : true,
- 'boolean-negation' : true,
+ 'boolean-negation' : false,
  'duplicate-arguments-array': true,
  'flatten-duplicate-arrays' : true
  },
@@ -84,8 +84,9 @@ export const defaults = {
  return <CommandArgumentConfig> cloneDeep({
  position: index,
  name : null,
- desc : '',
+ description : '',
  alias : null,
+ type: 'string',
  required: false,
  variadic: false,
  default: null

src/defaults.ts

@@ -152,7 +152,7 @@ export class CommandDescriptionHelper {
  ].join('');
  row.push(name)
 
- row.push(arg.desc || '')
+ row.push(arg.description || '')
 
  let type = [
  '[',

src/helpers/Help.ts

@@ -20,7 +20,7 @@ export interface CommandArgumentConfig {
  alias?: string | null
  required?: boolean
  variadic?: boolean
- desc?: string
+ description?: string
  type?: string
  default?:any | null
 }

src/interfaces.ts

@@ -52,7 +52,7 @@ export function prepareArguments<T extends CommandConfig = CommandConfig>(config
 //https://regex101.com/r/vSqbuK/1
 
  let name = config.name.replace(/\[\]/g, '__')
- let argumentPattern = /[{|\[](.*?)[}|\]]/gm
+ let argumentPattern = /[{\[](.*)[}\]]/gm
  if ( argumentPattern.test(name) ) {
  if ( name.match(argumentPattern) === null )
  return config
@@ -77,7 +77,7 @@ export function prepareArguments<T extends CommandConfig = CommandConfig>(config
  if ( hasAlias ) exp += '\\/(.*?)'
  if ( hasType ) exp += ':(.*?)'
  if ( isArray ) exp += '__'
- if ( hasDefault ) exp += '='
+ if ( hasDefault ) exp += '=(.*?)'
  if ( hasDesc ) exp += '@(.*?)'
  exp += '$'
 
@@ -89,9 +89,14 @@ export function prepareArguments<T extends CommandConfig = CommandConfig>(config
  if ( hasAlias ) arg.alias = res[ $ ++ ];
  if ( hasType ) arg.type = res[ $ ++ ]
  if ( hasDefault ) arg.default = res[ $ ++ ]
- if ( hasDesc ) arg.desc = res[ $ ++ ]
+ if ( hasDesc ) arg.description = res[ $ ++ ]
  if ( isArray ) arg.variadic = true;
 
+ if(hasDefault){
+ // console.dir({name, matches,original,exp,arg})
+ arg.default = JSON.parse(arg.default);
+ }
+
  args.push(arg);
  })
  config.arguments = args;
@@ -205,21 +210,24 @@ export function parseArguments(argv_: string[], args: CommandArgumentConfig[] =
  let res = {};
  args.forEach(arg => {
  let val: any = argv_[ arg.position ];
- // val = transformArgumentType<any>(val, arg);
 
  if ( ! val && arg.required ) {
  invalid.push(arg.name);
  }
- // val = transformArgumentType()
+
  if ( arg.variadic ) {
- if ( ! res[ arg.name ] ) {
- res[ arg.name ] = [ val ];
- } else {
- res[ arg.name ].push(val)
+ val = argv_.slice(arg.position, argv_.length);
+ if(arg.default && val.length === 0){
+ val = JSON.parse(arg.default);
  }
- } else {
- res[ arg.name ] = val;
  }
+
+ if(!val && arg.default){
+ val = JSON.parse(arg.default)
+ }
+
+ res[ arg.name ] = transformArgumentType(val, arg);
+
  if ( arg.alias ) {
  res[ arg.alias ] = res[ arg.name ];
  }