@nx/react 0.0.0-pr-27957-a99d5ea → 0.0.0-pr-28229-afe192c

package/src/generators/hook/hook.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hookGenerator = hookGenerator;
-exports.hookGeneratorInternal = hookGeneratorInternal;
 // TODO(jack): Remove inline renderHook function when RTL releases with its own version
 const devkit_1 = require("@nx/devkit");
 const ast_utils_1 = require("../../utils/ast-utils");
@@ -9,12 +8,6 @@ const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescri
 const path_1 = require("path");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 async function hookGenerator(host, schema) {
-    return hookGeneratorInternal(host, {
-        nameAndDirectoryFormat: 'derived',
-        ...schema,
-    });
-}
-async function hookGeneratorInternal(host, schema) {
     const options = await normalizeOptions(host, schema);
     createFiles(host, options);
     addExportsToBarrel(host, options);
@@ -57,53 +50,26 @@ function addExportsToBarrel(host, options) {
 }
 async function normalizeOptions(host, options) {
     assertValidOptions(options);
-    const { artifactName: name, directory: _directory, fileName: _fileName, nameAndDirectoryFormat, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
-        artifactType: 'hook',
-        callingGenerator: '@nx/react:hook',
+    const { directory, fileName: _fileName, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+        path: options.path,
         name: options.name,
-        directory: options.directory,
-        derivedDirectory: options.directory,
-        flat: options.flat,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         fileExtension: 'tsx',
-        pascalCaseFile: options.pascalCaseFiles,
-        pascalCaseDirectory: options.pascalCaseDirectory,
     });
-    let base = _fileName;
-    if (base.startsWith('use-')) {
-        base = base.substring(4);
-    }
-    else if (base.startsWith('use')) {
-        base = base.substring(3);
-    }
-    const { className, fileName } = (0, devkit_1.names)(base);
+    const { className, fileName } = (0, devkit_1.names)(_fileName);
     // If using `as-provided` file and directory, then don't normalize.
     // Otherwise, support legacy behavior of prefixing filename with `use-`.
-    const hookFilename = nameAndDirectoryFormat === 'as-provided'
-        ? fileName
-        : options.pascalCaseFiles
-            ? 'use'.concat(className)
-            : 'use-'.concat(fileName);
-    const hookName = 'use'.concat(className);
-    const hookTypeName = 'Use'.concat(className);
+    const hookFilename = fileName;
+    const hookName = className.toLocaleLowerCase().startsWith('use')
+        ? className
+        : 'use'.concat(className);
+    const hookTypeName = className.toLocaleLowerCase().startsWith('use')
+        ? className
+        : 'Use'.concat(className);
     const project = (0, devkit_1.getProjects)(host).get(projectName);
     const { sourceRoot: projectSourceRoot, projectType } = project;
     if (options.export && projectType === 'application') {
         devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
     }
-    // Support legacy behavior of derived directory to prefix with `use-`.
-    let directory = _directory;
-    if (nameAndDirectoryFormat === 'derived') {
-        const parts = directory.split('/');
-        parts.pop();
-        if (!options.flat) {
-            parts.push(options.pascalCaseDirectory
-                ? 'use'.concat(className)
-                : 'use-'.concat(fileName));
-        }
-        directory = parts.join('/');
-    }
     return {
         ...options,
         directory,

package/src/generators/hook/schema.d.ts

@@ -1,24 +1,9 @@
 export interface Schema {
-  name: string;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project: string;
+  path: string;
+  name?: string;
   skipTests?: boolean;
   directory?: string;
   export?: boolean;
-  /**
-   * @deprecated Provide the `name` option instead and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  pascalCaseFiles?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  pascalCaseDirectory?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  flat?: boolean;
   js?: boolean;
-  nameAndDirectoryFormat?: 'as-provided' | 'derived';
+  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/hook/schema.json

@@ -7,27 +7,24 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g hook my-hook --project=mylib",
-      "description": "Generate a hook in the `mylib` library"
+      "command": "nx g hook mylib/my-hook",
+      "description": "Generate a hook `my-hook` in the `mylib` library"
     }
   ],
   "properties": {
-    "project": {
+    "path": {
       "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
+      "description": "Path where the hook will be generated.",
       "$default": {
-        "$source": "projectName"
+        "$source": "argv",
+        "index": 0
       },
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
+      "x-prompt": "Where should the hook be generated?",
+      "x-priority": "important"
     },
     "name": {
       "type": "string",
       "description": "The name of the hook.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
       "x-prompt": "What name would you like to use for the hook?",
       "x-priority": "important"
     },
@@ -52,32 +49,12 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "flat": {
-      "type": "boolean",
-      "description": "Create hook at the source root rather than its own directory.",
-      "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "export": {
       "type": "boolean",
       "description": "When true, the hook is exported from the project `index.ts` (if it exists).",
       "alias": "e",
       "default": false,
       "x-prompt": "Should this hook be exported in the project?"
-    },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case hook file name (e.g. `useHook.ts`).",
-      "alias": "P",
-      "default": false,
-      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19."
-    },
-    "pascalCaseDirectory": {
-      "type": "boolean",
-      "description": "Use pascal case directory name (e.g. `useHook/useHook.ts`).",
-      "alias": "R",
-      "default": false,
-      "x-deprecated": "Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19."
     }
   },
   "required": ["name"]

package/src/generators/host/host.d.ts

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function hostGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
-export declare function hostGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default hostGenerator;

package/src/generators/host/host.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hostGenerator = hostGenerator;
-exports.hostGeneratorInternal = hostGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const update_module_federation_project_1 = require("../../rules/update-module-federation-project");
 const application_1 = require("../application/application");
@@ -15,16 +14,11 @@ const update_module_federation_e2e_project_1 = require("./lib/update-module-fede
 const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 async function hostGenerator(host, schema) {
-    return hostGeneratorInternal(host, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function hostGeneratorInternal(host, schema) {
     const tasks = [];
     const options = {
-        ...(await (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:host')),
+        ...(await (0, normalize_options_1.normalizeOptions)(host, schema)),
         js: schema.js ?? false,
         typescriptConfiguration: schema.js
             ? false
@@ -44,8 +38,10 @@ async function hostGeneratorInternal(host, schema) {
             }
         });
     }
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
     const initTask = await (0, application_1.default)(host, {
         ...options,
+        name: options.projectName,
         // The target use-case is loading remotes as child routes, thus always enable routing.
         routing: true,
         skipFormat: true,
@@ -67,7 +63,6 @@ async function hostGeneratorInternal(host, schema) {
                 devServerPort: remotePort,
                 ssr: options.ssr,
                 skipFormat: true,
-                projectNameAndRootFormat: options.projectNameAndRootFormat,
                 typescriptConfiguration: options.typescriptConfiguration,
                 js: options.js,
                 dynamic: options.dynamic,

package/src/generators/host/lib/add-module-federation-files.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const maybe_js_1 = require("../../../utils/maybe-js");
 function addModuleFederationFiles(host, options, defaultRemoteManifest) {
     const templateVariables = {
-        ...(0, devkit_1.names)(options.name),
+        ...(0, devkit_1.names)(options.projectName),
         ...options,
         static: !options?.dynamic,
         tmpl: '',
@@ -16,7 +16,7 @@ function addModuleFederationFiles(host, options, defaultRemoteManifest) {
             };
         }),
     };
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.name);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     const pathToMFManifest = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'assets/module-federation.manifest.json');
     // Module federation requires bootstrap code to be dynamically imported.
     // Renaming original entry file so we can use `import(./bootstrap)` in

package/src/generators/host/lib/normalize-remote.js

@@ -9,19 +9,23 @@ async function normalizeRemoteName(tree, remote, options) {
         name: remote,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/react:host',
     });
     return remoteName;
 }
 function normalizeRemoteDirectory(remote, options) {
-    if (options.projectNameAndRootFormat === 'derived' || !options.directory) {
-        return options.directory;
-    }
     /**
      * With the `as-provided` format, the provided directory would be the root
      * of the host application. Append the remote name to the host parent
      * directory to get the remote directory.
+     *
+     * If no directory is provided, the remote directory will use the grandparent of the hostRoot 'acme/host/src' -> 'acme'
      */
-    return (0, devkit_1.joinPathFragments)(options.directory, '..', remote);
+    if (options.directory) {
+        return (0, devkit_1.joinPathFragments)(options.directory, '..', remote);
+    }
+    else {
+        return options.appProjectRoot === '.'
+            ? remote
+            : (0, devkit_1.joinPathFragments)(options.appProjectRoot, '..', remote);
+    }
 }

package/src/generators/host/schema.d.ts

@@ -1,4 +1,3 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { SupportedStyles } from '../../../typings/style';
 
@@ -6,14 +5,12 @@ export interface Schema {
   classComponent?: boolean;
   compiler?: 'babel' | 'swc';
   devServerPort?: number;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
   e2eTestRunner: 'cypress' | 'playwright' | 'none';
   globalCss?: boolean;
   js?: boolean;
   linter: Linter | LinterType;
-  name: string;
-  pascalCaseFiles?: boolean;
+  name?: string;
   remotes?: string[];
   setParserOptionsProject?: boolean;
   skipFormat?: boolean;

package/src/generators/host/schema.json

@@ -6,28 +6,22 @@
   "description": "Create Module Federation configuration files for given React Host Application.",
   "type": "object",
   "properties": {
-    "name": {
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
-      "description": "The name of the host application to generate the Module Federation configuration",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use as the host application?",
-      "pattern": "^[a-zA-Z][^:]*$",
-      "x-priority": "important"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "directory": {
-      "description": "The directory of the new application.",
+    "name": {
       "type": "string",
-      "alias": "dir",
+      "description": "The name of the host application to generate the Module Federation configuration",
+      "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -113,12 +107,6 @@
       "description": "Add tags to the application (used for linting).",
       "alias": "t"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. App.tsx).",
-      "alias": "P",
-      "default": false
-    },
     "classComponent": {
       "type": "boolean",
       "description": "Use class components instead of functional component.",
@@ -193,6 +181,6 @@
       "x-priority": "important"
     }
   },
-  "required": ["name"],
+  "required": ["directory"],
   "additionalProperties": false
 }

package/src/generators/library/lib/normalize-options.js

@@ -5,13 +5,12 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const assertion_1 = require("../../../utils/assertion");
 async function normalizeOptions(host, options) {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
         importPath: options.importPath,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/react:library',
     });
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&

package/src/generators/library/library.js

@@ -23,7 +23,6 @@ const set_defaults_1 = require("./lib/set-defaults");
 async function libraryGenerator(host, schema) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }
@@ -125,6 +124,7 @@ async function libraryGeneratorInternal(host, schema) {
             skipFormat: true,
             testEnvironment: 'jsdom',
             addPlugin: options.addPlugin,
+            compiler: options.compiler,
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(host, {
@@ -147,19 +147,15 @@ async function libraryGeneratorInternal(host, schema) {
     }
     if (options.component) {
         const relativeCwd = (0, artifact_name_and_directory_utils_1.getRelativeCwd)();
-        const name = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.fileName);
+        const path = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.fileName);
         const componentTask = await (0, component_1.default)(host, {
-            nameAndDirectoryFormat: 'as-provided',
-            name: relativeCwd ? (0, path_1.relative)(relativeCwd, name) : name,
-            project: options.name,
-            flat: true,
+            path: relativeCwd ? (0, path_1.relative)(relativeCwd, path) : path,
             style: options.style,
             skipTests: options.unitTestRunner === 'none' ||
                 (options.unitTestRunner === 'vitest' && options.inSourceTests == true),
             export: true,
             routing: options.routing,
             js: options.js,
-            pascalCaseFiles: options.pascalCaseFiles,
             inSourceTests: options.inSourceTests,
             skipFormat: true,
             globalCss: options.globalCss,

package/src/generators/library/schema.d.ts

@@ -1,4 +1,3 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { SupportedStyles } from '../../../typings/style';
 
@@ -8,15 +7,13 @@ export interface Schema {
   bundler?: 'none' | 'rollup' | 'vite';
   compiler?: 'babel' | 'swc';
   component?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
   globalCss?: boolean;
   importPath?: string;
   inSourceTests?: boolean;
   js?: boolean;
   linter: Linter | LinterType;
-  name: string;
-  pascalCaseFiles?: boolean;
+  name?: string;
   publishable?: boolean;
   routing?: boolean;
   setParserOptionsProject?: boolean;

package/src/generators/library/schema.json

@@ -16,28 +16,21 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "Library name",
+      "description": "A directory where the lib is placed.",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the library?",
-      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
-      "x-priority": "important"
+      "x-prompt": "Which directory do you want to create the library in?"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "A directory where the lib is placed.",
-      "alias": "dir",
+      "description": "Library name",
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -47,7 +40,10 @@
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
         "items": [
-          { "value": "css", "label": "CSS" },
+          {
+            "value": "css",
+            "label": "CSS"
+          },
           {
             "value": "scss",
             "label": "SASS(.scss)       [ https://sass-lang.com          ]"
@@ -83,7 +79,8 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "vitest", "none"],
+      "enum": ["vitest", "jest", "none"],
+      "default": "vitest",
       "description": "Test runner to use for unit tests.",
       "x-prompt": "What unit test runner should be used?"
     },
@@ -109,12 +106,6 @@
       "description": "Do not update `tsconfig.json` for development experience.",
       "x-priority": "internal"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. `App.tsx`).",
-      "alias": "P",
-      "default": false
-    },
     "routing": {
       "type": "boolean",
       "description": "Generate library with routes."
@@ -194,5 +185,5 @@
       "default": false
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/generators/redux/redux.d.ts

@@ -1,5 +1,4 @@
 import { Schema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function reduxGenerator(host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
-export declare function reduxGeneratorInternal(host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default reduxGenerator;

package/src/generators/redux/redux.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reduxGenerator = reduxGenerator;
-exports.reduxGeneratorInternal = reduxGeneratorInternal;
 const path = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
 const versions_1 = require("../../utils/versions");
@@ -11,12 +10,6 @@ const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescri
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 let tsModule;
 async function reduxGenerator(host, schema) {
-    return reduxGeneratorInternal(host, {
-        nameAndDirectoryFormat: 'derived',
-        ...schema,
-    });
-}
-async function reduxGeneratorInternal(host, schema) {
     const options = await normalizeOptions(host, schema);
     generateReduxFiles(host, options);
     addExportsToBarrel(host, options);
@@ -27,7 +20,7 @@ async function reduxGeneratorInternal(host, schema) {
     return installTask;
 }
 function generateReduxFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files'), options.directory, {
+    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files'), options.projectDirectory, {
         ...options,
         tmpl: '',
     });
@@ -49,8 +42,8 @@ function addExportsToBarrel(host, options) {
     const indexSource = host.read(indexFilePath, 'utf-8');
     if (indexSource !== null) {
         const indexSourceFile = tsModule.createSourceFile(indexFilePath, indexSource, tsModule.ScriptTarget.Latest, true);
-        const statePath = options.directory
-            ? `./lib/${options.directory}/${options.fileName}`
+        const statePath = options.path
+            ? `./lib/${options.path}/${options.fileName}`
             : `./lib/${options.fileName}`;
         const changes = (0, devkit_1.applyChangesToString)(indexSource, (0, ast_utils_1.addImport)(indexSourceFile, `export * from '${statePath}.slice';`));
         host.write(indexFilePath, changes);
@@ -85,14 +78,8 @@ function updateReducerConfiguration(host, options) {
 }
 async function normalizeOptions(host, options) {
     const { artifactName: name, directory, fileName, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
-        artifactType: 'slice',
-        callingGenerator: '@nx/react:redux',
+        path: options.path,
         name: options.name,
-        directory: options.directory,
-        derivedDirectory: options.directory,
-        flat: true,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         fileExtension: 'tsx',
     });
     let appProjectSourcePath;
@@ -106,8 +93,8 @@ async function normalizeOptions(host, options) {
         ? tsConfigJson.compilerOptions.paths || {}
         : {};
     const modulePath = projectType === 'application'
-        ? options.directory
-            ? `./app/${options.directory}/${extraNames.fileName}.slice`
+        ? options.path
+            ? `./app/${options.path}/${extraNames.fileName}.slice`
             : `./app/${extraNames.fileName}.slice`
         : Object.keys(tsPaths).find((k) => tsPaths[k].some((s) => s.includes(sourceRoot)));
     // If --project is set to an app, automatically configure store
@@ -130,8 +117,8 @@ async function normalizeOptions(host, options) {
         ...options,
         ...extraNames,
         fileName,
-        constantName: (0, devkit_1.names)(options.name).constantName.toUpperCase(),
-        directory,
+        constantName: (0, devkit_1.names)(name).constantName.toUpperCase(),
+        projectDirectory: directory,
         projectType,
         projectSourcePath: sourceRoot,
         projectModulePath: modulePath,

package/src/generators/redux/schema.d.ts

@@ -1,17 +1,13 @@
 export interface Schema {
-  name: string;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
-  directory?: string;
+  path: string;
+  name?: string;
   appProject?: string;
   js?: string;
-  nameAndDirectoryFormat?: 'as-provided' | 'derived';
 }
 
 interface NormalizedSchema extends Schema {
   projectType: string;
+  projectDirectory: string;
   projectSourcePath: string;
   projectModulePath: string;
   appProjectSourcePath: string;