refactoring getParams

Author: worka

dist/url.js

@@ -40,10 +40,12 @@
                 var row = _query.split('=', 2);
 
                 var key = row[0];
-                var value = row[1] || ''; // @todo обработать массивы с числовыми индексами // const match = key.match(/(.+?)\[(\d*)\]/i);
+                var value = row[1] || '';
+                var match = key.match(/(.+?)\[(\d*)\]/i);
 
-                if (key.substr(-2) === '[]') {
-                    key = key.substr(0, key.length - 2);
+                if (match) {
+                    key = match[1];
+                    var index = match[2];
 
                     if (
                         params[key] === undefined ||
@@ -52,7 +54,11 @@
                         params[key] = [];
                     }
 
-                    params[key].push(value);
+                    if (index === '') {
+                        params[key].push(value);
+                    } else {
+                        params[key][index] = value;
+                    }
                 } else {
                     params[key] = value;
                 }

dist/url.min.js

@@ -1,6 +1,6 @@
 {
     "name": "vanilla-js-url",
-    "version": "2.4.1",
+    "version": "2.5.0",
     "devDependencies": {
         "@babel/core": "^7.9.0",
         "@babel/preset-env": "^7.9.0",
@@ -9,7 +9,7 @@
         "esm": "^3.2.25",
         "jest": "^25.2.7",
         "prettier": "2.0.2",
-        "rollup": "^2.3.2",
+        "rollup": "^2.3.3",
         "rollup-plugin-babel": "^4.4.0"
     },
     "scripts": {

package.json

@@ -20,16 +20,21 @@ export default function _buildParams(query, decode = true) {
             let key = row[0];
             let value = row[1] || '';
 
-            // @todo обработать массивы с числовыми индексами // const match = key.match(/(.+?)\[(\d*)\]/i);
+            const match = key.match(/(.+?)\[(\d*)\]/i);
 
-            if (key.substr(-2) === '[]') {
-                key = key.substr(0, key.length - 2);
+            if (match) {
+                key = match[1];
+                let index = match[2];
 
                 if (params[key] === undefined || !Array.isArray(params[key])) {
                     params[key] = [];
                 }
 
-                params[key].push(value);
+                if (index === '') {
+                    params[key].push(value);
+                } else {
+                    params[key][index] = value;
+                }
             } else {
                 params[key] = value;
             }

src/_buildParams.js

@@ -9,6 +9,9 @@ describe('GET', () => {
         expect(getParams('example.com?bar=1&bar[]=2')).toEqual({ bar: ['2'] });
         expect(getParams('example.com?bar=test+test%2Ctest')).toEqual({ bar: 'test test,test' });
         expect(getParams('example.com?s%5B%5D=4%264&s%5B%5D=3&r=s+s%2Bs')).toEqual({ s: ['4&4', '3'], r: 's s+s' });
+        expect(getParams('example.com?bar[]=0&bar[1]=1&bar[2]=2')).toEqual({ bar: ['0', '1', '2'] });
+        expect(getParams('example.com?too=q&bar[]=1&bar[0]=0&bar[2]=2&foo[]=1&foo[]=2'))
+            .toEqual({ too: 'q', bar: ['0', undefined, '2'], foo: ['1', '2'] });
     });
 
     test('getParamsExtended()', () => {
@@ -32,6 +35,7 @@ describe('ADD', () => {
         expect(addParams('example.com?bar=1&bar[]=2', { bar: [3, 4] })).toBe('example.com?bar[]=2&bar[]=3&bar[]=4');
         expect(addParams('example.com?bar=1&bar=2', { bar: [3, 4] })).toBe('example.com?bar[]=3&bar[]=4');
         expect(addParams('example.com?bar[]=1&bar[]=2', { bar: [3, 4] })).toBe('example.com?bar[]=1&bar[]=2&bar[]=3&bar[]=4');
+        expect(addParams('example.com?bar[0]=1&bar[2]=2', { bar: [3, 4] })).toBe('example.com?bar[]=1&bar[]=2&bar[]=3&bar[]=4');
     });
 
     test('addParamsExtended()', () => {

src/url.test.js

@@ -4226,10 +4226,10 @@ rollup-pluginutils@^2.8.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.3.2.tgz#afa68e4f3325bcef4e150d082056bef450bcac60"
-  integrity sha512-p66+fbfaUUOGE84sHXAOgfeaYQMslgAazoQMp//nlR519R61213EPFgrMZa48j31jNacJwexSAR1Q8V/BwGKBA==
+rollup@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.3.3.tgz#5982df700d7aae8907075ba68122bb57d98e9cd0"
+  integrity sha512-uJ9VNWk80mb4wDCSfd1AyHoSc9TrWbkZtnO6wbsMTp9muSWkT26Dvc99MX1yGCOTvUN1Skw/KpFzKdUDuZKTXA==
   optionalDependencies:
     fsevents "~2.1.2"