fix(core): #35 dry run is not passed to dotnet new

nx-dotnet · May 5, 2021 · 8e0b398 · 8e0b398
1 parent f075046
commit 8e0b398
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 9 deletions.
diff --git a/packages/core/src/generators/utils/generate-project.ts b/packages/core/src/generators/utils/generate-project.ts
@@ -117,9 +117,7 @@ async function GenerateTestProject(
   ];
 
   if (isDryRun()) {
-    newParams.push({
-      flag: 'dryRun',
-    });
+    addDryRunParameter(newParams);
   }
 
   dotnetClient.new(schema.testTemplate, newParams);
@@ -220,9 +218,7 @@ export async function GenerateProject(
   ];
 
   if (isDryRun()) {
-    newParams.push({
-      flag: 'dryRun',
-    });
+    addDryRunParameter(newParams);
   }
 
   dotnetClient.new(normalizedOptions.template, newParams);
@@ -244,3 +240,10 @@ export async function GenerateProject(
 
   await formatFiles(host);
 }
+
+function addDryRunParameter(parameters: dotnetNewOptions): void {
+  parameters.push({
+    flag: 'dryRun',
+    value: true,
+  });
+}
diff --git a/packages/dotnet/src/lib/core/dotnet.client.ts b/packages/dotnet/src/lib/core/dotnet.client.ts
@@ -14,6 +14,7 @@ import {
   dotnetRunOptions,
   dotnetTemplate,
   dotnetTestOptions,
+  newKeyMap,
   testKeyMap,
 } from '../models';
 import { LoadedCLI } from './dotnet.factory';
@@ -24,7 +25,7 @@ export class DotNetClient {
   new(template: dotnetTemplate, parameters?: dotnetNewOptions): Buffer {
     let cmd = `${this.cliCommand.command} new ${template}`;
     if (parameters) {
-      parameters = swapArrayFieldValueUsingMap(parameters, 'flag', testKeyMap);
+      parameters = swapArrayFieldValueUsingMap(parameters, 'flag', newKeyMap);
       const paramString = parameters ? getParameterString(parameters) : '';
       cmd = `${cmd} ${paramString}`;
     }

diff --git a/packages/utils/src/lib/utility-functions/args.ts b/packages/utils/src/lib/utility-functions/args.ts
@@ -22,6 +22,6 @@ export function swapArrayFieldValueUsingMap<T>(
 ) {
   return array.map((x) => ({
     ...x,
-    field: map[x[field]] ?? x[field],
+    [field]: map[x[field]] ?? x[field],
   }));
 }
diff --git a/yarn.lock b/yarn.lock
@@ -838,6 +838,17 @@
     node-gyp "^7.1.0"
     read-package-json-fast "^2.0.1"
 
+"@nrwl/cli@*":
+  version "12.1.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-12.1.1.tgz#853f04314b584173e54ad427770731da2e74a029"
+  integrity sha512-Svsq0qFu6RnP8piVS69mxgQCYKLvhhCLVVa9/mGLY6guXApk2pc6fHQMmB2HgYZuAUtwDADw/qe8LBh4Hr4PRQ==
+  dependencies:
+    "@nrwl/tao" "12.1.1"
+    chalk "4.1.0"
+    v8-compile-cache "2.3.0"
+    yargs "15.4.1"
+    yargs-parser "20.0.0"
+
 "@nrwl/cli@12.0.8":
   version "12.0.8"
   resolved "https://registry.npmjs.org/@nrwl/cli/-/cli-12.0.8.tgz"
@@ -965,6 +976,22 @@
     tslib "^2.0.0"
     yargs-parser "20.0.0"
 
+"@nrwl/tao@12.1.1":
+  version "12.1.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-12.1.1.tgz#b00273390a1f7dc136954328bb76a94cd95a4e6d"
+  integrity sha512-qzJpQ6YAmAEy1toYM1JPZtNMo+GFNnly53FV4j1c/1gnQpmpT3PU3gFwEx/tzseafX6DKlxF/KSAbPdhsNnkdw==
+  dependencies:
+    chalk "4.1.0"
+    enquirer "~2.3.6"
+    fs-extra "^9.1.0"
+    rxjs "^6.5.4"
+    rxjs-for-await "0.0.2"
+    semver "7.3.4"
+    strip-json-comments "^3.1.1"
+    tmp "~0.2.1"
+    tslib "^2.0.0"
+    yargs-parser "20.0.0"
+
 "@nrwl/workspace@12.0.8":
   version "12.0.8"
   resolved "https://registry.npmjs.org/@nrwl/workspace/-/workspace-12.0.8.tgz"
@@ -4454,7 +4481,7 @@ fs-extra@7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.0:
+fs-extra@^9.0.0, fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -7497,6 +7524,13 @@ nwsapi@^2.2.0:
   resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
+nx@^12.1.1:
+  version "12.1.1"
+  resolved "https://registry.yarnpkg.com/nx/-/nx-12.1.1.tgz#86f07c2cd1edf1ee4ba5b3f4337055c7ba29ff39"
+  integrity sha512-RLMlWwMw+JyKL+rxhRpx0NHCIZWtdP16Kv8eNA0p4X6aMnoI6wxrZBjFxLterg9CoHyY6fMnDXo6VCTMjFEiLw==
+  dependencies:
+    "@nrwl/cli" "*"
+
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"