@nx/nest 17.0.0-beta.8 → 17.0.0-rc.0

package/generators.json

@@ -25,77 +25,77 @@
       "description": "Create a new NestJS library."
     },
     "class": {
-      "factory": "./src/generators/class/class",
+      "factory": "./src/generators/class/class#classGeneratorInternal",
       "schema": "./src/generators/class/schema.json",
       "description": "Run the `class` NestJS generator with Nx project support."
     },
     "controller": {
-      "factory": "./src/generators/controller/controller",
+      "factory": "./src/generators/controller/controller#controllerGeneratorInternal",
       "schema": "./src/generators/controller/schema.json",
       "description": "Run the `controller` NestJS generator with Nx project support."
     },
     "decorator": {
-      "factory": "./src/generators/decorator/decorator",
+      "factory": "./src/generators/decorator/decorator#decoratorGeneratorInternal",
       "schema": "./src/generators/decorator/schema.json",
       "description": "Run the `decorator` NestJS generator with Nx project support."
     },
     "filter": {
-      "factory": "./src/generators/filter/filter",
+      "factory": "./src/generators/filter/filter#filterGeneratorInternal",
       "schema": "./src/generators/filter/schema.json",
       "description": "Run the `filter` NestJS generator with Nx project support."
     },
     "gateway": {
-      "factory": "./src/generators/gateway/gateway",
+      "factory": "./src/generators/gateway/gateway#gatewayGeneratorInternal",
       "schema": "./src/generators/gateway/schema.json",
       "description": "Run the `gateway` NestJS generator with Nx project support."
     },
     "guard": {
-      "factory": "./src/generators/guard/guard",
+      "factory": "./src/generators/guard/guard#guardGeneratorInternal",
       "schema": "./src/generators/guard/schema.json",
       "description": "Run the `guard` NestJS generator with Nx project support."
     },
     "interceptor": {
-      "factory": "./src/generators/interceptor/interceptor",
+      "factory": "./src/generators/interceptor/interceptor#interceptorGeneratorInternal",
       "schema": "./src/generators/interceptor/schema.json",
       "description": "Run the `interceptor` NestJS generator with Nx project support."
     },
     "interface": {
-      "factory": "./src/generators/interface/interface",
+      "factory": "./src/generators/interface/interface#interfaceGeneratorInternal",
       "schema": "./src/generators/interface/schema.json",
       "description": "Run the `interface` NestJS generator with Nx project support."
     },
     "middleware": {
-      "factory": "./src/generators/middleware/middleware",
+      "factory": "./src/generators/middleware/middleware#middlewareGeneratorInternal",
       "schema": "./src/generators/middleware/schema.json",
       "description": "Run the `middleware` NestJS generator with Nx project support."
     },
     "module": {
-      "factory": "./src/generators/module/module",
+      "factory": "./src/generators/module/module#moduleGeneratorInternal",
       "schema": "./src/generators/module/schema.json",
       "description": "Run the `module` NestJS generator with Nx project support."
     },
     "pipe": {
-      "factory": "./src/generators/pipe/pipe",
+      "factory": "./src/generators/pipe/pipe#pipeGeneratorInternal",
       "schema": "./src/generators/pipe/schema.json",
       "description": "Run the `pipe` NestJS generator with Nx project support."
     },
     "provider": {
-      "factory": "./src/generators/provider/provider",
+      "factory": "./src/generators/provider/provider#providerGeneratorInternal",
       "schema": "./src/generators/provider/schema.json",
       "description": "Run the `provider` NestJS generator with Nx project support."
     },
     "resolver": {
-      "factory": "./src/generators/resolver/resolver",
+      "factory": "./src/generators/resolver/resolver#resolverGeneratorInternal",
       "schema": "./src/generators/resolver/schema.json",
       "description": "Run the `resolver` NestJS generator with Nx project support."
     },
     "resource": {
-      "factory": "./src/generators/resource/resource",
+      "factory": "./src/generators/resource/resource#resourceGeneratorInternal",
       "schema": "./src/generators/resource/schema.json",
       "description": "Run the `resource` NestJS generator with Nx project support."
     },
     "service": {
-      "factory": "./src/generators/service/service",
+      "factory": "./src/generators/service/service#serviceGeneratorInternal",
       "schema": "./src/generators/service/schema.json",
       "description": "Run the `service` NestJS generator with Nx project support."
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nest",
-  "version": "17.0.0-beta.8",
+  "version": "17.0.0-rc.0",
   "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": {
@@ -31,13 +31,13 @@
   },
   "dependencies": {
     "@nestjs/schematics": "^9.1.0",
-    "@nx/devkit": "17.0.0-beta.8",
-    "@nx/js": "17.0.0-beta.8",
-    "@nx/eslint": "17.0.0-beta.8",
-    "@nx/node": "17.0.0-beta.8",
+    "@nx/devkit": "17.0.0-rc.0",
+    "@nx/js": "17.0.0-rc.0",
+    "@nx/eslint": "17.0.0-rc.0",
+    "@nx/node": "17.0.0-rc.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "tslib": "^2.3.0",
-    "@nrwl/nest": "17.0.0-beta.8"
+    "@nrwl/nest": "17.0.0-rc.0"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/class/class.d.ts

@@ -1,5 +1,6 @@
 import type { Tree } from '@nx/devkit';
 import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption } from '../utils';
 export type ClassGeneratorOptions = NestGeneratorWithLanguageOption & NestGeneratorWithTestOption;
-export declare function classGenerator(tree: Tree, rawOptions: ClassGeneratorOptions): Promise<any>;
+export declare function classGenerator(tree: Tree, rawOptions: ClassGeneratorOptions): Promise<void>;
+export declare function classGeneratorInternal(tree: Tree, rawOptions: ClassGeneratorOptions): Promise<any>;
 export default classGenerator;

package/src/generators/class/class.js

@@ -1,16 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.classGenerator = void 0;
+exports.classGeneratorInternal = exports.classGenerator = void 0;
 const utils_1 = require("../utils");
-function classGenerator(tree, rawOptions) {
-    const options = normalizeClassOptions(tree, rawOptions);
-    return (0, utils_1.runNestSchematic)(tree, 'class', options);
+async function classGenerator(tree, rawOptions) {
+    await classGeneratorInternal(tree, {
+        nameAndDirectoryFormat: 'derived',
+        ...rawOptions,
+    });
 }
 exports.classGenerator = classGenerator;
+async function classGeneratorInternal(tree, rawOptions) {
+    const options = await normalizeClassOptions(tree, rawOptions);
+    return (0, utils_1.runNestSchematic)(tree, 'class', options);
+}
+exports.classGeneratorInternal = classGeneratorInternal;
 exports.default = classGenerator;
-function normalizeClassOptions(tree, options) {
+async function normalizeClassOptions(tree, options) {
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, 'class', '@nx/nest:class', options);
     return {
-        ...(0, utils_1.normalizeOptions)(tree, options),
+        ...normalizedOptions,
         language: options.language,
         spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
     };

package/src/generators/class/schema.json

@@ -15,6 +15,11 @@
       },
       "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",
@@ -22,10 +27,10 @@
         "$source": "projectName"
       },
       "alias": "p",
-      "x-prompt": "What Nest project would you like to target?"
+      "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 v18."
     },
     "directory": {
-      "description": "Directory where the generated files are placed.",
+      "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"]
     },
@@ -43,6 +48,7 @@
     },
     "flat": {
       "description": "Flag to indicate if a directory is created.",
+      "x-deprecated": "provide the `directory` option instead and use the `as-provided` format. it will be removed in nx v18.",
       "type": "boolean",
       "default": true
     },
@@ -53,5 +59,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name", "project"]
+  "required": ["name"]
 }

package/src/generators/controller/controller.d.ts

@@ -4,5 +4,6 @@ export type ControllerGeneratorOptions = NestGeneratorWithLanguageOption & NestG
     module?: string;
     skipImport?: boolean;
 };
-export declare function controllerGenerator(tree: Tree, rawOptions: ControllerGeneratorOptions): Promise<any>;
+export declare function controllerGenerator(tree: Tree, rawOptions: ControllerGeneratorOptions): Promise<void>;
+export declare function controllerGeneratorInternal(tree: Tree, rawOptions: ControllerGeneratorOptions): Promise<any>;
 export default controllerGenerator;

package/src/generators/controller/controller.js

@@ -1,16 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.controllerGenerator = void 0;
+exports.controllerGeneratorInternal = exports.controllerGenerator = void 0;
 const utils_1 = require("../utils");
-function controllerGenerator(tree, rawOptions) {
-    const options = normalizeControllerOptions(tree, rawOptions);
-    return (0, utils_1.runNestSchematic)(tree, 'controller', options);
+async function controllerGenerator(tree, rawOptions) {
+    await controllerGeneratorInternal(tree, {
+        nameAndDirectoryFormat: 'derived',
+        ...rawOptions,
+    });
 }
 exports.controllerGenerator = controllerGenerator;
+async function controllerGeneratorInternal(tree, rawOptions) {
+    const options = await normalizeControllerOptions(tree, rawOptions);
+    return (0, utils_1.runNestSchematic)(tree, 'controller', options);
+}
+exports.controllerGeneratorInternal = controllerGeneratorInternal;
 exports.default = controllerGenerator;
-function normalizeControllerOptions(tree, options) {
+async function normalizeControllerOptions(tree, options) {
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, 'controller', '@nx/nest:controller', options);
     return {
-        ...(0, utils_1.normalizeOptions)(tree, options),
+        ...normalizedOptions,
         language: options.language,
         module: options.module,
         skipImport: options.skipImport,

package/src/generators/controller/schema.json

@@ -22,10 +22,15 @@
         "$source": "projectName"
       },
       "alias": "p",
-      "x-prompt": "What Nest project would you like to target?"
+      "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 v18."
+    },
+    "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.",
+      "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"]
     },
@@ -43,6 +48,7 @@
     },
     "flat": {
       "description": "Flag to indicate if a directory is created.",
+      "x-deprecated": "provide the `directory` option instead and use the `as-provided` format. it will be removed in nx v18.",
       "type": "boolean",
       "default": false
     },
@@ -62,5 +68,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name", "project"]
+  "required": ["name"]
 }

package/src/generators/decorator/decorator.d.ts

@@ -1,5 +1,6 @@
 import type { Tree } from '@nx/devkit';
 import type { NestGeneratorWithLanguageOption } from '../utils';
 export type DecoratorGeneratorOptions = NestGeneratorWithLanguageOption;
-export declare function decoratorGenerator(tree: Tree, rawOptions: DecoratorGeneratorOptions): Promise<any>;
+export declare function decoratorGenerator(tree: Tree, rawOptions: DecoratorGeneratorOptions): Promise<void>;
+export declare function decoratorGeneratorInternal(tree: Tree, rawOptions: DecoratorGeneratorOptions): Promise<any>;
 export default decoratorGenerator;

package/src/generators/decorator/decorator.js

@@ -1,16 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decoratorGenerator = void 0;
+exports.decoratorGeneratorInternal = exports.decoratorGenerator = void 0;
 const utils_1 = require("../utils");
-function decoratorGenerator(tree, rawOptions) {
-    const options = normalizeDecoratorOptions(tree, rawOptions);
-    return (0, utils_1.runNestSchematic)(tree, 'decorator', options);
+async function decoratorGenerator(tree, rawOptions) {
+    await decoratorGeneratorInternal(tree, {
+        nameAndDirectoryFormat: 'derived',
+        ...rawOptions,
+    });
 }
 exports.decoratorGenerator = decoratorGenerator;
+async function decoratorGeneratorInternal(tree, rawOptions) {
+    const options = await normalizeDecoratorOptions(tree, rawOptions);
+    return (0, utils_1.runNestSchematic)(tree, 'decorator', options);
+}
+exports.decoratorGeneratorInternal = decoratorGeneratorInternal;
 exports.default = decoratorGenerator;
-function normalizeDecoratorOptions(tree, options) {
+async function normalizeDecoratorOptions(tree, options) {
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, 'decorator', '@nx/nest:decorator', options);
     return {
-        ...(0, utils_1.normalizeOptions)(tree, options),
+        ...normalizedOptions,
         language: options.language,
     };
 }

package/src/generators/decorator/schema.json

@@ -15,6 +15,11 @@
       },
       "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",
@@ -22,10 +27,10 @@
         "$source": "projectName"
       },
       "alias": "p",
-      "x-prompt": "What Nest project would you like to target?"
+      "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 v18."
     },
     "directory": {
-      "description": "Directory where the generated files are placed.",
+      "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"]
     },
@@ -37,6 +42,7 @@
     },
     "flat": {
       "description": "Flag to indicate if a directory is created.",
+      "x-deprecated": "provide the `directory` option instead and use the `as-provided` format. it will be removed in nx v18.",
       "type": "boolean",
       "default": true
     },
@@ -47,5 +53,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name", "project"]
+  "required": ["name"]
 }

package/src/generators/filter/filter.d.ts

@@ -1,5 +1,6 @@
 import type { Tree } from '@nx/devkit';
 import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption } from '../utils';
 export type FilterGeneratorOptions = NestGeneratorWithLanguageOption & NestGeneratorWithTestOption;
-export declare function filterGenerator(tree: Tree, rawOptions: FilterGeneratorOptions): Promise<any>;
+export declare function filterGenerator(tree: Tree, rawOptions: FilterGeneratorOptions): Promise<void>;
+export declare function filterGeneratorInternal(tree: Tree, rawOptions: FilterGeneratorOptions): Promise<any>;
 export default filterGenerator;

package/src/generators/filter/filter.js

@@ -1,16 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterGenerator = void 0;
+exports.filterGeneratorInternal = exports.filterGenerator = void 0;
 const utils_1 = require("../utils");
-function filterGenerator(tree, rawOptions) {
-    const options = normalizeFilterOptions(tree, rawOptions);
-    return (0, utils_1.runNestSchematic)(tree, 'filter', options);
+async function filterGenerator(tree, rawOptions) {
+    await filterGeneratorInternal(tree, {
+        nameAndDirectoryFormat: 'derived',
+        ...rawOptions,
+    });
 }
 exports.filterGenerator = filterGenerator;
+async function filterGeneratorInternal(tree, rawOptions) {
+    const options = await normalizeFilterOptions(tree, rawOptions);
+    return (0, utils_1.runNestSchematic)(tree, 'filter', options);
+}
+exports.filterGeneratorInternal = filterGeneratorInternal;
 exports.default = filterGenerator;
-function normalizeFilterOptions(tree, options) {
+async function normalizeFilterOptions(tree, options) {
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, 'filter', '@nx/nest:filter', options);
     return {
-        ...(0, utils_1.normalizeOptions)(tree, options),
+        ...normalizedOptions,
         language: options.language,
         spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
     };

package/src/generators/filter/schema.json

@@ -15,6 +15,11 @@
       },
       "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",
@@ -22,10 +27,10 @@
         "$source": "projectName"
       },
       "alias": "p",
-      "x-prompt": "What Nest project would you like to target?"
+      "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 v18."
     },
     "directory": {
-      "description": "Directory where the generated files are placed.",
+      "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"]
     },
@@ -43,6 +48,7 @@
     },
     "flat": {
       "description": "Flag to indicate if a directory is created.",
+      "x-deprecated": "provide the `directory` option instead and use the `as-provided` format. it will be removed in nx v18.",
       "type": "boolean",
       "default": true
     },
@@ -53,5 +59,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name", "project"]
+  "required": ["name"]
 }

package/src/generators/gateway/gateway.d.ts

@@ -1,5 +1,6 @@
 import type { Tree } from '@nx/devkit';
 import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption } from '../utils';
 export type GatewayGeneratorOptions = NestGeneratorWithLanguageOption & NestGeneratorWithTestOption;
-export declare function gatewayGenerator(tree: Tree, rawOptions: GatewayGeneratorOptions): Promise<any>;
+export declare function gatewayGenerator(tree: Tree, rawOptions: GatewayGeneratorOptions): Promise<void>;
+export declare function gatewayGeneratorInternal(tree: Tree, rawOptions: GatewayGeneratorOptions): Promise<any>;
 export default gatewayGenerator;

package/src/generators/gateway/gateway.js

@@ -1,16 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gatewayGenerator = void 0;
+exports.gatewayGeneratorInternal = exports.gatewayGenerator = void 0;
 const utils_1 = require("../utils");
-function gatewayGenerator(tree, rawOptions) {
-    const options = normalizeGatewayOptions(tree, rawOptions);
-    return (0, utils_1.runNestSchematic)(tree, 'gateway', options);
+async function gatewayGenerator(tree, rawOptions) {
+    await gatewayGeneratorInternal(tree, {
+        nameAndDirectoryFormat: 'derived',
+        ...rawOptions,
+    });
 }
 exports.gatewayGenerator = gatewayGenerator;
+async function gatewayGeneratorInternal(tree, rawOptions) {
+    const options = await normalizeGatewayOptions(tree, rawOptions);
+    return (0, utils_1.runNestSchematic)(tree, 'gateway', options);
+}
+exports.gatewayGeneratorInternal = gatewayGeneratorInternal;
 exports.default = gatewayGenerator;
-function normalizeGatewayOptions(tree, options) {
+async function normalizeGatewayOptions(tree, options) {
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, 'gateway', '@nx/nest:gateway', options);
     return {
-        ...(0, utils_1.normalizeOptions)(tree, options),
+        ...normalizedOptions,
         language: options.language,
         spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
     };

package/src/generators/gateway/schema.json

@@ -15,6 +15,11 @@
       },
       "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",
@@ -22,10 +27,10 @@
         "$source": "projectName"
       },
       "alias": "p",
-      "x-prompt": "What Nest project would you like to target?"
+      "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 v18."
     },
     "directory": {
-      "description": "Directory where the generated files are placed.",
+      "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"]
     },
@@ -43,6 +48,7 @@
     },
     "flat": {
       "description": "Flag to indicate if a directory is created.",
+      "x-deprecated": "provide the `directory` option instead and use the `as-provided` format. it will be removed in nx v18.",
       "type": "boolean",
       "default": true
     },
@@ -53,5 +59,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name", "project"]
+  "required": ["name"]
 }

package/src/generators/guard/guard.d.ts

@@ -1,5 +1,6 @@
 import type { Tree } from '@nx/devkit';
 import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption } from '../utils';
 export type GuardGeneratorOptions = NestGeneratorWithLanguageOption & NestGeneratorWithTestOption;
-export declare function guardGenerator(tree: Tree, rawOptions: GuardGeneratorOptions): Promise<any>;
+export declare function guardGenerator(tree: Tree, rawOptions: GuardGeneratorOptions): Promise<void>;
+export declare function guardGeneratorInternal(tree: Tree, rawOptions: GuardGeneratorOptions): Promise<any>;
 export default guardGenerator;

package/src/generators/guard/guard.js

@@ -1,16 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.guardGenerator = void 0;
+exports.guardGeneratorInternal = exports.guardGenerator = void 0;
 const utils_1 = require("../utils");
-function guardGenerator(tree, rawOptions) {
-    const options = normalizeGuardOptions(tree, rawOptions);
-    return (0, utils_1.runNestSchematic)(tree, 'guard', options);
+async function guardGenerator(tree, rawOptions) {
+    await guardGeneratorInternal(tree, {
+        nameAndDirectoryFormat: 'derived',
+        ...rawOptions,
+    });
 }
 exports.guardGenerator = guardGenerator;
+async function guardGeneratorInternal(tree, rawOptions) {
+    const options = await normalizeGuardOptions(tree, rawOptions);
+    return (0, utils_1.runNestSchematic)(tree, 'guard', options);
+}
+exports.guardGeneratorInternal = guardGeneratorInternal;
 exports.default = guardGenerator;
-function normalizeGuardOptions(tree, options) {
+async function normalizeGuardOptions(tree, options) {
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, 'guard', '@nx/nest:guard', options);
     return {
-        ...(0, utils_1.normalizeOptions)(tree, options),
+        ...normalizedOptions,
         language: options.language,
         spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
     };

package/src/generators/guard/schema.json

@@ -15,6 +15,11 @@
       },
       "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",
@@ -22,10 +27,10 @@
         "$source": "projectName"
       },
       "alias": "p",
-      "x-prompt": "What Nest project would you like to target?"
+      "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 v18."
     },
     "directory": {
-      "description": "Directory where the generated files are placed.",
+      "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"]
     },
@@ -43,6 +48,7 @@
     },
     "flat": {
       "description": "Flag to indicate if a directory is created.",
+      "x-deprecated": "provide the `directory` option instead and use the `as-provided` format. it will be removed in nx v18.",
       "type": "boolean",
       "default": true
     },
@@ -53,5 +59,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name", "project"]
+  "required": ["name"]
 }

package/src/generators/interceptor/interceptor.d.ts

@@ -1,5 +1,6 @@
 import type { Tree } from '@nx/devkit';
 import type { NestGeneratorWithLanguageOption, NestGeneratorWithTestOption } from '../utils';
 export type InterceptorGeneratorOptions = NestGeneratorWithLanguageOption & NestGeneratorWithTestOption;
-export declare function interceptorGenerator(tree: Tree, rawOptions: InterceptorGeneratorOptions): Promise<any>;
+export declare function interceptorGenerator(tree: Tree, rawOptions: InterceptorGeneratorOptions): Promise<void>;
+export declare function interceptorGeneratorInternal(tree: Tree, rawOptions: InterceptorGeneratorOptions): Promise<any>;
 export default interceptorGenerator;