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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "17.0.0-beta.4",
+  "version": "17.0.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": {
@@ -34,7 +34,7 @@
     "tmp": "~0.2.1",
     "tslib": "^2.3.0",
     "semver": "7.5.3",
-    "@nrwl/devkit": "17.0.0-beta.4"
+    "@nrwl/devkit": "17.0.0-beta.6"
   },
   "peerDependencies": {
     "nx": ">= 16 <= 18"

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

@@ -14,6 +14,7 @@ export type ArtifactGenerationOptions = {
     pascalCaseFile?: boolean;
     project?: string;
     suffix?: string;
+    derivedDirectory?: string;
 };
 export type NameAndDirectoryOptions = {
     /**
@@ -40,3 +41,7 @@ export type NameAndDirectoryOptions = {
 export declare function determineArtifactNameAndDirectoryOptions(tree: Tree, options: ArtifactGenerationOptions): Promise<NameAndDirectoryOptions & {
     nameAndDirectoryFormat: NameAndDirectoryFormat;
 }>;
+/**
+ * Function for setting cwd during testing
+ */
+export declare function setCwd(path: string): void;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.determineArtifactNameAndDirectoryOptions = void 0;
+exports.setCwd = exports.determineArtifactNameAndDirectoryOptions = void 0;
 const enquirer_1 = require("enquirer");
 const path_1 = require("path");
 const nx_1 = require("../../nx");
@@ -9,7 +9,7 @@ const { createProjectRootMappingsFromProjectConfigurations, findProjectForPath,
 async function determineArtifactNameAndDirectoryOptions(tree, options) {
     const formats = getNameAndDirectoryOptionFormats(tree, options);
     const format = options.nameAndDirectoryFormat ?? (await determineFormat(formats, options));
-    validateResolvedProject(formats[format]?.project, options, formats[format]?.directory);
+    validateResolvedProject(tree, formats[format]?.project, options, formats[format]?.directory);
     return {
         ...formats[format],
         nameAndDirectoryFormat: format,
@@ -77,7 +77,7 @@ function getNameAndDirectoryOptionFormats(tree, options) {
         name: extractedName,
     });
     if (!options.project) {
-        validateResolvedProject(asProvidedOptions.project, options, asProvidedOptions.directory);
+        validateResolvedProject(tree, asProvidedOptions.project, options, asProvidedOptions.directory);
     }
     if (options.nameAndDirectoryFormat === 'as-provided') {
         return {
@@ -142,11 +142,17 @@ function getDerivedOptions(tree, options, asProvidedOptions, extractedDirectory)
     const baseDirectory = options.directory
         ? (0, names_1.names)(options.directory).fileName
         : joinPathFragments(project.sourceRoot ?? joinPathFragments(project.root, 'src'), project.projectType === 'application' ? 'app' : 'lib', extractedDirectory ?? '');
-    const derivedDirectory = options.flat
-        ? normalizePath(baseDirectory)
-        : joinPathFragments(baseDirectory, options.pascalCaseDirectory
-            ? (0, names_1.names)(derivedName).className
-            : (0, names_1.names)(derivedName).fileName);
+    const derivedDirectory = typeof options.derivedDirectory === 'string'
+        ? 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
+            ? normalizePath(baseDirectory)
+            : 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) {
@@ -180,7 +186,7 @@ function getDerivedOptions(tree, options, asProvidedOptions, extractedDirectory)
         project: projectName,
     };
 }
-function validateResolvedProject(project, options, normalizedDirectory) {
+function validateResolvedProject(tree, project, options, normalizedDirectory) {
     if (project) {
         return;
     }
@@ -212,6 +218,13 @@ function isTTY() {
 function getRelativeCwd() {
     return normalizePath((0, path_1.relative)(workspaceRoot, getCwd()));
 }
+/**
+ * Function for setting cwd during testing
+ */
+function setCwd(path) {
+    process.env.INIT_CWD = (0, path_1.join)(workspaceRoot, path);
+}
+exports.setCwd = setCwd;
 function getCwd() {
     return process.env.INIT_CWD?.startsWith(workspaceRoot)
         ? process.env.INIT_CWD