Skip to content

refactor: extract helper for argument normalization #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ayoub-Mabrouk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: extract helper for argument normalization #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 20 additions & 32 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,8 @@ function Accepts (req) {

Accepts.prototype.type =
Accepts.prototype.types = function (types_) {
var types = types_

// support flattened arguments
if (types && !Array.isArray(types)) {
types = new Array(arguments.length)
for (var i = 0; i < types.length; i++) {
types[i] = arguments[i]
}
}
const types = normalizeArguments(types_, arguments)

// no types, return all requested types
if (!types || types.length === 0) {
Expand Down Expand Up @@ -126,15 +119,8 @@ Accepts.prototype.types = function (types_) {

Accepts.prototype.encoding =
Accepts.prototype.encodings = function (encodings_) {
var encodings = encodings_

// support flattened arguments
if (encodings && !Array.isArray(encodings)) {
encodings = new Array(arguments.length)
for (var i = 0; i < encodings.length; i++) {
encodings[i] = arguments[i]
}
}
const encodings = normalizeArguments(encodings_, arguments)

// no encodings, return all requested encodings
if (!encodings || encodings.length === 0) {
Expand All @@ -159,15 +145,8 @@ Accepts.prototype.encodings = function (encodings_) {

Accepts.prototype.charset =
Accepts.prototype.charsets = function (charsets_) {
var charsets = charsets_

// support flattened arguments
if (charsets && !Array.isArray(charsets)) {
charsets = new Array(arguments.length)
for (var i = 0; i < charsets.length; i++) {
charsets[i] = arguments[i]
}
}
const charsets = normalizeArguments(charsets_, arguments)

// no charsets, return all requested charsets
if (!charsets || charsets.length === 0) {
Expand All @@ -194,15 +173,8 @@ Accepts.prototype.lang =
Accepts.prototype.langs =
Accepts.prototype.language =
Accepts.prototype.languages = function (languages_) {
var languages = languages_

// support flattened arguments
if (languages && !Array.isArray(languages)) {
languages = new Array(arguments.length)
for (var i = 0; i < languages.length; i++) {
languages[i] = arguments[i]
}
}
const languages = normalizeArguments(languages_, arguments)

// no languages, return all requested languages
if (!languages || languages.length === 0) {
Expand All @@ -212,6 +184,22 @@ Accepts.prototype.languages = function (languages_) {
return this.negotiator.languages(languages)[0] || false
}

/**
* Normalize a possibly-flattened argument list into an array.
*
* @param {string|Array|undefined} firstArg
* @param {ArrayLike} args
* @return {Array|undefined}
* @private
*/

function normalizeArguments (firstArg, args) {
if (firstArg && !Array.isArray(firstArg)) {
return Array.from(args)
}
return firstArg
}

/**
* Convert extnames to mime.
*
Expand Down