From 679437a822a915efa7f6e0606b6121a56262c5e7 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Tue, 16 Jun 2020 15:48:43 +0300
Subject: [PATCH] some fixes + nesting works, still need to think and
 simplify...

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

diff --git a/argv.js b/argv.js
index d30a2d0..25a064a 100644
--- a/argv.js
+++ b/argv.js
@@ -288,6 +288,11 @@ object.Constructor('Parser', {
 
 	// Handler API...
 	// XXX should these be .getOptions(..) / .getCommands(..) ???
+	// Format:
+	// 	[
+	// 		[<keys>, <arg>, <doc>, <handler>],
+	// 		...
+	// 	]
 	options: function(...prefix){
 		var that = this
 		prefix = prefix.length == 0 ?
@@ -298,7 +303,6 @@ object.Constructor('Parser', {
 				var handlers = {}
 				object.deepKeys(that, Parser.prototype)
 					.forEach(function(opt){
-						// XXX
 						if(!opt.startsWith(prefix)){
 							return }
 						var [k, h] = that.getHandler(opt)
@@ -306,7 +310,20 @@ object.Constructor('Parser', {
 							handlers[k][0].push(opt)
 							: (handlers[k] = [[opt], h.arg, h.doc || k.slice(1), h]) })
 				return Object.values(handlers) })
-			.flat(1) },
+			.flat(1) 
+			.map(function(e, i){ return [e, i] })
+			.sort(function([a, ai], [b, bi]){
+				a = a[3].priority
+				b = b[3].priority
+				return a != null && b != null ?
+						b - a
+					// positive priority above order, negative below...
+					: (a > 0 || b < 0) ?
+						-1
+					: (b < 0 || a > 0) ?
+						1
+					: ai - bi })
+			.map(function([e, _]){ return e }) },
 	commands: function(){
 		return this.options(this.commandPrefix) },
 
@@ -360,6 +377,7 @@ object.Constructor('Parser', {
 	'-h': '-help',
 	'-help': {
 		doc: 'print this message and exit.',
+		priority: 99,
 		// XXX argv is first for uniformity with .__call__(..) -- need 
 		// 		the two to be interchangeable...
 		// 		...an alternative would keep it last, but this feels more fragile...
@@ -432,11 +450,34 @@ object.Constructor('Parser', {
 		process.exit(1) }, 
 
 
-	__call__: function(_, argv){
-		var rest = this.rest = argv.slice()
-		this.argv = argv.slice()
-		this.script = rest[0]
-		this.scriptName = rest.shift().split(/[\\\/]/).pop()
+	// XXX need to unify this with handler as much as possible to make
+	// 		parsers nestable....
+	// 		there are differences that can't be avoided:
+	// 			- argv/rest -- argv includes 2 extra args:
+	// 				- interpreter
+	// 				- script
+	// 		...these should be either avoided or "inherited"	
+	__call__: function(context, argv){
+		// 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]
+
+		// root parser...
+		} else {
+			var rest = this.rest = argv.slice()
+			this.argv = argv.slice()
+			// XXX revise this...
+			// 		- when run from node -- [<node>, <script>, ...]
+			// 		- when run from electron -- [<electron>, ...]
+			// 			require('electron').remove.process.argv
+			this.interpreter = rest.shift()
+			this.script = rest[0]
+			this.scriptName = rest.shift().split(/[\\\/]/).pop()
+		}
 
 		var opt_pattern = this.optionPattern
 
@@ -462,10 +503,9 @@ object.Constructor('Parser', {
 						handler
 						: handler.handler)
 					.call(this, 
-						// pass value...
-						...(handler.arg ? [value] : []), 
-						arg, 
-						argv)
+						argv,
+						arg,
+						...(handler.arg ? [value] : []))
 				continue }
 			// other...
 			other.push(arg) }
@@ -475,10 +515,8 @@ object.Constructor('Parser', {
 		Object.assign(this, spec)
 
 		// check for alias loops...
-		this.__pre_check__
-			&& this.__getoptions__(
-				this.__opt_pattern__ || module.OPTION_PATTERN,
-				this.__cmd_pattern__ || module.COMMAND_PATTERN)
+		this.initCheck
+			&& this.options(this.optionPrefix, this.commandPrefix)
 	},
 })
 
diff --git a/package.json b/package.json
index daccd6e..ff07cf2 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,6 @@
   "homepage": "https://github.com/flynx/argv.js#readme",
   "dependencies": {
     "colors": "^1.4.0",
-    "ig-object": "^5.0.12"
+    "ig-object": "^5.0.13"
   }
 }
diff --git a/test.js b/test.js
index bfa58d9..3bd1ce0 100644
--- a/test.js
+++ b/test.js
@@ -17,7 +17,9 @@ var argv = require('./argv')
 //---------------------------------------------------------------------
 
 
-var p = argv.Parser({
+var p = 
+module.p =
+argv.Parser({
 	'@help': '-help',
 
 	'-v': '-verbose',
@@ -28,13 +30,27 @@ var p = argv.Parser({
 
 	'-c': '@command',
 	'@cmd': '@command',
-	'@command': function(){
-		console.log('>>> COMMAND:', ...arguments)
-		return 'command'
+	'@command': {
+		priority: -50,
+		handler: function(){
+			console.log('>>> COMMAND:', ...arguments)
+			return 'command'
+		},
 	},
+
+	// XXX this for some reason breaks...
+	//'@test': argv.Parser({
+	//}),
+
+	'@nested': argv.Parser({
+		doc: 'nested parser.',
+
+	}),
 })
 
 
+
+/*
 console.log('  ->', p(['test', '--verbose', 'a', 'b', 'c']))
 
 console.log('  ->', p(['test', '-c', 'a', 'b', 'c']))
@@ -43,8 +59,18 @@ console.log('  ->', p(['test', 'command', 'a', 'b', 'c']))
 
 console.log('---')
 
-p(['test', '-h'])
 
+p(['test', 'nested', '-h'])
+
+
+p(['test', '-h'])
+//*/
+
+if(typeof(__filename) != 'undefined'
+		&& __filename == (require.main || {}).filename){
+
+	p(process.argv)
+}
 
 
 /**********************************************************************