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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "0.0.0-pr-27957-a99d5ea",
+  "version": "0.0.0-pr-28229-afe192c",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
   "repository": {
@@ -29,14 +29,13 @@
   "homepage": "https://nx.dev",
   "dependencies": {
     "ejs": "^3.1.7",
-    "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
     "tmp": "~0.2.1",
     "tslib": "^2.3.0",
     "semver": "^7.5.3",
     "yargs-parser": "21.1.1",
     "minimatch": "9.0.3",
-    "@nrwl/devkit": "0.0.0-pr-27957-a99d5ea"
+    "enquirer": "~2.3.6"
   },
   "peerDependencies": {
     "nx": ">= 17 <= 20"
@@ -49,4 +48,4 @@
   },
   "type": "commonjs",
   "types": "./index.d.ts"
-}
+}

package/src/generators/artifact-name-and-directory-utils.d.ts

@@ -1,20 +1,10 @@
-import { Tree } from 'nx/src/devkit-exports';
-export type NameAndDirectoryFormat = 'as-provided' | 'derived';
+import { type Tree } from 'nx/src/devkit-exports';
 export type ArtifactGenerationOptions = {
-    artifactType: string;
-    callingGenerator: string | null;
-    name: string;
-    directory?: string;
-    disallowPathInNameForDerived?: boolean;
+    path: string;
+    name?: string;
     fileExtension?: 'js' | 'jsx' | 'ts' | 'tsx' | 'vue';
     fileName?: string;
-    flat?: boolean;
-    nameAndDirectoryFormat?: NameAndDirectoryFormat;
-    pascalCaseDirectory?: boolean;
-    pascalCaseFile?: boolean;
-    project?: string;
     suffix?: string;
-    derivedDirectory?: string;
 };
 export type NameAndDirectoryOptions = {
     /**
@@ -38,9 +28,7 @@ export type NameAndDirectoryOptions = {
      */
     project: string;
 };
-export declare function determineArtifactNameAndDirectoryOptions(tree: Tree, options: ArtifactGenerationOptions): Promise<NameAndDirectoryOptions & {
-    nameAndDirectoryFormat: NameAndDirectoryFormat;
-}>;
+export declare function determineArtifactNameAndDirectoryOptions(tree: Tree, options: ArtifactGenerationOptions): Promise<NameAndDirectoryOptions>;
 export declare function getRelativeCwd(): string;
 /**
  * Function for setting cwd during testing

package/src/generators/artifact-name-and-directory-utils.js

@@ -3,210 +3,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineArtifactNameAndDirectoryOptions = determineArtifactNameAndDirectoryOptions;
 exports.getRelativeCwd = getRelativeCwd;
 exports.setCwd = setCwd;
-const enquirer_1 = require("enquirer");
-const path_1 = require("path");
-const names_1 = require("../utils/names");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
+const path_1 = require("path");
 async function determineArtifactNameAndDirectoryOptions(tree, options) {
-    if (!options.nameAndDirectoryFormat &&
-        (process.env.NX_INTERACTIVE !== 'true' || !isTTY())) {
-        options.nameAndDirectoryFormat = 'derived';
-    }
-    const formats = getNameAndDirectoryOptionFormats(tree, options);
-    const format = options.nameAndDirectoryFormat ?? (await determineFormat(formats, options));
-    validateResolvedProject(tree, formats[format]?.project, options, formats[format]?.directory);
-    if (format === 'derived' && options.callingGenerator) {
-        logDeprecationMessage(options, formats);
-    }
-    return {
-        ...formats[format],
-        nameAndDirectoryFormat: format,
-    };
+    const normalizedOptions = getNameAndDirectoryOptions(tree, options);
+    validateResolvedProject(normalizedOptions.project, normalizedOptions.directory);
+    return normalizedOptions;
 }
-async function determineFormat(formats, options) {
-    if (!formats.derived) {
-        return 'as-provided';
-    }
-    const asProvidedDescription = `As provided: ${formats['as-provided'].filePath}`;
-    const asProvidedSelectedValue = formats['as-provided'].filePath;
-    const derivedDescription = `Derived:     ${formats['derived'].filePath}`;
-    const derivedSelectedValue = formats['derived'].filePath;
-    if (asProvidedSelectedValue === derivedSelectedValue) {
-        return 'as-provided';
-    }
-    const result = await (0, enquirer_1.prompt)({
-        type: 'select',
-        name: 'format',
-        message: `Where should the ${options.artifactType} be generated?`,
-        choices: [
-            {
-                message: asProvidedDescription,
-                name: asProvidedSelectedValue,
-            },
-            {
-                message: derivedDescription,
-                name: derivedSelectedValue,
-            },
-        ],
-        initial: 0,
-    }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
-    return result;
-}
-function logDeprecationMessage(options, formats) {
-    devkit_exports_1.logger.warn(`
-In Nx 20, generating a ${options.artifactType} will no longer support providing a project and deriving the directory.
-Please provide the exact directory in the future.
-Example: nx g ${options.callingGenerator} ${formats['derived'].artifactName} --directory ${formats['derived'].directory}
-NOTE: The example above assumes the command is being run from the workspace root. If the command is being run from a subdirectory, the directory option should be adjusted accordingly.
-`);
-}
-function getNameAndDirectoryOptionFormats(tree, options) {
-    const directory = options.directory
-        ? (0, devkit_exports_1.normalizePath)(options.directory.replace(/^\.?\//, ''))
+function getNameAndDirectoryOptions(tree, options) {
+    const path = options.path
+        ? (0, devkit_exports_1.normalizePath)(options.path.replace(/^\.?\//, ''))
         : undefined;
     const fileExtension = options.fileExtension ?? 'ts';
-    const { name: extractedName, directory: extractedDirectory } = extractNameAndDirectoryFromName(options.name);
-    if (extractedDirectory && directory) {
-        throw new Error(`You can't specify both a directory (${options.directory}) and a name with a directory path (${options.name}). ` +
-            `Please specify either a directory or a name with a directory path.`);
-    }
-    const asProvidedOptions = getAsProvidedOptions(tree, {
-        ...options,
-        directory: directory ?? extractedDirectory,
-        fileExtension,
-        name: extractedName,
-    });
-    if (!options.project) {
-        validateResolvedProject(tree, asProvidedOptions.project, options, asProvidedOptions.directory);
-    }
-    if (options.nameAndDirectoryFormat === 'as-provided') {
-        return {
-            'as-provided': asProvidedOptions,
-            derived: undefined,
-        };
-    }
-    if (options.disallowPathInNameForDerived && options.name.includes('/')) {
-        if (!options.nameAndDirectoryFormat) {
-            devkit_exports_1.output.warn({
-                title: `The provided name "${options.name}" contains a path and this is not supported by the "${options.callingGenerator}" when using the "derived" format.`,
-                bodyLines: [
-                    `The generator will try to generate the ${options.artifactType} using the "as-provided" format at "${asProvidedOptions.filePath}".`,
-                ],
-            });
-            return {
-                'as-provided': asProvidedOptions,
-                derived: undefined,
-            };
-        }
-        throw new Error(`The provided name "${options.name}" contains a path and this is not supported by the "${options.callingGenerator}" when using the "derived" format. ` +
-            `Please provide a name without a path or use the "as-provided" format.`);
-    }
-    const derivedOptions = getDerivedOptions(tree, {
-        ...options,
-        directory,
-        fileExtension,
-        name: extractedName,
-    }, asProvidedOptions, !options.disallowPathInNameForDerived && extractedDirectory
-        ? extractedDirectory
-        : undefined);
-    return {
-        'as-provided': asProvidedOptions,
-        derived: derivedOptions,
-    };
-}
-function getAsProvidedOptions(tree, options) {
+    let { name: extractedName, directory } = extractNameAndDirectoryFromPath(path);
     const relativeCwd = getRelativeCwd();
-    let asProvidedDirectory;
-    if (options.directory) {
-        // append the directory to the current working directory if it doesn't start with it
-        if (options.directory === relativeCwd ||
-            options.directory.startsWith(`${relativeCwd}/`)) {
-            asProvidedDirectory = options.directory;
-        }
-        else {
-            asProvidedDirectory = (0, devkit_exports_1.joinPathFragments)(relativeCwd, options.directory);
-        }
-    }
-    else {
-        asProvidedDirectory = relativeCwd;
-    }
-    const asProvidedProject = findProjectFromPath(tree, asProvidedDirectory);
-    const asProvidedFileName = options.fileName ??
-        (options.suffix ? `${options.name}.${options.suffix}` : options.name);
-    const asProvidedFilePath = (0, devkit_exports_1.joinPathFragments)(asProvidedDirectory, `${asProvidedFileName}.${options.fileExtension}`);
-    return {
-        artifactName: options.name,
-        directory: asProvidedDirectory,
-        fileName: asProvidedFileName,
-        filePath: asProvidedFilePath,
-        project: asProvidedProject,
-    };
-}
-function getDerivedOptions(tree, options, asProvidedOptions, extractedDirectory) {
-    const projects = (0, devkit_exports_1.getProjects)(tree);
-    if (options.project && !projects.has(options.project)) {
-        throw new Error(`The provided project "${options.project}" does not exist! Please provide an existing project name.`);
-    }
-    const projectName = options.project ?? asProvidedOptions.project;
-    const project = projects.get(projectName);
-    const derivedName = options.name;
-    const baseDirectory = options.directory
-        ? (0, names_1.names)(options.directory).fileName
-        : (0, devkit_exports_1.joinPathFragments)(project.sourceRoot ?? (0, devkit_exports_1.joinPathFragments)(project.root, 'src'), project.projectType === 'application' ? 'app' : 'lib', extractedDirectory ?? '');
-    const derivedDirectory = typeof options.derivedDirectory === 'string'
-        ? (0, devkit_exports_1.joinPathFragments)(project.sourceRoot ?? project.root, options.derivedDirectory, options.flat
-            ? ''
-            : options.pascalCaseDirectory
-                ? (0, names_1.names)(derivedName).className
-                : (0, names_1.names)(derivedName).fileName)
-        : options.flat
-            ? (0, devkit_exports_1.normalizePath)(baseDirectory)
-            : (0, devkit_exports_1.joinPathFragments)(baseDirectory, options.pascalCaseDirectory
-                ? (0, names_1.names)(derivedName).className
-                : (0, names_1.names)(derivedName).fileName);
-    if (options.directory &&
-        !isDirectoryUnderProjectRoot(derivedDirectory, project.root)) {
-        if (!options.nameAndDirectoryFormat) {
-            devkit_exports_1.output.warn({
-                title: `The provided directory "${options.directory}" is not under the provided project root "${project.root}".`,
-                bodyLines: [
-                    `The generator will try to generate the ${options.artifactType} using the "as-provided" format.`,
-                    `With the "as-provided" format, the "project" option is ignored and the ${options.artifactType} will be generated at "${asProvidedOptions.filePath}" (<cwd>/<provided directory>).`,
-                ],
-            });
-            return undefined;
-        }
-        throw new Error(`The provided directory "${options.directory}" is not under the provided project root "${project.root}". ` +
-            `Please provide a directory that is under the provided project root or use the "as-provided" format and only provide the directory.`);
-    }
-    let derivedFileName = options.fileName;
-    if (!derivedFileName) {
-        derivedFileName = options.suffix
-            ? `${derivedName}.${options.suffix}`
-            : derivedName;
-        derivedFileName = options.pascalCaseFile
-            ? (0, names_1.names)(derivedFileName).className
-            : (0, names_1.names)(derivedFileName).fileName;
-    }
-    const derivedFilePath = (0, devkit_exports_1.joinPathFragments)(derivedDirectory, `${derivedFileName}.${options.fileExtension}`);
+    // append the directory to the current working directory if it doesn't start with it
+    if (directory !== relativeCwd && !directory.startsWith(`${relativeCwd}/`)) {
+        directory = (0, devkit_exports_1.joinPathFragments)(relativeCwd, directory);
+    }
+    const project = findProjectFromPath(tree, directory);
+    const name = options.fileName ??
+        (options.suffix ? `${extractedName}.${options.suffix}` : extractedName);
+    const filePath = (0, devkit_exports_1.joinPathFragments)(directory, `${name}.${fileExtension}`);
     return {
-        artifactName: derivedName,
-        directory: derivedDirectory,
-        fileName: derivedFileName,
-        filePath: derivedFilePath,
-        project: projectName,
+        artifactName: options.name ?? extractedName,
+        directory: directory,
+        fileName: name,
+        filePath: filePath,
+        project: project,
     };
 }
-function validateResolvedProject(tree, project, options, normalizedDirectory) {
+function validateResolvedProject(project, normalizedDirectory) {
     if (project) {
         return;
     }
-    if (options.directory) {
-        throw new Error(`The provided directory resolved relative to the current working directory "${normalizedDirectory}" does not exist under any project root. ` +
-            `Please make sure to navigate to a location or provide a directory that exists under a project root.`);
-    }
-    throw new Error(`The current working directory "${getRelativeCwd() || '.'}" does not exist under any project root. ` +
+    throw new Error(`The provided directory resolved relative to the current working directory "${normalizedDirectory}" does not exist under any project root. ` +
         `Please make sure to navigate to a location or provide a directory that exists under a project root.`);
 }
 function findProjectFromPath(tree, path) {
@@ -218,15 +50,6 @@ function findProjectFromPath(tree, path) {
     const projectRootMappings = (0, devkit_internals_1.createProjectRootMappingsFromProjectConfigurations)(projectConfigurations);
     return (0, devkit_internals_1.findProjectForPath)(path, projectRootMappings);
 }
-function isDirectoryUnderProjectRoot(directory, projectRoot) {
-    const normalizedDirectory = (0, devkit_exports_1.joinPathFragments)(devkit_exports_1.workspaceRoot, directory);
-    const normalizedProjectRoot = (0, devkit_exports_1.joinPathFragments)(devkit_exports_1.workspaceRoot, projectRoot).replace(/\/$/, '');
-    return (normalizedDirectory === normalizedProjectRoot ||
-        normalizedDirectory.startsWith(`${normalizedProjectRoot}/`));
-}
-function isTTY() {
-    return !!process.stdout.isTTY && process.env['CI'] !== 'true';
-}
 function getRelativeCwd() {
     return (0, devkit_exports_1.normalizePath)((0, path_1.relative)(devkit_exports_1.workspaceRoot, getCwd()));
 }
@@ -241,9 +64,11 @@ function getCwd() {
         ? process.env.INIT_CWD
         : process.cwd();
 }
-function extractNameAndDirectoryFromName(rawName) {
-    const parsedName = (0, devkit_exports_1.normalizePath)(rawName).split('/');
-    const name = parsedName.pop();
-    const directory = parsedName.length ? parsedName.join('/') : undefined;
+function extractNameAndDirectoryFromPath(path) {
+    // Remove trailing slash
+    path = path.replace(/\/$/, '');
+    const parsedPath = (0, devkit_exports_1.normalizePath)(path).split('/');
+    const name = parsedPath.pop();
+    const directory = parsedPath.join('/');
     return { name, directory };
 }

package/src/generators/project-name-and-root-utils.d.ts

@@ -1,19 +1,15 @@
-import { ProjectType, Tree } from 'nx/src/devkit-exports';
-export type ProjectNameAndRootFormat = 'as-provided' | 'derived';
+import { type ProjectType, type Tree } from 'nx/src/devkit-exports';
 export type ProjectGenerationOptions = {
-    name: string;
+    directory: string;
+    name?: string;
     projectType: ProjectType;
-    callingGenerator: string | null;
-    directory?: string;
     importPath?: string;
-    projectNameAndRootFormat?: ProjectNameAndRootFormat;
     rootProject?: boolean;
 };
 export type ProjectNameAndRootOptions = {
     /**
      * Normalized full project name, including scope if name was provided with
-     * scope (e.g., `@scope/name`, only available when `projectNameAndRootFormat`
-     * is `as-provided`).
+     * scope (e.g., `@scope/name`)
      */
     projectName: string;
     /**
@@ -37,10 +33,5 @@ export type ProjectNameAndRootOptions = {
      */
     importPath?: string;
 };
-export declare function determineProjectNameAndRootOptions(tree: Tree, options: ProjectGenerationOptions): Promise<ProjectNameAndRootOptions & {
-    projectNameAndRootFormat: ProjectNameAndRootFormat;
-}>;
-/**
- * Function for setting cwd during testing
- */
-export declare function setCwd(path: string): void;
+export declare function determineProjectNameAndRootOptions(tree: Tree, options: ProjectGenerationOptions): Promise<ProjectNameAndRootOptions>;
+export declare function ensureProjectName(tree: Tree, options: Omit<ProjectGenerationOptions, 'projectType'>, projectType: 'application' | 'library'): Promise<void>;

package/src/generators/project-name-and-root-utils.js

@@ -1,157 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineProjectNameAndRootOptions = determineProjectNameAndRootOptions;
-exports.setCwd = setCwd;
+exports.ensureProjectName = ensureProjectName;
 const enquirer_1 = require("enquirer");
-const path_1 = require("path");
-const get_workspace_layout_1 = require("../utils/get-workspace-layout");
-const names_1 = require("../utils/names");
 const devkit_exports_1 = require("nx/src/devkit-exports");
+const path_1 = require("path");
 async function determineProjectNameAndRootOptions(tree, options) {
-    if (!options.projectNameAndRootFormat &&
-        (process.env.NX_INTERACTIVE !== 'true' || !isTTY())) {
-        options.projectNameAndRootFormat = 'derived';
-    }
-    validateName(options.name, options.projectNameAndRootFormat);
-    const formats = getProjectNameAndRootFormats(tree, options);
-    const format = options.projectNameAndRootFormat ?? (await determineFormat(formats));
-    if (format === 'derived' && options.callingGenerator) {
-        logDeprecationMessage(options.callingGenerator, formats);
-    }
-    return {
-        ...formats[format],
-        projectNameAndRootFormat: format,
-    };
-}
-function validateName(name, projectNameAndRootFormat) {
-    if (projectNameAndRootFormat === 'derived' && name.startsWith('@')) {
-        throw new Error(`The project name "${name}" cannot start with "@" when the "projectNameAndRootFormat" is "derived".`);
-    }
-    /**
-     * Matches two types of project names:
-     *
-     * 1. Valid npm package names (e.g., '@scope/name' or 'name').
-     * 2. Names starting with a letter and can contain any character except whitespace and ':'.
-     *
-     * The second case is to support the legacy behavior (^[a-zA-Z].*$) with the difference
-     * that it doesn't allow the ":" character. It was wrong to allow it because it would
-     * conflict with the notation for tasks.
-     */
-    const pattern = '(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$';
-    const validationRegex = new RegExp(pattern);
-    if (!validationRegex.test(name)) {
-        throw new Error(`The project name should match the pattern "${pattern}". The provided value "${name}" does not match.`);
-    }
-}
-function logDeprecationMessage(callingGenerator, formats) {
-    devkit_exports_1.logger.warn((0, devkit_exports_1.stripIndents) `
-    In Nx 20, generating projects will no longer derive the name and root.
-    Please provide the exact project name and root in the future.
-    Example: nx g ${callingGenerator} ${formats['derived'].projectName} --directory ${formats['derived'].projectRoot}
-  `);
-}
-async function determineFormat(formats) {
-    if (!formats.derived) {
-        return 'as-provided';
-    }
-    const asProvidedDescription = `As provided:
-    Name: ${formats['as-provided'].projectName}
-    Root: ${formats['as-provided'].projectRoot}`;
-    const asProvidedSelectedValue = `${formats['as-provided'].projectName} @ ${formats['as-provided'].projectRoot}`;
-    const derivedDescription = `Derived:
-    Name: ${formats['derived'].projectName}
-    Root: ${formats['derived'].projectRoot}`;
-    const derivedSelectedValue = `${formats['derived'].projectName} @ ${formats['derived'].projectRoot}`;
-    if (asProvidedSelectedValue === derivedSelectedValue) {
-        return 'as-provided';
-    }
-    const result = await (0, enquirer_1.prompt)({
-        type: 'select',
-        name: 'format',
-        message: 'What should be the project name and where should it be generated?',
-        choices: [
-            {
-                message: asProvidedDescription,
-                name: asProvidedSelectedValue,
-            },
-            {
-                message: derivedDescription,
-                name: derivedSelectedValue,
-            },
-        ],
-        initial: 0,
-    }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
-    return result;
-}
-function getProjectNameAndRootFormats(tree, options) {
-    const directory = options.directory
-        ? (0, devkit_exports_1.normalizePath)(options.directory.replace(/^\.?\//, ''))
-        : undefined;
-    const { name: asProvidedParsedName, directory: asProvidedParsedDirectory } = parseNameForAsProvided(options.name);
-    if (asProvidedParsedDirectory && directory) {
-        throw new Error(`You can't specify both a directory (${options.directory}) and a name with a directory path (${options.name}). ` +
-            `Please specify either a directory or a name with a directory path.`);
-    }
-    const asProvidedOptions = getAsProvidedOptions(tree, {
-        ...options,
-        directory: directory ?? asProvidedParsedDirectory,
-        name: asProvidedParsedName,
-    });
-    if (options.projectNameAndRootFormat === 'as-provided') {
-        return {
-            'as-provided': asProvidedOptions,
-            derived: undefined,
-        };
-    }
-    if (asProvidedOptions.projectName.startsWith('@')) {
-        if (!options.projectNameAndRootFormat) {
-            devkit_exports_1.output.warn({
-                title: `The provided name "${options.name}" contains a scoped project name and this is not supported by the "${options.callingGenerator}" when using the "derived" format.`,
-                bodyLines: [
-                    `The generator will try to generate the project "${asProvidedOptions.projectName}" using the "as-provided" format at "${asProvidedOptions.projectRoot}".`,
-                ],
-            });
-            return {
-                'as-provided': asProvidedOptions,
-                derived: undefined,
-            };
-        }
-        throw new Error(`The provided name "${options.name}" contains a scoped project name and this is not supported by the "${options.callingGenerator}" when using the "derived" format. ` +
-            `Please provide a name without "@" or use the "as-provided" format.`);
-    }
-    const { name: derivedParsedName, directory: derivedParsedDirectory } = parseNameForDerived(options.name);
-    const derivedOptions = getDerivedOptions(tree, {
-        ...options,
-        directory: directory ?? derivedParsedDirectory,
-        name: derivedParsedName,
-    });
-    return {
-        'as-provided': asProvidedOptions,
-        derived: derivedOptions,
-    };
-}
-function getAsProvidedOptions(tree, options) {
+    validateOptions(options);
+    const directory = (0, devkit_exports_1.normalizePath)(options.directory);
+    const name = options.name ??
+        directory.match(/(@[^@/]+(\/[^@/]+)+)/)?.[1] ??
+        directory.substring(directory.lastIndexOf('/') + 1);
     let projectSimpleName;
     let projectFileName;
-    if (options.name.startsWith('@')) {
-        const [_scope, ...rest] = options.name.split('/');
+    if (name.startsWith('@')) {
+        const [_scope, ...rest] = name.split('/');
         projectFileName = rest.join('-');
         projectSimpleName = rest.pop();
     }
     else {
-        projectSimpleName = options.name;
-        projectFileName = options.name;
+        projectSimpleName = name;
+        projectFileName = name;
     }
     let projectRoot;
     const relativeCwd = getRelativeCwd();
-    if (options.directory) {
+    if (directory) {
         // append the directory to the current working directory if it doesn't start with it
-        if (options.directory === relativeCwd ||
-            options.directory.startsWith(`${relativeCwd}/`)) {
-            projectRoot = options.directory;
+        if (directory === relativeCwd || directory.startsWith(`${relativeCwd}/`)) {
+            projectRoot = directory;
         }
         else {
-            projectRoot = (0, devkit_exports_1.joinPathFragments)(relativeCwd, options.directory);
+            projectRoot = (0, devkit_exports_1.joinPathFragments)(relativeCwd, directory);
         }
     }
     else if (options.rootProject) {
@@ -160,29 +39,29 @@ function getAsProvidedOptions(tree, options) {
     else {
         projectRoot = relativeCwd;
         // append the project name to the current working directory if it doesn't end with it
-        if (!relativeCwd.endsWith(options.name)) {
-            projectRoot = (0, devkit_exports_1.joinPathFragments)(relativeCwd, options.name);
+        if (!relativeCwd.endsWith(name)) {
+            projectRoot = (0, devkit_exports_1.joinPathFragments)(relativeCwd, name);
         }
     }
     let importPath = undefined;
     if (options.projectType === 'library') {
         importPath = options.importPath;
         if (!importPath) {
-            if (options.name.startsWith('@')) {
-                importPath = options.name;
+            if (name.startsWith('@')) {
+                importPath = name;
             }
             else {
                 const npmScope = getNpmScope(tree);
                 importPath =
                     projectRoot === '.'
                         ? (0, devkit_exports_1.readJson)(tree, 'package.json').name ??
-                            getImportPath(npmScope, options.name)
-                        : getImportPath(npmScope, options.name);
+                            getImportPath(npmScope, name)
+                        : getImportPath(npmScope, name);
             }
         }
     }
     return {
-        projectName: options.name,
+        projectName: name,
         names: {
             projectSimpleName,
             projectFileName,
@@ -191,53 +70,51 @@ function getAsProvidedOptions(tree, options) {
         projectRoot,
     };
 }
-function getDerivedOptions(tree, options) {
-    const name = (0, names_1.names)(options.name).fileName;
-    let { projectDirectory, layoutDirectory } = getDirectories(tree, options.directory, options.projectType);
-    const projectDirectoryWithoutLayout = projectDirectory
-        ? `${(0, names_1.names)(projectDirectory).fileName}/${name}`
-        : options.rootProject
-            ? '.'
-            : name;
-    // the project name uses the directory without the layout directory
-    const projectName = projectDirectoryWithoutLayout === '.'
-        ? name
-        : projectDirectoryWithoutLayout.replace(/\//g, '-');
-    const projectSimpleName = name;
-    let projectRoot = projectDirectoryWithoutLayout;
-    if (projectDirectoryWithoutLayout !== '.') {
-        // prepend the layout directory
-        projectRoot = (0, devkit_exports_1.joinPathFragments)(layoutDirectory, projectRoot);
-    }
-    let importPath;
-    if (options.projectType === 'library') {
-        importPath = options.importPath;
-        if (!importPath) {
-            const npmScope = getNpmScope(tree);
-            importPath =
-                projectRoot === '.'
-                    ? (0, devkit_exports_1.readJson)(tree, 'package.json').name ??
-                        getImportPath(npmScope, projectName)
-                    : getImportPath(npmScope, projectDirectoryWithoutLayout);
+async function ensureProjectName(tree, options, projectType) {
+    if (!options.name) {
+        if (options.directory === '.' && getRelativeCwd() === '') {
+            const result = await (0, enquirer_1.prompt)({
+                type: 'input',
+                name: 'name',
+                message: `What do you want to name the ${projectType}?`,
+            }).then(({ name }) => (options.name = name));
+        }
+        const { projectName } = await determineProjectNameAndRootOptions(tree, {
+            ...options,
+            projectType,
+        });
+        options.name = projectName;
+    }
+}
+function validateOptions(options) {
+    if (options.directory === '.') {
+        /**
+         * Root projects must provide name option
+         */
+        if (!options.name) {
+            throw new Error(`Root projects must also specify name option.`);
         }
     }
-    return {
-        projectName,
-        names: {
-            projectSimpleName,
-            projectFileName: projectName,
-        },
-        importPath,
-        projectRoot,
-    };
-}
-function getDirectories(tree, directory, projectType) {
-    let { projectDirectory, layoutDirectory } = (0, get_workspace_layout_1.extractLayoutDirectory)(directory);
-    if (!layoutDirectory) {
-        const { appsDir, libsDir } = (0, get_workspace_layout_1.getWorkspaceLayout)(tree);
-        layoutDirectory = projectType === 'application' ? appsDir : libsDir;
+    else {
+        /**
+         * Both directory and name (if present) must match one of two cases:
+         *
+         * 1. Valid npm package names (e.g., '@scope/name' or 'name').
+         * 2. Names starting with a letter and can contain any character except whitespace and ':'.
+         *
+         * The second case is to support the legacy behavior (^[a-zA-Z].*$) with the difference
+         * that it doesn't allow the ":" character. It was wrong to allow it because it would
+         * conflict with the notation for tasks.
+         */
+        const pattern = '(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$';
+        const validationRegex = new RegExp(pattern);
+        if (options.name && !validationRegex.test(options.name)) {
+            throw new Error(`The name should match the pattern "${pattern}". The provided value "${options.name}" does not match.`);
+        }
+        if (!validationRegex.test(options.directory)) {
+            throw new Error(`The directory should match the pattern "${pattern}". The provided value "${options.directory}" does not match.`);
+        }
     }
-    return { projectDirectory, layoutDirectory };
 }
 function getImportPath(npmScope, name) {
     return npmScope ? `${npmScope === '@' ? '' : '@'}${npmScope}/${name}` : name;
@@ -248,9 +125,6 @@ function getNpmScope(tree) {
         : { name: null };
     return name?.startsWith('@') ? name.split('/')[0].substring(1) : undefined;
 }
-function isTTY() {
-    return !!process.stdout.isTTY && process.env['CI'] !== 'true';
-}
 /**
  * When running a script with the package manager (e.g. `npm run`), the package manager will
  * traverse the directory tree upwards until it finds a `package.json` and will set `process.cwd()`
@@ -265,32 +139,3 @@ function getCwd() {
 function getRelativeCwd() {
     return (0, devkit_exports_1.normalizePath)((0, path_1.relative)(devkit_exports_1.workspaceRoot, getCwd())).replace(/\/$/, '');
 }
-/**
- * Function for setting cwd during testing
- */
-function setCwd(path) {
-    process.env.INIT_CWD = (0, path_1.join)(devkit_exports_1.workspaceRoot, path);
-}
-function parseNameForAsProvided(rawName) {
-    const directory = (0, devkit_exports_1.normalizePath)(rawName);
-    if (rawName.includes('@')) {
-        const index = directory.lastIndexOf('@');
-        if (index === 0) {
-            return { name: rawName, directory: undefined };
-        }
-        const name = directory.substring(index);
-        return { name, directory };
-    }
-    if (rawName.includes('/')) {
-        const index = directory.lastIndexOf('/');
-        const name = directory.substring(index + 1);
-        return { name, directory };
-    }
-    return { name: rawName, directory: undefined };
-}
-function parseNameForDerived(rawName) {
-    const parsedName = (0, devkit_exports_1.normalizePath)(rawName).split('/');
-    const name = parsedName.pop();
-    const directory = parsedName.length ? parsedName.join('/') : undefined;
-    return { name, directory };
-}

package/src/tasks/install-packages-task.js

@@ -27,6 +27,7 @@ function installPackagesTask(tree, alwaysRun = false, cwd = '', packageManager =
         const execSyncOptions = {
             cwd: (0, path_1.join)(tree.root, cwd),
             stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',
+            windowsHide: true,
         };
         // ensure local registry from process is not interfering with the install
         // when we start the process from temp folder the local registry would override the custom registry

package/src/utils/add-plugin.js

@@ -38,16 +38,51 @@ async function _addPluginInternal(tree, graph, pluginName, pluginFactory, option
     const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     let pluginOptions;
     let projConfigs;
-    const combinations = generateCombinations(options);
-    optionsLoop: for (const _pluginOptions of combinations) {
-        pluginOptions = _pluginOptions;
-        nxJson.plugins ??= [];
-        if (nxJson.plugins.some((p) => typeof p === 'string'
-            ? p === pluginName
-            : p.plugin === pluginName && !p.include)) {
-            // Plugin has already been added
-            return;
+    if (Object.keys(options).length > 0) {
+        const combinations = generateCombinations(options);
+        optionsLoop: for (const _pluginOptions of combinations) {
+            pluginOptions = _pluginOptions;
+            nxJson.plugins ??= [];
+            if (nxJson.plugins.some((p) => typeof p === 'string'
+                ? p === pluginName
+                : p.plugin === pluginName && !p.include)) {
+                // Plugin has already been added
+                return;
+            }
+            global.NX_GRAPH_CREATION = true;
+            try {
+                projConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([pluginFactory(pluginOptions)], tree.root, nxJson);
+            }
+            catch (e) {
+                // Errors are okay for this because we're only running 1 plugin
+                if (e instanceof devkit_internals_1.ProjectConfigurationsError) {
+                    projConfigs = e.partialProjectConfigurationsResult;
+                }
+                else {
+                    throw e;
+                }
+            }
+            global.NX_GRAPH_CREATION = false;
+            for (const projConfig of Object.values(projConfigs.projects)) {
+                const node = graphNodes.find((node) => node.data.root === projConfig.root);
+                if (!node) {
+                    continue;
+                }
+                for (const targetName in projConfig.targets) {
+                    if (node.data.targets[targetName]) {
+                        // Conflicting Target Name, check the next one
+                        pluginOptions = null;
+                        continue optionsLoop;
+                    }
+                }
+            }
+            break;
         }
+    }
+    else {
+        // If the plugin does not take in options, we add the plugin with empty options.
+        nxJson.plugins ??= [];
+        pluginOptions = {};
         global.NX_GRAPH_CREATION = true;
         try {
             projConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([pluginFactory(pluginOptions)], tree.root, nxJson);
@@ -62,20 +97,6 @@ async function _addPluginInternal(tree, graph, pluginName, pluginFactory, option
             }
         }
         global.NX_GRAPH_CREATION = false;
-        for (const projConfig of Object.values(projConfigs.projects)) {
-            const node = graphNodes.find((node) => node.data.root === projConfig.root);
-            if (!node) {
-                continue;
-            }
-            for (const targetName in projConfig.targets) {
-                if (node.data.targets[targetName]) {
-                    // Conflicting Target Name, check the next one
-                    pluginOptions = null;
-                    continue optionsLoop;
-                }
-            }
-        }
-        break;
     }
     if (!pluginOptions) {
         throw new Error('Could not add the plugin in a way which does not conflict with existing targets. Please report this error at: https://github.com/nrwl/nx/issues/new/choose');

package/src/utils/calculate-hash-for-create-nodes.d.ts

@@ -1,2 +1,2 @@
-import { CreateNodesContext } from 'nx/src/devkit-exports';
-export declare function calculateHashForCreateNodes(projectRoot: string, options: object, context: CreateNodesContext, additionalGlobs?: string[]): Promise<string>;
+import { CreateNodesContext, CreateNodesContextV2 } from 'nx/src/devkit-exports';
+export declare function calculateHashForCreateNodes(projectRoot: string, options: object, context: CreateNodesContext | CreateNodesContextV2, additionalGlobs?: string[]): Promise<string>;

package/src/utils/get-named-inputs.d.ts

@@ -1,8 +1,8 @@
 import type { InputDefinition } from 'nx/src/config/workspace-json-project-json';
-import { CreateNodesContext } from 'nx/src/devkit-exports';
+import { CreateNodesContext, CreateNodesContextV2 } from 'nx/src/devkit-exports';
 /**
  * Get the named inputs available for a directory
  */
-export declare function getNamedInputs(directory: string, context: CreateNodesContext): {
+export declare function getNamedInputs(directory: string, context: CreateNodesContext | CreateNodesContextV2): {
     [inputName: string]: (string | InputDefinition)[];
 };

package/src/utils/package-json.js

@@ -305,6 +305,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
         (0, child_process_1.execSync)(preInstallCommand, {
             cwd: tempDir,
             stdio: isVerbose ? 'inherit' : 'ignore',
+            windowsHide: true,
         });
     }
     let addCommand = (0, devkit_exports_1.getPackageManagerCommand)(packageManager).addDev;
@@ -314,6 +315,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
     (0, child_process_1.execSync)(`${addCommand} ${pkg}@${requiredVersion}`, {
         cwd: tempDir,
         stdio: isVerbose ? 'inherit' : 'ignore',
+        windowsHide: true,
     });
     addToNodePath((0, path_1.join)(devkit_exports_1.workspaceRoot, 'node_modules'));
     addToNodePath((0, path_1.join)(tempDir, 'node_modules'));