@nestjs/cli 9.1.9 → 9.2.0

package/.circleci/config.yml

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

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2022
+Copyright (c) 2017-2023
 Kamil Mysliwiec <https://kamilmysliwiec.com>
 Thomas Ricart <thomasr2309@gmail.com>
 

package/bin/nest.js

@@ -1,10 +1,19 @@
 #!/usr/bin/env node
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander = require("commander");
 const commands_1 = require("../commands");
 const local_binaries_1 = require("../lib/utils/local-binaries");
-const bootstrap = () => {
+const bootstrap = () => __awaiter(void 0, void 0, void 0, function* () {
     const program = commander;
     program
         .version(require('../package.json').version, '-v, --version', 'Output the current version.')
@@ -12,14 +21,14 @@ const bootstrap = () => {
         .helpOption('-h, --help', 'Output usage information.');
     if ((0, local_binaries_1.localBinExists)()) {
         const localCommandLoader = (0, local_binaries_1.loadLocalBinCommandLoader)();
-        localCommandLoader.load(program);
+        yield localCommandLoader.load(program);
     }
     else {
-        commands_1.CommandLoader.load(program);
+        yield commands_1.CommandLoader.load(program);
     }
-    commander.parse(process.argv);
+    commander.parseAsync(process.argv);
     if (!process.argv.slice(2).length) {
         program.outputHelp();
     }
-};
+});
 bootstrap();

package/commands/command.loader.d.ts

@@ -1,5 +1,5 @@
 import { CommanderStatic } from 'commander';
 export declare class CommandLoader {
-    static load(program: CommanderStatic): void;
+    static load(program: CommanderStatic): Promise<void>;
     private static handleInvalidCommand;
 }

package/commands/command.loader.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandLoader = void 0;
 const chalk = require("chalk");
@@ -12,13 +21,15 @@ const new_command_1 = require("./new.command");
 const start_command_1 = require("./start.command");
 class CommandLoader {
     static load(program) {
-        new new_command_1.NewCommand(new actions_1.NewAction()).load(program);
-        new build_command_1.BuildCommand(new actions_1.BuildAction()).load(program);
-        new start_command_1.StartCommand(new actions_1.StartAction()).load(program);
-        new info_command_1.InfoCommand(new actions_1.InfoAction()).load(program);
-        new add_command_1.AddCommand(new actions_1.AddAction()).load(program);
-        new generate_command_1.GenerateCommand(new actions_1.GenerateAction()).load(program);
-        this.handleInvalidCommand(program);
+        return __awaiter(this, void 0, void 0, function* () {
+            new new_command_1.NewCommand(new actions_1.NewAction()).load(program);
+            new build_command_1.BuildCommand(new actions_1.BuildAction()).load(program);
+            new start_command_1.StartCommand(new actions_1.StartAction()).load(program);
+            new info_command_1.InfoCommand(new actions_1.InfoAction()).load(program);
+            new add_command_1.AddCommand(new actions_1.AddAction()).load(program);
+            yield new generate_command_1.GenerateCommand(new actions_1.GenerateAction()).load(program);
+            this.handleInvalidCommand(program);
+        });
     }
     static handleInvalidCommand(program) {
         program.on('command:*', () => {

package/commands/generate.command.d.ts

@@ -1,7 +1,9 @@
 import { CommanderStatic } from 'commander';
 import { AbstractCommand } from './abstract.command';
 export declare class GenerateCommand extends AbstractCommand {
-    load(program: CommanderStatic): void;
+    load(program: CommanderStatic): Promise<void>;
     private buildDescription;
     private buildSchematicsListAsTable;
+    private getCollection;
+    private getSchematics;
 }

package/commands/generate.command.js

@@ -12,68 +12,74 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateCommand = void 0;
 const chalk = require("chalk");
 const Table = require("cli-table3");
-const nest_collection_1 = require("../lib/schematics/nest.collection");
+const schematics_1 = require("../lib/schematics");
+const load_configuration_1 = require("../lib/utils/load-configuration");
 const abstract_command_1 = require("./abstract.command");
 class GenerateCommand extends abstract_command_1.AbstractCommand {
     load(program) {
-        program
-            .command('generate <schematic> [name] [path]')
-            .alias('g')
-            .description(this.buildDescription())
-            .option('-d, --dry-run', 'Report actions that would be taken without writing out results.')
-            .option('-p, --project [project]', 'Project in which to generate files.')
-            .option('--flat', 'Enforce flat structure of generated element.', () => true)
-            .option('--no-flat', 'Enforce that directories are generated.', () => false)
-            .option('--spec', 'Enforce spec files generation.', () => {
-            return { value: true, passedAsInput: true };
-        }, true)
-            .option('--skip-import', 'Skip importing', () => true, false)
-            .option('--no-spec', 'Disable spec files generation.', () => {
-            return { value: false, passedAsInput: true };
-        })
-            .option('-c, --collection [collectionName]', 'Schematics collection to use.')
-            .action((schematic, name, path, command) => __awaiter(this, void 0, void 0, function* () {
-            const options = [];
-            options.push({ name: 'dry-run', value: !!command.dryRun });
-            if (command.flat !== undefined) {
-                options.push({ name: 'flat', value: command.flat });
-            }
-            options.push({
-                name: 'spec',
-                value: typeof command.spec === 'boolean'
-                    ? command.spec
-                    : command.spec.value,
-                options: {
-                    passedAsInput: typeof command.spec === 'boolean'
-                        ? false
-                        : command.spec.passedAsInput,
-                },
-            });
-            options.push({
-                name: 'collection',
-                value: command.collection,
-            });
-            options.push({
-                name: 'project',
-                value: command.project,
-            });
-            options.push({
-                name: 'skipImport',
-                value: command.skipImport,
-            });
-            const inputs = [];
-            inputs.push({ name: 'schematic', value: schematic });
-            inputs.push({ name: 'name', value: name });
-            inputs.push({ name: 'path', value: path });
-            yield this.action.handle(inputs, options);
-        }));
+        return __awaiter(this, void 0, void 0, function* () {
+            program
+                .command('generate <schematic> [name] [path]')
+                .alias('g')
+                .description(yield this.buildDescription())
+                .option('-d, --dry-run', 'Report actions that would be taken without writing out results.')
+                .option('-p, --project [project]', 'Project in which to generate files.')
+                .option('--flat', 'Enforce flat structure of generated element.', () => true)
+                .option('--no-flat', 'Enforce that directories are generated.', () => false)
+                .option('--spec', 'Enforce spec files generation.', () => {
+                return { value: true, passedAsInput: true };
+            }, true)
+                .option('--skip-import', 'Skip importing', () => true, false)
+                .option('--no-spec', 'Disable spec files generation.', () => {
+                return { value: false, passedAsInput: true };
+            })
+                .option('-c, --collection [collectionName]', 'Schematics collection to use.')
+                .action((schematic, name, path, command) => __awaiter(this, void 0, void 0, function* () {
+                const options = [];
+                options.push({ name: 'dry-run', value: !!command.dryRun });
+                if (command.flat !== undefined) {
+                    options.push({ name: 'flat', value: command.flat });
+                }
+                options.push({
+                    name: 'spec',
+                    value: typeof command.spec === 'boolean'
+                        ? command.spec
+                        : command.spec.value,
+                    options: {
+                        passedAsInput: typeof command.spec === 'boolean'
+                            ? false
+                            : command.spec.passedAsInput,
+                    },
+                });
+                options.push({
+                    name: 'collection',
+                    value: command.collection,
+                });
+                options.push({
+                    name: 'project',
+                    value: command.project,
+                });
+                options.push({
+                    name: 'skipImport',
+                    value: command.skipImport,
+                });
+                const inputs = [];
+                inputs.push({ name: 'schematic', value: schematic });
+                inputs.push({ name: 'name', value: name });
+                inputs.push({ name: 'path', value: path });
+                yield this.action.handle(inputs, options);
+            }));
+        });
     }
     buildDescription() {
-        return ('Generate a Nest element.\n' +
-            `  Schematics available on ${chalk.bold('@nestjs/schematics')} collection:\n` +
-            this.buildSchematicsListAsTable());
+        return __awaiter(this, void 0, void 0, function* () {
+            const collection = yield this.getCollection();
+            return ('Generate a Nest element.\n' +
+                `  Schematics available on ${chalk.bold(collection)} collection:\n` +
+                this.buildSchematicsListAsTable(yield this.getSchematics(collection)));
+        });
     }
-    buildSchematicsListAsTable() {
+    buildSchematicsListAsTable(schematics) {
         const leftMargin = '    ';
         const tableConfig = {
             head: ['name', 'alias', 'description'],
@@ -88,7 +94,7 @@ class GenerateCommand extends abstract_command_1.AbstractCommand {
             },
         };
         const table = new Table(tableConfig);
-        for (const schematic of nest_collection_1.NestCollection.getSchematics()) {
+        for (const schematic of schematics) {
             table.push([
                 chalk.green(schematic.name),
                 chalk.cyan(schematic.alias),
@@ -97,5 +103,17 @@ class GenerateCommand extends abstract_command_1.AbstractCommand {
         }
         return table.toString();
     }
+    getCollection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const configuration = yield (0, load_configuration_1.loadConfiguration)();
+            return configuration.collection;
+        });
+    }
+    getSchematics(collection) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const abstractCollection = schematics_1.CollectionFactory.create(collection);
+            return abstractCollection.getSchematics();
+        });
+    }
 }
 exports.GenerateCommand = GenerateCommand;

package/lib/compiler/plugins-loader.d.ts

@@ -1,6 +1,6 @@
 import * as ts from 'typescript';
-declare type Transformer = ts.TransformerFactory<any> | ts.CustomTransformerFactory;
-declare type PluginEntry = string | PluginAndOptions;
+type Transformer = ts.TransformerFactory<any> | ts.CustomTransformerFactory;
+type PluginEntry = string | PluginAndOptions;
 interface PluginAndOptions {
     name: 'string';
     options: Record<string, any>;

package/lib/compiler/watch-compiler.js

@@ -16,11 +16,11 @@ class WatchCompiler {
         if (!configPath) {
             throw new Error(errors_1.CLI_ERRORS.MISSING_TYPESCRIPT(configFilename));
         }
-        const { projectReferences } = this.tsConfigProvider.getByConfigFilename(configFilename);
+        const { options, projectReferences } = this.tsConfigProvider.getByConfigFilename(configFilename);
         const createProgram = tsBin.createEmitAndSemanticDiagnosticsBuilderProgram;
         const origDiagnosticReporter = tsBin.createDiagnosticReporter(tsBin.sys, true);
         const origWatchStatusReporter = tsBin.createWatchStatusReporter(tsBin.sys, true);
-        const host = tsBin.createWatchCompilerHost(configPath, tsCompilerOptions, tsBin.sys, createProgram, this.createDiagnosticReporter(origDiagnosticReporter), this.createWatchStatusChanged(origWatchStatusReporter, onSuccess));
+        const host = tsBin.createWatchCompilerHost(configPath, Object.assign(Object.assign({}, options), tsCompilerOptions), tsBin.sys, createProgram, this.createDiagnosticReporter(origDiagnosticReporter), this.createWatchStatusChanged(origWatchStatusReporter, onSuccess));
         const pluginsConfig = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.plugins', appName);
         const plugins = this.pluginsLoader.load(pluginsConfig);
         const origCreateProgram = host.createProgram;

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

@@ -2,8 +2,8 @@ import { Configuration } from '../configuration';
 import { AssetsManager } from './assets-manager';
 import { PluginsLoader } from './plugins-loader';
 import webpack = require('webpack');
-declare type WebpackConfigFactory = (config: webpack.Configuration, webpackRef: typeof webpack) => webpack.Configuration;
-declare type WebpackConfigFactoryOrConfig = WebpackConfigFactory | webpack.Configuration;
+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);

package/lib/compiler/workspace-utils.js

@@ -19,7 +19,7 @@ class WorkspaceUtils {
             if (!isDeleteEnabled) {
                 return;
             }
-            yield new Promise((resolve, reject) => rimraf(dirPath, (err) => (err ? reject(err) : resolve())));
+            yield rimraf(dirPath);
         });
     }
 }

package/lib/configuration/configuration.d.ts

@@ -1,4 +1,4 @@
-export declare type Asset = 'string' | AssetEntry;
+export type Asset = 'string' | AssetEntry;
 export interface AssetEntry {
     glob: string;
     include?: string;

package/lib/schematics/abstract.collection.d.ts

@@ -1,10 +1,12 @@
 import { AbstractRunner } from '../runners';
+import { Schematic } from './nest.collection';
 import { SchematicOption } from './schematic.option';
-export declare class AbstractCollection {
+export declare abstract class AbstractCollection {
     protected collection: string;
     protected runner: AbstractRunner;
     constructor(collection: string, runner: AbstractRunner);
     execute(name: string, options: SchematicOption[], extraFlags?: string): Promise<void>;
+    abstract getSchematics(): Schematic[];
     private buildCommandLine;
     private buildOptions;
 }

package/lib/schematics/collection.factory.js

@@ -7,11 +7,12 @@ const custom_collection_1 = require("./custom.collection");
 const nest_collection_1 = require("./nest.collection");
 class CollectionFactory {
     static create(collection) {
-        switch (collection) {
-            case collection_1.Collection.NESTJS:
-                return new nest_collection_1.NestCollection(runners_1.RunnerFactory.create(runners_1.Runner.SCHEMATIC));
-            default:
-                return new custom_collection_1.CustomCollection(collection, runners_1.RunnerFactory.create(runners_1.Runner.SCHEMATIC));
+        const schematicRunner = runners_1.RunnerFactory.create(runners_1.Runner.SCHEMATIC);
+        if (collection === collection_1.Collection.NESTJS) {
+            return new nest_collection_1.NestCollection(schematicRunner);
+        }
+        else {
+            return new custom_collection_1.CustomCollection(collection, schematicRunner);
         }
     }
 }

package/lib/schematics/custom.collection.d.ts

@@ -1,3 +1,10 @@
 import { AbstractCollection } from './abstract.collection';
+import { Schematic } from './nest.collection';
+export interface CollectionSchematic {
+    schema: string;
+    description: string;
+    aliases: string[];
+}
 export declare class CustomCollection extends AbstractCollection {
+    getSchematics(): Schematic[];
 }

package/lib/schematics/custom.collection.js

@@ -1,7 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomCollection = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
 const abstract_collection_1 = require("./abstract.collection");
 class CustomCollection extends abstract_collection_1.AbstractCollection {
+    getSchematics() {
+        const collectionPackagePath = (0, path_1.dirname)(require.resolve(this.collection));
+        const collectionPath = (0, path_1.join)(collectionPackagePath, 'collection.json');
+        const collection = JSON.parse((0, fs_1.readFileSync)(collectionPath, 'utf8'));
+        const schematics = Object.entries(collection.schematics).map(([name, value]) => {
+            var _a;
+            const schematic = value;
+            const description = schematic.description;
+            const alias = ((_a = schematic === null || schematic === void 0 ? void 0 : schematic.aliases) === null || _a === void 0 ? void 0 : _a.length) ? schematic.aliases[0] : '';
+            return { name, description, alias };
+        });
+        return schematics;
+    }
 }
 exports.CustomCollection = CustomCollection;

package/lib/schematics/nest.collection.d.ts

@@ -10,6 +10,6 @@ export declare class NestCollection extends AbstractCollection {
     private static schematics;
     constructor(runner: AbstractRunner);
     execute(name: string, options: SchematicOption[]): Promise<void>;
-    static getSchematics(): Schematic[];
+    getSchematics(): Schematic[];
     private validate;
 }

package/lib/schematics/nest.collection.js

@@ -24,7 +24,7 @@ class NestCollection extends abstract_collection_1.AbstractCollection {
             yield _super.execute.call(this, schematic, options);
         });
     }
-    static getSchematics() {
+    getSchematics() {
         return NestCollection.schematics.filter((item) => item.name !== 'angular-app');
     }
     validate(name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/cli",
-  "version": "9.1.9",
+  "version": "9.2.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -38,26 +38,26 @@
   },
   "homepage": "https://github.com/nestjs/nest-cli#readme",
   "dependencies": {
-    "@angular-devkit/core": "15.0.4",
-    "@angular-devkit/schematics": "15.0.4",
-    "@angular-devkit/schematics-cli": "15.0.4",
+    "@angular-devkit/core": "15.1.4",
+    "@angular-devkit/schematics": "15.1.4",
+    "@angular-devkit/schematics-cli": "15.1.4",
     "@nestjs/schematics": "^9.0.0",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",
     "cli-table3": "0.6.3",
     "commander": "4.1.1",
-    "fork-ts-checker-webpack-plugin": "7.2.14",
+    "fork-ts-checker-webpack-plugin": "7.3.0",
     "inquirer": "7.3.3",
     "node-emoji": "1.11.0",
     "ora": "5.4.1",
     "os-name": "4.0.1",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "shelljs": "0.8.5",
     "source-map-support": "0.5.21",
     "tree-kill": "1.2.2",
-    "tsconfig-paths": "4.1.1",
+    "tsconfig-paths": "4.1.2",
     "tsconfig-paths-webpack-plugin": "4.0.0",
-    "typescript": "4.9.4",
+    "typescript": "4.9.5",
     "webpack": "5.75.0",
     "webpack-node-externals": "3.0.0"
   },
@@ -66,7 +66,7 @@
     "@commitlint/config-angular": "17.4.2",
     "@types/copyfiles": "2.4.1",
     "@types/inquirer": "8.2.5",
-    "@types/jest": "29.2.6",
+    "@types/jest": "29.4.0",
     "@types/node": "18.11.18",
     "@types/node-emoji": "1.8.2",
     "@types/ora": "3.2.0",
@@ -74,16 +74,16 @@
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.11",
     "@types/webpack-node-externals": "2.5.3",
-    "@typescript-eslint/eslint-plugin": "5.49.0",
-    "@typescript-eslint/parser": "5.49.0",
+    "@typescript-eslint/eslint-plugin": "5.50.0",
+    "@typescript-eslint/parser": "5.50.0",
     "delete-empty": "3.0.0",
-    "eslint": "8.32.0",
+    "eslint": "8.33.0",
     "eslint-config-prettier": "8.6.0",
     "eslint-plugin-import": "2.27.5",
     "gulp": "4.0.2",
     "gulp-clean": "0.4.0",
     "husky": "8.0.3",
-    "jest": "29.3.1",
+    "jest": "29.4.1",
     "lint-staged": "13.1.0",
     "prettier": "2.8.3",
     "release-it": "15.6.0",