flynx/argv.js
1
0
Fork 0
mirror of https://github.com/flynx/argv.js.git synced 2025-10-29 10:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed root value handling...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2020-07-06 20:51:52 +03:00
parent 6c18c1b3a6
commit e4a06832c5
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
argv.js
View File

@ -160,7 +160,6 @@ var afterCallback = function(name){
// NOTE: essentially this parser is a very basic stack language... // NOTE: essentially this parser is a very basic stack language...
// XXX can we implement the whole thing directly as a stack language??? // XXX can we implement the whole thing directly as a stack language???
// //
// XXX need to handle values (and return values) of nested parsers correctly...
// XXX can we add more prefexes, like '+' and the like??? // XXX can we add more prefexes, like '+' and the like???
// XXX might be a good idea to read metadata from package.json // XXX might be a good idea to read metadata from package.json
// XXX should -help should work for any command? // XXX should -help should work for any command?
@ -191,8 +190,9 @@ object.Constructor('Parser', {
// instance stuff... // instance stuff...
argv: null, argv: null,
pre_argv: null, preArgv: null,
rest: null, rest: null,
rootValue: null,
scriptNmae: null, scriptNmae: null,
scriptPath: null, scriptPath: null,
@ -607,7 +607,7 @@ object.Constructor('Parser', {
rest.unshift(main) } rest.unshift(main) }
// normalize the argv... // normalize the argv...
if(main != null){ if(main != null){
parsed.pre_argv = rest.splice(0, rest.indexOf(main)) parsed.preArgv = rest.splice(0, rest.indexOf(main))
rest.includes(main) rest.includes(main)
|| rest.unshift(main) } || rest.unshift(main) }
// script stuff... // script stuff...
@ -643,7 +643,7 @@ object.Constructor('Parser', {
&& parsed.handleArgumentValue) ? && parsed.handleArgumentValue) ?
parsed.handleArgumentValue(handler, value) parsed.handleArgumentValue(handler, value)
: value : value
// required value ... // required value check...
if(handler.valueRequired && value == null){ if(handler.valueRequired && value == null){
handleError('value missing', arg, rest) handleError('value missing', arg, rest)
parsed.printError('value missing:', arg+'=?') parsed.printError('value missing:', arg+'=?')
@ -659,6 +659,11 @@ object.Constructor('Parser', {
[value] [value]
: [])) : []))
// add nested parser result parsed...
// XXX should this be done also for .STOP / .ERROR / ... ???
handler instanceof Parser
&& parsed.handlerDefault(handler, rest, arg, res)
res === module.STOP res === module.STOP
&& parsed.stop(arg, rest) && parsed.stop(arg, rest)
res === module.ERROR res === module.ERROR
@ -766,9 +771,12 @@ object.Constructor('Parser', {
return parsed } return parsed }
// handle root value... // handle root value...
root_value = (root_value && parsed.handleArgumentValue) ? root_value =
(root_value && parsed.handleArgumentValue) ?
parsed.handleArgumentValue(parsed, root_value) parsed.handleArgumentValue(parsed, root_value)
: root_value : root_value
root_value
&& (parsed.rootValue = root_value)
parsed.then(unhandled, root_value, rest) parsed.then(unhandled, root_value, rest)
return parsed }, return parsed },

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ig-argv", "name": "ig-argv",
"version": "2.2.0", "version": "2.2.2",
"description": "simple argv parser", "description": "simple argv parser",
"main": "argv.js", "main": "argv.js",
"scripts": { "scripts": {