Changements dans les modules (nouvelle version Express, mysql, ..)

node_modules/express/lib/utils.js

@@ -12,13 +12,10 @@
  * @api private
  */
 
-var Buffer = require('safe-buffer').Buffer
-var contentDisposition = require('content-disposition');
-var contentType = require('content-type');
-var deprecate = require('depd')('express');
-var flatten = require('array-flatten');
 var mime = require('send').mime;
+var contentType = require('content-type');
 var etag = require('etag');
+var flatten = require('array-flatten');
 var proxyaddr = require('proxy-addr');
 var qs = require('qs');
 var querystring = require('querystring');
@@ -32,7 +29,13 @@ var querystring = require('querystring');
  * @api private
  */
 
-exports.etag = createETagGenerator({ weak: false })
+exports.etag = function (body, encoding) {
+  var buf = !Buffer.isBuffer(body)
+    ? new Buffer(body, encoding)
+    : body;
+
+  return etag(buf, {weak: false});
+};
 
 /**
  * Return weak ETag for `body`.
@@ -43,33 +46,14 @@ exports.etag = createETagGenerator({ weak: false })
  * @api private
  */
 
-exports.wetag = createETagGenerator({ weak: true })
+exports.wetag = function wetag(body, encoding){
+  var buf = !Buffer.isBuffer(body)
+    ? new Buffer(body, encoding)
+    : body;
 
-/**
- * Check if `path` looks absolute.
- *
- * @param {String} path
- * @return {Boolean}
- * @api private
- */
-
-exports.isAbsolute = function(path){
-  if ('/' === path[0]) return true;
-  if (':' === path[1] && ('\\' === path[2] || '/' === path[2])) return true; // Windows device path
-  if ('\\\\' === path.substring(0, 2)) return true; // Microsoft Azure absolute path
+  return etag(buf, {weak: true});
 };
 
-/**
- * Flatten the given `arr`.
- *
- * @param {Array} arr
- * @return {Array}
- * @api private
- */
-
-exports.flatten = deprecate.function(flatten,
-  'utils.flatten: use array-flatten npm module instead');
-
 /**
  * Normalize the given `type`, for example "html" becomes "text/html".
  *
@@ -102,25 +86,12 @@ exports.normalizeTypes = function(types){
   return ret;
 };
 
-/**
- * Generate Content-Disposition header appropriate for the filename.
- * non-ascii filenames are urlencoded and a filename* parameter is added
- *
- * @param {String} filename
- * @return {String}
- * @api private
- */
-
-exports.contentDisposition = deprecate.function(contentDisposition,
-  'utils.contentDisposition: use content-disposition npm module instead');
-
 /**
  * Parse accept params `str` returning an
  * object with `.value`, `.quality` and `.params`.
  * also includes `.originalIndex` for stable sorting
  *
  * @param {String} str
- * @param {Number} index
  * @return {Object}
  * @api private
  */
@@ -131,7 +102,7 @@ function acceptParams(str, index) {
 
   for (var i = 1; i < parts.length; ++i) {
     var pms = parts[i].split(/ *= */);
-    if ('q' === pms[0]) {
+    if ('q' == pms[0]) {
       ret.quality = parseFloat(pms[1]);
     } else {
       ret.params[pms[0]] = pms[1];
@@ -158,7 +129,6 @@ exports.compileETag = function(val) {
 
   switch (val) {
     case true:
-    case 'weak':
       fn = exports.wetag;
       break;
     case false:
@@ -166,6 +136,9 @@ exports.compileETag = function(val) {
     case 'strong':
       fn = exports.etag;
       break;
+    case 'weak':
+      fn = exports.wetag;
+      break;
     default:
       throw new TypeError('unknown value for etag function: ' + val);
   }
@@ -190,15 +163,16 @@ exports.compileQueryParser = function compileQueryParser(val) {
 
   switch (val) {
     case true:
-    case 'simple':
       fn = querystring.parse;
       break;
     case false:
-      fn = newObject;
       break;
     case 'extended':
       fn = parseExtendedQueryString;
       break;
+    case 'simple':
+      fn = querystring.parse;
+      break;
     default:
       throw new TypeError('unknown value for query parser function: ' + val);
   }
@@ -229,8 +203,7 @@ exports.compileTrust = function(val) {
 
   if (typeof val === 'string') {
     // Support comma-separated values
-    val = val.split(',')
-      .map(function (v) { return v.trim() })
+    val = val.split(/ *, */);
   }
 
   return proxyaddr.compile(val || []);
@@ -260,25 +233,6 @@ exports.setCharset = function setCharset(type, charset) {
   return contentType.format(parsed);
 };
 
-/**
- * Create an ETag generator function, generating ETags with
- * the given options.
- *
- * @param {object} options
- * @return {function}
- * @private
- */
-
-function createETagGenerator (options) {
-  return function generateETag (body, encoding) {
-    var buf = !Buffer.isBuffer(body)
-      ? Buffer.from(body, encoding)
-      : body
-
-    return etag(buf, options)
-  }
-}
-
 /**
  * Parse an extended query string with qs.
  *
@@ -288,17 +242,7 @@ function createETagGenerator (options) {
 
 function parseExtendedQueryString(str) {
   return qs.parse(str, {
+    allowDots: false,
     allowPrototypes: true
   });
 }
-
-/**
- * Return new empty object.
- *
- * @return {Object}
- * @api private
- */
-
-function newObject() {
-  return {};
-}