fix(core): add extraParameters support to build and test executors (#514

)
nx-dotnet · Sep 6, 2022 · c6c648d · c6c648d
1 parent e84d4f1
commit c6c648d
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 4 deletions.
diff --git a/docs/core/executors/build.md b/docs/core/executors/build.md
@@ -45,3 +45,7 @@ Builds an app via the `dotnet` cli command.
 ### verbosity
 
 - (string):
+
+### extraParameters
+
+- (string): Extra command-line arguments that are passed verbatim to the dotnet command.
diff --git a/docs/core/executors/test.md b/docs/core/executors/test.md
@@ -104,3 +104,7 @@ Runs test via the dotnet cli
 ### watch
 
 - (boolean): Determines if `dotnet test` or `dotnet watch test` is used to execute tests.
+
+### extraParameters
+
+- (string): Extra command-line arguments that are passed verbatim to the dotnet command.
diff --git a/packages/core/src/executors/build/executor.ts b/packages/core/src/executors/build/executor.ts
@@ -22,11 +22,14 @@ export default async function runExecutor(
     workspaceRoot,
     await getProjectFileForNxProject(nxProjectConfiguration),
   );
+
+  const { extraParameters, ...flags } = options;
+
   options.output = options.output
     ? resolve(workspaceRoot, options.output)
     : undefined;
 
-  dotnetClient.build(projectFilePath, options);
+  dotnetClient.build(projectFilePath, flags, extraParameters);
 
   return {
     success: true,

diff --git a/packages/core/src/executors/build/schema.d.ts b/packages/core/src/executors/build/schema.d.ts
@@ -4,4 +4,5 @@ export type BuildExecutorSchema = {
   [key in dotnetBuildFlags]?: string | boolean;
 } & {
   output?: string;
+  extraParameters?: string;
 };
diff --git a/packages/core/src/executors/build/schema.json b/packages/core/src/executors/build/schema.json
@@ -47,6 +47,10 @@
       "type": "string",
       "enum": ["quiet", "minimal", "normal", "detailed", "diagnostic"],
       "default": "minimal"
+    },
+    "extraParameters": {
+      "type": "string",
+      "description": "Extra command-line arguments that are passed verbatim to the dotnet command."
     }
   },
   "required": ["configuration"]

diff --git a/packages/core/src/executors/test/executor.ts b/packages/core/src/executors/test/executor.ts
@@ -26,13 +26,14 @@ export default async function runExecutor(
     nxProjectConfiguration,
   );
   dotnetClient.cwd = projectDirectory;
-  const { watch, ...parsedOptions } = options;
+  const { watch, extraParameters, ...parsedOptions } = options;
 
   try {
     const result = dotnetClient.test(
       resolve(workspaceRoot, projectFilePath),
       watch,
       parsedOptions,
+      extraParameters,
     );
 
     if (watch && isChildProcess(result)) {

diff --git a/packages/core/src/executors/test/schema.d.ts b/packages/core/src/executors/test/schema.d.ts
@@ -32,4 +32,5 @@ export interface TestExecutorSchema {
     | 'diag'
     | 'diagnostic';
   watch?: boolean;
+  extraParameters?: string;
 }
diff --git a/packages/core/src/executors/test/schema.json b/packages/core/src/executors/test/schema.json
@@ -113,6 +113,10 @@
       "description": "Determines if `dotnet test` or `dotnet watch test` is used to execute tests.",
       "type": "boolean",
       "default": false
+    },
+    "extraParameters": {
+      "type": "string",
+      "description": "Extra command-line arguments that are passed verbatim to the dotnet command."
     }
   },
   "required": []

diff --git a/packages/dotnet/src/lib/core/dotnet.client.ts b/packages/dotnet/src/lib/core/dotnet.client.ts
@@ -60,12 +60,20 @@ export class DotNetClient {
     return parseDotnetNewListOutput(output);
   }
 
-  build(project: string, parameters?: dotnetBuildOptions): void {
+  build(
+    project: string,
+    parameters?: dotnetBuildOptions,
+    extraParameters?: string,
+  ): void {
     const params = [`build`, project];
     if (parameters) {
       parameters = swapKeysUsingMap(parameters, buildKeyMap);
       params.push(...getSpawnParameterArray(parameters));
     }
+    if (extraParameters) {
+      const matches = extraParameters.match(EXTRA_PARAMS_REGEX);
+      params.push(...(matches as string[]));
+    }
     return this.logAndExecute(params);
   }
 
@@ -89,6 +97,7 @@ export class DotNetClient {
     project: string,
     watch?: boolean,
     parameters?: dotnetTestOptions,
+    extraParameters?: string,
   ): void | ChildProcess {
     const params = watch
       ? [`watch`, `--project`, project, `test`]
@@ -98,6 +107,10 @@ export class DotNetClient {
       parameters = swapKeysUsingMap(parameters, testKeyMap);
       params.push(...getSpawnParameterArray(parameters));
     }
+    if (extraParameters) {
+      const matches = extraParameters.match(EXTRA_PARAMS_REGEX);
+      params.push(...(matches as string[]));
+    }
     if (!watch) {
       return this.logAndExecute(params);
     } else {
@@ -138,7 +151,7 @@ export class DotNetClient {
     }
     if (extraParameters) {
       const matches = extraParameters.match(EXTRA_PARAMS_REGEX);
-      params.push(...(matches as RegExpMatchArray));
+      params.push(...(matches as string[]));
     }
     return this.logAndExecute(params);
   }