@nx/devkit 16.7.0-beta.4 → 16.7.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "16.7.0-beta.4",
+  "version": "16.7.0-beta.6",
   "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.",
   "repository": {
@@ -28,7 +28,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/devkit": "16.7.0-beta.4",
+    "@nrwl/devkit": "16.7.0-beta.6",
     "ejs": "^3.1.7",
     "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
@@ -46,5 +46,5 @@
     "migrations": "./migrations.json"
   },
   "type": "commonjs",
-  "gitHead": "dcbba686b182737b66ebbfb9db372769e77ba005"
+  "gitHead": "d1ffe58644851335f18da1d60b1a60882347aff9"
 }

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

@@ -17,9 +17,9 @@ export type ProjectNameAndRootOptions = {
      */
     projectName: string;
     /**
-     * Normalized project directory, including the layout directory if configured.
+     * Normalized project root, including the layout directory if configured.
      */
-    projectDirectory: string;
+    projectRoot: string;
     names: {
         /**
          * Normalized project name without scope. It's meant to be used when

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

@@ -13,7 +13,7 @@ function determineProjectNameAndRootOptions(tree, options) {
         validateName(options.name, options.projectNameAndRootFormat);
         const formats = getProjectNameAndRootFormats(tree, options);
         const format = (_a = options.projectNameAndRootFormat) !== null && _a !== void 0 ? _a : (yield determineFormat(formats));
-        return formats[format].options;
+        return formats[format];
     });
 }
 exports.determineProjectNameAndRootOptions = determineProjectNameAndRootOptions;
@@ -45,22 +45,30 @@ function determineFormat(formats) {
         if (process.env.NX_INTERACTIVE !== 'true' || !isTTY()) {
             return 'derived';
         }
+        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} (This was derived from the folder structure. Please provide the exact name and directory in the future)`;
         return yield (0, enquirer_1.prompt)({
             type: 'select',
             name: 'format',
             message: 'What should be the project name and where should it be generated?',
             choices: [
                 {
-                    message: formats['as-provided'].description,
-                    name: 'as-provided',
+                    message: asProvidedDescription,
+                    name: asProvidedSelectedValue,
                 },
                 {
-                    message: formats['derived'].description,
-                    name: 'derived',
+                    message: derivedDescription,
+                    name: derivedSelectedValue,
                 },
             ],
             initial: 'as-provided',
-        }).then(({ format }) => format);
+        }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
     });
 }
 function getProjectNameAndRootFormats(tree, options) {
@@ -77,18 +85,13 @@ function getProjectNameAndRootFormats(tree, options) {
         const nameWithoutScope = asProvidedProjectName.split('/')[1];
         return {
             'as-provided': {
-                description: `Recommended:
-    Name: ${asProvidedProjectName}
-    Root: ${asProvidedProjectDirectory}`,
-                options: {
-                    projectName: asProvidedProjectName,
-                    names: {
-                        projectSimpleName: nameWithoutScope,
-                        projectFileName: nameWithoutScope,
-                    },
-                    importPath: (_b = options.importPath) !== null && _b !== void 0 ? _b : asProvidedProjectName,
-                    projectDirectory: asProvidedProjectDirectory,
+                projectName: asProvidedProjectName,
+                names: {
+                    projectSimpleName: nameWithoutScope,
+                    projectFileName: nameWithoutScope,
                 },
+                importPath: (_b = options.importPath) !== null && _b !== void 0 ? _b : asProvidedProjectName,
+                projectRoot: asProvidedProjectDirectory,
             },
         };
     }
@@ -132,32 +135,22 @@ function getProjectNameAndRootFormats(tree, options) {
     }
     return {
         'as-provided': {
-            description: `Recommended:
-    Name: ${asProvidedProjectName}
-    Root: ${asProvidedProjectDirectory}`,
-            options: {
-                projectName: asProvidedProjectName,
-                names: {
-                    projectSimpleName: asProvidedProjectName,
-                    projectFileName: asProvidedProjectName,
-                },
-                importPath: asProvidedImportPath,
-                projectDirectory: asProvidedProjectDirectory,
+            projectName: asProvidedProjectName,
+            names: {
+                projectSimpleName: asProvidedProjectName,
+                projectFileName: asProvidedProjectName,
             },
+            importPath: asProvidedImportPath,
+            projectRoot: asProvidedProjectDirectory,
         },
         derived: {
-            description: `Legacy:
-    Name: ${derivedProjectName}
-    Root: ${derivedProjectDirectory}`,
-            options: {
-                projectName: derivedProjectName,
-                names: {
-                    projectSimpleName: derivedSimpleProjectName,
-                    projectFileName: derivedProjectName,
-                },
-                importPath: derivedImportPath,
-                projectDirectory: derivedProjectDirectory,
+            projectName: derivedProjectName,
+            names: {
+                projectSimpleName: derivedSimpleProjectName,
+                projectFileName: derivedProjectName,
             },
+            importPath: derivedImportPath,
+            projectRoot: derivedProjectDirectory,
         },
     };
 }