Add arrayFormat option

This commit removes the indices option in favor of the arrayFormat
option. arrayFormat may be either "indices", "repeat", or "brackets".
It defaults to indices.

Author: mjackson

lib/stringify.js

@@ -7,11 +7,21 @@ var Utils = require('./utils');
 
 var internals = {
     delimiter: '&',
-    indices: true
+    arrayPrefixGenerators: {
+        brackets: function (prefix, key) {
+            return prefix + '[]';
+        },
+        indices: function (prefix, key) {
+            return prefix + '[' + key + ']';
+        },
+        repeat: function (prefix, key) {
+            return prefix;
+        }
+    }
 };
 
 
-internals.stringify = function (obj, prefix, options) {
+internals.stringify = function (obj, prefix, generateArrayPrefix) {
 
     if (Utils.isBuffer(obj)) {
         obj = obj.toString();
@@ -39,13 +49,11 @@ internals.stringify = function (obj, prefix, options) {
     var objKeys = Object.keys(obj);
     for (var i = 0, il = objKeys.length; i < il; ++i) {
         var key = objKeys[i];
-        if (!options.indices &&
-            Array.isArray(obj)) {
-
-            values = values.concat(internals.stringify(obj[key], prefix, options));
+        if (Array.isArray(obj)) {
+            values = values.concat(internals.stringify(obj[key], generateArrayPrefix(prefix, key), generateArrayPrefix));
         }
         else {
-            values = values.concat(internals.stringify(obj[key], prefix + '[' + key + ']', options));
+            values = values.concat(internals.stringify(obj[key], prefix + '[' + key + ']', generateArrayPrefix));
         }
     }
 
@@ -57,7 +65,6 @@ module.exports = function (obj, options) {
 
     options = options || {};
     var delimiter = typeof options.delimiter === 'undefined' ? internals.delimiter : options.delimiter;
-    options.indices = typeof options.indices === 'boolean' ? options.indices : internals.indices;
 
     var keys = [];
 
@@ -67,10 +74,18 @@ module.exports = function (obj, options) {
         return '';
     }
 
+    var generateArrayPrefix;
+    if (options.arrayFormat in internals.arrayPrefixGenerators) {
+        generateArrayPrefix = internals.arrayPrefixGenerators[options.arrayFormat];
+    }
+    else {
+        generateArrayPrefix = internals.arrayPrefixGenerators.indices;
+    }
+
     var objKeys = Object.keys(obj);
     for (var i = 0, il = objKeys.length; i < il; ++i) {
         var key = objKeys[i];
-        keys = keys.concat(internals.stringify(obj[key], key, options));
+        keys = keys.concat(internals.stringify(obj[key], key, generateArrayPrefix));
     }
 
     return keys.join(delimiter);

test/stringify.js

@@ -42,9 +42,9 @@ describe('stringify()', function () {
         done();
     });
 
-    it('omits array indices when asked', function (done) {
+    it('omits array indices when arrayFormat=repeat', function (done) {
 
-        expect(Qs.stringify({ a: ['b', 'c', 'd'] }, { indices: false })).to.equal('a=b&a=c&a=d');
+        expect(Qs.stringify({ a: ['b', 'c', 'd'] }, { arrayFormat: 'repeat' })).to.equal('a=b&a=c&a=d');
         done();
     });
 
@@ -54,16 +54,22 @@ describe('stringify()', function () {
         done();
     });
 
+    it('uses brackets when arrayFormat=brackets', function (done) {
+
+        expect(Qs.stringify({ a: { b: ['c', 'd'] } }, { arrayFormat: 'brackets' })).to.equal('a%5Bb%5D%5B%5D=c&a%5Bb%5D%5B%5D=d');
+        done();
+    });
+
     it('stringifies an object inside an array', function (done) {
 
         expect(Qs.stringify({ a: [{ b: 'c' }] })).to.equal('a%5B0%5D%5Bb%5D=c');
         expect(Qs.stringify({ a: [{ b: { c: [1] } }] })).to.equal('a%5B0%5D%5Bb%5D%5Bc%5D%5B0%5D=1');
         done();
     });
 
-    it('does not omit object keys when indices = false', function (done) {
+    it('does not omit object keys when arrayFormat=repeat', function (done) {
 
-        expect(Qs.stringify({ a: [{ b: 'c' }] }, { indices: false })).to.equal('a%5Bb%5D=c');
+        expect(Qs.stringify({ a: [{ b: 'c' }] }, { arrayFormat: 'repeat' })).to.equal('a%5Bb%5D=c');
         done();
     });