avoid breaking change by handling comma separation outside of decoder

ljharb · Mar 22, 2020 · 8aa59b6 · 8aa59b6
1 parent 756f1e1
commit 8aa59b6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/parse.js b/lib/parse.js
@@ -85,7 +85,15 @@ var parseValues = function parseQueryStringValues(str, options) {
             val = options.strictNullHandling ? null : '';
         } else {
             key = options.decoder(part.slice(0, pos), defaults.decoder, charset, 'key');
-            val = options.decoder(part.slice(pos + 1), defaults.decoder, charset, 'value', options.comma);
+            var encodedVal = part.slice(pos + 1);
+            if (options.comma && encodedVal.indexOf(',') !== -1) {
+                val = encodedVal.split(',')
+                    .map(function (encodedFragment) {
+                        return options.decoder(encodedFragment, defaults.decoder, charset, 'value');
+                    });
+            } else {
+                val = options.decoder(encodedVal, defaults.decoder, charset, 'value');
+            }
         }
 
         if (val && options.interpretNumericEntities && charset === 'iso-8859-1') {

diff --git a/lib/utils.js b/lib/utils.js
@@ -106,19 +106,14 @@ var assign = function assignSingleSource(target, source) {
     }, target);
 };
 
-var decode = function (str, decoder, charset, key, comma) {
+var decode = function (str, decoder, charset) {
     var strWithoutPlus = str.replace(/\+/g, ' ');
     if (charset === 'iso-8859-1') {
         // unescape never throws, no try...catch needed:
         return strWithoutPlus.replace(/%[0-9a-f]{2}/gi, unescape);
     }
     // utf-8
     try {
-        if (comma && strWithoutPlus.indexOf(',') > -1) {
-            return strWithoutPlus.split(',').map(function (withoutPlusItem) {
-                return decodeURIComponent(withoutPlusItem);
-            });
-        }
         return decodeURIComponent(strWithoutPlus);
     } catch (e) {
         return strWithoutPlus;