@nestjs/cli 9.4.0 → 9.4.2

package/.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
   build:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:19.9
+      - image: cimg/node:20.0
     steps:
       - checkout
       - run:
@@ -43,7 +43,7 @@ jobs:
   unit_tests:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:19.9
+      - image: cimg/node:20.0
     steps:
       - checkout
       - *restore-cache

package/actions/build.action.js

@@ -76,7 +76,7 @@ class BuildAction extends abstract_action_1.AbstractAction {
             if (isWebpackEnabled) {
                 const webpackPath = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.webpackConfigPath', appName, 'webpackPath', options);
                 const webpackConfigFactoryOrConfig = this.getWebpackConfigFactoryByPath(webpackPath, configuration.compilerOptions.webpackConfigPath);
-                return this.webpackCompiler.run(configuration, webpackConfigFactoryOrConfig, pathToTsconfig, appName, isDebugEnabled, watchMode, this.assetsManager, onSuccess);
+                return this.webpackCompiler.run(configuration, options, webpackConfigFactoryOrConfig, pathToTsconfig, appName, isDebugEnabled, watchMode, this.assetsManager, onSuccess);
             }
             if (watchMode) {
                 const tsCompilerOptions = {};

package/actions/generate.action.js

@@ -34,6 +34,7 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
         .value;
     const spec = inputs.find((option) => option.name === 'spec');
     const flat = inputs.find((option) => option.name === 'flat');
+    const specFileSuffix = inputs.find((option) => option.name === 'specFileSuffix');
     const collection = schematics_1.CollectionFactory.create(collectionOption || configuration.collection || schematics_1.Collection.NESTJS);
     const schematicOptions = mapSchematicOptions(inputs);
     schematicOptions.push(new schematics_1.SchematicOption('language', configuration.language));
@@ -42,10 +43,12 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
         ? (0, get_value_or_default_1.getValueOrDefault)(configuration, 'sourceRoot', appName)
         : configuration.sourceRoot;
     const specValue = spec.value;
-    const flatValue = !!flat;
+    const flatValue = !!(flat === null || flat === void 0 ? void 0 : flat.value);
+    const specFileSuffixValue = specFileSuffix.value;
     const specOptions = spec.options;
     let generateSpec = (0, project_utils_1.shouldGenerateSpec)(configuration, schematic, appName, specValue, specOptions.passedAsInput);
     let generateFlat = (0, project_utils_1.shouldGenerateFlat)(configuration, appName, flatValue);
+    let generateSpecFileSuffix = (0, project_utils_1.getSpecFileSuffix)(configuration, appName, specFileSuffixValue);
     // If you only add a `lib` we actually don't have monorepo: true BUT we do have "projects"
     // Ensure we don't run for new app/libs schematics
     if ((0, project_utils_1.shouldAskForProject)(schematic, configurationProjects, appName)) {
@@ -67,11 +70,13 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
             // Only overwrite if the appName is not the default- as it has already been loaded above
             generateSpec = (0, project_utils_1.shouldGenerateSpec)(configuration, schematic, answers.appName, specValue, specOptions.passedAsInput);
             generateFlat = (0, project_utils_1.shouldGenerateFlat)(configuration, answers.appNames, flatValue);
+            generateSpecFileSuffix = (0, project_utils_1.getSpecFileSuffix)(configuration, appName, specFileSuffixValue);
         }
     }
     schematicOptions.push(new schematics_1.SchematicOption('sourceRoot', sourceRoot));
     schematicOptions.push(new schematics_1.SchematicOption('spec', generateSpec));
     schematicOptions.push(new schematics_1.SchematicOption('flat', generateFlat));
+    schematicOptions.push(new schematics_1.SchematicOption('specFileSuffix', generateSpecFileSuffix));
     try {
         const schematicInput = inputs.find((input) => input.name === 'schematic');
         if (!schematicInput) {
@@ -86,7 +91,7 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
     }
 });
 const mapSchematicOptions = (inputs) => {
-    const excludedInputNames = ['schematic', 'spec', 'flat'];
+    const excludedInputNames = ['schematic', 'spec', 'flat', 'specFileSuffix'];
     const options = [];
     inputs.forEach((input) => {
         if (!excludedInputNames.includes(input.name) && input.value !== undefined) {

package/commands/generate.command.js

@@ -29,6 +29,7 @@ class GenerateCommand extends abstract_command_1.AbstractCommand {
                 .option('--spec', 'Enforce spec files generation.', () => {
                 return { value: true, passedAsInput: true };
             }, true)
+                .option('--spec-file-suffix [suffix]', 'Use a custom suffix for spec files.')
                 .option('--skip-import', 'Skip importing', () => true, false)
                 .option('--no-spec', 'Disable spec files generation.', () => {
                 return { value: false, passedAsInput: true };
@@ -51,6 +52,10 @@ class GenerateCommand extends abstract_command_1.AbstractCommand {
                             : command.spec.passedAsInput,
                     },
                 });
+                options.push({
+                    name: 'specFileSuffix',
+                    value: command.specFileSuffix,
+                });
                 options.push({
                     name: 'collection',
                     value: command.collection,

package/lib/compiler/webpack-compiler.d.ts

@@ -1,12 +1,13 @@
 import { Configuration } from '../configuration';
 import { AssetsManager } from './assets-manager';
 import { PluginsLoader } from './plugins-loader';
+import { Input } from '../../commands';
 import webpack = require('webpack');
 type WebpackConfigFactory = (config: webpack.Configuration, webpackRef: typeof webpack) => webpack.Configuration;
 type WebpackConfigFactoryOrConfig = WebpackConfigFactory | webpack.Configuration;
 export declare class WebpackCompiler {
     private readonly pluginsLoader;
     constructor(pluginsLoader: PluginsLoader);
-    run(configuration: Required<Configuration>, webpackConfigFactoryOrConfig: WebpackConfigFactoryOrConfig | WebpackConfigFactoryOrConfig[], tsConfigPath: string, appName: string, isDebugEnabled: boolean | undefined, watchMode: boolean | undefined, assetsManager: AssetsManager, onSuccess?: () => void): void;
+    run(configuration: Required<Configuration>, options: Input[], webpackConfigFactoryOrConfig: WebpackConfigFactoryOrConfig | WebpackConfigFactoryOrConfig[], tsConfigPath: string, appName: string, isDebugEnabled: boolean | undefined, watchMode: boolean | undefined, assetsManager: AssetsManager, onSuccess?: () => void): void;
 }
 export {};

package/lib/compiler/webpack-compiler.js

@@ -11,7 +11,7 @@ class WebpackCompiler {
     constructor(pluginsLoader) {
         this.pluginsLoader = pluginsLoader;
     }
-    run(configuration, webpackConfigFactoryOrConfig, tsConfigPath, appName, isDebugEnabled = false, watchMode = false, assetsManager, onSuccess) {
+    run(configuration, options, webpackConfigFactoryOrConfig, tsConfigPath, appName, isDebugEnabled = false, watchMode = false, assetsManager, onSuccess) {
         const cwd = process.cwd();
         const configPath = (0, path_1.join)(cwd, tsConfigPath);
         if (!(0, fs_1.existsSync)(configPath)) {
@@ -20,11 +20,11 @@ class WebpackCompiler {
         const pluginsConfig = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.plugins', appName);
         const plugins = this.pluginsLoader.load(pluginsConfig);
         const relativeRootPath = (0, path_1.dirname)((0, path_1.relative)(cwd, configPath));
-        const sourceRoot = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'sourceRoot', appName);
+        const sourceRoot = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'sourceRoot', appName, 'sourceRoot', options);
         const pathToSource = (0, path_1.normalize)(sourceRoot).indexOf((0, path_1.normalize)(relativeRootPath)) >= 0
             ? (0, path_1.join)(cwd, sourceRoot)
             : (0, path_1.join)(cwd, relativeRootPath, sourceRoot);
-        const entryFile = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'entryFile', appName);
+        const entryFile = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'entryFile', appName, 'entryFile', options);
         const entryFileRoot = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'root', appName) || '';
         const defaultOptions = (0, webpack_defaults_1.webpackDefaultsFactory)(pathToSource, entryFileRoot, entryFile, isDebugEnabled, tsConfigPath, plugins);
         let compiler;

package/lib/configuration/configuration.d.ts

@@ -29,6 +29,7 @@ interface PluginOptions {
 interface GenerateOptions {
     spec?: boolean | Record<string, boolean>;
     flat?: boolean;
+    specFileSuffix?: string;
 }
 export interface ProjectConfiguration {
     type?: string;

package/lib/configuration/nest-configuration.loader.js

@@ -20,9 +20,9 @@ class NestConfigurationLoader {
             const content = name
                 ? yield this.reader.read(name)
                 : yield this.reader.readAnyOf([
+                    'nest-cli.json',
                     '.nestcli.json',
                     '.nest-cli.json',
-                    'nest-cli.json',
                     'nest.json',
                 ]);
             if (!content) {

package/lib/utils/project-utils.d.ts

@@ -6,6 +6,7 @@ export declare function shouldAskForProject(schematic: string, configurationProj
 }, appName: string): boolean;
 export declare function shouldGenerateSpec(configuration: Required<Configuration>, schematic: string, appName: string, specValue: boolean, specPassedAsInput?: boolean): any;
 export declare function shouldGenerateFlat(configuration: Required<Configuration>, appName: string, flatValue: boolean): boolean;
+export declare function getSpecFileSuffix(configuration: Required<Configuration>, appName: string, specFileSuffixValue: string): string;
 export declare function askForProjectName(promptQuestion: string, projects: string[]): Promise<Answers>;
 export declare function moveDefaultProjectToStart(configuration: Configuration, defaultProjectName: string, defaultLabel: string): string[];
 export declare function hasValidOptionFlag(queriedOptionName: string, options: Input[], queriedValue?: string | number | boolean): boolean;

package/lib/utils/project-utils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasValidOptionFlag = exports.moveDefaultProjectToStart = exports.askForProjectName = exports.shouldGenerateFlat = exports.shouldGenerateSpec = exports.shouldAskForProject = void 0;
+exports.hasValidOptionFlag = exports.moveDefaultProjectToStart = exports.askForProjectName = exports.getSpecFileSuffix = exports.shouldGenerateFlat = exports.shouldGenerateSpec = exports.shouldAskForProject = void 0;
 const inquirer = require("inquirer");
 const get_value_or_default_1 = require("../compiler/helpers/get-value-or-default");
 const questions_1 = require("../questions/questions");
@@ -60,6 +60,18 @@ function shouldGenerateFlat(configuration, appName, flatValue) {
     return flatValue;
 }
 exports.shouldGenerateFlat = shouldGenerateFlat;
+function getSpecFileSuffix(configuration, appName, specFileSuffixValue) {
+    // CLI parameters have the highest priority
+    if (specFileSuffixValue) {
+        return specFileSuffixValue;
+    }
+    const specFileSuffixConfiguration = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'generateOptions.specFileSuffix', appName || '', undefined, undefined, 'spec');
+    if (typeof specFileSuffixConfiguration === 'string') {
+        return specFileSuffixConfiguration;
+    }
+    return specFileSuffixValue;
+}
+exports.getSpecFileSuffix = getSpecFileSuffix;
 function askForProjectName(promptQuestion, projects) {
     return __awaiter(this, void 0, void 0, function* () {
         const questions = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/cli",
-  "version": "9.4.0",
+  "version": "9.4.2",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -58,29 +58,29 @@
     "tsconfig-paths": "4.2.0",
     "tsconfig-paths-webpack-plugin": "4.0.1",
     "typescript": "4.9.5",
-    "webpack": "5.79.0",
+    "webpack": "5.80.0",
     "webpack-node-externals": "3.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.5.1",
-    "@commitlint/config-angular": "17.4.4",
+    "@commitlint/cli": "17.6.1",
+    "@commitlint/config-angular": "17.6.1",
     "@types/inquirer": "8.2.6",
-    "@types/jest": "29.5.0",
-    "@types/node": "18.15.11",
+    "@types/jest": "29.5.1",
+    "@types/node": "18.16.0",
     "@types/node-emoji": "1.8.2",
     "@types/shelljs": "0.8.12",
     "@types/webpack-node-externals": "3.0.0",
-    "@typescript-eslint/eslint-plugin": "5.58.0",
-    "@typescript-eslint/parser": "5.58.0",
+    "@typescript-eslint/eslint-plugin": "5.59.0",
+    "@typescript-eslint/parser": "5.59.0",
     "delete-empty": "3.0.0",
-    "eslint": "8.38.0",
+    "eslint": "8.39.0",
     "eslint-config-prettier": "8.8.0",
     "gulp": "4.0.2",
     "gulp-clean": "0.4.0",
     "husky": "8.0.3",
     "jest": "29.5.0",
     "lint-staged": "13.2.1",
-    "prettier": "2.8.7",
+    "prettier": "2.8.8",
     "release-it": "15.10.1",
     "ts-jest": "29.1.0",
     "ts-loader": "9.4.2"