fix(misc): correct some broken normalizations

nrwl · Nov 28, 2024 · a5439e8 · a5439e8
1 parent 1d13e34
commit a5439e8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 29 deletions.
diff --git a/packages/expo/src/generators/component/component.spec.ts b/packages/expo/src/generators/component/component.spec.ts
@@ -19,7 +19,6 @@ describe('component', () => {
     appTree = createTreeWithEmptyWorkspace();
     appTree.write('.gitignore', '');
     defaultSchema = {
-      name: 'hello',
       path: 'my-lib/src/lib/hello/hello',
       skipTests: false,
       export: false,

diff --git a/packages/expo/src/generators/component/lib/normalize-options.ts b/packages/expo/src/generators/component/lib/normalize-options.ts
@@ -15,8 +15,6 @@ export async function normalizeOptions(
   host: Tree,
   options: Schema
 ): Promise<NormalizedSchema> {
-  assertValidOptions(options);
-
   const {
     artifactName: name,
     fileName,
@@ -45,6 +43,7 @@ export async function normalizeOptions(
 
   return {
     ...options,
+    name,
     directory,
     className,
     fileName,
@@ -53,19 +52,3 @@ export async function normalizeOptions(
     projectName,
   };
 }
-
-function assertValidOptions(options: Schema) {
-  const slashes = ['/', '\\'];
-  slashes.forEach((s) => {
-    if (options.name.indexOf(s) !== -1) {
-      const [name, ...rest] = options.name.split(s).reverse();
-      let suggestion = rest.map((x) => x.toLowerCase()).join(s);
-      if (options.path) {
-        suggestion = `${options.path}${s}${suggestion}`;
-      }
-      throw new Error(
-        `Found "${s}" in the component name. Did you mean to use the --directory option (e.g. \`nx g c ${name} --directory ${suggestion}\`)?`
-      );
-    }
-  });
-}
diff --git a/packages/react/src/generators/hook/hook.ts b/packages/react/src/generators/hook/hook.ts
@@ -98,26 +98,26 @@ async function normalizeOptions(
   options: Schema
 ): Promise<NormalizedSchema> {
   const {
+    artifactName,
     directory,
-    fileName: _fileName,
+    fileName: hookFilename,
     project: projectName,
   } = await determineArtifactNameAndDirectoryOptions(host, {
     path: options.path,
     name: options.name,
     fileExtension: 'tsx',
   });
 
-  const { className, fileName } = names(_fileName);
+  const { className } = names(hookFilename);
 
-  // If using `as-provided` file and directory, then don't normalize.
-  // Otherwise, support legacy behavior of prefixing filename with `use-`.
-  const hookFilename = fileName;
-  const hookName = className.toLocaleLowerCase().startsWith('use')
-    ? className
-    : 'use'.concat(className);
-  const hookTypeName = className.toLocaleLowerCase().startsWith('use')
+  // if name is provided, use it as is for the hook name, otherwise prepend
+  // `use` to the pascal-cased file name if it doesn't already start with `use`
+  const hookName = options.name
+    ? artifactName
+    : className.toLocaleLowerCase().startsWith('use')
     ? className
-    : 'Use'.concat(className);
+    : `use${className}`;
+  const hookTypeName = names(hookName).className;
   const project = getProjects(host).get(projectName);
 
   const { sourceRoot: projectSourceRoot, projectType } = project;