Fix rebase

Author: Phillip9587

lib/types/urlencoded.js

@@ -15,19 +15,14 @@
 var createError = require('http-errors')
 var debug = require('debug')('body-parser:urlencoded')
 var genericParser = require('../..').generic
+var qs = require('qs')
 
 /**
  * Module exports.
  */
 
 module.exports = urlencoded
 
-/**
- * Cache of parser modules.
- */
-
-var parsers = Object.create(null)
-
 /**
  * Create a middleware to parse urlencoded bodies.
  *
@@ -42,19 +37,15 @@ function urlencoded (options) {
   var type = opts.type || 'application/x-www-form-urlencoded'
   var charset = opts.charset || 'utf-8'
 
-  var queryparse = opts.parser || (
-    extended
-      ? extendedparser(opts)
-      : simpleparser(opts)
-  )
+  var queryparse = opts.parser || createQueryParser(opts, extended)
 
   return genericParser(opts, {
     type: type,
     charset: charset,
 
-    parse: function parse (buf) {
-      return buf.length
-        ? queryparse(buf)
+    parse: function parse (body, encoding) {
+      return body.length
+        ? queryparse(body, encoding)
         : {}
     }
   })
@@ -66,17 +57,18 @@ function urlencoded (options) {
  * @param {object} options
  */
 
-function extendedparser (options) {
+function createQueryParser (options, extended) {
   var parameterLimit = options.parameterLimit !== undefined
     ? options.parameterLimit
     : 1000
   var charsetSentinel = options.charsetSentinel
   var interpretNumericEntities = options.interpretNumericEntities
-  var depth = (options.depth !== undefined ? options.depth : 32)
+  var depth = extended ? (options.depth !== undefined ? options.depth : 32) : 0
 
   if (isNaN(parameterLimit) || parameterLimit < 1) {
     throw new TypeError('option parameterLimit must be a positive number')
   }
+
   if (isNaN(depth) || depth < 0) {
     throw new TypeError('option depth must be a zero or a positive number')
   }
@@ -85,8 +77,6 @@ function extendedparser (options) {
     parameterLimit = parameterLimit | 0
   }
 
-  var parse = parser('qs')
-
   return function queryparse (body, encoding) {
     var paramCount = parameterCount(body, parameterLimit)
 
@@ -97,11 +87,11 @@ function extendedparser (options) {
       })
     }
 
-    var arrayLimit = Math.max(100, paramCount)
+    var arrayLimit = extended ? Math.max(100, paramCount) : 0
 
-    debug('parse extended urlencoding')
+    debug('parse ' + (extended ? 'extended ' : '') + 'urlencoding')
     try {
-      return parse(body, {
+      return qs.parse(body, {
         allowPrototypes: true,
         arrayLimit: arrayLimit,
         depth: depth,
@@ -146,69 +136,3 @@ function parameterCount (body, limit) {
 
   return count
 }
-
-/**
- * Get parser for module name dynamically.
- *
- * @param {string} name
- * @return {function}
- * @api private
- */
-
-function parser (name) {
-  var mod = parsers[name]
-
-  if (mod !== undefined) {
-    return mod.parse
-  }
-
-  // this uses a switch for static require analysis
-  switch (name) {
-    case 'qs':
-      mod = require('qs')
-      break
-    case 'querystring':
-      mod = require('querystring')
-      break
-  }
-
-  // store to prevent invoking require()
-  parsers[name] = mod
-
-  return mod.parse
-}
-
-/**
- * Get the simple query parser.
- *
- * @param {object} options
- */
-
-function simpleparser (options) {
-  var parameterLimit = options.parameterLimit !== undefined
-    ? options.parameterLimit
-    : 1000
-  var parse = parser('querystring')
-
-  if (isNaN(parameterLimit) || parameterLimit < 1) {
-    throw new TypeError('option parameterLimit must be a positive number')
-  }
-
-  if (isFinite(parameterLimit)) {
-    parameterLimit = parameterLimit | 0
-  }
-
-  return function queryparse (body) {
-    var paramCount = parameterCount(body, parameterLimit)
-
-    if (paramCount === undefined) {
-      debug('too many parameters')
-      throw createError(413, 'too many parameters', {
-        type: 'parameters.too.many'
-      })
-    }
-
-    debug('parse urlencoding')
-    return parse(body, undefined, undefined, { maxKeys: parameterLimit })
-  }
-}