qs 0.6.2 → 0.6.6

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.
  */
@@ -32,7 +37,11 @@ var isArray = Array.isArray || function(arr) {
 
 var objectKeys = Object.keys || function(obj) {
   var ret = [];
-  for (var key in obj) ret.push(key);
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      ret.push(key);
+    }
+  }
   return ret;
 };
 
@@ -57,16 +66,6 @@ var reduce = function(arr, fn, initial) {
   return res;
 };
 
-/**
- * Create a nullary object if possible
- */
-
-function createObject() {
-  return Object.create
-    ? Object.create(null)
-    : {};
-}
-
 /**
  * Cache non-integer test regexp.
  */
@@ -74,15 +73,23 @@ function createObject() {
 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];
+  if (parent[key].length == 0) return parent[key] = {}
+  var t = {};
+  for (var i in parent[key]) {
+    if (hasOwnProperty.call(parent[key], i)) {
+      t[i] = parent[key][i];
+    }
+  }
   parent[key] = t;
   return t;
 }
 
 function parse(parts, parent, key, val) {
   var part = parts.shift();
+  
+  // illegal
+  if (Object.getOwnPropertyDescriptor(Object.prototype, key)) return;
+  
   // end
   if (!part) {
     if (isArray(parent[key])) {
@@ -131,7 +138,7 @@ function merge(parent, key, val){
     // optimize
   } else {
     if (!isint.test(key) && isArray(parent.base)) {
-      var t = createObject();
+      var t = {};
       for (var k in parent.base) t[k] = parent.base[k];
       parent.base = t;
     }
@@ -142,7 +149,7 @@ function merge(parent, key, val){
 }
 
 /**
- * Compact sparse arrays
+ * Compact sparse arrays.
  */
 
 function compact(obj) {
@@ -150,7 +157,13 @@ function compact(obj) {
 
   if (isArray(obj)) {
     var ret = [];
-    for (var i in obj) ret.push(obj[i]);
+
+    for (var i in obj) {
+      if (hasOwnProperty.call(obj, i)) {
+        ret.push(obj[i]);
+      }
+    }
+
     return ret;
   }
 
@@ -161,13 +174,13 @@ function compact(obj) {
   return obj;
 }
 
-
 /**
  * Parse the given obj.
  */
 
 function parseObject(obj){
   var ret = { base: {} };
+
   forEach(objectKeys(obj), function(name){
     merge(ret, name, obj[name]);
   });
@@ -192,7 +205,7 @@ function parseString(str){
     if ('' == key) return ret;
 
     return merge(ret, decode(key), decode(val));
-  }, { base: createObject() }).base;
+  }, { base: {} }).base;
 
   return compact(ret);
 }
@@ -306,6 +319,7 @@ function stringifyObject(obj, prefix) {
 
 function set(obj, key, val) {
   var v = obj[key];
+  if (Object.getOwnPropertyDescriptor(Object.prototype, key)) return;
   if (undefined === v) {
     obj[key] = val;
   } else if (isArray(v)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qs",
   "description": "querystring parser",
-  "version": "0.6.2",
+  "version": "0.6.6",
   "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": "*" }