Minimist version update

.gitignore

@@ -0,0 +1 @@
+node_modules

index.js

@@ -3,16 +3,16 @@ var minimist = require('minimist');
 module.exports = function parse (args, opts) {
     var level = 0, index;
     var args_ = [];
-    
+
     for (var i = 0; i < args.length; i++) {
         if (typeof args[i] === 'string' && /^\[/.test(args[i])) {
             if (level ++ === 0) {
                 index = i;
             }
         }
-        if (typeof args[i] === 'string' && /\]$/.test(args[i])) {
+        if (typeof args[i] === 'string' && /^\[?[^\[]*\]$/.test(args[i])) {
             if (-- level > 0) continue;
-            
+
             var sub = args.slice(index, i + 1);
             if (typeof sub[0] === 'string') {
                 sub[0] = sub[0].replace(/^\[/, '');
@@ -24,12 +24,12 @@ module.exports = function parse (args, opts) {
                 sub[n] = sub[n].replace(/\]$/, '');
             }
             if (sub[n] === '') sub.pop();
-            
+
             args_.push(parse(sub));
         }
         else if (level === 0) args_.push(args[i]);
     }
-    
+
     var argv = minimist(args_, opts);
     return argv;
 };

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@minimistjs/subarg",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "parse arguments with recursive contexts",
   "main": "index.js",
   "dependencies": {
-    "minimist": "^1.1.0"
+    "minimist": "^1.2.8"
   },
   "devDependencies": {
     "tape": "^3.0.0"

test/inlineBrackets.js

@@ -0,0 +1,133 @@
+var subarg = require('..');
+var test = require('tape');
+
+test('inline brackets', function (t) {
+    t.plan(7);
+
+    t.deepEqual(
+        subarg('http://localhost\?q=\[1\]'.split(/\s+/)),
+        {
+            _: [ 'http://localhost?q=[1]' ]
+        }
+    )
+
+    t.deepEqual(
+        subarg('beep -t [ boop -o a.txt -u http://localhost -u http://localhost\?q=\[1\] -q]'.split(/\s+/)),
+        {
+            _: [ 'beep'],
+            t: {
+                _: [ 'boop' ],
+                o: 'a.txt',
+                u: [ 'http://localhost', 'http://localhost?q=[1]' ],
+                q: true
+            }
+        }
+    )
+
+    t.deepEqual(
+        subarg('beep -t [boop -o a.txt -u http://localhost -u http://localhost\?q=\[1\] -q -o b.txt]'.split(/\s+/)),
+        {
+            _: [ 'beep'],
+            t: {
+                _: [ 'boop' ],
+                o: [ 'a.txt', 'b.txt' ],
+                u: [ 'http://localhost', 'http://localhost?q=[1]' ],
+                q: true
+            }
+        }
+    )
+
+    t.deepEqual(
+        subarg('beep -t [ boop -o a.txt -u http://localhost -u http://localhost\?q=\[1\] ]'.split(/\s+/)),
+        {
+            _: [ 'beep'],
+            t: {
+                _: [ 'boop' ],
+                o: 'a.txt',
+                u: [ 'http://localhost', 'http://localhost?q=[1]' ]
+            }
+        }
+    )
+
+    t.deepEqual(
+        subarg('beep -t [boop -o a.txt -u http://localhost\?q=\[1\] -u http://localhost]'.split(/\s+/)),
+        {
+            _: [ 'beep'],
+            t: {
+                _: [ 'boop' ],
+                o: 'a.txt',
+                u: [ 'http://localhost?q=[1]', 'http://localhost' ]
+            }
+        }
+    )
+
+    t.deepEqual(
+        subarg('beep -t [ boop -o a.txt -u [beep] ]'.split(/\s+/)),
+        {
+            _: [ 'beep'],
+            t: {
+                _: [ 'boop' ],
+                o: 'a.txt',
+                u: {
+                    _: [ 'beep' ]
+                }
+            }
+        }
+    )
+
+    t.deepEqual(
+        subarg('beep -t [boop] -u [ be[ep] ]'.split(/\s+/)),
+        {
+            _: [ 'beep'],
+            t: {
+                _: [ 'boop' ]
+            },
+            u: {
+                _: [ 'be[ep]' ]
+            }
+        }
+    )
+});
+
+test.skip('doesnt work', function (t) {
+    t.plan(2);
+    /*
+     *  expected:
+     *    { _: [ 'beep' ], t: { _: [ 'boop' ], o: 'a.txt', u: [ 'http://localhost', 'http://localhost?q=[1]' ] } }
+     *  actual:
+     *    { _: [ 'beep' ], t: true }
+     *
+    */
+    t.deepEqual(
+        subarg('beep -t [boop -o a.txt -u http://localhost -u http://localhost\?q=\[1\]]'.split(/\s+/)),
+        {
+            _: [ 'beep'],
+            t: {
+                _: [ 'boop' ],
+                o: 'a.txt',
+                u: [ 'http://localhost', 'http://localhost?q=[1]' ]
+            }
+        }
+    )
+
+    t.deepEqual(
+        subarg('beep -t [ boop -o a.txt -u [ be[ep]] ]'.split(/\s+/)),
+        {
+            /* Same as above - note the context-closing bracket is right next to an inline closing bracket
+             * If you add a space, it works
+             *  expected:
+             *    { _: [ 'beep' ], t: { _: [ 'boop' ], o: 'a.txt', u: { _: [ 'be[ep]' ] } } }
+             *  actual:
+             *    { _: [ 'beep' ], t: true }
+            */
+            _: [ 'beep'],
+            t: {
+                _: [ 'boop' ],
+                o: 'a.txt',
+                u: {
+                    _: [ 'be[ep]' ]
+                }
+            }
+        }
+    )
+});