Use array-flatten module for flattening arrays

closes #2624

Author: dee-kap

History.md

@@ -2,6 +2,7 @@ unreleased
 ==========
 
   * Fix issue where `next('route')` in `app.param` would incorrectly skip values
+  * Use `array-flatten` module for flattening arrays
 
 4.12.4 / 2015-05-17
 ===================

lib/application.js

@@ -12,7 +12,6 @@
  */
 
 var finalhandler = require('finalhandler');
-var flatten = require('./utils').flatten;
 var Router = require('./router');
 var methods = require('methods');
 var middleware = require('./middleware/init');
@@ -24,6 +23,7 @@ var compileETag = require('./utils').compileETag;
 var compileQueryParser = require('./utils').compileQueryParser;
 var compileTrust = require('./utils').compileTrust;
 var deprecate = require('depd')('express');
+var flatten = require('array-flatten');
 var merge = require('utils-merge');
 var resolve = require('path').resolve;
 var slice = Array.prototype.slice;

lib/router/index.js

@@ -9,8 +9,8 @@ var methods = require('methods');
 var mixin = require('utils-merge');
 var debug = require('debug')('express:router');
 var deprecate = require('depd')('express');
+var flatten = require('array-flatten');
 var parseUrl = require('parseurl');
-var utils = require('../utils');
 
 /**
  * Module variables.
@@ -436,7 +436,7 @@ proto.use = function use(fn) {
     }
   }
 
-  var callbacks = utils.flatten(slice.call(arguments, offset));
+  var callbacks = flatten(slice.call(arguments, offset));
 
   if (callbacks.length === 0) {
     throw new TypeError('Router.use() requires middleware functions');

lib/router/route.js

@@ -3,9 +3,9 @@
  */
 
 var debug = require('debug')('express:router:route');
+var flatten = require('array-flatten');
 var Layer = require('./layer');
 var methods = require('methods');
-var utils = require('../utils');
 
 /**
  * Expose `Route`.
@@ -141,7 +141,7 @@ Route.prototype.dispatch = function(req, res, done){
  */
 
 Route.prototype.all = function(){
-  var callbacks = utils.flatten([].slice.call(arguments));
+  var callbacks = flatten([].slice.call(arguments));
   callbacks.forEach(function(fn) {
     if (typeof fn !== 'function') {
       var type = {}.toString.call(fn);
@@ -161,7 +161,7 @@ Route.prototype.all = function(){
 
 methods.forEach(function(method){
   Route.prototype[method] = function(){
-    var callbacks = utils.flatten([].slice.call(arguments));
+    var callbacks = flatten([].slice.call(arguments));
 
     callbacks.forEach(function(fn) {
       if (typeof fn !== 'function') {

lib/utils.js

@@ -13,6 +13,7 @@
 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 basename = require('path').basename;
 var etag = require('etag');
@@ -76,18 +77,8 @@ exports.isAbsolute = function(path){
  * @api private
  */
 
-exports.flatten = function(arr, ret){
-  ret = ret || [];
-  var len = arr.length;
-  for (var i = 0; i < len; ++i) {
-    if (Array.isArray(arr[i])) {
-      exports.flatten(arr[i], ret);
-    } else {
-      ret.push(arr[i]);
-    }
-  }
-  return ret;
-};
+exports.flatten = deprecate.function(flatten,
+  'utils.flatten: use array-flatten npm module instead');
 
 /**
  * Normalize the given `type`, for example "html" becomes "text/html".

package.json

@@ -28,6 +28,7 @@
   ],
   "dependencies": {
     "accepts": "~1.2.7",
+    "array-flatten": "1.1.0",
     "content-disposition": "0.5.0",
     "content-type": "~1.0.1",
     "cookie": "0.1.2",