Skip to content

Commit 00d55a8

Browse files
committed
attempt to fix flag output changes
1 parent 3d1c84c commit 00d55a8

File tree

5 files changed

+6
-10
lines changed

5 files changed

+6
-10
lines changed

docs/lib/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const getCommandByDoc = (docFile, docExt, commandLoader = defaultCommandLoader)
6262
if (name === 'npm') {
6363
return {
6464
name,
65-
definitions: {},
65+
definitions: [],
6666
usage: 'npm',
6767
}
6868
}

docs/test/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ description: Test command without params
812812
const commandLoader = createCommandLoader({
813813
'testcmd-empty-defs': {
814814
usage: ['<pkg>'],
815-
definitions: {},
815+
definitions: [],
816816
},
817817
})
818818

lib/base-cmd.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ class BaseCommand {
6868
}
6969

7070
if (cmdDefs) {
71-
const cmdDefsKeys = new Set(cmdDefs.map(d => d.key))
7271
let results = ''
7372
let line = ''
7473
for (const def of cmdDefs) {
@@ -101,9 +100,6 @@ class BaseCommand {
101100
if (cmdDefs.length > 0 && includeDescriptions) {
102101
fullUsage.push('')
103102
for (const def of cmdDefs) {
104-
if (seenExclusive.has(def.key) && !cmdDefsKeys.has(def.key)) {
105-
continue
106-
}
107103
if (def.description) {
108104
const desc = def.description.trim().split('\n')[0]
109105
const shortcuts = def.short ? `-${def.short}|` : ''

tap-snapshots/test/lib/commands/install.js.test.cjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ silly logfile done cleaning log files
134134
verbose stack Error: The developer of this package has specified the following through devEngines
135135
verbose stack Invalid devEngines.runtime
136136
verbose stack Invalid name "nondescript" does not match "node" for "runtime"
137-
verbose stack at Install.checkDevEngines ({CWD}/lib/base-cmd.js:273:27)
137+
verbose stack at Install.checkDevEngines ({CWD}/lib/base-cmd.js:244:27)
138138
verbose stack at MockNpm.execCommandClass ({CWD}/lib/npm.js:310:7)
139139
verbose stack at MockNpm.exec ({CWD}/lib/npm.js:209:9)
140140
error code EBADDEVENGINES
@@ -199,7 +199,7 @@ warn EBADDEVENGINES }
199199
verbose stack Error: The developer of this package has specified the following through devEngines
200200
verbose stack Invalid devEngines.runtime
201201
verbose stack Invalid name "nondescript" does not match "node" for "runtime"
202-
verbose stack at Install.checkDevEngines ({CWD}/lib/base-cmd.js:273:27)
202+
verbose stack at Install.checkDevEngines ({CWD}/lib/base-cmd.js:244:27)
203203
verbose stack at MockNpm.execCommandClass ({CWD}/lib/npm.js:310:7)
204204
verbose stack at MockNpm.exec ({CWD}/lib/npm.js:209:9)
205205
error code EBADDEVENGINES
@@ -225,7 +225,7 @@ silly logfile done cleaning log files
225225
verbose stack Error: The developer of this package has specified the following through devEngines
226226
verbose stack Invalid devEngines.runtime
227227
verbose stack Invalid name "nondescript" does not match "node" for "runtime"
228-
verbose stack at Install.checkDevEngines ({CWD}/lib/base-cmd.js:273:27)
228+
verbose stack at Install.checkDevEngines ({CWD}/lib/base-cmd.js:244:27)
229229
verbose stack at MockNpm.execCommandClass ({CWD}/lib/npm.js:310:7)
230230
verbose stack at MockNpm.exec ({CWD}/lib/npm.js:209:9)
231231
error code EBADDEVENGINES

workspaces/config/test/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ t.equal(typeDefs, RealConfig.typeDefs, 'exposes type definitions')
5757
t.test('construct with no settings, get default values for stuff', t => {
5858
const npmPath = t.testdir()
5959
const c = new Config({
60-
definitions: {},
60+
definitions: [],
6161
npmPath,
6262
})
6363

0 commit comments

Comments
 (0)