@nx/devkit 20.7.0 → 20.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "20.7.0",
+  "version": "20.7.1",
   "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": {

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

@@ -7,11 +7,15 @@ const enquirer_1 = require("enquirer");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const path_1 = require("path");
 async function determineProjectNameAndRootOptions(tree, options) {
-    validateOptions(options);
+    // root projects must provide name option
+    if (options.directory === '.' && !options.name) {
+        throw new Error(`When generating a root project, you must also specify the name option.`);
+    }
     const directory = (0, devkit_exports_1.normalizePath)(options.directory);
     const name = options.name ??
         directory.match(/(@[^@/]+(\/[^@/]+)+)/)?.[1] ??
         directory.substring(directory.lastIndexOf('/') + 1);
+    validateOptions(options.name, name, options.directory);
     let projectSimpleName;
     let projectFileName;
     if (name.startsWith('@')) {
@@ -44,6 +48,9 @@ async function determineProjectNameAndRootOptions(tree, options) {
             projectRoot = (0, devkit_exports_1.joinPathFragments)(relativeCwd, name);
         }
     }
+    if (projectRoot.startsWith('..')) {
+        throw new Error(`The resolved project root "${projectRoot}" is outside of the workspace root "${devkit_exports_1.workspaceRoot}".`);
+    }
     const importPath = options.importPath ?? resolveImportPath(tree, name, projectRoot);
     return {
         projectName: name,
@@ -80,34 +87,26 @@ async function ensureRootProjectName(options, projectType) {
         options.name = result.name;
     }
 }
-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.`);
+function validateOptions(providedName, derivedName, directory) {
+    /**
+     * The provided name and the derived name from the provided directory 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 (providedName) {
+        if (!validationRegex.test(providedName)) {
+            throw new Error(`The name should match the pattern "${pattern}". The provided value "${providedName}" does not match.`);
         }
     }
-    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.`);
-        }
+    else if (!validationRegex.test(derivedName)) {
+        throw new Error(`The derived name from the provided directory should match the pattern "${pattern}". The derived name "${derivedName}" from the provided value "${directory}" does not match.`);
     }
 }
 function getImportPath(npmScope, name) {