@nestjs/cli 6.14.0-next.1 → 6.14.2

package/.commitlintrc.json

@@ -0,0 +1,28 @@
+{
+  "extends": ["@commitlint/config-angular"],
+  "rules": {
+    "subject-case": [
+      2,
+      "always",
+      ["sentence-case", "start-case", "pascal-case", "upper-case", "lower-case"]
+    ],
+    "type-enum": [
+      2,
+      "always",
+      [
+        "build",
+        "chore",
+        "ci",
+        "docs",
+        "feat",
+        "fix",
+        "perf",
+        "refactor",
+        "revert",
+        "style",
+        "test",
+        "sample"
+      ]
+    ]
+  }
+}

package/.eslintignore

@@ -0,0 +1,3 @@
+src/**/*.test.ts
+src/**/files/**
+test/**

package/.eslintrc.js

@@ -0,0 +1,26 @@
+module.exports = {
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    project: 'tsconfig.json',
+    sourceType: 'module',
+  },
+  plugins: ['@typescript-eslint/eslint-plugin'],
+  extends: [
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+    'prettier',
+    'prettier/@typescript-eslint',
+  ],
+  root: true,
+  env: {
+    node: true,
+    jest: true,
+  },
+  rules: {
+    '@typescript-eslint/interface-name-prefix': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-use-before-define': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'off',
+  },
+};

package/.release-it.json

@@ -0,0 +1,8 @@
+{
+  "git": {
+    "commitMessage": "chore(): release v${version}"
+  },
+  "github": {
+    "release": true
+  }
+}

package/actions/generate.action.js

@@ -32,6 +32,7 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
         .value;
     const appName = inputs.find(option => option.name === 'project')
         .value;
+    const spec = inputs.find(option => option.name === 'spec');
     const collection = schematics_1.CollectionFactory.create(collectionOption || configuration.collection);
     const schematicOptions = mapSchematicOptions(inputs);
     schematicOptions.push(new schematics_1.SchematicOption('language', configuration.language));
@@ -39,6 +40,9 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
     let sourceRoot = appName
         ? get_value_or_default_1.getValueOrDefault(configuration, 'sourceRoot', appName)
         : configuration.sourceRoot;
+    const specValue = spec.value;
+    const specOptions = spec.options;
+    let generateSpec = project_utils_1.shouldGenerateSpec(configuration, schematic, appName, specValue, specOptions.passedAsInput);
     // 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 (project_utils_1.shouldAskForProject(schematic, configurationProjects, appName)) {
@@ -56,8 +60,13 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
         if (project !== configuration.sourceRoot) {
             sourceRoot = configurationProjects[project].sourceRoot;
         }
+        if (answers.appName !== defaultProjectName) {
+            // Only overwrite if the appName is not the default- as it has already been loaded above
+            generateSpec = project_utils_1.shouldGenerateSpec(configuration, schematic, answers.appName, specValue, specOptions.passedAsInput);
+        }
     }
     schematicOptions.push(new schematics_1.SchematicOption('sourceRoot', sourceRoot));
+    schematicOptions.push(new schematics_1.SchematicOption('spec', generateSpec));
     try {
         const schematicInput = inputs.find(input => input.name === 'schematic');
         if (!schematicInput) {
@@ -72,9 +81,10 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
     }
 });
 const mapSchematicOptions = (inputs) => {
+    const excludedInputNames = ['schematic', 'spec'];
     const options = [];
     inputs.forEach(input => {
-        if (input.name !== 'schematic' && input.value !== undefined) {
+        if (!excludedInputNames.includes(input.name) && input.value !== undefined) {
             options.push(new schematics_1.SchematicOption(input.name, input.value));
         }
     });

package/actions/new.action.js

@@ -26,13 +26,14 @@ const abstract_action_1 = require("./abstract.action");
 class NewAction extends abstract_action_1.AbstractAction {
     handle(inputs, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const directoryOption = options.find(option => option.name === 'directory');
             const dryRunOption = options.find(option => option.name === 'dry-run');
             const isDryRunEnabled = dryRunOption && dryRunOption.value;
             yield askForMissingInformation(inputs);
             yield generateApplicationFiles(inputs, options).catch(exports.exit);
             const shouldSkipInstall = options.some(option => option.name === 'skip-install' && option.value === true);
             const shouldSkipGit = options.some(option => option.name === 'skip-git' && option.value === true);
-            const projectDirectory = strings_1.dasherize(getApplicationNameInput(inputs).value);
+            const projectDirectory = getProjectDirectory(getApplicationNameInput(inputs), directoryOption);
             if (!shouldSkipInstall) {
                 yield installPackages(options, isDryRunEnabled, projectDirectory);
             }
@@ -49,6 +50,10 @@ class NewAction extends abstract_action_1.AbstractAction {
 }
 exports.NewAction = NewAction;
 const getApplicationNameInput = (inputs) => inputs.find(input => input.name === 'name');
+const getProjectDirectory = (applicationName, directoryOption) => {
+    return ((directoryOption && directoryOption.value) ||
+        strings_1.dasherize(applicationName.value));
+};
 const askForMissingInformation = (inputs) => __awaiter(void 0, void 0, void 0, function* () {
     console.info(ui_1.MESSAGES.PROJECT_INFORMATION_START);
     console.info();

package/actions/start.action.js

@@ -53,7 +53,7 @@ class StartAction extends build_action_1.BuildAction {
         const sourceRoot = get_value_or_default_1.getValueOrDefault(configuration, 'sourceRoot', appName);
         const entryFile = get_value_or_default_1.getValueOrDefault(configuration, 'entryFile', appName);
         let childProcessRef;
-        process.on('exit', code => childProcessRef && killProcess(childProcessRef.pid));
+        process.on('exit', () => childProcessRef && killProcess(childProcessRef.pid));
         return () => {
             if (childProcessRef) {
                 childProcessRef.removeAllListeners('exit');

package/commands/command.input.d.ts

@@ -1,4 +1,5 @@
 export interface Input {
     name: string;
     value: boolean | string;
+    options?: any;
 }

package/commands/generate.command.js

@@ -19,10 +19,15 @@ class GenerateCommand extends abstract_command_1.AbstractCommand {
             .command('generate <schematic> [name] [path]')
             .alias('g')
             .description(this.buildDescription())
-            .option('--dry-run', 'Report actions that would be taken without writing out results.')
+            .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.')
-            .option('--no-spec', 'Disable spec files generation.')
+            .option('--spec', 'Enforce spec files generation.', () => {
+            return { value: true, passedAsInput: true };
+        }, true)
+            .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 = [];
@@ -30,7 +35,14 @@ class GenerateCommand extends abstract_command_1.AbstractCommand {
             options.push({ name: 'flat', value: command.flat });
             options.push({
                 name: 'spec',
-                value: command.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',

package/commands/new.command.js

@@ -17,6 +17,7 @@ class NewCommand extends abstract_command_1.AbstractCommand {
             .command('new [name]')
             .alias('n')
             .description('Generate Nest application.')
+            .option('--directory [directory]', 'Specify the destination directory')
             .option('-d, --dry-run', 'Report actions that would be performed without writing out results.')
             .option('-g, --skip-git', 'Skip git repository initialization.')
             .option('-s, --skip-install', 'Skip package installation.')
@@ -25,6 +26,7 @@ class NewCommand extends abstract_command_1.AbstractCommand {
             .option('-c, --collection [collectionName]', 'Schematics collection to use.')
             .action((name, command) => __awaiter(this, void 0, void 0, function* () {
             const options = [];
+            options.push({ name: 'directory', value: command.directory });
             options.push({ name: 'dry-run', value: !!command.dryRun });
             options.push({ name: 'skip-git', value: !!command.skipGit });
             options.push({ name: 'skip-install', value: !!command.skipInstall });

package/lib/compiler/assets-manager.js

@@ -36,7 +36,7 @@ class AssetsManager {
                         flat: item.flat,
                     };
                 });
-                const copyFiles = (item) => new Promise((resolve, reject) => copyfiles([item.glob, outDir], {
+                const copyFiles = (item) => new Promise((resolve, reject) => copyfiles([item.glob, item.outDir], {
                     exclude: item.exclude,
                     flat: item.flat,
                     up: sourceRoot.split(path_1.sep).length,

package/lib/compiler/helpers/get-value-or-default.js

@@ -8,12 +8,15 @@ function getValueOrDefault(configuration, propertyPath, appName, key, options =
     }
     if (configuration.projects && configuration.projects[appName]) {
         const perAppValue = getValueOfPath(configuration, `projects.${appName}.`.concat(propertyPath));
-        if (perAppValue) {
+        if (perAppValue !== undefined) {
             return perAppValue;
         }
     }
-    const value = getValueOfPath(configuration, propertyPath);
-    return value || defaultValue;
+    let value = getValueOfPath(configuration, propertyPath);
+    if (value === undefined) {
+        value = defaultValue;
+    }
+    return value;
 }
 exports.getValueOrDefault = getValueOrDefault;
 function getValueOfPath(object, propertyPath) {

package/lib/compiler/plugins-loader.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = require("fs");
 const path_1 = require("path");
 const util_1 = require("util");
 const ui_1 = require("../ui");
@@ -12,13 +11,13 @@ class PluginsLoader {
             ...module.paths,
         ];
         const pluginRefs = pluginNames.map(item => {
-            for (const path of nodeModulePaths) {
-                const binaryPath = path_1.resolve(path, item);
-                if (fs_1.existsSync(binaryPath + '.js')) {
-                    return require(binaryPath);
-                }
+            try {
+                const binaryPath = require.resolve(item, { paths: nodeModulePaths });
+                return require(binaryPath);
+            }
+            catch (e) {
+                throw new Error(`"${item}" plugin could not be found!`);
             }
-            throw new Error(`"${item}" plugin could not be found!`);
         });
         const beforeHooks = [];
         const afterHooks = [];

package/lib/configuration/configuration.d.ts

@@ -13,6 +13,9 @@ interface CompilerOptions {
     assets?: string[];
     deleteOutDir?: boolean;
 }
+interface GenerateOptions {
+    spec?: boolean | Record<string, boolean>;
+}
 export interface ProjectConfiguration {
     type?: string;
     root?: string;
@@ -28,6 +31,7 @@ export interface Configuration {
     entryFile?: string;
     monorepo?: boolean;
     compilerOptions?: CompilerOptions;
+    generateOptions?: GenerateOptions;
     projects?: {
         [key: string]: ProjectConfiguration;
     };

package/lib/configuration/defaults.js

@@ -14,6 +14,7 @@ exports.defaultConfiguration = {
         plugins: [],
         assets: [],
     },
+    generateOptions: {},
 };
 exports.defaultOutDir = 'dist';
 exports.defaultGitIgnore = `# compiled output

package/lib/utils/local-binaries.js

@@ -8,6 +8,7 @@ function localBinExists() {
 }
 exports.localBinExists = localBinExists;
 function loadLocalBinCommandLoader() {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
     const commandsFile = require(path_1.posix.join(...localBinPathSegments, 'commands'));
     return commandsFile.CommandLoader;
 }

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

@@ -3,5 +3,6 @@ import { Configuration, ProjectConfiguration } from '../configuration';
 export declare function shouldAskForProject(schematic: string, configurationProjects: {
     [key: string]: ProjectConfiguration;
 }, appName: string): boolean;
+export declare function shouldGenerateSpec(configuration: Required<Configuration>, schematic: string, appName: string, specValue: boolean, specPassedAsInput?: boolean): any;
 export declare function askForProjectName(promptQuestion: string, projects: string[]): Promise<Answers>;
 export declare function moveDefaultProjectToStart(configuration: Configuration, defaultProjectName: string, defaultLabel: string): string[];

package/lib/utils/project-utils.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const inquirer = require("inquirer");
+const get_value_or_default_1 = require("../compiler/helpers/get-value-or-default");
 const questions_1 = require("../questions/questions");
 function shouldAskForProject(schematic, configurationProjects, appName) {
     return (['app', 'sub-app', 'library', 'lib'].includes(schematic) === false &&
@@ -18,6 +19,34 @@ function shouldAskForProject(schematic, configurationProjects, appName) {
         !appName);
 }
 exports.shouldAskForProject = shouldAskForProject;
+function shouldGenerateSpec(configuration, schematic, appName, specValue, specPassedAsInput) {
+    if (specPassedAsInput === true || specPassedAsInput === undefined) {
+        // CLI parameters has the highest priority
+        return specValue;
+    }
+    let specConfiguration = get_value_or_default_1.getValueOrDefault(configuration, 'generateOptions.spec', appName || '');
+    if (typeof specConfiguration === 'boolean') {
+        return specConfiguration;
+    }
+    if (typeof specConfiguration === 'object' &&
+        specConfiguration[schematic] !== undefined) {
+        return specConfiguration[schematic];
+    }
+    if (typeof specConfiguration === 'object' && appName) {
+        // The appName has a generateOption spec, but not for the schematic trying to generate
+        // Check if the global generateOptions has a spec to use instead
+        specConfiguration = get_value_or_default_1.getValueOrDefault(configuration, 'generateOptions.spec', '');
+        if (typeof specConfiguration === 'boolean') {
+            return specConfiguration;
+        }
+        if (typeof specConfiguration === 'object' &&
+            specConfiguration[schematic] !== undefined) {
+            return specConfiguration[schematic];
+        }
+    }
+    return specValue;
+}
+exports.shouldGenerateSpec = shouldGenerateSpec;
 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": "6.14.0-next.1",
+  "version": "6.14.2",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -16,14 +16,16 @@
     "build": "tsc",
     "clean": "gulp clean:bundle",
     "format": "prettier --write \"**/*.ts\"",
-    "lint": "tslint -p .",
+    "lint": "eslint '{lib,commands,actions}/**/*.ts' --fix",
     "start": "node bin/nest.js",
     "prepublish:next": "npm run build",
     "publish:next": "npm publish --access public --tag next",
     "prepublish:npm": "npm run build",
     "publish:npm": "npm publish --access public",
     "test": "jest --config test/jest-config.json",
-    "test:dev": "npm run clean && jest --config test/jest-config.json --watchAll"
+    "test:dev": "npm run clean && jest --config test/jest-config.json --watchAll",
+    "prerelease": "npm run build",
+    "release": "release-it"
   },
   "repository": {
     "type": "git",
@@ -43,18 +45,18 @@
     "@angular-devkit/core": "7.3.8",
     "@angular-devkit/schematics": "7.3.8",
     "@angular-devkit/schematics-cli": "0.13.8",
-    "@nestjs/schematics": "^6.8.0",
-    "@types/webpack": "4.41.2",
+    "@nestjs/schematics": "^6.8.2",
+    "@types/webpack": "4.41.5",
     "chalk": "2.4.2",
     "cli-table3": "0.5.1",
-    "commander": "4.1.0",
-    "copyfiles": "2.1.1",
-    "fork-ts-checker-webpack-plugin": "3.1.1",
-    "inquirer": "7.0.3",
+    "commander": "4.1.1",
+    "copyfiles": "2.2.0",
+    "fork-ts-checker-webpack-plugin": "4.0.3",
+    "inquirer": "7.0.4",
     "node-emoji": "1.10.0",
     "ora": "4.0.3",
     "os-name": "3.1.0",
-    "rimraf": "3.0.0",
+    "rimraf": "3.0.1",
     "tree-kill": "1.2.2",
     "tsconfig-paths": "3.9.0",
     "tsconfig-paths-webpack-plugin": "3.2.0",
@@ -63,23 +65,36 @@
     "webpack-node-externals": "1.7.2"
   },
   "devDependencies": {
+    "@commitlint/cli": "8.3.5",
+    "@commitlint/config-angular": "8.3.4",
     "@types/copyfiles": "2.1.1",
     "@types/inquirer": "6.5.0",
-    "@types/jest": "24.0.25",
+    "@types/jest": "25.1.1",
     "@types/node": "12.12.21",
     "@types/node-emoji": "1.8.1",
     "@types/ora": "3.1.0",
     "@types/os-name": "2.0.0",
     "@types/rimraf": "2.0.3",
-    "@types/webpack-node-externals": "1.7.0",
+    "@types/webpack-node-externals": "1.7.1",
+    "@typescript-eslint/eslint-plugin": "^2.19.0",
+    "@typescript-eslint/parser": "^2.19.0",
     "delete-empty": "3.0.0",
+    "eslint": "6.8.0",
+    "eslint-config-prettier": "6.10.0",
+    "eslint-plugin-import": "2.20.1",
     "gulp": "4.0.2",
     "gulp-clean": "0.4.0",
-    "jest": "24.9.0",
+    "husky": "4.2.1",
+    "jest": "25.1.0",
     "prettier": "1.19.1",
-    "ts-jest": "24.3.0",
+    "release-it": "12.4.3",
+    "ts-jest": "25.2.0",
     "ts-loader": "6.2.1",
-    "ts-node": "8.6.0",
-    "tslint": "5.20.1"
+    "ts-node": "8.6.2"
+  },
+  "husky": {
+    "hooks": {
+      "commit-msg": "commitlint -c .commitlintrc.json -E HUSKY_GIT_PARAMS"
+    }
   }
 }