refactor: cleanup parser options (#596)

Author: Phillip9587

lib/types/json.js

@@ -51,11 +51,10 @@ var JSON_SYNTAX_REGEXP = /#+/g
  */
 
 function json (options) {
-  var opts = options || {}
-  var { inflate, limit, verify, shouldParse } = normalizeOptions(opts, 'application/json')
+  var { inflate, limit, verify, shouldParse } = normalizeOptions(options, 'application/json')
 
-  var reviver = opts.reviver
-  var strict = opts.strict !== false
+  var reviver = options?.reviver
+  var strict = options?.strict !== false
 
   function parse (body) {
     if (body.length === 0) {
@@ -125,9 +124,9 @@ function json (options) {
     // read
     read(req, res, next, parse, debug, {
       encoding: charset,
-      inflate: inflate,
-      limit: limit,
-      verify: verify
+      inflate,
+      limit,
+      verify
     })
   }
 }

lib/types/raw.js

@@ -31,8 +31,7 @@ module.exports = raw
  */
 
 function raw (options) {
-  var opts = options || {}
-  var { inflate, limit, verify, shouldParse } = normalizeOptions(opts, 'application/octet-stream')
+  var { inflate, limit, verify, shouldParse } = normalizeOptions(options, 'application/octet-stream')
 
   function parse (buf) {
     return buf
@@ -68,9 +67,9 @@ function raw (options) {
     // read
     read(req, res, next, parse, debug, {
       encoding: null,
-      inflate: inflate,
-      limit: limit,
-      verify: verify
+      inflate,
+      limit,
+      verify
     })
   }
 }

lib/types/text.js

@@ -31,10 +31,9 @@ module.exports = text
  */
 
 function text (options) {
-  var opts = options || {}
-  var { inflate, limit, verify, shouldParse } = normalizeOptions(opts, 'text/plain')
+  var { inflate, limit, verify, shouldParse } = normalizeOptions(options, 'text/plain')
 
-  var defaultCharset = opts.defaultCharset || 'utf-8'
+  var defaultCharset = options?.defaultCharset || 'utf-8'
 
   function parse (buf) {
     return buf
@@ -73,9 +72,9 @@ function text (options) {
     // read
     read(req, res, next, parse, debug, {
       encoding: charset,
-      inflate: inflate,
-      limit: limit,
-      verify: verify
+      inflate,
+      limit,
+      verify
     })
   }
 }

lib/types/urlencoded.js

@@ -35,20 +35,15 @@ module.exports = urlencoded
  */
 
 function urlencoded (options) {
-  var opts = options || {}
-  var { inflate, limit, verify, shouldParse } = normalizeOptions(opts, 'application/x-www-form-urlencoded')
+  var { inflate, limit, verify, shouldParse } = normalizeOptions(options, 'application/x-www-form-urlencoded')
 
-  var extended = Boolean(opts.extended)
-  var charsetSentinel = opts.charsetSentinel
-  var interpretNumericEntities = opts.interpretNumericEntities
-
-  var defaultCharset = opts.defaultCharset || 'utf-8'
+  var defaultCharset = options?.defaultCharset || 'utf-8'
   if (defaultCharset !== 'utf-8' && defaultCharset !== 'iso-8859-1') {
     throw new TypeError('option defaultCharset must be either utf-8 or iso-8859-1')
   }
 
   // create the appropriate query parser
-  var queryparse = createQueryParser(opts, extended)
+  var queryparse = createQueryParser(options)
 
   function parse (body, encoding) {
     return body.length
@@ -96,13 +91,10 @@ function urlencoded (options) {
 
     // read
     read(req, res, next, parse, debug, {
-      debug: debug,
       encoding: charset,
-      inflate: inflate,
-      limit: limit,
-      verify: verify,
-      charsetSentinel: charsetSentinel,
-      interpretNumericEntities: interpretNumericEntities
+      inflate,
+      limit,
+      verify
     })
   }
 }
@@ -113,13 +105,14 @@ function urlencoded (options) {
  * @param {object} options
  */
 
-function createQueryParser (options, extended) {
-  var parameterLimit = options.parameterLimit !== undefined
-    ? options.parameterLimit
+function createQueryParser (options) {
+  var extended = Boolean(options?.extended)
+  var parameterLimit = options?.parameterLimit !== undefined
+    ? options?.parameterLimit
     : 1000
-  var charsetSentinel = options.charsetSentinel
-  var interpretNumericEntities = options.interpretNumericEntities
-  var depth = extended ? (options.depth !== undefined ? options.depth : 32) : 0
+  var charsetSentinel = options?.charsetSentinel
+  var interpretNumericEntities = options?.interpretNumericEntities
+  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')