fix: the -r option is not supported by all cmds

ref #2396
pnpm · Mar 15, 2020 · 906ede3 · 906ede3
1 parent d1ccc43
commit 906ede3
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 46 deletions.
diff --git a/packages/parse-cli-args/src/index.ts b/packages/parse-cli-args/src/index.ts
@@ -58,7 +58,6 @@ export default async function parseCliArgs (
   const commandName = getCommandName(noptExploratoryResults.argv.remain)
   let cmd = commandName ? opts.getCommandLongName(commandName) : null
   const types = {
-    'recursive': Boolean,
     ...opts.universalOptionsTypes,
     ...opts.getTypesByCommandName(commandName),
   } as any // tslint:disable-line:no-any
@@ -74,7 +73,10 @@ export default async function parseCliArgs (
   }
 
   const { argv, ...options } = nopt(
-    types,
+    {
+      'recursive': Boolean,
+      ...types,
+    },
     {
       ...opts.universalShorthands,
       ...opts.shorthandsByCommandName[commandName],

diff --git a/packages/plugin-commands-installation/src/add.ts b/packages/plugin-commands-installation/src/add.ts
@@ -33,7 +33,6 @@ export function rcOptionsTypes () {
     'pnpmfile',
     'prefer-offline',
     'production',
-    'recursive',
     'registry',
     'reporter',
     'resolution-strategy',
@@ -65,6 +64,7 @@ export function rcOptionsTypes () {
 export function cliOptionsTypes () {
   return {
     ...rcOptionsTypes(),
+    recursive: Boolean,
     save: Boolean,
     workspace: Boolean,
   }

diff --git a/packages/plugin-commands-installation/src/install.ts b/packages/plugin-commands-installation/src/install.ts
@@ -11,15 +11,12 @@ import R = require('ramda')
 import renderHelp = require('render-help')
 import installDeps from './installDeps'
 
-export const rcOptionsTypes = cliOptionsTypes
-
-export function cliOptionsTypes () {
+export function rcOptionsTypes () {
   return R.pick([
     'child-concurrency',
     'dev',
     'engine-strict',
     'frozen-lockfile',
-    'force',
     'global-dir',
     'global-pnpmfile',
     'global',
@@ -39,7 +36,6 @@ export function cliOptionsTypes () {
     'prefer-frozen-lockfile',
     'prefer-offline',
     'production',
-    'recursive',
     'registry',
     'reporter',
     'resolution-strategy',
@@ -62,6 +58,12 @@ export function cliOptionsTypes () {
   ], allTypes)
 }
 
+export const cliOptionsTypes = () => ({
+  ...rcOptionsTypes(),
+  ...R.pick(['force'], allTypes),
+  recursive: Boolean,
+})
+
 export const shorthands = {
   'D': '--dev',
   'P': '--production',

diff --git a/packages/plugin-commands-installation/src/remove.ts b/packages/plugin-commands-installation/src/remove.ts
@@ -18,11 +18,8 @@ import {
 } from 'supi'
 import recursive from './recursive'
 
-export const rcOptionsTypes = cliOptionsTypes
-
-export function cliOptionsTypes () {
+export function rcOptionsTypes () {
   return R.pick([
-    'force',
     'global-dir',
     'global-pnpmfile',
     'global',
@@ -32,7 +29,6 @@ export function cliOptionsTypes () {
     'lockfile',
     'package-import-method',
     'pnpmfile',
-    'recursive',
     'reporter',
     'resolution-strategy',
     'save-dev',
@@ -45,6 +41,12 @@ export function cliOptionsTypes () {
   ], allTypes)
 }
 
+export const cliOptionsTypes = () => ({
+  ...rcOptionsTypes(),
+  ...R.pick(['force'], allTypes),
+  recursive: Boolean,
+})
+
 export function help () {
   return renderHelp({
     aliases: ['rm', 'r', 'uninstall', 'un'],

diff --git a/packages/plugin-commands-installation/src/update/index.ts b/packages/plugin-commands-installation/src/update/index.ts
@@ -40,7 +40,6 @@ export function rcOptionsTypes () {
     'pnpmfile',
     'prefer-offline',
     'production',
-    'recursive',
     'registry',
     'reporter',
     'resolution-strategy',
@@ -63,6 +62,7 @@ export function cliOptionsTypes () {
     ...rcOptionsTypes(),
     interactive: Boolean,
     latest: Boolean,
+    recursive: Boolean,
     workspace: Boolean,
   }
 }

diff --git a/packages/plugin-commands-listing/src/list.ts b/packages/plugin-commands-listing/src/list.ts
@@ -8,9 +8,7 @@ import R = require('ramda')
 import renderHelp = require('render-help')
 import listRecursive from './recursive'
 
-export const rcOptionsTypes = cliOptionsTypes
-
-export function cliOptionsTypes () {
+export function rcOptionsTypes () {
   return R.pick([
     'depth',
     'dev',
@@ -22,10 +20,14 @@ export function cliOptionsTypes () {
     'optional',
     'parseable',
     'production',
-    'recursive',
   ], allTypes)
 }
 
+export const cliOptionsTypes = () => ({
+  ...rcOptionsTypes(),
+  recursive: Boolean,
+})
+
 export const shorthands = {
   'D': '--dev',
   'P': '--production',

diff --git a/packages/plugin-commands-listing/src/why.ts b/packages/plugin-commands-listing/src/why.ts
@@ -7,9 +7,7 @@ import R = require('ramda')
 import renderHelp = require('render-help')
 import { handler as list, ListCommandOptions } from './list'
 
-export const rcOptionsTypes = cliOptionsTypes
-
-export function cliOptionsTypes () {
+export function rcOptionsTypes () {
   return R.pick([
     'dev',
     'global-dir',
@@ -20,10 +18,14 @@ export function cliOptionsTypes () {
     'optional',
     'parseable',
     'production',
-    'recursive',
   ], allTypes)
 }
 
+export const cliOptionsTypes = () => ({
+  ...rcOptionsTypes(),
+  recursive: Boolean,
+})
+
 export const commandNames = ['why']
 
 export function help () {

diff --git a/packages/plugin-commands-outdated/src/outdated.ts b/packages/plugin-commands-outdated/src/outdated.ts
@@ -27,9 +27,7 @@ import {
   OutdatedWithVersionDiff,
 } from './utils'
 
-export const rcOptionsTypes = cliOptionsTypes
-
-export function cliOptionsTypes () {
+export function rcOptionsTypes () {
   return {
     ...R.pick([
       'depth',
@@ -39,13 +37,17 @@ export function cliOptionsTypes () {
       'long',
       'optional',
       'production',
-      'recursive',
     ], allTypes),
     'compatible': Boolean,
     'table': Boolean,
   }
 }
 
+export const cliOptionsTypes = () => ({
+  ...rcOptionsTypes(),
+  recursive: Boolean,
+})
+
 export const shorthands = {
   'D': '--dev',
   'P': '--production',

diff --git a/packages/plugin-commands-rebuild/src/rebuild.ts b/packages/plugin-commands-rebuild/src/rebuild.ts
@@ -19,17 +19,17 @@ export function rcOptionsTypes () {
   return {
     ...R.pick([
       'npm-path',
+      'reporter',
+      'unsafe-perm',
     ], allTypes),
   }
 }
 
 export function cliOptionsTypes () {
   return {
-    ...R.pick([
-      'reporter',
-      'unsafe-perm',
-    ], allTypes),
-    'pending': Boolean,
+    ...rcOptionsTypes(),
+    pending: Boolean,
+    recursive: Boolean,
   }
 }
 

diff --git a/packages/plugin-commands-script-runners/src/exec.ts b/packages/plugin-commands-script-runners/src/exec.ts
@@ -9,9 +9,7 @@ import renderHelp = require('render-help')
 
 export const commandNames = ['exec']
 
-export const rcOptionsTypes = cliOptionsTypes
-
-export function cliOptionsTypes () {
+export function rcOptionsTypes () {
   return R.pick([
     'bail',
     'sort',
@@ -20,6 +18,11 @@ export function cliOptionsTypes () {
   ], types)
 }
 
+export const cliOptionsTypes = () => ({
+  ...rcOptionsTypes(),
+  recursive: Boolean,
+})
+
 export function help () {
   return renderHelp({
     description: 'Run a command in each package.',

diff --git a/packages/plugin-commands-script-runners/src/run.ts b/packages/plugin-commands-script-runners/src/run.ts
@@ -37,6 +37,7 @@ export function cliOptionsTypes () {
       'workspace-concurrency',
     ], allTypes),
     ...IF_PRESENT_OPTION,
+    recursive: Boolean,
   }
 }
 

diff --git a/packages/plugin-commands-script-runners/src/runRecursive.ts b/packages/plugin-commands-script-runners/src/runRecursive.ts
@@ -18,7 +18,7 @@ export default async (
   params: string[],
   opts: RecursiveRunOpts,
 ) => {
-  const scriptName = params[0]
+  const [scriptName, ...passedThruArgs] = params
   let hasCommand = 0
   const packageChunks = opts.sort
     ? sortPackages(opts.selectedProjectsGraph)
@@ -34,7 +34,6 @@ export default async (
     opts.workspaceConcurrency === 1 ||
     packageChunks.length === 1 && packageChunks[0].length === 1
   ) ? 'inherit' : 'pipe'
-  const passedThruArgs = params.slice(1)
 
   for (const chunk of packageChunks) {
     await Promise.all(chunk.map((prefix: string) =>

diff --git a/packages/plugin-commands-script-runners/src/test.ts b/packages/plugin-commands-script-runners/src/test.ts
@@ -7,22 +7,24 @@ import renderHelp = require('render-help')
 import { handler as run, RunOpts } from './run'
 
 export function rcOptionsTypes () {
-  return {
-    ...R.pick([
-      'npm-path',
-    ], allTypes),
-  }
-}
-
-export function cliOptionsTypes () {
   return R.pick([
-    'bail',
-    'sort',
+    'npm-path',
     'unsafe-perm',
     'workspace-concurrency',
   ], allTypes)
 }
 
+export function cliOptionsTypes () {
+  return {
+    ...rcOptionsTypes(),
+    ...R.pick([
+      'bail',
+      'sort',
+    ], allTypes),
+    recursive: Boolean,
+  }
+}
+
 export const commandNames = ['test', 't', 'tst']
 
 export function help () {