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

node_modules/vary/index.js

@@ -1,30 +1,23 @@
 /*!
  * vary
- * Copyright(c) 2014-2017 Douglas Christopher Wilson
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
  * MIT Licensed
  */
 
-'use strict'
+'use strict';
 
 /**
  * Module exports.
  */
 
-module.exports = vary
-module.exports.append = append
+module.exports = vary;
+module.exports.append = append;
 
 /**
- * RegExp to match field-name in RFC 7230 sec 3.2
- *
- * field-name    = token
- * token         = 1*tchar
- * tchar         = "!" / "#" / "$" / "%" / "&" / "'" / "*"
- *               / "+" / "-" / "." / "^" / "_" / "`" / "|" / "~"
- *               / DIGIT / ALPHA
- *               ; any VCHAR, except delimiters
+ * Variables.
  */
 
-var FIELD_NAME_REGEXP = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/
+var separators = /[\(\)<>@,;:\\"\/\[\]\?=\{\}\u0020\u0009]/;
 
 /**
  * Append a field to a vary header.
@@ -32,57 +25,57 @@ var FIELD_NAME_REGEXP = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/
  * @param {String} header
  * @param {String|Array} field
  * @return {String}
- * @public
+ * @api public
  */
 
-function append (header, field) {
+function append(header, field) {
   if (typeof header !== 'string') {
-    throw new TypeError('header argument is required')
+    throw new TypeError('header argument is required');
   }
 
   if (!field) {
-    throw new TypeError('field argument is required')
+    throw new TypeError('field argument is required');
   }
 
   // get fields array
   var fields = !Array.isArray(field)
     ? parse(String(field))
-    : field
+    : field;
 
-  // assert on invalid field names
-  for (var j = 0; j < fields.length; j++) {
-    if (!FIELD_NAME_REGEXP.test(fields[j])) {
-      throw new TypeError('field argument contains an invalid header name')
+  // assert on invalid fields
+  for (var i = 0; i < fields.length; i++) {
+    if (separators.test(fields[i])) {
+      throw new TypeError('field argument contains an invalid header');
     }
   }
 
   // existing, unspecified vary
   if (header === '*') {
-    return header
+    return header;
   }
 
   // enumerate current values
-  var val = header
-  var vals = parse(header.toLowerCase())
+  var val = header;
+  var vals = parse(header.toLowerCase());
 
   // unspecified vary
   if (fields.indexOf('*') !== -1 || vals.indexOf('*') !== -1) {
-    return '*'
+    return '*';
   }
 
   for (var i = 0; i < fields.length; i++) {
-    var fld = fields[i].toLowerCase()
+    var fld = fields[i].toLowerCase();
 
     // append value (case-preserving)
     if (vals.indexOf(fld) === -1) {
-      vals.push(fld)
+      vals.push(fld);
       val = val
         ? val + ', ' + fields[i]
-        : fields[i]
+        : fields[i];
     }
   }
 
-  return val
+  return val;
 }
 
 /**
@@ -90,36 +83,11 @@ function append (header, field) {
  *
  * @param {String} header
  * @return {Array}
- * @private
+ * @api private
  */
 
-function parse (header) {
-  var end = 0
-  var list = []
-  var start = 0
-
-  // gather tokens
-  for (var i = 0, len = header.length; i < len; i++) {
-    switch (header.charCodeAt(i)) {
-      case 0x20: /*   */
-        if (start === end) {
-          start = end = i + 1
-        }
-        break
-      case 0x2c: /* , */
-        list.push(header.substring(start, end))
-        start = end = i + 1
-        break
-      default:
-        end = i + 1
-        break
-    }
-  }
-
-  // final token
-  list.push(header.substring(start, end))
-
-  return list
+function parse(header) {
+  return header.trim().split(/ *, */);
 }
 
 /**
@@ -127,23 +95,23 @@ function parse (header) {
  *
  * @param {Object} res
  * @param {String|Array} field
- * @public
+ * @api public
  */
 
-function vary (res, field) {
+function vary(res, field) {
   if (!res || !res.getHeader || !res.setHeader) {
     // quack quack
-    throw new TypeError('res argument is required')
+    throw new TypeError('res argument is required');
   }
 
   // get existing header
   var val = res.getHeader('Vary') || ''
   var header = Array.isArray(val)
     ? val.join(', ')
-    : String(val)
+    : String(val);
 
   // set new header
   if ((val = append(header, field))) {
-    res.setHeader('Vary', val)
+    res.setHeader('Vary', val);
   }
 }