qs 0.6.1 → 0.6.5

package/index.js

@@ -1,10 +1,15 @@
-
 /**
  * Object#toString() ref for stringify().
  */
 
 var toString = Object.prototype.toString;
 
+/**
+ * Object#hasOwnProperty ref
+ */
+
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+
 /**
  * Array#indexOf shim.
  */
@@ -76,7 +81,11 @@ var isint = /^[0-9]+$/;
 function promote(parent, key) {
   if (parent[key].length == 0) return parent[key] = createObject();
   var t = createObject();
-  for (var i in parent[key]) t[i] = parent[key][i];
+  for (var i in parent[key]) {
+    if (hasOwnProperty.call(parent[key], i)) {
+      t[i] = parent[key][i];
+    }
+  }
   parent[key] = t;
   return t;
 }
@@ -141,16 +150,64 @@ function merge(parent, key, val){
   return parent;
 }
 
+/**
+ * Compact sparse arrays.
+ */
+
+function compact(obj) {
+  if ('object' != typeof obj) return obj;
+
+  if (isArray(obj)) {
+    var ret = [];
+
+    for (var i in obj) {
+      if (hasOwnProperty.call(obj, i)) {
+        ret.push(obj[i]);
+      }
+    }
+
+    return ret;
+  }
+
+  for (var key in obj) {
+    obj[key] = compact(obj[key]);
+  }
+
+  return obj;
+}
+
+/**
+ * Restore Object.prototype.
+ * see pull-request #58
+ */
+
+function restoreProto(obj) {
+  if (!Object.create) return obj;
+  if (isArray(obj)) return obj;
+  if (obj && 'object' != typeof obj) return obj;
+
+  for (var key in obj) {
+    if (hasOwnProperty.call(obj, key)) {
+      obj[key] = restoreProto(obj[key]);
+    }
+  }
+
+  obj.__proto__ = Object.prototype;
+  return obj;
+}
+
 /**
  * Parse the given obj.
  */
 
 function parseObject(obj){
   var ret = { base: {} };
+
   forEach(objectKeys(obj), function(name){
     merge(ret, name, obj[name]);
   });
-  return ret.base;
+
+  return compact(ret.base);
 }
 
 /**
@@ -158,7 +215,7 @@ function parseObject(obj){
  */
 
 function parseString(str){
-  return reduce(String(str).split('&'), function(ret, pair){
+  var ret = reduce(String(str).split('&'), function(ret, pair){
     var eql = indexOf(pair, '=')
       , brace = lastBraceInKey(pair)
       , key = pair.substr(0, brace || eql)
@@ -171,6 +228,8 @@ function parseString(str){
 
     return merge(ret, decode(key), decode(val));
   }, { base: createObject() }).base;
+
+  return restoreProto(compact(ret));
 }
 
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qs",
   "description": "querystring parser",
-  "version": "0.6.1",
+  "version": "0.6.5",
   "keywords": ["query string", "parser", "component"],
   "repository": {
     "type" : "git",
@@ -14,11 +14,6 @@
   "scripts": {
     "test": "make test"
   },
-  "component": {
-    "scripts": {
-      "querystring": "querystring.js"
-    }
-  },
   "author": "TJ Holowaychuk <tj@vision-media.ca> (http://tjholowaychuk.com)",
   "main": "index",
   "engines": { "node": "*" }