query-string 2.2.0 → 2.4.2

package/index.js

@@ -1,4 +1,9 @@
 'use strict';
+var strictUriEncode = require('strict-uri-encode');
+
+exports.extract = function (str) {
+	return str.split('?')[1] || '';
+};
 
 exports.parse = function (str) {
 	if (typeof str !== 'string') {
@@ -11,12 +16,15 @@ exports.parse = function (str) {
 		return {};
 	}
 
-	return str.trim().split('&').reduce(function (ret, param) {
+	return str.split('&').reduce(function (ret, param) {
 		var parts = param.replace(/\+/g, ' ').split('=');
-		var key = parts[0];
-		var val = parts[1];
+		// Firefox (pre 40) decodes `%3D` to `=`
+		// https://github.com/sindresorhus/query-string/pull/37
+		var key = parts.shift();
+		var val = parts.length > 0 ? parts.join('=') : undefined;
 
 		key = decodeURIComponent(key);
+
 		// missing `=` should be `null`:
 		// http://w3.org/TR/2012/WD-url-20120524/#collect-url-parameters
 		val = val === undefined ? null : decodeURIComponent(val);
@@ -39,10 +47,12 @@ exports.stringify = function (obj) {
 
 		if (Array.isArray(val)) {
 			return val.sort().map(function (val2) {
-				return encodeURIComponent(key) + '=' + encodeURIComponent(val2);
+				return strictUriEncode(key) + '=' + strictUriEncode(val2);
 			}).join('&');
 		}
 
-		return encodeURIComponent(key) + '=' + encodeURIComponent(val);
+		return strictUriEncode(key) + '=' + strictUriEncode(val);
+	}).filter(function (x) {
+		return x.length > 0;
 	}).join('&') : '';
 };

package/package.json

@@ -1,7 +1,23 @@
 {
   "name": "query-string",
-  "version": "2.2.0",
+  "version": "2.4.2",
   "description": "Parse and stringify URL query strings",
+  "license": "MIT",
+  "repository": "sindresorhus/query-string",
+  "author": {
+    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "xo && ava"
+  },
+  "files": [
+    "index.js"
+  ],
   "keywords": [
     "browser",
     "querystring",
@@ -17,23 +33,11 @@
     "encode",
     "decode"
   ],
-  "license": "MIT",
-  "author": {
-    "name": "Sindre Sorhus",
-    "email": "sindresorhus@gmail.com",
-    "url": "sindresorhus.com"
-  },
-  "files": [
-    "index.js"
-  ],
-  "repository": "sindresorhus/query-string",
-  "scripts": {
-    "test": "mocha"
+  "dependencies": {
+    "strict-uri-encode": "^1.0.0"
   },
   "devDependencies": {
-    "mocha": "*"
-  },
-  "engines": {
-    "node": ">=0.10.0"
+    "ava": "*",
+    "xo": "*"
   }
 }

package/readme.md

@@ -13,19 +13,19 @@ $ npm install --save query-string
 ## Usage
 
 ```js
-var queryString = require('query-string');
+const queryString = require('query-string');
 
 console.log(location.search);
-//=> ?foo=bar
+//=> '?foo=bar'
 
-var parsed = queryString.parse(location.search);
+const parsed = queryString.parse(location.search);
 console.log(parsed);
 //=> {foo: 'bar'}
 
 console.log(location.hash);
-//=> #token=bada55cafe
+//=> '#token=bada55cafe'
 
-var parsedHash = queryString.parse(location.hash);
+const parsedHash = queryString.parse(location.hash);
 console.log(parsedHash);
 //=> {token: 'bada55cafe'}
 
@@ -35,35 +35,39 @@ parsed.ilike = 'pizza';
 location.search = queryString.stringify(parsed);
 
 console.log(location.search);
-//=> ?foo=unicorn&ilike=pizza
+//=> '?foo=unicorn&ilike=pizza'
 ```
 
 
 ## API
 
-### queryString.parse(*string*)
+### .parse(*string*)
 
 Parse a query string into an object. Leading `?` or `#` are ignored, so you can pass `location.search` or `location.hash` directly.
 
-### queryString.stringify(*object*)
+### .stringify(*object*)
 
 Stringify an object into a query string, sorting the keys.
 
+### .extract(*string*)
+
+Extract a query string from a URL that can be passed into `.parse()`.
+
 
 ## Nesting
 
-This module intentionally doesn't support nesting as it's not specced and varies between implementations, which causes a lot of [edge cases](https://github.com/visionmedia/node-querystring/issues).
+This module intentionally doesn't support nesting as it's not spec'd and varies between implementations, which causes a lot of [edge cases](https://github.com/visionmedia/node-querystring/issues).
 
 You're much better off just converting the object to a JSON string:
 
 ```js
 queryString.stringify({
-  foo: 'bar',
-  nested: JSON.stringify({
-    unicorn: 'cake'
-  })
+	foo: 'bar',
+	nested: JSON.stringify({
+		unicorn: 'cake'
+	})
 });
-//=> foo=bar&nested=%7B%22unicorn%22%3A%22cake%22%7D
+//=> 'foo=bar&nested=%7B%22unicorn%22%3A%22cake%22%7D'
 ```