fix(core): runExecutor should set overrides_unparsed to mimic the inv…

…ocation from the terminal
nrwl · Jun 15, 2022 · da1faaf · da1faaf · vercel · Jun 15, 2022
1 parent d68b9bb
commit da1faaf
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 25 deletions.
diff --git a/docs/generated/devkit/index.md b/docs/generated/devkit/index.md
@@ -1605,7 +1605,7 @@ B will depend on A.
 
 ### runExecutor
 
-▸ **runExecutor**<`T`\>(`targetDescription`, `options`, `context`): `Promise`<`AsyncIterableIterator`<`T`\>\>
+▸ **runExecutor**<`T`\>(`targetDescription`, `overrides`, `context`): `Promise`<`AsyncIterableIterator`<`T`\>\>
 
 Loads and invokes executor.
 
@@ -1649,7 +1649,7 @@ Note that the return value is a promise of an iterator, so you need to await bef
 | `targetDescription.configuration?` | `string`                                                |
 | `targetDescription.project`        | `string`                                                |
 | `targetDescription.target`         | `string`                                                |
-| `options`                          | `Object`                                                |
+| `overrides`                        | `Object`                                                |
 | `context`                          | [`ExecutorContext`](../../devkit/index#executorcontext) |
 
 #### Returns

diff --git a/docs/generated/packages/devkit.json b/docs/generated/packages/devkit.json
diff --git a/packages/nx/src/command-line/run.ts b/packages/nx/src/command-line/run.ts
@@ -20,6 +20,7 @@ import {
   ProjectsConfigurations,
 } from '../config/workspace-json-project-json';
 import { Executor, ExecutorContext } from '../config/misc-interfaces';
+import { serializeOverridesIntoCommandLine } from 'nx/src/utils/serialize-overrides-into-command-line';
 
 export interface Target {
   project: string;
@@ -123,7 +124,7 @@ async function runExecutorInternal<T extends { success: boolean }>(
     target: string;
     configuration?: string;
   },
-  options: { [k: string]: any },
+  overrides: { [k: string]: any },
   root: string,
   cwd: string,
   workspace: ProjectsConfigurations & NxJsonConfiguration,
@@ -164,7 +165,7 @@ async function runExecutorInternal<T extends { success: boolean }>(
   }
 
   const combinedOptions = combineOptionsForExecutor(
-    options,
+    overrides,
     configuration,
     targetConfig,
     schema,
@@ -245,12 +246,15 @@ export async function runExecutor<T extends { success: boolean }>(
     target: string;
     configuration?: string;
   },
-  options: { [k: string]: any },
+  overrides: { [k: string]: any },
   context: ExecutorContext
 ): Promise<AsyncIterableIterator<T>> {
   return await runExecutorInternal<T>(
     targetDescription,
-    options,
+    {
+      ...overrides,
+      __overrides_unparsed__: serializeOverridesIntoCommandLine(overrides),
+    },
     context.root,
     context.cwd,
     context.workspace,

diff --git a/packages/nx/src/utils/command-line-utils.ts b/packages/nx/src/utils/command-line-utils.ts
@@ -5,8 +5,8 @@ import { output } from './output';
 import { NxJsonConfiguration } from '../config/nx-json';
 import { execSync } from 'child_process';
 import { readAllWorkspaceConfiguration } from '../config/configuration';
+import { serializeOverridesIntoCommandLine } from './serialize-overrides-into-command-line';
 
-//
 export function names(name: string): {
   name: string;
   className: string;
@@ -199,7 +199,7 @@ export function splitArgsIntoNxArgsAndOverrides(
     }
   } else {
     overrides = overridesFromMainArgs;
-    overrides['__overrides_unparsed__'] = serializeArgsIntoCommandLine(
+    overrides['__overrides_unparsed__'] = serializeOverridesIntoCommandLine(
       overridesFromMainArgs
     );
   }
@@ -395,19 +395,3 @@ export function getProjectRoots(projectNames: string[]): string[] {
   const { projects } = readAllWorkspaceConfiguration();
   return projectNames.map((name) => projects[name].root);
 }
-
-export function serializeArgsIntoCommandLine(args: {
-  [k: string]: any;
-}): string[] {
-  const r = args['_'] ? [...args['_']] : [];
-  Object.keys(args).forEach((a) => {
-    if (a !== '_') {
-      r.push(
-        typeof args[a] === 'string' && args[a].includes(' ')
-          ? `--${a}="${args[a].replace(/"/g, '"')}"`
-          : `--${a}=${args[a]}`
-      );
-    }
-  });
-  return r;
-}
diff --git a/packages/nx/src/utils/serialize-overrides-into-command-line.ts b/packages/nx/src/utils/serialize-overrides-into-command-line.ts
@@ -0,0 +1,15 @@
+export function serializeOverridesIntoCommandLine(args: {
+  [k: string]: any;
+}): string[] {
+  const r = args['_'] ? [...args['_']] : [];
+  Object.keys(args).forEach((a) => {
+    if (a !== '_') {
+      r.push(
+        typeof args[a] === 'string' && args[a].includes(' ')
+          ? `--${a}="${args[a].replace(/"/g, '"')}"`
+          : `--${a}=${args[a]}`
+      );
+    }
+  });
+  return r;
+}