From 330cef99be72ae29b66e40d040d3045b3902740c Mon Sep 17 00:00:00 2001 From: Mael LE GUEN Date: Wed, 4 Dec 2019 18:29:56 +0100 Subject: [PATCH 1/2] fix: handle properly array flags in hasAnyFlag --- index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index 2a55b372..e942a5af 100644 --- a/index.js +++ b/index.js @@ -762,11 +762,11 @@ function parse (args, opts) { } function hasAnyFlag (key) { - // XXX Switch to [].concat(...Object.values(flags)) once node.js 6 is dropped - var toCheck = [].concat(...Object.keys(flags).map(k => flags[k])) + // XXX Switch to [].concat(Object.values(flags)) once node.js 6 is dropped + var toCheck = [].concat(Object.keys(flags).map(k => flags[k])) return toCheck.some(function (flag) { - return flag[key] + return Array.isArray(flag) ? flag.includes(key) : flag[key] }) } From e69c3e36f99af9e4ddab83d3815c17fb43000e17 Mon Sep 17 00:00:00 2001 From: Mael LE GUEN Date: Wed, 4 Dec 2019 18:43:38 +0100 Subject: [PATCH 2/2] fix: handle properly object flags in hasAnyFlag --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index e942a5af..243c1dee 100644 --- a/index.js +++ b/index.js @@ -766,7 +766,7 @@ function parse (args, opts) { var toCheck = [].concat(Object.keys(flags).map(k => flags[k])) return toCheck.some(function (flag) { - return Array.isArray(flag) ? flag.includes(key) : flag[key] + return Array.isArray(flag) ? flag.includes(key) : flag.hasOwnProperty(key) && flag[key] }) }