@nx/nest 20.0.0-beta.4 → 20.0.0-beta.6

package/migrations.json

@@ -1,76 +1,4 @@
 {
-  "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/nest with @nx/nest",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "update-16-4-0-support-nestjs-10": {
-      "cli": "nx",
-      "version": "16.4.0-beta.16",
-      "description": "Update TsConfig target to es2021 and CacheModule if being used. Read more at https://docs.nestjs.com/migration-guide",
-      "implementation": "./src/migrations/update-16-4-0-cache-manager/nestjs-10-updates"
-    }
-  },
-  "packageJsonUpdates": {
-    "16.1.0": {
-      "version": "16.1.0-beta.0",
-      "packages": {
-        "@nestjs/common": {
-          "version": "^9.1.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/core": {
-          "version": "^9.1.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/platform-express": {
-          "version": "^9.1.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/schematics": {
-          "version": "^9.1.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/swagger": {
-          "version": "^6.3.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/testing": {
-          "version": "^9.1.1",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "16.4.0": {
-      "version": "16.4.0-beta.11",
-      "packages": {
-        "@nestjs/common": {
-          "version": "^10.0.2",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/core": {
-          "version": "^10.0.2",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/platform-express": {
-          "version": "^10.0.2",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/schematics": {
-          "version": "^10.0.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/swagger": {
-          "version": "^7.0.2",
-          "alwaysAddToPackageJson": false
-        },
-        "@nestjs/testing": {
-          "version": "^10.0.2",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    }
-  }
+  "generators": {},
+  "packageJsonUpdates": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nest",
-  "version": "20.0.0-beta.4",
+  "version": "20.0.0-beta.6",
   "private": false,
   "description": "The Nx Plugin for Nest contains executors and generators for allowing your workspace to create powerful Nest best in class APIs.",
   "repository": {
@@ -32,13 +32,11 @@
   },
   "dependencies": {
     "@nestjs/schematics": "^9.1.0",
-    "@nx/devkit": "20.0.0-beta.4",
-    "@nx/js": "20.0.0-beta.4",
-    "@nx/eslint": "20.0.0-beta.4",
-    "@nx/node": "20.0.0-beta.4",
-    "@phenomnomnominal/tsquery": "~5.0.1",
-    "tslib": "^2.3.0",
-    "@nrwl/nest": "20.0.0-beta.4"
+    "@nx/devkit": "20.0.0-beta.6",
+    "@nx/js": "20.0.0-beta.6",
+    "@nx/eslint": "20.0.0-beta.6",
+    "@nx/node": "20.0.0-beta.6",
+    "tslib": "^2.3.0"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const node_1 = require("@nx/node");
 const init_1 = require("../init/init");
 const lib_1 = require("./lib");
@@ -14,6 +15,7 @@ async function applicationGenerator(tree, rawOptions) {
     });
 }
 async function applicationGeneratorInternal(tree, rawOptions) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'nest', 'application');
     const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     const tasks = [];
     const initTask = await (0, init_1.initGenerator)(tree, {

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

@@ -6,15 +6,14 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const eslint_1 = require("@nx/eslint");
 async function normalizeOptions(tree, options) {
-    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
     });
     options.rootProject = appProjectRoot === '.';
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
@@ -34,7 +33,6 @@ function toNodeApplicationGeneratorOptions(options) {
         name: options.name,
         directory: options.directory,
         frontendProject: options.frontendProject,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         linter: options.linter,
         skipFormat: true,
         skipPackageJson: options.skipPackageJson,

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

@@ -1,10 +1,8 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface ApplicationGeneratorOptions {
-  name: string;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
+  name?: string;
   frontendProject?: string;
   linter?: Linter | LinterType;
   skipFormat?: boolean;

package/src/generators/application/schema.json

@@ -6,24 +6,20 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the node application?",
-      "pattern": "^[a-zA-Z][^:]*$"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "directory": {
-      "description": "The directory of the new application.",
-      "type": "string"
-    },
-    "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`).",
+    "name": {
+      "description": "The name of the application.",
       "type": "string",
-      "enum": ["as-provided", "derived"]
+      "pattern": "^[a-zA-Z][^:]*$",
+      "x-priority": "important"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -82,5 +78,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/generators/class/schema.json

@@ -6,33 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the class.",
+    "path": {
+      "description": "Path where the class will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
-    "project": {
-      "description": "The Nest project to target.",
-      "type": "string",
-      "$default": {
-        "$source": "projectName"
-      },
-      "alias": "p",
-      "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 class be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the class.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -59,5 +45,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/controller/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the controller.",
+    "path": {
+      "description": "Path where the controller will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "x-prompt": "Where should the controller be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the controller.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -53,5 +48,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/decorator/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the decorator.",
+    "path": {
+      "description": "Path where the decorator will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "x-prompt": "Where should the decorator be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the decorator.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -38,5 +33,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/filter/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the filter.",
+    "path": {
+      "description": "Path where the filter will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "x-prompt": "Where should the filter be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the filter.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "type": "boolean",
@@ -44,5 +39,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/gateway/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the gateway.",
+    "path": {
+      "description": "Path where the gateway will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "x-prompt": "Where should the gateway be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the gateway.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -44,5 +39,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/guard/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the guard.",
+    "path": {
+      "description": "Path where the guard will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "x-prompt": "Where should the guard be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the guard.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",

package/src/generators/init/init.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = initGenerator;
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const lib_1 = require("./lib");
 async function initGenerator(tree, options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'nest', 'init');
     let installPackagesTask = () => { };
     if (!options.skipPackageJson) {
         installPackagesTask = (0, lib_1.addDependencies)(tree, options);

package/src/generators/interceptor/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the interceptor.",
+    "path": {
+      "description": "Path where the interceptor will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "x-prompt": "Where should the interceptor be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the interceptor.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",

package/src/generators/interface/schema.json

@@ -6,33 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the interface.",
+    "path": {
+      "description": "Path where the interface will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
-    "project": {
-      "description": "The Nest project to target.",
-      "type": "string",
-      "$default": {
-        "$source": "projectName"
-      },
-      "alias": "p",
-      "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 interface be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the interface.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -48,5 +34,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

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

@@ -7,12 +7,12 @@ const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project
 const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const eslint_1 = require("@nx/eslint");
 async function normalizeOptions(tree, options) {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
         importPath: options.importPath,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
@@ -46,7 +46,7 @@ async function normalizeOptions(tree, options) {
 function toJsLibraryGeneratorOptions(options) {
     return {
         name: options.name,
-        bundler: options?.buildable ? 'tsc' : 'none',
+        bundler: options.buildable || options.publishable ? 'tsc' : 'none',
         directory: options.directory,
         importPath: options.importPath,
         linter: options.linter,
@@ -60,7 +60,6 @@ function toJsLibraryGeneratorOptions(options) {
         unitTestRunner: options.unitTestRunner,
         config: options.standaloneConfig ? 'project' : 'workspace',
         setParserOptionsProject: options.setParserOptionsProject,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         addPlugin: options.addPlugin,
     };
 }

package/src/generators/library/library.js

@@ -4,6 +4,7 @@ exports.libraryGenerator = libraryGenerator;
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const lib_1 = require("./lib");
 const init_1 = require("../init/init");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
@@ -15,6 +16,7 @@ async function libraryGenerator(tree, rawOptions) {
     });
 }
 async function libraryGeneratorInternal(tree, rawOptions) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'nest', 'library');
     const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     await (0, js_1.libraryGenerator)(tree, (0, lib_1.toJsLibraryGeneratorOptions)(options));
     const initTask = await (0, init_1.default)(tree, rawOptions);

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

@@ -1,13 +1,11 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { UnitTestRunner } from '../utils';
 
 export interface LibraryGeneratorOptions {
-  name: string;
+  directory: string;
+  name?: string;
   buildable?: boolean;
   controller?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   global?: boolean;
   importPath?: string;
   linter?: Linter | LinterType;

package/src/generators/library/schema.json

@@ -12,25 +12,20 @@
     }
   ],
   "properties": {
-    "name": {
-      "description": "Library name.",
+    "directory": {
+      "description": "A directory where the library is placed.",
       "type": "string",
+      "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][^:]*)$"
-    },
-    "directory": {
-      "description": "A directory where the library is placed.",
-      "type": "string",
-      "alias": "dir"
+      "x-prompt": "Which directory do you want to create the library in?"
     },
-    "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"]
+    "name": {
+      "description": "Library name.",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
+      "type": "string"
     },
     "linter": {
       "description": "The tool to use for running lint checks.",
@@ -143,5 +138,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/generators/middleware/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the middleware.",
+    "path": {
+      "description": "Path where the middleware will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided"]
+      "x-prompt": "Where should the middleware be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the middleware.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -44,5 +39,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/module/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the module.",
+    "path": {
+      "description": "Path where the module will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "x-prompt": "Where should the module be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the module.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -48,5 +43,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/pipe/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the pipe.",
+    "path": {
+      "description": "Path where the pipe will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "x-prompt": "Where should the pipe be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the pipe.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -44,5 +39,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/provider/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the provider.",
+    "path": {
+      "description": "Path where the provider will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "x-prompt": "Where should the provider be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the provider.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -44,5 +39,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/resolver/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the resolver.",
+    "path": {
+      "description": "Path where the resolver will be generated.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
-    },
-    "nameAndDirectoryFormat": {
-      "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"]
+      "x-prompt": "Where should the resolver be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
+      "description": "The name of the resolver.",
       "type": "string",
-      "aliases": ["dir", "path"]
+      "x-prompt": "What name would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -44,5 +39,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/resource/schema.json

@@ -6,24 +6,19 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the resource.",
+      "description": "Path where the resource will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for this resource (plural, e.g., `users`)?"
-    },
-    "nameAndDirectoryFormat": {
-      "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"]
+      "x-prompt": "Where should the resource be generated?"
     },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
+    "name": {
       "type": "string",
-      "aliases": ["dir", "path"]
+      "description": "The name of the resource.",
+      "x-prompt": "What name would you like to use for this resource (plural, e.g., `users`)?"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
@@ -93,5 +88,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/service/schema.json

@@ -15,16 +15,6 @@
       },
       "x-prompt": "What name would you like to use?"
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
-    "directory": {
-      "description": "Directory where the generated files are placed. when `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. otherwise, it will be relative to the workspace root.",
-      "type": "string",
-      "aliases": ["dir", "path"]
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/src/generators/utils/normalize-options.js

@@ -6,8 +6,7 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 async function normalizeOptions(tree, options) {
     const { directory, fileName } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
     });
     return {
         ...options,

package/src/generators/utils/types.d.ts

@@ -1,13 +1,11 @@
-import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 export type Language = 'js' | 'ts';
 export type UnitTestRunner = 'jest' | 'none';
 export type NestSchematic = 'class' | 'controller' | 'decorator' | 'filter' | 'gateway' | 'guard' | 'interceptor' | 'interface' | 'middleware' | 'module' | 'pipe' | 'provider' | 'resolver' | 'resource' | 'service';
 export type TransportLayer = 'rest' | 'graphql-code-first' | 'graphql-schema-first' | 'microservice' | 'ws';
 export type NestGeneratorOptions = {
-    name: string;
-    directory?: string;
+    path: string;
+    name?: string;
     skipFormat?: boolean;
-    nameAndDirectoryFormat?: NameAndDirectoryFormat;
 };
 export type NestGeneratorWithLanguageOption = NestGeneratorOptions & {
     language?: Language;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/nest', '@nx/nest');
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-4-0-cache-manager/nestjs-10-updates.d.ts

@@ -1,5 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function updateNestJs10(tree: Tree): Promise<import("@nx/devkit").GeneratorCallback>;
-export declare function updateCacheManagerImport(tree: Tree, filePath: string): boolean;
-export declare function updateTsConfigTarget(tree: Tree, tsConfigPath: string): void;
-export default updateNestJs10;

package/src/migrations/update-16-4-0-cache-manager/nestjs-10-updates.js

@@ -1,80 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateNestJs10 = updateNestJs10;
-exports.updateCacheManagerImport = updateCacheManagerImport;
-exports.updateTsConfigTarget = updateTsConfigTarget;
-const devkit_1 = require("@nx/devkit");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
-const typescript_1 = require("typescript");
-const JS_TS_FILE_MATCHER = /\.[jt]sx?$/;
-const importMatch = ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="CacheModule"], Identifier[name="CacheModule"]):has(StringLiteral[value="@nestjs/common"])';
-async function updateNestJs10(tree) {
-    const nestProjects = await getNestProejcts();
-    if (nestProjects.length === 0) {
-        return;
-    }
-    let installCacheModuleDeps = false;
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const projectName of nestProjects) {
-        const projectConfig = projects.get(projectName);
-        const tsConfig = projectConfig.targets?.build?.options?.tsConfig ??
-            (0, devkit_1.joinPathFragments)(projectConfig.root, projectConfig.projectType === 'application'
-                ? 'tsconfig.app.json'
-                : 'tsconfig.lib.json');
-        if (tree.exists(tsConfig)) {
-            updateTsConfigTarget(tree, tsConfig);
-        }
-        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
-            if (!JS_TS_FILE_MATCHER.test(filePath)) {
-                return;
-            }
-            installCacheModuleDeps =
-                updateCacheManagerImport(tree, filePath) || installCacheModuleDeps;
-        });
-    }
-    await (0, devkit_1.formatFiles)(tree);
-    return installCacheModuleDeps
-        ? (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@nestjs/cache-manager': '^2.0.0',
-            'cache-manager': '^5.2.3',
-        }, {})
-        : () => { };
-}
-async function getNestProejcts() {
-    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-    return Object.entries(projectGraph.dependencies)
-        .filter(([node, dep]) => dep.some(({ target }) => !projectGraph.externalNodes?.[node] && target === 'npm:@nestjs/common'))
-        .map(([projectName]) => projectName);
-}
-// change import { CacheModule } from '@nestjs/common';
-// to import { CacheModule } from '@nestjs/cache-manager';
-function updateCacheManagerImport(tree, filePath) {
-    const content = tree.read(filePath, 'utf-8');
-    const updated = tsquery_1.tsquery.replace(content, importMatch, (node) => {
-        const text = node.getText();
-        return `${text.replace('CacheModule', '')}\n${(0, typescript_1.isVariableStatement)(node)
-            ? "const { CacheModule } = require('@nestjs/cache-manager')"
-            : "import { CacheModule } from '@nestjs/cache-manager';"}`;
-    });
-    if (updated !== content) {
-        tree.write(filePath, updated);
-        return true;
-    }
-}
-function updateTsConfigTarget(tree, tsConfigPath) {
-    (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
-        if (!json.compilerOptions.target) {
-            return json;
-        }
-        const normalizedTargetName = json.compilerOptions.target.toUpperCase();
-        // es6 isn't apart of the ScriptTarget enum but is a valid tsconfig target in json file
-        const existingTarget = normalizedTargetName === 'ES6'
-            ? typescript_1.ScriptTarget.ES2015
-            : typescript_1.ScriptTarget[normalizedTargetName];
-        if (existingTarget < typescript_1.ScriptTarget.ES2021) {
-            json.compilerOptions.target = 'es2021';
-        }
-        return json;
-    });
-}
-exports.default = updateNestJs10;