Don't overwrite null values

ljharb · Aug 14, 2014 · 3cd85c4 · 3cd85c4
1 parent 8e8baa5
commit 3cd85c4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/lib/parse.js b/lib/parse.js
@@ -153,5 +153,3 @@ module.exports = function (str, depth, delimiter) {
 
     return Utils.compact(obj);
 };
-
-
diff --git a/lib/utils.js b/lib/utils.js
@@ -106,7 +106,7 @@ exports.decode = function (str) {
 
 exports.compact = function (obj) {
 
-    if (typeof obj !== 'object') {
+    if (typeof obj !== 'object' || obj === null) {
         return obj;
     }
 

diff --git a/test/parse.js b/test/parse.js
@@ -192,7 +192,7 @@ describe('#parse', function () {
         done();
     });
 
-    it('should compact sparse arrays', function (done) {
+    it('compacts sparse arrays', function (done) {
 
         expect(Qs.parse('a[10]=1&a[2]=2')).to.deep.equal({ a: ['2', '1'] });
         done();
@@ -253,9 +253,29 @@ describe('#parse', function () {
         done();
     });
 
-    it('should not use non-string objects as delimiters', function (done) {
+    it('does not use non-string objects as delimiters', function (done) {
 
         expect(Qs.parse('a=b&c=d', {})).to.deep.equal({ a: 'b', c: 'd' });
         done();
     });
+
+    it('parses an object', function (done) {
+
+        var input = {
+            "user[name]": {"pop[bob]": 3},
+            "user[email]": null
+        };
+
+        var expected = {
+            "user": {
+                "name": {"pop[bob]": 3},
+                "email": null
+            }
+        };
+
+        var result = Qs.parse(input);
+
+        expect(result).to.deep.equal(expected);
+        done();
+    });
 });