@nestjs/cli 8.2.7 → 9.1.0-next.1

package/.circleci/config.yml

@@ -21,12 +21,12 @@ jobs:
   build:
     working_directory: ~/nest
     docker:
-      - image: circleci/node:17
+      - image: cimg/node:17.9
     steps:
       - checkout
       - run:
           name: Update NPM version
-          command: 'sudo npm install -g npm@latest'
+          command: npm install -g npm@latest
       - restore_cache:
           key: dependency-cache-{{ checksum "package.json" }}
       - run:
@@ -43,7 +43,7 @@ jobs:
   unit_tests:
     working_directory: ~/nest
     docker:
-      - image: circleci/node:17
+      - image: cimg/node:17.9
     steps:
       - checkout
       - *restore-cache

package/.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx lint-staged
+npx --no-install lint-staged

package/actions/generate.action.js

@@ -85,10 +85,7 @@ const mapSchematicOptions = (inputs) => {
     const options = [];
     inputs.forEach((input) => {
         if (!excludedInputNames.includes(input.name) && input.value !== undefined) {
-            const keepInputName = input.options
-                ? 'keepInputNameFormat' in input.options
-                : false;
-            options.push(new schematics_1.SchematicOption(input.name, input.value, keepInputName));
+            options.push(new schematics_1.SchematicOption(input.name, input.value));
         }
     });
     return options;

package/actions/index.d.ts

@@ -3,6 +3,5 @@ export * from './build.action';
 export * from './generate.action';
 export * from './info.action';
 export * from './new.action';
-export * from './update.action';
 export * from './start.action';
 export * from './add.action';

package/actions/index.js

@@ -19,6 +19,5 @@ __exportStar(require("./build.action"), exports);
 __exportStar(require("./generate.action"), exports);
 __exportStar(require("./info.action"), exports);
 __exportStar(require("./new.action"), exports);
-__exportStar(require("./update.action"), exports);
 __exportStar(require("./start.action"), exports);
 __exportStar(require("./add.action"), exports);

package/actions/new.action.js

@@ -146,6 +146,9 @@ const initializeGitRepository = (dir) => __awaiter(void 0, void 0, void 0, funct
 const createGitIgnoreFile = (dir, content) => {
     const fileContent = content || defaults_1.defaultGitIgnore;
     const filePath = (0, path_1.join)(process.cwd(), dir, '.gitignore');
+    if (fileExists(filePath)) {
+        return;
+    }
     return (0, util_1.promisify)(fs.writeFile)(filePath, fileContent);
 };
 const printCollective = () => {
@@ -184,5 +187,17 @@ const retrieveCols = () => {
     }
 };
 exports.retrieveCols = retrieveCols;
+const fileExists = (path) => {
+    try {
+        fs.accessSync(path);
+        return true;
+    }
+    catch (err) {
+        if (err.code === 'ENOENT') {
+            return false;
+        }
+        throw err;
+    }
+};
 const exit = () => process.exit(1);
 exports.exit = exit;

package/commands/command.loader.js

@@ -10,14 +10,12 @@ const generate_command_1 = require("./generate.command");
 const info_command_1 = require("./info.command");
 const new_command_1 = require("./new.command");
 const start_command_1 = require("./start.command");
-const update_command_1 = require("./update.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 update_command_1.UpdateCommand(new actions_1.UpdateAction()).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);

package/commands/generate.command.js

@@ -60,9 +60,6 @@ class GenerateCommand extends abstract_command_1.AbstractCommand {
             options.push({
                 name: 'skipImport',
                 value: command.skipImport,
-                options: {
-                    keepInputNameFormat: true,
-                },
             });
             const inputs = [];
             inputs.push({ name: 'schematic', value: schematic });

package/lib/compiler/compiler.js

@@ -34,7 +34,9 @@ class Compiler {
         const after = plugins.afterHooks.map((hook) => hook(programRef));
         const afterDeclarations = plugins.afterDeclarationsHooks.map((hook) => hook(programRef));
         const emitResult = program.emit(undefined, undefined, undefined, undefined, {
-            before: before.concat(tsconfigPathsPlugin),
+            before: tsconfigPathsPlugin
+                ? before.concat(tsconfigPathsPlugin)
+                : before,
             after,
             afterDeclarations,
         });

package/lib/compiler/hooks/tsconfig-paths.hook.d.ts

@@ -1,2 +1,2 @@
 import * as ts from 'typescript';
-export declare function tsconfigPathsBeforeHookFactory(compilerOptions: ts.CompilerOptions): (ctx: ts.TransformationContext) => ts.Transformer<any>;
+export declare function tsconfigPathsBeforeHookFactory(compilerOptions: ts.CompilerOptions): ((ctx: ts.TransformationContext) => ts.Transformer<any>) | undefined;

package/lib/compiler/hooks/tsconfig-paths.hook.js

@@ -9,26 +9,32 @@ function tsconfigPathsBeforeHookFactory(compilerOptions) {
     const tsBinary = new typescript_loader_1.TypeScriptBinaryLoader().load();
     const { paths = {}, baseUrl = './' } = compilerOptions;
     const matcher = tsPaths.createMatchPath(baseUrl, paths, ['main']);
+    if (Object.keys(paths).length === 0) {
+        return undefined;
+    }
     return (ctx) => {
         return (sf) => {
             const visitNode = (node) => {
                 if (tsBinary.isImportDeclaration(node) ||
                     (tsBinary.isExportDeclaration(node) && node.moduleSpecifier)) {
                     try {
-                        const newNode = tsBinary.getMutableClone(node);
                         const importPathWithQuotes = node.moduleSpecifier && node.moduleSpecifier.getText();
                         if (!importPathWithQuotes) {
                             return node;
                         }
-                        const text = importPathWithQuotes.substr(1, importPathWithQuotes.length - 2);
+                        const text = importPathWithQuotes.substring(1, importPathWithQuotes.length - 1);
                         const result = getNotAliasedPath(sf, matcher, text);
                         if (!result) {
                             return node;
                         }
-                        newNode.moduleSpecifier = tsBinary.createLiteral(result);
-                        newNode.moduleSpecifier.parent = node.moduleSpecifier.parent;
-                        newNode.flags = node.flags;
-                        return newNode;
+                        const moduleSpecifier = tsBinary.factory.createStringLiteral(result);
+                        moduleSpecifier.parent = node.moduleSpecifier.parent;
+                        if (tsBinary.isImportDeclaration(node)) {
+                            return tsBinary.factory.updateImportDeclaration(node, node.decorators, node.modifiers, node.importClause, moduleSpecifier, node.assertClause);
+                        }
+                        else {
+                            return tsBinary.factory.updateExportDeclaration(node, node.decorators, node.modifiers, node.isTypeOnly, node.exportClause, moduleSpecifier, node.assertClause);
+                        }
                     }
                     catch (_a) {
                         return node;

package/lib/schematics/nest.collection.js

@@ -84,12 +84,12 @@ NestCollection.schematics = [
     },
     {
         name: 'interceptor',
-        alias: 'in',
+        alias: 'itc',
         description: 'Generate an interceptor declaration',
     },
     {
         name: 'interface',
-        alias: 'interface',
+        alias: 'itf',
         description: 'Generate an interface',
     },
     {

package/lib/schematics/schematic.option.d.ts

@@ -1,8 +1,8 @@
 export declare class SchematicOption {
     private name;
     private value;
-    private keepInputNameFormat;
-    constructor(name: string, value: boolean | string, keepInputNameFormat?: boolean);
+    constructor(name: string, value: boolean | string);
+    get normalizedName(): string;
     toCommandString(): string;
     private format;
 }

package/lib/schematics/schematic.option.js

@@ -3,31 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchematicOption = void 0;
 const formatting_1 = require("../utils/formatting");
 class SchematicOption {
-    constructor(name, value, keepInputNameFormat = false) {
+    constructor(name, value) {
         this.name = name;
         this.value = value;
-        this.keepInputNameFormat = keepInputNameFormat;
+    }
+    get normalizedName() {
+        return (0, formatting_1.normalizeToKebabOrSnakeCase)(this.name);
     }
     toCommandString() {
         if (typeof this.value === 'string') {
             if (this.name === 'name') {
-                return `--${this.name}=${this.format()}`;
+                return `--${this.normalizedName}=${this.format()}`;
             }
             else if (this.name === 'version' || this.name === 'path') {
-                return `--${this.name}=${this.value}`;
+                return `--${this.normalizedName}=${this.value}`;
             }
             else {
-                return `--${this.name}="${this.value}"`;
+                return `--${this.normalizedName}="${this.value}"`;
             }
         }
         else if (typeof this.value === 'boolean') {
-            const str = this.keepInputNameFormat
-                ? this.name
-                : (0, formatting_1.normalizeToKebabOrSnakeCase)(this.name);
+            const str = this.normalizedName;
             return this.value ? `--${str}` : `--no-${str}`;
         }
         else {
-            return `--${(0, formatting_1.normalizeToKebabOrSnakeCase)(this.name)}=${this.value}`;
+            return `--${this.normalizedName}=${this.value}`;
         }
     }
     format() {

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@nestjs/cli",
-  "version": "8.2.7",
+  "version": "9.1.0-next.1",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
   },
   "engines": {
-    "node": ">= 10.13.0",
-    "npm": ">= 6.11.0"
+    "node": ">= 12.9.0"
   },
   "bin": {
     "nest": "bin/nest.js"
@@ -33,26 +32,21 @@
     "type": "git",
     "url": "git+https://github.com/nestjs/nest-cli.git"
   },
-  "contributors": [
-    "Kamil Mysliwiec <mail@kamilmysliwiec.com>",
-    "Mark Pieszak <mark@trilon.io>",
-    "ThomRick"
-  ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/nestjs/nest-cli/issues"
   },
   "homepage": "https://github.com/nestjs/nest-cli#readme",
   "dependencies": {
-    "@angular-devkit/core": "14.0.2",
-    "@angular-devkit/schematics": "14.0.2",
-    "@angular-devkit/schematics-cli": "14.0.2",
-    "@nestjs/schematics": "^8.0.3",
+    "@angular-devkit/core": "14.2.0",
+    "@angular-devkit/schematics": "14.2.0",
+    "@angular-devkit/schematics-cli": "14.2.0",
+    "@nestjs/schematics": "^9.0.0",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",
     "cli-table3": "0.6.2",
     "commander": "4.1.1",
-    "fork-ts-checker-webpack-plugin": "7.2.11",
+    "fork-ts-checker-webpack-plugin": "7.2.13",
     "inquirer": "7.3.3",
     "node-emoji": "1.11.0",
     "ora": "5.4.1",
@@ -61,40 +55,41 @@
     "shelljs": "0.8.5",
     "source-map-support": "0.5.21",
     "tree-kill": "1.2.2",
-    "tsconfig-paths": "3.14.1",
-    "tsconfig-paths-webpack-plugin": "3.5.2",
+    "tsconfig-paths": "4.1.0",
+    "tsconfig-paths-webpack-plugin": "4.0.0",
     "typescript": "4.7.4",
     "webpack": "5.73.0",
     "webpack-node-externals": "3.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.0.2",
-    "@commitlint/config-angular": "17.0.0",
+    "@commitlint/cli": "17.0.3",
+    "@commitlint/config-angular": "17.0.3",
     "@types/copyfiles": "2.4.1",
-    "@types/inquirer": "8.2.1",
-    "@types/jest": "28.1.3",
-    "@types/node": "16.11.41",
+    "@types/inquirer": "8.2.2",
+    "@types/jest": "28.1.6",
+    "@types/node": "16.11.47",
     "@types/node-emoji": "1.8.1",
     "@types/ora": "3.2.0",
     "@types/os-name": "3.1.0",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.11",
     "@types/webpack-node-externals": "2.5.3",
-    "@typescript-eslint/eslint-plugin": "5.29.0",
-    "@typescript-eslint/parser": "5.29.0",
+    "@typescript-eslint/eslint-plugin": "5.30.7",
+    "@typescript-eslint/parser": "5.30.7",
     "delete-empty": "3.0.0",
-    "eslint": "8.18.0",
+    "eslint": "8.20.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-import": "2.26.0",
     "gulp": "4.0.2",
     "gulp-clean": "0.4.0",
     "husky": "8.0.1",
-    "jest": "28.1.1",
+    "jest": "28.1.3",
+    "lint-staged": "13.0.3",
     "prettier": "2.7.1",
-    "release-it": "15.1.0",
-    "ts-jest": "28.0.5",
+    "release-it": "15.3.0",
+    "ts-jest": "28.0.7",
     "ts-loader": "9.3.1",
-    "ts-node": "10.8.1"
+    "ts-node": "10.9.1"
   },
   "lint-staged": {
     "**/*.{ts,json}": []

package/actions/update.action.d.ts

@@ -1,5 +0,0 @@
-import { Input } from '../commands';
-import { AbstractAction } from './abstract.action';
-export declare class UpdateAction extends AbstractAction {
-    handle(inputs: Input[], options: Input[]): Promise<void>;
-}

package/actions/update.action.js

@@ -1,26 +0,0 @@
-"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.UpdateAction = void 0;
-const dependency_managers_1 = require("../lib/dependency-managers");
-const package_managers_1 = require("../lib/package-managers");
-const abstract_action_1 = require("./abstract.action");
-class UpdateAction extends abstract_action_1.AbstractAction {
-    handle(inputs, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const force = options.find((option) => option.name === 'force');
-            const tag = options.find((option) => option.name === 'tag');
-            const manager = new dependency_managers_1.NestDependencyManager(yield package_managers_1.PackageManagerFactory.find());
-            yield manager.update(force.value, tag.value);
-        });
-    }
-}
-exports.UpdateAction = UpdateAction;

package/commands/update.command.d.ts

@@ -1,5 +0,0 @@
-import { CommanderStatic } from 'commander';
-import { AbstractCommand } from './abstract.command';
-export declare class UpdateCommand extends AbstractCommand {
-    load(program: CommanderStatic): void;
-}

package/commands/update.command.js

@@ -1,30 +0,0 @@
-"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.UpdateCommand = void 0;
-const abstract_command_1 = require("./abstract.command");
-class UpdateCommand extends abstract_command_1.AbstractCommand {
-    load(program) {
-        program
-            .command('update')
-            .alias('u')
-            .description('Update Nest dependencies.')
-            .option('-f, --force', 'Remove and re-install dependencies (instead of update).')
-            .option('-t, --tag <tag>', 'Upgrade to tagged packages (latest | beta | rc | next tag).')
-            .action((command) => __awaiter(this, void 0, void 0, function* () {
-            const options = [];
-            options.push({ name: 'force', value: !!command.force });
-            options.push({ name: 'tag', value: command.tag });
-            yield this.action.handle([], options);
-        }));
-    }
-}
-exports.UpdateCommand = UpdateCommand;