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

This reverts commit bdab795506.

node_modules/negotiator/lib/language.js

@@ -1,14 +1,41 @@
+/**
+ * negotiator
+ * Copyright(c) 2012 Isaac Z. Schlueter
+ * Copyright(c) 2014 Federico Romero
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+'use strict';
+
+/**
+ * Module exports.
+ * @public
+ */
+
 module.exports = preferredLanguages;
-preferredLanguages.preferredLanguages = preferredLanguages;
+module.exports.preferredLanguages = preferredLanguages;
+
+/**
+ * Module variables.
+ * @private
+ */
+
+var simpleLanguageRegExp = /^\s*([^\s\-;]+)(?:-([^\s;]+))?\s*(?:;(.*))?$/;
+
+/**
+ * Parse the Accept-Language header.
+ * @private
+ */
 
 function parseAcceptLanguage(accept) {
   var accepts = accept.split(',');
 
   for (var i = 0, j = 0; i < accepts.length; i++) {
-    var langauge = parseLanguage(accepts[i].trim(), i);
+    var language = parseLanguage(accepts[i].trim(), i);
 
-    if (langauge) {
-      accepts[j++] = langauge;
+    if (language) {
+      accepts[j++] = language;
     }
   }
 
@@ -18,21 +45,26 @@ function parseAcceptLanguage(accept) {
   return accepts;
 }
 
-function parseLanguage(s, i) {
-  var match = s.match(/^\s*(\S+?)(?:-(\S+?))?\s*(?:;(.*))?$/);
+/**
+ * Parse a language from the Accept-Language header.
+ * @private
+ */
+
+function parseLanguage(str, i) {
+  var match = simpleLanguageRegExp.exec(str);
   if (!match) return null;
 
-  var prefix = match[1],
-      suffix = match[2],
-      full = prefix;
+  var prefix = match[1]
+  var suffix = match[2]
+  var full = prefix
 
   if (suffix) full += "-" + suffix;
 
   var q = 1;
   if (match[3]) {
     var params = match[3].split(';')
-    for (var i = 0; i < params.length; i ++) {
-      var p = params[i].split('=');
+    for (var j = 0; j < params.length; j++) {
+      var p = params[j].split('=');
       if (p[0] === 'q') q = parseFloat(p[1]);
     }
   }
@@ -46,6 +78,11 @@ function parseLanguage(s, i) {
   };
 }
 
+/**
+ * Get the priority of a language.
+ * @private
+ */
+
 function getLanguagePriority(language, accepted, index) {
   var priority = {o: -1, q: 0, s: 0};
 
@@ -60,6 +97,11 @@ function getLanguagePriority(language, accepted, index) {
   return priority;
 }
 
+/**
+ * Get the specificity of the language.
+ * @private
+ */
+
 function specify(language, spec, index) {
   var p = parseLanguage(language)
   if (!p) return null;
@@ -82,15 +124,21 @@ function specify(language, spec, index) {
   }
 };
 
+/**
+ * Get the preferred languages from an Accept-Language header.
+ * @public
+ */
+
 function preferredLanguages(accept, provided) {
   // RFC 2616 sec 14.4: no header = *
   var accepts = parseAcceptLanguage(accept === undefined ? '*' : accept || '');
 
   if (!provided) {
     // sorted list of all languages
-    return accepts.filter(isQuality).sort(compareSpecs).map(function getLanguage(spec) {
-      return spec.full;
-    });
+    return accepts
+      .filter(isQuality)
+      .sort(compareSpecs)
+      .map(getFullLanguage);
   }
 
   var priorities = provided.map(function getPriority(type, index) {
@@ -103,10 +151,29 @@ function preferredLanguages(accept, provided) {
   });
 }
 
+/**
+ * Compare two specs.
+ * @private
+ */
+
 function compareSpecs(a, b) {
   return (b.q - a.q) || (b.s - a.s) || (a.o - b.o) || (a.i - b.i) || 0;
 }
 
+/**
+ * Get full language string.
+ * @private
+ */
+
+function getFullLanguage(spec) {
+  return spec.full;
+}
+
+/**
+ * Check if a spec has any quality.
+ * @private
+ */
+
 function isQuality(spec) {
   return spec.q > 0;
 }