@nx/nest 20.2.1 → 20.3.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nest",
-  "version": "20.2.1",
+  "version": "20.3.0-beta.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": {
@@ -32,10 +32,10 @@
   },
   "dependencies": {
     "@nestjs/schematics": "^9.1.0",
-    "@nx/devkit": "20.2.1",
-    "@nx/js": "20.2.1",
-    "@nx/eslint": "20.2.1",
-    "@nx/node": "20.2.1",
+    "@nx/devkit": "20.3.0-beta.0",
+    "@nx/js": "20.3.0-beta.0",
+    "@nx/eslint": "20.3.0-beta.0",
+    "@nx/node": "20.3.0-beta.0",
     "tslib": "^2.3.0"
   },
   "publishConfig": {

package/src/generators/class/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the class `Foo` at `myapp/src/app/foo.ts`",
+      "command": "nx g @nx/nest:class myapp/src/app/foo.ts"
+    },
+    {
+      "description": "Generate the class without providing the file extension. It results in the class `Foo` at `myapp/src/app/foo.ts`",
       "command": "nx g @nx/nest:class myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the class without the file extension. Relative to the current working directory.",
+      "description": "The file path to the class. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/controller/controller.js

@@ -8,7 +8,9 @@ async function controllerGenerator(tree, rawOptions) {
 }
 exports.default = controllerGenerator;
 async function normalizeControllerOptions(tree, options) {
-    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options, {
+        suffix: 'controller',
+    });
     return {
         ...normalizedOptions,
         language: options.language,

package/src/generators/controller/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the controller `FooController` at `myapp/src/app/foo.controller.ts`",
+      "command": "nx g @nx/nest:controller myapp/src/app/foo.controller.ts"
+    },
+    {
+      "description": "Generate the controller without providing the file extension. It results in the controller `FooController` at `myapp/src/app/foo.controller.ts`",
       "command": "nx g @nx/nest:controller myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the controller without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the controller. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/decorator/decorator.js

@@ -8,7 +8,9 @@ async function decoratorGenerator(tree, rawOptions) {
 }
 exports.default = decoratorGenerator;
 async function normalizeDecoratorOptions(tree, options) {
-    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options, {
+        suffix: 'decorator',
+    });
     return {
         ...normalizedOptions,
         language: options.language,

package/src/generators/decorator/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the decorator `Foo` at `myapp/src/app/foo.decorator.ts`",
+      "command": "nx g @nx/nest:decorator myapp/src/app/foo.decorator.ts"
+    },
+    {
+      "description": "Generate the decorator without providing the file extension. It results in the decorator `Foo` at `myapp/src/app/foo.decorator.ts`",
       "command": "nx g @nx/nest:decorator myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the decorator without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the decorator. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/filter/filter.js

@@ -8,7 +8,9 @@ async function filterGenerator(tree, rawOptions) {
 }
 exports.default = filterGenerator;
 async function normalizeFilterOptions(tree, options) {
-    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options, {
+        suffix: 'filter',
+    });
     return {
         ...normalizedOptions,
         language: options.language,

package/src/generators/filter/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the filter `FooFilter` at `myapp/src/app/foo.filter.ts`",
+      "command": "nx g @nx/nest:filter myapp/src/app/foo.filter.ts"
+    },
+    {
+      "description": "Generate the filter without providing the file extension. It results in the filter `FooFilter` at `myapp/src/app/foo.filter.ts`",
       "command": "nx g @nx/nest:filter myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the filter without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the filter. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/gateway/gateway.js

@@ -8,7 +8,9 @@ async function gatewayGenerator(tree, rawOptions) {
 }
 exports.default = gatewayGenerator;
 async function normalizeGatewayOptions(tree, options) {
-    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options, {
+        suffix: 'gateway',
+    });
     return {
         ...normalizedOptions,
         language: options.language,

package/src/generators/gateway/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the gateway `FooGateway` at `myapp/src/app/foo.gateway.ts`",
+      "command": "nx g @nx/nest:gateway myapp/src/app/foo.gateway.ts"
+    },
+    {
+      "description": "Generate the gateway without providing the file extension. It results in the gateway `FooGateway` at `myapp/src/app/foo.gateway.ts`",
       "command": "nx g @nx/nest:gateway myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the gateway without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the gateway. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/guard/guard.js

@@ -8,7 +8,9 @@ async function guardGenerator(tree, rawOptions) {
 }
 exports.default = guardGenerator;
 async function normalizeGuardOptions(tree, options) {
-    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options, {
+        suffix: 'guard',
+    });
     return {
         ...normalizedOptions,
         language: options.language,

package/src/generators/guard/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the guard `FooGuard` at `myapp/src/app/foo.guard.ts`",
+      "command": "nx g @nx/nest:guard myapp/src/app/foo.guard.ts"
+    },
+    {
+      "description": "Generate the guard without providing the file extension. It results in the guard `FooGuard` at `myapp/src/app/foo.guard.ts`",
       "command": "nx g @nx/nest:guard myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the guard without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the guard. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/interceptor/interceptor.js

@@ -8,7 +8,9 @@ async function interceptorGenerator(tree, rawOptions) {
 }
 exports.default = interceptorGenerator;
 async function normalizeInterceptorOptions(tree, options) {
-    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options, {
+        suffix: 'interceptor',
+    });
     return {
         ...normalizedOptions,
         language: options.language,

package/src/generators/interceptor/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the interceptor `FooInterceptor` at `myapp/src/app/foo.interceptor.ts`",
+      "command": "nx g @nx/nest:interceptor myapp/src/app/foo.interceptor.ts"
+    },
+    {
+      "description": "Generate the interceptor without providing the file extension. It results in the interceptor `FooInterceptor` at `myapp/src/app/foo.interceptor.ts`",
       "command": "nx g @nx/nest:interceptor myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the interceptor without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the interceptor. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/interface/interface.js

@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.interfaceGenerator = interfaceGenerator;
 const utils_1 = require("../utils");
 async function interfaceGenerator(tree, rawOptions) {
-    const options = await (0, utils_1.normalizeOptions)(tree, rawOptions);
+    const options = await (0, utils_1.normalizeOptions)(tree, rawOptions, {
+        allowedFileExtensions: ['ts'],
+        skipLanguageOption: true,
+        suffix: 'interface',
+    });
     return (0, utils_1.runNestSchematic)(tree, 'interface', options);
 }
 exports.default = interfaceGenerator;

package/src/generators/interface/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the interface `Foo` at `myapp/src/app/foo.interface.ts`",
+      "command": "nx g @nx/nest:interface myapp/src/app/foo.interface.ts"
+    },
+    {
+      "description": "Generate the interface without providing the file extension. It results in the interface `Foo` at `myapp/src/app/foo.interface.ts`",
       "command": "nx g @nx/nest:interface myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the interface without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the interface. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/middleware/middleware.js

@@ -8,7 +8,9 @@ async function middlewareGenerator(tree, rawOptions) {
 }
 exports.default = middlewareGenerator;
 async function normalizeMiddlewareOptions(tree, options) {
-    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options, {
+        suffix: 'middleware',
+    });
     return {
         ...normalizedOptions,
         language: options.language,

package/src/generators/middleware/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the middleware `FooMiddleware` at `myapp/src/app/foo.middleware.ts`",
+      "command": "nx g @nx/nest:middleware myapp/src/app/foo.middleware.ts"
+    },
+    {
+      "description": "Generate the middleware without providing the file extension. It results in the middleware `FooMiddleware` at `myapp/src/app/foo.middleware.ts`",
       "command": "nx g @nx/nest:middleware myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the middleware without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the middleware. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/module/module.js

@@ -8,7 +8,9 @@ async function moduleGenerator(tree, rawOptions) {
 }
 exports.default = moduleGenerator;
 async function normalizeModuleOptions(tree, options) {
-    const normalizedOption = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOption = await (0, utils_1.normalizeOptions)(tree, options, {
+        suffix: 'module',
+    });
     return {
         ...normalizedOption,
         language: options.language,

package/src/generators/module/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the module `FooModule` at `myapp/src/app/foo.module.ts`",
+      "command": "nx g @nx/nest:module myapp/src/app/foo.module.ts"
+    },
+    {
+      "description": "Generate the module without providing the file extension. It results in the module `FooModule` at `myapp/src/app/foo.module.ts`",
       "command": "nx g @nx/nest:module myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the module without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the module. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/pipe/pipe.js

@@ -8,7 +8,9 @@ async function pipeGenerator(tree, rawOptions) {
 }
 exports.default = pipeGenerator;
 async function normalizePipeOptions(tree, options) {
-    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options, {
+        suffix: 'pipe',
+    });
     return {
         ...normalizedOptions,
         language: options.language,

package/src/generators/pipe/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the pipe `FooPipe` at `myapp/src/app/foo.pipe.ts`",
+      "command": "nx g @nx/nest:pipe myapp/src/app/foo.pipe.ts"
+    },
+    {
+      "description": "Generate the pipe without providing the file extension. It results in the pipe `FooPipe` at `myapp/src/app/foo.pipe.ts`",
       "command": "nx g @nx/nest:pipe myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the pipe without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the pipe. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/provider/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the provider `Foo` at `myapp/src/app/foo.ts`",
+      "command": "nx g @nx/nest:provider myapp/src/app/foo.ts"
+    },
+    {
+      "description": "Generate the provider without providing the file extension. It results in the provider `Foo` at `myapp/src/app/foo.ts`",
       "command": "nx g @nx/nest:provider myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the provider without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the provider. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/resolver/resolver.js

@@ -8,7 +8,9 @@ async function resolverGenerator(tree, rawOptions) {
 }
 exports.default = resolverGenerator;
 async function normalizeResolverOptions(tree, options) {
-    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options, {
+        suffix: 'resolver',
+    });
     return {
         ...normalizedOptions,
         language: options.language,

package/src/generators/resolver/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the resolver `FooResolver` at `myapp/src/app/foo.resolver.ts`",
+      "command": "nx g @nx/nest:resolver myapp/src/app/foo.resolver.ts"
+    },
+    {
+      "description": "Generate the resolver without providing the file extension. It results in the resolver `FooResolver` at `myapp/src/app/foo.resolver.ts`",
       "command": "nx g @nx/nest:resolver myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the resolver without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the resolver. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/resource/resource.d.ts

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

package/src/generators/resource/resource.js

@@ -8,10 +8,11 @@ async function resourceGenerator(tree, rawOptions) {
 }
 exports.default = resourceGenerator;
 async function normalizeResourceOptions(tree, options) {
-    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options, {
+        skipLanguageOption: true,
+    });
     return {
         ...normalizedOptions,
-        language: options.language,
         spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
     };
 }

package/src/generators/resource/schema.json

@@ -14,7 +14,7 @@
   "properties": {
     "path": {
       "type": "string",
-      "description": "The file path to the resource without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the resource. Relative to the current working directory.",
       "$default": {
         "$source": "argv",
         "index": 0
@@ -33,11 +33,6 @@
       "enum": ["jest", "none"],
       "default": "jest"
     },
-    "language": {
-      "description": "Nest class language.",
-      "type": "string",
-      "enum": ["js", "ts"]
-    },
     "type": {
       "type": "string",
       "description": "The transport layer.",

package/src/generators/service/schema.json

@@ -8,12 +8,16 @@
   "examples": [
     {
       "description": "Generate the service `FooService` at `myapp/src/app/foo.service.ts`",
+      "command": "nx g @nx/nest:service myapp/src/app/foo.service.ts"
+    },
+    {
+      "description": "Generate the service without providing the file extension. It results in the service `FooService` at `myapp/src/app/foo.service.ts`",
       "command": "nx g @nx/nest:service myapp/src/app/foo"
     }
   ],
   "properties": {
     "path": {
-      "description": "The file path to the service without the file extension and suffix. Relative to the current working directory.",
+      "description": "The file path to the service. Relative to the current working directory.",
       "type": "string",
       "$default": {
         "$source": "argv",

package/src/generators/service/service.js

@@ -8,7 +8,9 @@ async function serviceGenerator(tree, rawOptions) {
 }
 exports.default = serviceGenerator;
 async function normalizeServiceOptions(tree, options) {
-    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options);
+    const normalizedOptions = await (0, utils_1.normalizeOptions)(tree, options, {
+        suffix: 'service',
+    });
     return {
         ...normalizedOptions,
         language: options.language,

package/src/generators/utils/normalize-options.d.ts

@@ -1,4 +1,8 @@
 import type { Tree } from '@nx/devkit';
-import type { NestGeneratorOptions, NormalizedOptions, UnitTestRunner } from './types';
-export declare function normalizeOptions(tree: Tree, options: NestGeneratorOptions): Promise<NormalizedOptions>;
+import type { NestGeneratorWithLanguageOption, NormalizedOptions, UnitTestRunner } from './types';
+export declare function normalizeOptions(tree: Tree, options: NestGeneratorWithLanguageOption, normalizationOptions?: {
+    allowedFileExtensions?: Array<'js' | 'ts'>;
+    skipLanguageOption?: boolean;
+    suffix?: string;
+}): Promise<NormalizedOptions>;
 export declare function unitTestRunnerToSpec(unitTestRunner: UnitTestRunner | undefined): boolean | undefined;

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

@@ -3,16 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 exports.unitTestRunnerToSpec = unitTestRunnerToSpec;
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-async function normalizeOptions(tree, options) {
-    const { directory, artifactName } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+async function normalizeOptions(tree, options, normalizationOptions = {}) {
+    const { allowedFileExtensions = ['js', 'ts'], skipLanguageOption = false, suffix, } = normalizationOptions;
+    const { directory, artifactName, fileExtension } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         path: options.path,
+        allowedFileExtensions,
+        fileExtension: options.language === 'js' ? 'js' : 'ts',
+        js: options.language ? options.language === 'js' : undefined,
+        jsOptionName: 'language',
     });
     options.path = undefined; // Now that we have `directory` we don't need `path`
+    if (!skipLanguageOption) {
+        // we assign the language based on the normalized file extension
+        options.language = fileExtension;
+    }
+    let name = artifactName;
+    if (suffix && artifactName.endsWith(`.${suffix}`)) {
+        // strip the suffix if it exists, the nestjs schematic will always add it
+        name = artifactName.replace(`.${suffix}`, '');
+    }
     return {
         ...options,
         flat: true,
-        name: artifactName,
-        skipFormat: options.skipFormat,
+        name,
         sourceRoot: directory,
     };
 }