From 5ca866263a294047541091fe3b5eacc7e090c430 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Mon, 29 Jun 2020 02:51:06 +0300
Subject: [PATCH] several minor fixes...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 argv.js      | 33 ++++++++++++++++++++++-----------
 package.json |  2 +-
 test.js      |  2 +-
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/argv.js b/argv.js
index 0dabb48..9a3440e 100644
--- a/argv.js
+++ b/argv.js
@@ -349,6 +349,16 @@ object.Constructor('Parser', {
 
 	// post parsing callbacks...
 	//
+	// 	.then(callback(unhandleed))
+	//
+	// 	.stop(callback(arg))
+	//
+	// 	.error(callback(arg))
+	//
+	//
+	// XXX need to document the arguments to each handler/callback...
+	// XXX .then(..) passes the full list of unhandleed args including 
+	// 		argv[0] and argv[1]...
 	then: afterCallback('parsing'),
 	stop: afterCallback('stop'),
 	error: afterCallback('error'),
@@ -366,15 +376,17 @@ object.Constructor('Parser', {
 		var nested = false
 
 		// default argv...
-		argv = argv == null ?
-			process.argv.slice()
-			: argv
-		// XXX ARGV: strip out the interpreter if it is given...
+		argv = (argv == null ?
+				process.argv
+				: argv)
+			.slice()
+		var rest = this.rest = argv.slice()
+
+		// XXX ARGV: strip out the interpreter if it is given... (???)
 
 		// nested command handler...
 		// XXX the condition is a bit too strong...
 		if(context instanceof Parser){
-			var rest = this.rest = argv.slice()
 			this.script = this.scriptName = 
 				context.scriptName +' '+ arguments[2]
 			this.argv = [context.scriptName, this.scriptName, ...argv]
@@ -382,7 +394,6 @@ object.Constructor('Parser', {
 
 		// root parser...
 		} else {
-			var rest = this.rest = argv.slice()
 			this.argv = argv.slice()
 			// XXX ARGV: revise this...
 			// 		- when run from node -- [<node>, <script>, ...]
@@ -396,8 +407,8 @@ object.Constructor('Parser', {
 		var opt_pattern = this.optionInputPattern
 
 		var unhandled = []
-		while(argv.length > 0){
-			var [arg, value] = argv.shift().split(/=/)
+		while(rest.length > 0){
+			var [arg, value] = rest.shift().split(/=/)
 			var type = opt_pattern.test(arg) ?
 					'opt'
 				: this.isCommand(arg) ?
@@ -410,8 +421,8 @@ object.Constructor('Parser', {
 						|| this.handleArgument
 				// get option value...
 				value = value 
-					|| ((handler.arg && !opt_pattern.test(argv[0])) ?
-							argv.shift()
+					|| ((handler.arg && !opt_pattern.test(rest[0])) ?
+							rest.shift()
 						: undefined)
 				// value conversion...
 				value = value && this.handleArgumentValue ?
@@ -422,7 +433,7 @@ object.Constructor('Parser', {
 						handler
 						: handler.handler)
 					.call(this, 
-						argv,
+						rest,
 						arg,
 						...(value ? [value] : []))
 				// handle .STOP / .ERROR
diff --git a/package.json b/package.json
index bf5e6d9..9093522 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ig-argv",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "simple argv parser",
   "main": "argv.js",
   "scripts": {
diff --git a/test.js b/test.js
index 527b71c..0445131 100644
--- a/test.js
+++ b/test.js
@@ -67,7 +67,7 @@ argv.Parser({
 		'-c': '-a',
 	})
 	.then(function(){
-		console.log('DONE') })
+		console.log('DONE', ...arguments) })
 	.stop(function(){
 		console.log('STOP') })
 	.error(function(){