Correctly handle query strings that contain =

index.js

@@ -1,6 +1,7 @@
 'use strict';
 const strictUriEncode = require('strict-uri-encode');
 const decodeComponent = require('decode-uri-component');
+const splitOnFirst = require('split-on-first');
 
 function encoderForArrayFormat(options) {
 	switch (options.arrayFormat) {
@@ -150,7 +151,7 @@ function parse(input, options) {
 	}
 
 	for (const param of input.split('&')) {
-		let [key, value] = param.replace(/\+/g, ' ').split('=');
+		let [key, value] = splitOnFirst(param.replace(/\+/g, ' '), '=');
 
 		// Missing `=` should be `null`:
 		// http://w3.org/TR/2012/WD-url-20120524/#collect-url-parameters

package.json

@@ -42,6 +42,7 @@
 		"ava": "^1.2.1",
 		"deep-equal": "^1.0.1",
 		"fast-check": "^1.5.0",
+		"split-on-first": "^1.0.0",
 		"tsd-check": "^0.3.0",
 		"xo": "^0.24.0"
 	}

test/parse-url.js

@@ -13,6 +13,11 @@ test('handles strings not containing query string', t => {
 	t.deepEqual(m.parseUrl(''), {url: '', query: {}});
 });
 
+test('handles strings with query string that contain =', t => {
+	t.deepEqual(m.parseUrl('https://foo.bar?foo=baz=bar&foo=baz#top'), {url: 'https://foo.bar', query: {foo: ['baz=bar', 'baz']}});
+	t.deepEqual(m.parseUrl('https://foo.bar?foo=bar=&foo=baz='), {url: 'https://foo.bar', query: {foo: ['bar=', 'baz=']}});
+});
+
 test('throws for invalid values', t => {
 	t.throws(() => {
 		m.parseUrl(null);

test/parse.js

@@ -122,6 +122,11 @@ test('query strings having indexed arrays and format option as `index`', t => {
 	}), {foo: ['bar', 'baz']});
 });
 
+test('query strings having = within parameters (i.e. GraphQL IDs)', t => {
+	t.deepEqual(m.parse('foo=bar=&foo=ba=z=', {
+	}), {foo: ['bar=', 'ba=z=']});
+});
+
 test('query strings having ordered index arrays and format option as `index`', t => {
 	t.deepEqual(m.parse('foo[1]=bar&foo[0]=baz&foo[3]=one&foo[2]=two', {
 		arrayFormat: 'index'