Merge pull request tj#31 from aheckmann/objects

ensure objects are created when appropo
focusjs · Feb 8, 2012 · 18f06b0 · 18f06b0
2 parents 1f2bac6 + eddf9f7
commit 18f06b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/querystring.js b/lib/querystring.js
@@ -21,7 +21,7 @@ var toString = Object.prototype.toString;
  * Cache non-integer test regexp.
  */
 
-var notint = /^[^0-9]+$/;
+var isint = /^[0-9]+$/;
 
 function promote(parent, key) {
   if (parent[key].length == 0) return parent[key] = {};
@@ -58,11 +58,11 @@ function parse(parts, parent, key, val) {
       // prop
     } else if (~part.indexOf(']')) {
       part = part.substr(0, part.length - 1);
-      if(notint.test(part) && Array.isArray(obj)) obj = promote(parent, key);
+      if (!isint.test(part) && Array.isArray(obj)) obj = promote(parent, key);
       parse(parts, obj, part, val);
       // key
     } else {
-      if(notint.test(part) && Array.isArray(obj)) obj = promote(parent, key);
+      if (!isint.test(part) && Array.isArray(obj)) obj = promote(parent, key);
       parse(parts, obj, part, val);
     }
   }
@@ -80,7 +80,7 @@ function merge(parent, key, val){
     parse(parts, parent, 'base', val);
     // optimize
   } else {
-    if (notint.test(key) && Array.isArray(parent.base)) {
+    if (!isint.test(key) && Array.isArray(parent.base)) {
       var t = {};
       for (var k in parent.base) t[k] = parent.base[k];
       parent.base = t;

diff --git a/test/parse.js b/test/parse.js
@@ -91,8 +91,12 @@ module.exports = {
 
     qs.parse('user[name][first]=tj&user[name][first]=TJ')
       .should.eql({ user: { name: { first: ['tj', 'TJ'] }}});
+
+    var o = qs.parse('existing[fcbaebfecc][name][last]=tj')
+    o.should.eql({ existing: { 'fcbaebfecc': { name: { last: 'tj' }}}})
+    Array.isArray(o.existing).should.be.false;
   },
-  
+
   'test right-hand brackets': function(){
     qs.parse('pets=["tobi"]')
       .should.eql({ pets: '["tobi"]' });