qs 0.4.0 → 0.5.1

package/test/browser/qs.js

@@ -0,0 +1,351 @@
+
+/**
+ * Require the given path.
+ *
+ * @param {String} path
+ * @return {Object} exports
+ * @api public
+ */
+
+function require(p, parent){
+  var path = require.resolve(p)
+    , mod = require.modules[path];
+  if (!mod) throw new Error('failed to require "' + p + '" in ' + parent);
+  if (!mod.exports) {
+    mod.exports = {};
+    mod.client = true;
+    mod.call(mod.exports, mod, mod.exports, require.relative(path));
+  }
+  return mod.exports;
+}
+
+/**
+ * Registered modules.
+ */
+
+require.modules = {};
+
+/**
+ * Resolve `path`.
+ *
+ * @param {String} path
+ * @return {Object} module
+ * @api public
+ */
+
+require.resolve = function(path){
+  var orig = path
+    , reg = path + '.js'
+    , index = path + '/index.js';
+  return require.modules[reg] && reg
+    || require.modules[index] && index
+    || orig;
+};
+
+/**
+ * Register module at `path` with callback `fn`.
+ *
+ * @param {String} path
+ * @param {Function} fn
+ * @api public
+ */
+
+require.register = function(path, fn){
+  require.modules[path] = fn;
+};
+
+/**
+ * Defines and executes anonymous module immediately, while preserving relative
+ * paths.
+ *
+ * @param {String} path
+ * @param {Function} require ref
+ * @api public
+ */
+
+require.exec = function (path, fn) {
+  fn.call(window, require.relative(path));
+};
+
+/**
+ * Return a require function relative to the `parent` path.
+ *
+ * @param {String} parent
+ * @return {Function}
+ * @api private
+ */
+
+require.relative = function(parent) {
+  return function(p){
+    if ('.' != p[0]) return require(p);
+    
+    var path = parent.split('/')
+      , segs = p.split('/');
+    path.pop();
+    
+    for (var i = 0; i < segs.length; i++) {
+      var seg = segs[i];
+      if ('..' == seg) path.pop();
+      else if ('.' != seg) path.push(seg);
+    }
+
+    return require(path.join('/'), parent);
+  };
+};
+// component qs: querystring
+require.register("querystring", function(module, exports, require){
+;(function(){
+
+/**
+ * Object#toString() ref for stringify().
+ */
+
+var toString = Object.prototype.toString;
+
+/**
+ * Cache non-integer test regexp.
+ */
+
+var isint = /^[0-9]+$/;
+
+function promote(parent, key) {
+  if (parent[key].length == 0) return parent[key] = {};
+  var t = {};
+  for (var i in parent[key]) t[i] = parent[key][i];
+  parent[key] = t;
+  return t;
+}
+
+function parse(parts, parent, key, val) {
+  var part = parts.shift();
+  // end
+  if (!part) {
+    if (Array.isArray(parent[key])) {
+      parent[key].push(val);
+    } else if ('object' == typeof parent[key]) {
+      parent[key] = val;
+    } else if ('undefined' == typeof parent[key]) {
+      parent[key] = val;
+    } else {
+      parent[key] = [parent[key], val];
+    }
+    // array
+  } else {
+    var obj = parent[key] = parent[key] || [];
+    if (']' == part) {
+      if (Array.isArray(obj)) {
+        if ('' != val) obj.push(val);
+      } else if ('object' == typeof obj) {
+        obj[Object.keys(obj).length] = val;
+      } else {
+        obj = parent[key] = [parent[key], val];
+      }
+      // prop
+    } else if (~part.indexOf(']')) {
+      part = part.substr(0, part.length - 1);
+      if (!isint.test(part) && Array.isArray(obj)) obj = promote(parent, key);
+      parse(parts, obj, part, val);
+      // key
+    } else {
+      if (!isint.test(part) && Array.isArray(obj)) obj = promote(parent, key);
+      parse(parts, obj, part, val);
+    }
+  }
+}
+
+/**
+ * Merge parent key/val pair.
+ */
+
+function merge(parent, key, val){
+  if (~key.indexOf(']')) {
+    var parts = key.split('[')
+      , len = parts.length
+      , last = len - 1;
+    parse(parts, parent, 'base', val);
+    // optimize
+  } else {
+    if (!isint.test(key) && Array.isArray(parent.base)) {
+      var t = {};
+      for (var k in parent.base) t[k] = parent.base[k];
+      parent.base = t;
+    }
+    set(parent.base, key, val);
+  }
+
+  return parent;
+}
+
+/**
+ * Parse the given obj.
+ */
+
+function parseObject(obj){
+  var ret = { base: {} };
+  Object.keys(obj).forEach(function(name){
+    merge(ret, name, obj[name]);
+  });
+  return ret.base;
+}
+
+/**
+ * Parse the given str.
+ */
+
+function parseString(str){
+  return String(str)
+    .split('&')
+    .reduce(function(ret, pair){
+      try{
+        pair = decodeURIComponent(pair.replace(/\+/g, ' '));
+      } catch(e) {
+        // ignore
+      }
+
+      var eql = pair.indexOf('=')
+        , brace = lastBraceInKey(pair)
+        , key = pair.substr(0, brace || eql)
+        , val = pair.substr(brace || eql, pair.length)
+        , val = val.substr(val.indexOf('=') + 1, val.length);
+
+      // ?foo
+      if ('' == key) key = pair, val = '';
+
+      return merge(ret, key, val);
+    }, { base: {} }).base;
+}
+
+/**
+ * Parse the given query `str` or `obj`, returning an object.
+ *
+ * @param {String} str | {Object} obj
+ * @return {Object}
+ * @api public
+ */
+
+exports.parse = function(str){
+  if (null == str || '' == str) return {};
+  return 'object' == typeof str
+    ? parseObject(str)
+    : parseString(str);
+};
+
+/**
+ * Turn the given `obj` into a query string
+ *
+ * @param {Object} obj
+ * @return {String}
+ * @api public
+ */
+
+var stringify = exports.stringify = function(obj, prefix) {
+  if (Array.isArray(obj)) {
+    return stringifyArray(obj, prefix);
+  } else if ('[object Object]' == toString.call(obj)) {
+    return stringifyObject(obj, prefix);
+  } else if ('string' == typeof obj) {
+    return stringifyString(obj, prefix);
+  } else {
+    return prefix + '=' + obj;
+  }
+};
+
+/**
+ * Stringify the given `str`.
+ *
+ * @param {String} str
+ * @param {String} prefix
+ * @return {String}
+ * @api private
+ */
+
+function stringifyString(str, prefix) {
+  if (!prefix) throw new TypeError('stringify expects an object');
+  return prefix + '=' + encodeURIComponent(str);
+}
+
+/**
+ * Stringify the given `arr`.
+ *
+ * @param {Array} arr
+ * @param {String} prefix
+ * @return {String}
+ * @api private
+ */
+
+function stringifyArray(arr, prefix) {
+  var ret = [];
+  if (!prefix) throw new TypeError('stringify expects an object');
+  for (var i = 0; i < arr.length; i++) {
+    ret.push(stringify(arr[i], prefix + '['+i+']'));
+  }
+  return ret.join('&');
+}
+
+/**
+ * Stringify the given `obj`.
+ *
+ * @param {Object} obj
+ * @param {String} prefix
+ * @return {String}
+ * @api private
+ */
+
+function stringifyObject(obj, prefix) {
+  var ret = []
+    , keys = Object.keys(obj)
+    , key;
+
+  for (var i = 0, len = keys.length; i < len; ++i) {
+    key = keys[i];
+    ret.push(stringify(obj[key], prefix
+      ? prefix + '[' + encodeURIComponent(key) + ']'
+      : encodeURIComponent(key)));
+  }
+
+  return ret.join('&');
+}
+
+/**
+ * Set `obj`'s `key` to `val` respecting
+ * the weird and wonderful syntax of a qs,
+ * where "foo=bar&foo=baz" becomes an array.
+ *
+ * @param {Object} obj
+ * @param {String} key
+ * @param {String} val
+ * @api private
+ */
+
+function set(obj, key, val) {
+  var v = obj[key];
+  if (undefined === v) {
+    obj[key] = val;
+  } else if (Array.isArray(v)) {
+    v.push(val);
+  } else {
+    obj[key] = [v, val];
+  }
+}
+
+/**
+ * Locate last brace in `str` within the key.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function lastBraceInKey(str) {
+  var len = str.length
+    , brace
+    , c;
+  for (var i = 0; i < len; ++i) {
+    c = str[i];
+    if (']' == c) brace = false;
+    if ('[' == c) brace = true;
+    if ('=' == c && !brace) return i;
+  }
+}
+})();
+});

package/test/parse.js

@@ -1,155 +1,147 @@
 
-/**
- * Module dependencies.
- */
+if (require.register) {
+  var qs = require('querystring');
+} else {
+  var qs = require('../')
+    , expect = require('expect.js');
+}
 
-var qs = require('../');
+describe('qs.parse()', function(){
+  it('should support the basics', function(){
+    expect(qs.parse('0=foo')).to.eql({ '0': 'foo' });
 
-module.exports = {
-  'test basics': function(){
-    qs.parse('0=foo').should.eql({ '0': 'foo' });
+    expect(qs.parse('foo=c++'))
+      .to.eql({ foo: 'c  ' });
 
-    qs.parse('foo=c++')
-      .should.eql({ foo: 'c  ' });
+    expect(qs.parse('a[>=]=23'))
+      .to.eql({ a: { '>=': '23' }});
 
-    qs.parse('a[>=]=23')
-      .should.eql({ a: { '>=': '23' }});
+    expect(qs.parse('a[<=>]==23'))
+      .to.eql({ a: { '<=>': '=23' }});
 
-    qs.parse('a[<=>]==23')
-      .should.eql({ a: { '<=>': '=23' }});
+    expect(qs.parse('a[==]=23'))
+      .to.eql({ a: { '==': '23' }});
 
-    qs.parse('a[==]=23')
-      .should.eql({ a: { '==': '23' }});
+    expect(qs.parse('foo'))
+      .to.eql({ foo: '' });
 
-    qs.parse('foo')
-      .should.eql({ foo: '' });
+    expect(qs.parse('foo=bar'))
+      .to.eql({ foo: 'bar' });
 
-    qs.parse('foo=bar')
-      .should.eql({ foo: 'bar' });
+    expect(qs.parse(' foo = bar = baz '))
+      .to.eql({ ' foo ': ' bar = baz ' });
 
-    qs.parse('foo%3Dbar=baz')
-      .should.eql({ foo: 'bar=baz' });
+    expect(qs.parse('foo=bar=baz'))
+      .to.eql({ foo: 'bar=baz' });
 
-    qs.parse(' foo = bar = baz ')
-      .should.eql({ ' foo ': ' bar = baz ' });
+    expect(qs.parse('foo=bar&bar=baz'))
+      .to.eql({ foo: 'bar', bar: 'baz' });
 
-    qs.parse('foo=bar=baz')
-      .should.eql({ foo: 'bar=baz' });
+    expect(qs.parse('foo=bar&baz'))
+      .to.eql({ foo: 'bar', baz: '' });
 
-    qs.parse('foo=bar&bar=baz')
-      .should.eql({ foo: 'bar', bar: 'baz' });
-
-    qs.parse('foo=bar&baz')
-      .should.eql({ foo: 'bar', baz: '' });
-
-    qs.parse('cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World')
-      .should.eql({
+    expect(qs.parse('cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World'))
+      .to.eql({
           cht: 'p3'
         , chd: 't:60,40'
         , chs: '250x100'
         , chl: 'Hello|World'
       });
-  },
-  
-  'test nesting': function(){
-    qs.parse('ops[>=]=25')
-      .should.eql({ ops: { '>=': '25' }});
-
-    qs.parse('user[name]=tj')
-      .should.eql({ user: { name: 'tj' }});
-
-    qs.parse('user[name][first]=tj&user[name][last]=holowaychuk')
-      .should.eql({ user: { name: { first: 'tj', last: 'holowaychuk' }}});
-  },
-  
-  'test escaping': function(){
-    qs.parse('foo=foo%20bar')
-      .should.eql({ foo: 'foo bar' });
-  },
-  
-  'test arrays': function(){
-    qs.parse('images[]')
-      .should.eql({ images: [] });
-
-    qs.parse('user[]=tj')
-      .should.eql({ user: ['tj'] });
-
-    qs.parse('user[]=tj&user[]=tobi&user[]=jane')
-      .should.eql({ user: ['tj', 'tobi', 'jane'] });
-
-    qs.parse('user[names][]=tj&user[names][]=tyler')
-      .should.eql({ user: { names: ['tj', 'tyler'] }});
-
-    qs.parse('user[names][]=tj&user[names][]=tyler&user[email]=tj@vision-media.ca')
-      .should.eql({ user: { names: ['tj', 'tyler'], email: 'tj@vision-media.ca' }});
-
-    qs.parse('items=a&items=b')
-      .should.eql({ items: ['a', 'b'] });
-
-    qs.parse('user[names]=tj&user[names]=holowaychuk&user[names]=TJ')
-      .should.eql({ user: { names: ['tj', 'holowaychuk', 'TJ'] }});
-
-    qs.parse('user[name][first]=tj&user[name][first]=TJ')
-      .should.eql({ user: { name: { first: ['tj', 'TJ'] }}});
-  },
-  
-  'test right-hand brackets': function(){
-    qs.parse('pets=["tobi"]')
-      .should.eql({ pets: '["tobi"]' });
-
-    qs.parse('operators=[">=", "<="]')
-      .should.eql({ operators: '[">=", "<="]' });
-
-    qs.parse('op[>=]=[1,2,3]')
-      .should.eql({ op: { '>=': '[1,2,3]' }});
-
-    qs.parse('op[>=]=[1,2,3]&op[=]=[[[[1]]]]')
-          .should.eql({ op: { '>=': '[1,2,3]', '=': '[[[[1]]]]' }});
-  },
-  
-  'test duplicates': function(){
-    qs.parse('items=bar&items=baz&items=raz')
-      .should.eql({ items: ['bar', 'baz', 'raz'] });
-  },
-
-  'test empty': function(){
-    qs.parse('').should.eql({});
-    qs.parse(undefined).should.eql({});
-    qs.parse(null).should.eql({});
-  },
-
-  'test arrays with indexes': function(){
-    qs.parse('foo[0]=bar&foo[1]=baz').should.eql({ foo: ['bar', 'baz'] });
-    qs.parse('foo[1]=bar&foo[0]=baz').should.eql({ foo: ['baz', 'bar'] });
-    qs.parse('foo[base64]=RAWR').should.eql({ foo: { base64: 'RAWR' }});
-    qs.parse('foo[64base]=RAWR').should.eql({ foo: { '64base': 'RAWR' }});
-  },
-
-  'test arrays becoming objects': function(){
-    qs.parse('foo[0]=bar&foo[bad]=baz').should.eql({ foo: { 0: "bar", bad: "baz" }});
-    qs.parse('foo[bad]=baz&foo[0]=bar').should.eql({ foo: { 0: "bar", bad: "baz" }});
-  },
-
-  'test bleed-through of Array native properties/methods': function(){
-    Array.prototype.protoProperty = true;
-    Array.prototype.protoFunction = function () {};
-    qs.parse('foo=bar').should.eql({ foo: 'bar' });
-  },
-
-  'test malformed uri': function(){
-    qs.parse('{%:%}').should.eql({ '{%:%}': '' });
-    qs.parse('foo=%:%}').should.eql({ 'foo': '%:%}' });
-  }
-  
-  // 'test complex': function(){
-  //   qs.parse('users[][name][first]=tj&users[foo]=bar')
-  //     .should.eql({
-  //       users: [ { name: 'tj' }, { name: 'tobi' }, { foo: 'bar' }]
-  //     });
-  // 
-  //   qs.parse('users[][name][first]=tj&users[][name][first]=tobi')
-  //     .should.eql({
-  //       users: [ { name: 'tj' }, { name: 'tobi' }]
-  //     });
-  // }
-};
+  })
+
+  it('should support encoded = signs', function(){
+    expect(qs.parse('he%3Dllo=th%3Dere'))
+      .to.eql({ 'he=llo': 'th=ere' });
+  })
+
+  it('should support nesting', function(){
+    expect(qs.parse('ops[>=]=25'))
+      .to.eql({ ops: { '>=': '25' }});
+
+    expect(qs.parse('user[name]=tj'))
+      .to.eql({ user: { name: 'tj' }});
+
+    expect(qs.parse('user[name][first]=tj&user[name][last]=holowaychuk'))
+      .to.eql({ user: { name: { first: 'tj', last: 'holowaychuk' }}});
+  })
+
+  it('should support array notation', function(){
+    expect(qs.parse('images[]'))
+      .to.eql({ images: [] });
+
+    expect(qs.parse('user[]=tj'))
+      .to.eql({ user: ['tj'] });
+
+    expect(qs.parse('user[]=tj&user[]=tobi&user[]=jane'))
+      .to.eql({ user: ['tj', 'tobi', 'jane'] });
+
+    expect(qs.parse('user[names][]=tj&user[names][]=tyler'))
+      .to.eql({ user: { names: ['tj', 'tyler'] }});
+
+    expect(qs.parse('user[names][]=tj&user[names][]=tyler&user[email]=tj@vision-media.ca'))
+      .to.eql({ user: { names: ['tj', 'tyler'], email: 'tj@vision-media.ca' }});
+
+    expect(qs.parse('items=a&items=b'))
+      .to.eql({ items: ['a', 'b'] });
+
+    expect(qs.parse('user[names]=tj&user[names]=holowaychuk&user[names]=TJ'))
+      .to.eql({ user: { names: ['tj', 'holowaychuk', 'TJ'] }});
+
+    expect(qs.parse('user[name][first]=tj&user[name][first]=TJ'))
+      .to.eql({ user: { name: { first: ['tj', 'TJ'] }}});
+
+    var o = qs.parse('existing[fcbaebfecc][name][last]=tj')
+    expect(o).to.eql({ existing: { 'fcbaebfecc': { name: { last: 'tj' }}}})
+    expect(Array.isArray(o.existing)).to.equal(false);
+  })
+
+  it('should support arrays with indexes', function(){
+    expect(qs.parse('foo[0]=bar&foo[1]=baz')).to.eql({ foo: ['bar', 'baz'] });
+    expect(qs.parse('foo[1]=bar&foo[0]=baz')).to.eql({ foo: ['baz', 'bar'] });
+    expect(qs.parse('foo[base64]=RAWR')).to.eql({ foo: { base64: 'RAWR' }});
+    expect(qs.parse('foo[64base]=RAWR')).to.eql({ foo: { '64base': 'RAWR' }});
+  })
+
+  it('should expand to an array when dupliate keys are present', function(){
+    expect(qs.parse('items=bar&items=baz&items=raz'))
+      .to.eql({ items: ['bar', 'baz', 'raz'] });
+  })
+
+  it('should support right-hand side brackets', function(){
+    expect(qs.parse('pets=["tobi"]'))
+      .to.eql({ pets: '["tobi"]' });
+
+    expect(qs.parse('operators=[">=", "<="]'))
+      .to.eql({ operators: '[">=", "<="]' });
+
+    expect(qs.parse('op[>=]=[1,2,3]'))
+      .to.eql({ op: { '>=': '[1,2,3]' }});
+
+    expect(qs.parse('op[>=]=[1,2,3]&op[=]=[[[[1]]]]'))
+          .to.eql({ op: { '>=': '[1,2,3]', '=': '[[[[1]]]]' }});
+  })
+
+  it('should support empty values', function(){
+    expect(qs.parse('')).to.eql({});
+    expect(qs.parse(undefined)).to.eql({});
+    expect(qs.parse(null)).to.eql({});
+  })
+
+  it('should transform arrays to objects', function(){
+    expect(qs.parse('foo[0]=bar&foo[bad]=baz')).to.eql({ foo: { 0: "bar", bad: "baz" }});
+    expect(qs.parse('foo[bad]=baz&foo[0]=bar')).to.eql({ foo: { 0: "bar", bad: "baz" }});
+  })
+
+  it('should support malformed uri chars', function(){
+    expect(qs.parse('{%:%}')).to.eql({ '{%:%}': '' });
+    expect(qs.parse('foo=%:%}')).to.eql({ 'foo': '%:%}' });
+  })
+
+  it('should support semi-parsed strings', function(){
+    expect(qs.parse({ 'user[name]': 'tobi' }))
+      .to.eql({ user: { name: 'tobi' }});
+
+    expect(qs.parse({ 'user[name]': 'tobi', 'user[email][main]': 'tobi@lb.com' }))
+      .to.eql({ user: { name: 'tobi', email: { main: 'tobi@lb.com' } }});
+  })
+})