feat(core): make swagger tool run in project directory (#758)

nx-dotnet · Sep 19, 2023 · 12d89ac · 12d89ac
1 parent 24eb831
commit 12d89ac
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 12 deletions.
diff --git a/packages/core/src/executors/update-swagger/executor.spec.ts b/packages/core/src/executors/update-swagger/executor.spec.ts
@@ -20,11 +20,8 @@ const mockCSProj = `<Project>
 </ItemGroup>
 </Project>`;
 
-const options: UpdateSwaggerJsonExecutorSchema = {
-  output: '',
-  startupAssembly: '',
-  swaggerDoc: '',
-  skipInstall: false,
+const options: Partial<UpdateSwaggerJsonExecutorSchema> = {
+  output: 'libs/generated/my-app-swagger/swagger.json',
 };
 
 const root = '/virtual';
@@ -36,6 +33,20 @@ jest.mock('@nrwl/devkit', () => ({
 
 jest.mock('../../../../dotnet/src/lib/core/dotnet.client');
 
+jest.mock('fs-extra');
+
+jest.mock('../../generators/utils/get-path-to-startup-assembly', () => ({
+  buildStartupAssemblyPath: (
+    projectName: string,
+    _project: devkit.ProjectConfiguration,
+    csProjFilePath: string,
+  ) =>
+    `${root}/dist/apps/${projectName}/${csProjFilePath.replace(
+      'csproj',
+      'dll',
+    )}`,
+}));
+
 describe('Update-Swagger Executor', () => {
   let context: ExecutorContext;
   let dotnetClient: DotNetClient;
@@ -91,7 +102,14 @@ describe('Update-Swagger Executor', () => {
     const res = await executor(options, context, dotnetClient);
     expect(
       (dotnetClient as jest.Mocked<DotNetClient>).runTool,
-    ).toHaveBeenCalled();
+    ).toHaveBeenCalledWith('swagger', [
+      'tofile',
+      '--output',
+      `${root}/libs/generated/my-app-swagger/swagger.json`,
+      `${root}/dist/apps/my-app/1.dll`,
+      'v1',
+    ]);
+    expect(dotnetClient.cwd).toEqual(`${root}/apps/my-app`);
     expect(res.success).toBeTruthy();
   });
 

diff --git a/packages/core/src/executors/update-swagger/executor.ts b/packages/core/src/executors/update-swagger/executor.ts
@@ -31,10 +31,14 @@ function normalizeOptions(
   projectName: string,
 ): UpdateSwaggerJsonExecutorSchema {
   return {
-    output: opts.output ?? `dist/swagger/${project.root}/swagger.json`,
-    startupAssembly:
-      opts.startupAssembly ??
-      buildStartupAssemblyPath(projectName, project, csProjFilePath),
+    output: resolve(
+      workspaceRoot,
+      opts.output ?? `dist/swagger/${project.root}/swagger.json`,
+    ),
+    startupAssembly: opts.startupAssembly
+      ? resolve(workspaceRoot, opts.startupAssembly)
+      : resolve(buildStartupAssemblyPath(projectName, project, csProjFilePath)),
+
     swaggerDoc: opts.swaggerDoc ?? 'v1',
     skipInstall: opts.skipInstall ?? false,
   };
@@ -77,7 +81,8 @@ export default async function runExecutor(
   const csProjFilePath = await getProjectFileForNxProject(
     nxProjectConfiguration,
   );
-
+  const projectDirectory = resolve(workspaceRoot, nxProjectConfiguration.root);
+  dotnetClient.cwd = projectDirectory;
   const options = normalizeOptions(
     schema,
     nxProjectConfiguration,
@@ -99,7 +104,7 @@ export default async function runExecutor(
     'tofile',
     '--output',
     options.output,
-    resolve(options.startupAssembly),
+    options.startupAssembly,
     options.swaggerDoc,
   ]);