From 5a9c087ca2693ac93b48de43d92e9080d5e92b91 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Wed, 1 Jul 2020 13:55:52 +0300
Subject: [PATCH] now arguments passed correctly to merged options + doc update

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 README.md    | 19 +++++++++++++------
 argv.js      | 34 +++++++++++++++++++++++++++-------
 package.json |  2 +-
 test.js      |  3 +++
 4 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index b370607..0d4cd72 100644
--- a/README.md
+++ b/README.md
@@ -17,12 +17,16 @@ This code is an evolution of that parser.
 
 - Simple
 - Supports both the _option_ (a-la `find`) and _command_ (a-la `git`) paradigms
-- Nestable &ndash; parsers can be nested as option/command handlers defining 
-  independent nested contexts
-- Option expansion &ndash; `-abc` expands to `-a -b -c` if `-abc` is not defined
-- Option/command value passing
-- Environment variable option/command values &ndash; env can control option 
-  defaults
+- Nestable  
+  parsers can be nested as option/command handlers defining independent 
+  nested contexts
+- Option expansion  
+  `-abc` expands to `-a -b -c` if `-abc` is not defined
+- Option/command value passing  
+  implicit `-a 123` (requires definition or manual handling) or explicit 
+  `-a=123`
+- Environment variable option/command values  
+  env can control option defaults
 - Reasonable defaults
   - `-help` generator
   - common option aliases
@@ -32,6 +36,9 @@ This code is an evolution of that parser.
   - Customizable error and stop condition handling
 
 
+<!-- XXX ### Alternatives -->
+
+
 ## Installation
 
 ```shell
diff --git a/argv.js b/argv.js
index cbeeabc..30dd6f6 100644
--- a/argv.js
+++ b/argv.js
@@ -199,10 +199,13 @@ object.Constructor('Parser', {
 	isCommand: function(str){
 		return this.commandInputPattern.test(str) 
 			&& (this.commandPrefix + str) in this },
+	// NOTE: this ignores any arguments values present in the key...
 	// NOTE: this ignores options forming alias loops and dead-end 
 	// 		options...
 	handler: function(key){
-		var value
+		// clear arg value...
+		key = key.split(/=/).shift()
+		// option or command?
 		key = this.optionInputPattern.test(key) ?
 			key.replace(this.optionInputPattern, this.optionPrefix+'$1')
 			: key.replace(this.commandInputPattern, this.commandPrefix+'$1')
@@ -231,6 +234,8 @@ object.Constructor('Parser', {
 	helpColumnPrefix: '- ',
 
 	// doc sections...
+	// XXX
+	version: undefined,
 	usage: '$SCRIPTNAME [OPTIONS]',
 	doc: undefined,
 	examples: undefined,
@@ -451,7 +456,8 @@ object.Constructor('Parser', {
 		var opt_pattern = this.optionInputPattern
 
 		// helpers...
-		var runHandler = function(handler, arg, value, rest){
+		var runHandler = function(handler, arg, rest){
+			var [arg, value] = arg.split(/=/)
 			// get option value...
 			value = value 
 				|| ((handler.arg && !opt_pattern.test(rest[0])) ?
@@ -480,7 +486,10 @@ object.Constructor('Parser', {
 					&& this.handleErrorExit
 					&& this.handleErrorExit(arg) }
 			return res }
+		// NOTE: if successful this needs to modify the arg, thus it 
+		// 		returns both the new first arg and the handler...
 		var splitArgs = function(arg, rest){
+			var [arg, value] = arg.split(/=/)
 			// skip single letter unknown options or '--' options...
 			if(arg.length <= 2 
 					|| arg.startsWith(that.optionPrefix.repeat(2))){
@@ -489,14 +498,19 @@ object.Constructor('Parser', {
 			var [a, ...r] = 
 				[...arg.slice(1)]
 					.map(function(e){ return '-'+ e })
+			// push the value to the last arg...
+			value !== undefined
+				&& r.push(r.pop() +'='+ value) 
 			// push new options back to option "stack"...
 			rest.splice(0, 0, ...r)
-			return that.handler(a)[1] }
+			var handler = that.handler(a)[1]
+			return handler 
+				&& [a, handler] }
 
 		var env = new Set()
 		var unhandled = []
 		while(rest.length > 0){
-			var [arg, value] = rest.shift().split(/=/)
+			var arg = rest.shift()
 			var type = opt_pattern.test(arg) ?
 					'opt'
 				: this.isCommand(arg) ?
@@ -505,18 +519,24 @@ object.Constructor('Parser', {
 			// options / commands...
 			if(type != 'unhandled'){
 				// get handler...
+				// XXX revise -- arg replacement feels clunky...
 				var handler = this.handler(arg)[1]
-					// handle merged options...
+					// handle merged options
+					// NOTE: if successful returns array...
 					|| (type == 'opt' 
 						&& this.splitOptions
 						&& splitArgs(arg, rest))
-					// dynamic/error...
+					// dynamic or error...
 					|| this.handleArgument
+				// normalize output of splitArgs(..)
+				;[arg, handler] = handler instanceof Array ?
+					handler
+					: [arg, handler]
 				// env handler called...
 				handler.env
 					&& env.add(handler)
 
-				var res = runHandler(handler, arg, value, rest)
+				var res = runHandler(handler, arg, rest)
 
 				// handle stop conditions...
 				if(res === module.STOP || res === module.ERROR){
diff --git a/package.json b/package.json
index 119cb91..2b8f3a9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ig-argv",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "simple argv parser",
   "main": "argv.js",
   "scripts": {
diff --git a/test.js b/test.js
index dabdf72..a7f4ab4 100644
--- a/test.js
+++ b/test.js
@@ -56,6 +56,9 @@ argv.Parser({
 		}).then(function(){
 			console.log('NESTED DONE', ...arguments) }),
 
+		'-': function(){
+			console.log('OPTION: "-"') },
+
 		// these aliases will not get shown...
 
 		// dead-end alias...