Merge remote-tracking branch 'upstream/master'

Author: marcelorl

index.js

@@ -63,12 +63,40 @@ QueryString.prototype.parse = function (queryStr) {
 
     queryStr.split('&').forEach((param) => {
         const components = param.split('=');
+        const value = decodeURIComponent(components[1]);
+        var key = decodeURIComponent(components[0]);
 
-        obj[decodeURIComponent(components[0])] = decodeURIComponent(components[1]);
+        //Is the query param an array?
+        if (key.search(/\[([0-9]*)\]/) !== -1) {
+            const indexOfArray = key.slice(-2) !== '[]' ? key.charAt(key.length - 2) : undefined;
+            key = key.slice(0, key.indexOf('['));
+
+            //Does the array already exist in the object
+            if (obj[key]) {
+                if (indexOfArray) {
+                    obj[key][indexOfArray] = value;
+                } else {
+                    obj[key].push(value);
+                }
+            } else {
+                if (indexOfArray) {
+                    obj[key] = [];
+                    obj[key][indexOfArray] = value;
+                } else {
+                    obj[key] = [value];
+                }
+            }
+        } else {
+            obj[key] = value;
+        }
     });
 
     return obj;
 }
 
+QueryString.prototype.extract = function (url) {
+    return url.substring(url.indexOf('?') + 1);
+}
+
 // Export the module
 module.exports = new QueryString();

test.js

@@ -45,5 +45,40 @@ describe('query-stringifier', function () {
             expect(parsed).to.have.property('foo', 'bar');
             expect(parsed).to.have.property('thing', 'thung');
         });
+        it('converts an query string with arrays', function () {
+            var parsed = qs.parse('&arr[]=1&arr[]=2&arr[]=3');
+
+            expect(parsed).to.be.an('object');
+            expect(parsed).to.have.keys(['arr']);
+            expect(parsed).to.deep.equal({ arr: ['1', '2', '3'] });
+        });
+        it('converts an query string with arrays and indexes', function () {
+            var parsed = qs.parse('&arr[2]=1&arr[0]=2&arr[1]=3');
+
+            expect(parsed).to.be.an('object');
+            expect(parsed).to.have.keys(['arr']);
+            expect(parsed).to.deep.equal({ arr: ['2', '3', '1'] });
+        });
     });
+
+    describe('#extract', function () {
+        it('exract the query string of the url', function() {
+            var url = 'www.dummyurl.com?firstqueryparam=first&secondqueryparam=second';
+            var result = qs.extract(url);
+
+            expect(result).to.equal('firstqueryparam=first&secondqueryparam=second');
+        });
+    });
+
+    describe('#extract/#parse', function() {
+        it('extract the query string of the url and parses it', function () {
+            var url = 'www.dummyurl.com?firstqueryparam=first&secondqueryparam=second';
+            var result = qs.parse(qs.extract(url));
+
+            expect(result).to.be.an('object');
+            expect(result).to.have.property('firstqueryparam', 'first');
+            expect(result).to.have.property('secondqueryparam', 'second');
+        });
+    });
+
 });