Change req.query to a getter

Author: dougwilson

History.md

@@ -5,8 +5,10 @@
     - `res.json(obj, status)` signature - use `res.json(status, obj)`
     - `res.jsonp(obj, status)` signature - use `res.jsonp(status, obj)`
     - `res.send(body, status)` signature - use `res.send(status, body)`
+    - `express.query` middleware
   * change:
     - `req.host` now returns host (`hostname:port`) - use `req.hostname` for only hostname
+    - `req.query` is now a getter instead of a plain property
 
 4.10.1 / 2014-10-28
 ===================

lib/application.js

@@ -7,7 +7,6 @@ var flatten = require('./utils').flatten;
 var Router = require('./router');
 var methods = require('methods');
 var middleware = require('./middleware/init');
-var query = require('./middleware/query');
 var debug = require('debug')('express:application');
 var View = require('./view');
 var http = require('http');
@@ -102,7 +101,6 @@ app.lazyrouter = function() {
       strict: this.enabled('strict routing')
     });
 
-    this._router.use(query(this.get('query parser fn')));
     this._router.use(middleware.init(this));
   }
 };

lib/express.js

@@ -56,7 +56,6 @@ exports.Router = Router;
  * Expose middleware
  */
 
-exports.query = require('./middleware/query');
 exports.static = require('serve-static');
 
 /**
@@ -83,6 +82,7 @@ exports.static = require('serve-static');
   'limit',
   'multipart',
   'staticCache',
+  'query',
 ].forEach(function (name) {
   Object.defineProperty(exports, name, {
     get: function () {

lib/middleware/query.js

@@ -183,6 +183,29 @@ req.range = function(size){
   return parseRange(size, range);
 };
 
+/**
+ * Parse the query string of `req.url`.
+ *
+ * This uses the "query parser" setting to parse the raw
+ * string into an object.
+ *
+ * @return {String}
+ * @api public
+ */
+
+defineGetter(req, 'query', function query(){
+  var queryparse = this.app.get('query parser fn');
+
+  if (!queryparse) {
+    // parsing is disabled
+    return Object.create(null);
+  }
+
+  var querystring = parse(this).query;
+
+  return queryparse(querystring);
+});
+
 /**
  * Return the value of param `name` when present or `defaultValue`.
  *

lib/request.js

@@ -205,7 +205,6 @@ exports.compileQueryParser = function compileQueryParser(val) {
       fn = querystring.parse;
       break;
     case false:
-      fn = newObject;
       break;
     case 'extended':
       fn = qs.parse;
@@ -270,14 +269,3 @@ exports.setCharset = function(type, charset){
   // format type
   return typer.format(parsed);
 };
-
-/**
- * Return new empty objet.
- *
- * @return {Object}
- * @api private
- */
-
-function newObject() {
-  return {};
-}