@@ -8,6 +8,7 @@ class Configuration {
88 }
99
1010 static get ( key ) {
11+ Configuration . load ( )
1112 return process . env [ key ]
1213 }
1314}
@@ -31,18 +32,33 @@ class Logger {
3132class FlagsProcessor {
3233 static formatFlagsString ( args ) {
3334 if ( ! Array . isArray ( args ) || args . length === 0 ) return ""
35+ let lastIsAttr = false
36+ let isPreviousDump = false
3437
35- return args . map ( ( token , index ) =>
36- index === args . length - 1 ? token : index % 2 === 0 ? `${ token } ` : `${ token } +`
37- ) . join ( "" )
38+ return args . map ( ( token , index ) => {
39+ if ( index === 0 ) return token
40+ if ( token . startsWith ( "-" ) || isPreviousDump ) {
41+ lastIsAttr = true
42+ if ( token . includes ( "dump" ) ) { isPreviousDump = true } else { isPreviousDump = false }
43+ return "+" + token
44+ }
45+
46+ lastIsAttr = false
47+ return ";" + token
48+ } ) . join ( "" )
3849 }
3950
4051 static parseFlags ( flags ) {
4152 const paramWithValue = flags . split ( "+" )
4253 const flagsObject = { }
4354 paramWithValue . forEach ( token => {
44- const [ attr , value ] = token . split ( "" )
45- flagsObject [ attr ] = value
55+ let [ attr , value ] = token . split ( ";" )
56+ if ( ! value ) value = true
57+ if ( attr . startsWith ( "--" ) ) {
58+ flagsObject [ attr . slice ( 2 ) ] = value
59+ } else {
60+ flagsObject [ attr . slice ( 1 ) ] = value
61+ }
4662 } )
4763 return flagsObject
4864 }
@@ -160,8 +176,9 @@ class Ewtools {
160176 this . validateArgs ( )
161177 Logger . log ( this . args , Logger . Types . INFO )
162178 Logger . log ( this . flags , Logger . Types . INFO )
179+ Logger . log ( FlagsProcessor . formatFlagsString ( this . restArgs ) , Logger . Types . INFO )
163180
164- switch ( this . action ) {
181+ if ( ! this . flags . dump && ! this . flags . dp ) switch ( this . action ) {
165182 case FileHandler . ActionTypes . MAKE :
166183 this . handleMake ( )
167184 break
@@ -201,7 +218,6 @@ class Ewtools {
201218 }
202219}
203220
204- Configuration . load ( )
205221const args = process . argv . slice ( 2 )
206222
207223if ( args . length <= 0 ) {
0 commit comments