From 25c5643283bc077023d6548411fabab6f5afe162 Mon Sep 17 00:00:00 2001
From: Nicholas Cunningham <ndcunningham@gmail.com>
Date: Wed, 27 Nov 2024 10:24:06 -0700
Subject: [PATCH] fix(nest): Fix generators (guard, interceptor etc...) path to
 not duplicate when provided (#29084)

<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

<!-- If this is a particularly complex change or feature addition, you
can request a dedicated Nx release for this pull request branch. Mention
someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they
will confirm if the PR warrants its own release for testing purposes,
and generate it for you if appropriate. -->

## Current Behavior
<!-- This is the behavior we have today -->
When we run the nest generators (interceptor, resource, guard etc...) it
tends to duplicate the path and leads to unexpected folder creations.

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->
It should generate in the path provided.

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #29076
---
 docs/generated/packages/nest/generators/guard.json       | 2 +-
 docs/generated/packages/nest/generators/interceptor.json | 2 +-
 packages/nest/src/generators/guard/schema.json           | 2 +-
 packages/nest/src/generators/interceptor/schema.json     | 2 +-
 packages/nest/src/generators/utils/normalize-options.ts  | 6 ++++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/generated/packages/nest/generators/guard.json b/docs/generated/packages/nest/generators/guard.json
index 20921b3958443..689e354e2c156 100644
--- a/docs/generated/packages/nest/generators/guard.json
+++ b/docs/generated/packages/nest/generators/guard.json
@@ -39,7 +39,7 @@
       }
     },
     "additionalProperties": false,
-    "required": ["name"],
+    "required": ["path"],
     "presets": []
   },
   "description": "Run the `guard` NestJS generator with Nx project support.",
diff --git a/docs/generated/packages/nest/generators/interceptor.json b/docs/generated/packages/nest/generators/interceptor.json
index 8f25cf08a5b84..f456859882db1 100644
--- a/docs/generated/packages/nest/generators/interceptor.json
+++ b/docs/generated/packages/nest/generators/interceptor.json
@@ -39,7 +39,7 @@
       }
     },
     "additionalProperties": false,
-    "required": ["name"],
+    "required": ["path"],
     "presets": []
   },
   "description": "Run the `interceptor` NestJS generator with Nx project support.",
diff --git a/packages/nest/src/generators/guard/schema.json b/packages/nest/src/generators/guard/schema.json
index 32217e7496149..4a1ef99e4356d 100644
--- a/packages/nest/src/generators/guard/schema.json
+++ b/packages/nest/src/generators/guard/schema.json
@@ -39,5 +39,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }
diff --git a/packages/nest/src/generators/interceptor/schema.json b/packages/nest/src/generators/interceptor/schema.json
index 91fa7edc33eea..20a16606a3d81 100644
--- a/packages/nest/src/generators/interceptor/schema.json
+++ b/packages/nest/src/generators/interceptor/schema.json
@@ -39,5 +39,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }
diff --git a/packages/nest/src/generators/utils/normalize-options.ts b/packages/nest/src/generators/utils/normalize-options.ts
index 50bba69f812c8..a17980124001d 100644
--- a/packages/nest/src/generators/utils/normalize-options.ts
+++ b/packages/nest/src/generators/utils/normalize-options.ts
@@ -10,16 +10,18 @@ export async function normalizeOptions(
   tree: Tree,
   options: NestGeneratorOptions
 ): Promise<NormalizedOptions> {
-  const { directory, fileName } =
+  const { directory, artifactName } =
     await determineArtifactNameAndDirectoryOptions(tree, {
       name: options.name,
       path: options.path,
     });
 
+  options.path = undefined; // Now that we have `directory` we don't need `path`
+
   return {
     ...options,
     flat: true,
-    name: fileName,
+    name: artifactName,
     skipFormat: options.skipFormat,
     sourceRoot: directory,
   };