@nestjs/cli 9.3.0 → 9.4.1

package/.circleci/config.yml

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

package/README.md

@@ -7,8 +7,6 @@
 <a href="https://www.npmjs.com/~nestjscore"><img src="https://img.shields.io/npm/v/@nestjs/cli.svg" alt="NPM Version" /></a>
 <a href="https://www.npmjs.com/~nestjscore"><img src="https://img.shields.io/npm/l/@nestjs/cli.svg" alt="Package License" /></a>
 <a href="https://www.npmjs.com/~nestjscore"><img src="https://img.shields.io/npm/dm/@nestjs/cli.svg" alt="NPM Downloads" /></a>
-  <a href="https://travis-ci.org/nestjs/nest"><img src="https://api.travis-ci.org/nestjs/nest.svg?branch=master" alt="Travis" /></a>
-<a href="https://travis-ci.org/nestjs/nest"><img src="https://img.shields.io/travis/nestjs/nest/master.svg?label=linux" alt="Linux" /></a>
 <a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
 <a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
 <a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
@@ -42,4 +40,4 @@ Learn more in the [official documentation](https://docs.nestjs.com/cli/overview)
 
 ## License
 
-Nest is [MIT licensed](LICENSE).
+Nest is [MIT licensed](LICENSE).

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/actions/start.action.d.ts

@@ -2,7 +2,7 @@ import { Input } from '../commands';
 import { BuildAction } from './build.action';
 export declare class StartAction extends BuildAction {
     handle(inputs: Input[], options: Input[]): Promise<void>;
-    createOnSuccessHook(entryFile: string, sourceRoot: string, debugFlag: boolean | string | undefined, outDirName: string, binaryToRun?: string): () => void;
+    createOnSuccessHook(entryFile: string, sourceRoot: string, debugFlag: boolean | string | undefined, outDirName: string, binaryToRun: string): () => void;
     private spawnChildProcess;
     private isSourceMapSupportPkgAvailable;
 }

package/actions/start.action.js

@@ -22,7 +22,6 @@ const ui_1 = require("../lib/ui");
 const build_action_1 = require("./build.action");
 class StartAction extends build_action_1.BuildAction {
     handle(inputs, options) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const configFileName = options.find((option) => option.name === 'config')
@@ -31,20 +30,17 @@ class StartAction extends build_action_1.BuildAction {
                 const appName = inputs.find((input) => input.name === 'app')
                     .value;
                 const pathToTsconfig = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.tsConfigPath', appName, 'path', options);
-                const binaryToRunOption = options.find((option) => option.name === 'exec');
                 const debugModeOption = options.find((option) => option.name === 'debug');
                 const watchModeOption = options.find((option) => option.name === 'watch');
                 const isWatchEnabled = !!(watchModeOption && watchModeOption.value);
                 const watchAssetsModeOption = options.find((option) => option.name === 'watchAssets');
                 const isWatchAssetsEnabled = !!(watchAssetsModeOption && watchAssetsModeOption.value);
                 const debugFlag = debugModeOption && debugModeOption.value;
-                const binaryToRun = binaryToRunOption && binaryToRunOption.value;
+                const binaryToRun = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'exec', appName, 'exec', options, defaults_1.defaultConfiguration.exec);
                 const { options: tsOptions } = this.tsConfigProvider.getByConfigFilename(pathToTsconfig);
                 const outDir = tsOptions.outDir || defaults_1.defaultOutDir;
-                const entryFile = ((_a = options.find((option) => option.name === 'entryFile')) === null || _a === void 0 ? void 0 : _a.value) ||
-                    (0, get_value_or_default_1.getValueOrDefault)(configuration, 'entryFile', appName, undefined, undefined, defaults_1.defaultConfiguration.entryFile);
-                const sourceRoot = ((_b = options.find((option) => option.name === 'sourceRoot')) === null || _b === void 0 ? void 0 : _b.value) ||
-                    (0, get_value_or_default_1.getValueOrDefault)(configuration, 'sourceRoot', appName, undefined, undefined, defaults_1.defaultConfiguration.sourceRoot);
+                const entryFile = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'entryFile', appName, 'entryFile', options, defaults_1.defaultConfiguration.entryFile);
+                const sourceRoot = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'sourceRoot', appName, 'sourceRoot', options, defaults_1.defaultConfiguration.sourceRoot);
                 const onSuccess = this.createOnSuccessHook(entryFile, sourceRoot, debugFlag, outDir, binaryToRun);
                 yield this.runBuild(inputs, options, isWatchEnabled, isWatchAssetsEnabled, !!debugFlag, onSuccess);
             }
@@ -58,7 +54,7 @@ class StartAction extends build_action_1.BuildAction {
             }
         });
     }
-    createOnSuccessHook(entryFile, sourceRoot, debugFlag, outDirName, binaryToRun = 'node') {
+    createOnSuccessHook(entryFile, sourceRoot, debugFlag, outDirName, binaryToRun) {
         let childProcessRef;
         process.on('exit', () => childProcessRef && (0, tree_kill_1.treeKillSync)(childProcessRef.pid));
         return () => {

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/helpers/get-value-or-default.d.ts

@@ -1,4 +1,4 @@
 import { Input } from '../../../commands';
 import { Configuration } from '../../configuration';
-export declare function getValueOrDefault<T = any>(configuration: Required<Configuration>, propertyPath: string, appName: string, key?: 'path' | 'webpack' | 'webpackPath', options?: Input[], defaultValue?: T): T;
+export declare function getValueOrDefault<T = any>(configuration: Required<Configuration>, propertyPath: string, appName: string, key?: 'path' | 'webpack' | 'webpackPath' | 'entryFile' | 'sourceRoot' | 'exec', options?: Input[], defaultValue?: T): T;
 export declare function getValueOfPath<T = any>(object: Record<string, any>, propertyPath: string): T;

package/lib/compiler/helpers/manual-restart.d.ts

@@ -0,0 +1,2 @@
+export declare function listenForManualRestart(callback: () => void): void;
+export declare function displayManualRestartTip(): void;

package/lib/compiler/helpers/manual-restart.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.displayManualRestartTip = exports.listenForManualRestart = void 0;
+const chalk = require("chalk");
+function listenForManualRestart(callback) {
+    const stdinListener = (data) => {
+        if (data.toString().trim() === 'rs') {
+            process.stdin.removeListener('data', stdinListener);
+            callback();
+        }
+    };
+    process.stdin.on('data', stdinListener);
+}
+exports.listenForManualRestart = listenForManualRestart;
+function displayManualRestartTip() {
+    console.log(`To restart at any time, enter ${chalk.gray('rs')}.\n`);
+}
+exports.displayManualRestartTip = displayManualRestartTip;

package/lib/compiler/watch-compiler.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WatchCompiler = void 0;
 const errors_1 = require("../ui/errors");
 const get_value_or_default_1 = require("./helpers/get-value-or-default");
+const manual_restart_1 = require("./helpers/manual-restart");
 const tsconfig_paths_hook_1 = require("./hooks/tsconfig-paths.hook");
 class WatchCompiler {
     constructor(pluginsLoader, tsConfigProvider, typescriptLoader) {
@@ -27,7 +28,10 @@ class WatchCompiler {
         host.createProgram = (rootNames, options, 
         // tslint:disable-next-line:no-shadowed-variable
         host, oldProgram) => {
-            const tsconfigPathsPlugin = options ? (0, tsconfig_paths_hook_1.tsconfigPathsBeforeHookFactory)(options) : null;
+            (0, manual_restart_1.displayManualRestartTip)();
+            const tsconfigPathsPlugin = options
+                ? (0, tsconfig_paths_hook_1.tsconfigPathsBeforeHookFactory)(options)
+                : null;
             const program = origCreateProgram(rootNames, options, host, oldProgram, undefined, projectReferences);
             const origProgramEmit = program.emit;
             program.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
@@ -46,7 +50,11 @@ class WatchCompiler {
             };
             return program;
         };
-        tsBin.createWatchProgram(host);
+        const watchProgram = tsBin.createWatchProgram(host);
+        (0, manual_restart_1.listenForManualRestart)(() => {
+            watchProgram.close();
+            this.run(configuration, configFilename, appName, tsCompilerOptions, onSuccess);
+        });
     }
     createDiagnosticReporter(diagnosticReporter) {
         return function (diagnostic, ...args) {

package/lib/configuration/configuration.d.ts

@@ -29,11 +29,13 @@ interface PluginOptions {
 interface GenerateOptions {
     spec?: boolean | Record<string, boolean>;
     flat?: boolean;
+    specFileSuffix?: string;
 }
 export interface ProjectConfiguration {
     type?: string;
     root?: string;
     entryFile?: string;
+    exec?: string;
     sourceRoot?: string;
     compilerOptions?: CompilerOptions;
 }
@@ -43,6 +45,7 @@ export interface Configuration {
     collection?: string;
     sourceRoot?: string;
     entryFile?: string;
+    exec?: string;
     monorepo?: boolean;
     compilerOptions?: CompilerOptions;
     generateOptions?: GenerateOptions;

package/lib/configuration/defaults.js

@@ -7,6 +7,7 @@ exports.defaultConfiguration = {
     sourceRoot: 'src',
     collection: '@nestjs/schematics',
     entryFile: 'main',
+    exec: 'node',
     projects: {},
     monorepo: false,
     compilerOptions: {

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.3.0",
+  "version": "9.4.1",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -38,9 +38,9 @@
   },
   "homepage": "https://github.com/nestjs/nest-cli#readme",
   "dependencies": {
-    "@angular-devkit/core": "15.2.4",
-    "@angular-devkit/schematics": "15.2.4",
-    "@angular-devkit/schematics-cli": "15.2.4",
+    "@angular-devkit/core": "15.2.6",
+    "@angular-devkit/schematics": "15.2.6",
+    "@angular-devkit/schematics-cli": "15.2.6",
     "@nestjs/schematics": "^9.0.4",
     "chalk": "4.1.2",
     "chokidar": "3.5.3",
@@ -51,38 +51,38 @@
     "node-emoji": "1.11.0",
     "ora": "5.4.1",
     "os-name": "4.0.1",
-    "rimraf": "4.4.0",
+    "rimraf": "4.4.1",
     "shelljs": "0.8.5",
     "source-map-support": "0.5.21",
     "tree-kill": "1.2.2",
-    "tsconfig-paths": "4.1.2",
+    "tsconfig-paths": "4.2.0",
     "tsconfig-paths-webpack-plugin": "4.0.1",
     "typescript": "4.9.5",
-    "webpack": "5.76.2",
+    "webpack": "5.79.0",
     "webpack-node-externals": "3.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.4.4",
-    "@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.3",
+    "@types/jest": "29.5.1",
+    "@types/node": "18.15.12",
     "@types/node-emoji": "1.8.2",
-    "@types/shelljs": "0.8.11",
+    "@types/shelljs": "0.8.12",
     "@types/webpack-node-externals": "3.0.0",
-    "@typescript-eslint/eslint-plugin": "5.55.0",
-    "@typescript-eslint/parser": "5.55.0",
+    "@typescript-eslint/eslint-plugin": "5.59.0",
+    "@typescript-eslint/parser": "5.59.0",
     "delete-empty": "3.0.0",
-    "eslint": "8.36.0",
-    "eslint-config-prettier": "8.7.0",
+    "eslint": "8.38.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.0",
-    "prettier": "2.8.4",
-    "release-it": "15.9.0",
-    "ts-jest": "29.0.5",
+    "lint-staged": "13.2.1",
+    "prettier": "2.8.7",
+    "release-it": "15.10.1",
+    "ts-jest": "29.1.0",
     "ts-loader": "9.4.2"
   },
   "lint-staged": {