cleanup(angular): address pr feedback

nrwl · Oct 11, 2023 · c75ab8c · c75ab8c
1 parent 93e16fb
commit c75ab8c
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 240 deletions.
diff --git a/docs/generated/packages/angular/generators/component.json b/docs/generated/packages/angular/generators/component.json
@@ -19,20 +19,14 @@
       "directory": {
         "type": "string",
         "description": "The directory at which to create the component file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-        "aliases": ["dir"],
+        "aliases": ["dir", "path"],
         "x-priority": "important"
       },
       "nameAndDirectoryFormat": {
         "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
         "type": "string",
         "enum": ["as-provided", "derived"]
       },
-      "path": {
-        "type": "string",
-        "description": "The directory at which to create the component file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-        "visible": false,
-        "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
-      },
       "project": {
         "type": "string",
         "description": "The name of the project.",

diff --git a/packages/angular/src/generators/component/lib/normalize-options.ts b/packages/angular/src/generators/component/lib/normalize-options.ts
@@ -10,17 +10,22 @@ export async function normalizeOptions(
   options: Schema
 ): Promise<NormalizedSchema> {
   options.type ??= 'component';
-  const { directory, file, name, project } =
-    await determineArtifactNameAndDirectoryOptions(tree, {
-      artifactName: 'component',
-      callingGenerator: '@nx/angular:component',
-      name: options.name,
-      directory: options.directory ?? options.path,
-      flat: options.flat,
-      nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-      project: options.project,
-      suffix: options.type ?? 'component',
-    });
+  const {
+    artifactName: name,
+    directory,
+    fileName,
+    filePath,
+    project,
+  } = await determineArtifactNameAndDirectoryOptions(tree, {
+    artifactType: 'component',
+    callingGenerator: '@nx/angular:component',
+    name: options.name,
+    directory: options.directory ?? options.path,
+    flat: options.flat,
+    nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+    project: options.project,
+    suffix: options.type ?? 'component',
+  });
 
   const { className } = names(name);
   const { className: suffixClassName } = names(options.type);
@@ -42,8 +47,8 @@ export async function normalizeOptions(
     changeDetection: options.changeDetection ?? 'Default',
     style: options.style ?? 'css',
     directory,
-    fileName: file.name,
-    filePath: file.path,
+    fileName,
+    filePath,
     symbolName,
     projectSourceRoot: sourceRoot,
     projectRoot: root,

diff --git a/packages/angular/src/generators/component/schema.json b/packages/angular/src/generators/component/schema.json
@@ -19,20 +19,14 @@
     "directory": {
       "type": "string",
       "description": "The directory at which to create the component file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir"],
+      "aliases": ["dir", "path"],
       "x-priority": "important"
     },
     "nameAndDirectoryFormat": {
       "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "path": {
-      "type": "string",
-      "description": "The directory at which to create the component file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "visible": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
-    },
     "project": {
       "type": "string",
       "description": "The name of the project.",