Merge branch 'master' of https://github.com/nestjs/nest-cli

commands/new.command.ts

@@ -30,6 +30,7 @@ export class NewCommand extends AbstractCommand {
       )
       .action(async (name: string, command: Command) => {
         const options: Input[] = [];
+        const availableLanguages = ['js', 'ts', 'javascript', 'typescript'];
         options.push({ name: 'directory', value: command.directory });
         options.push({ name: 'dry-run', value: !!command.dryRun });
         options.push({ name: 'skip-git', value: !!command.skipGit });
@@ -38,6 +39,25 @@ export class NewCommand extends AbstractCommand {
           name: 'package-manager',
           value: command.packageManager,
         });
+
+        if (!!command.language) {
+          const langMatch = availableLanguages.includes(
+            command.language.toLowerCase(),
+          );
+          if (!langMatch) {
+            throw new Error(
+              `Invalid language "${command.language}" selected. Available languages are "typescript" or "javascript"`,
+            );
+          }
+          switch (command.language) {
+            case 'javascript':
+              command.language = 'js';
+              break;
+            case 'typescript':
+              command.language = 'ts';
+              break;
+          }
+        }
         options.push({
           name: 'language',
           value: !!command.language ? command.language : 'ts',

package.json

@@ -42,9 +42,9 @@
   },
   "homepage": "https://github.com/nestjs/nest-cli#readme",
   "dependencies": {
-    "@angular-devkit/core": "10.0.6",
-    "@angular-devkit/schematics": "10.0.6",
-    "@angular-devkit/schematics-cli": "0.1000.6",
+    "@angular-devkit/core": "10.0.7",
+    "@angular-devkit/schematics": "10.0.7",
+    "@angular-devkit/schematics-cli": "0.1000.7",
     "@nestjs/schematics": "^7.0.1",
     "@types/webpack": "4.41.21",
     "chalk": "3.0.0",

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/core@10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.0.6.tgz#cbb40a34f976f9496270efc4fbdb3ad836b9723e"
-  integrity sha512-mVvqSEoeErZ7bAModk95EAa6R9Nl23rvX+/TXuKVTK2dziMFBOrwHjb1DYhnZxFIH4xfUftCx+BWHjXBXCPYlA==
+"@angular-devkit/core@10.0.7":
+  version "10.0.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.0.7.tgz#f88c1fe316e83049703c658ec82b2d1f811b1e36"
+  integrity sha512-pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw==
   dependencies:
     ajv "6.12.3"
     fast-json-stable-stringify "2.1.0"
@@ -24,25 +24,25 @@
     rxjs "6.5.4"
     source-map "0.7.3"
 
-"@angular-devkit/schematics-cli@0.1000.6":
-  version "0.1000.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics-cli/-/schematics-cli-0.1000.6.tgz#e4b46fdc3ffd7b11b72d7e858f40fbda05e18ead"
-  integrity sha512-EJmG63Ir2xfpYKwXjnAwK0HoTMJH/t0ckN6D/wUDKVgZEFOJC32oVPaMRYLLQLINCT3btNVADw/TRQ/Jc/WC7A==
+"@angular-devkit/schematics-cli@0.1000.7":
+  version "0.1000.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics-cli/-/schematics-cli-0.1000.7.tgz#e0ee3f62eb4497208ea61e69681082aa693ed9ed"
+  integrity sha512-5zXO0WfyRySZudv2/EEC/UVfG75y7TGrdMfVZNc1WP0SB54psA0U3Z3jT+6Y9VjdjmXdxjVfybhuOzZ4I1fs0Q==
   dependencies:
-    "@angular-devkit/core" "10.0.6"
-    "@angular-devkit/schematics" "10.0.6"
-    "@schematics/schematics" "0.1000.6"
+    "@angular-devkit/core" "10.0.7"
+    "@angular-devkit/schematics" "10.0.7"
+    "@schematics/schematics" "0.1000.7"
     inquirer "7.1.0"
     minimist "1.2.5"
     rxjs "6.5.5"
     symbol-observable "1.2.0"
 
-"@angular-devkit/schematics@10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.0.6.tgz#dc3486448cc34544f7076f7fe0a67b75137ae840"
-  integrity sha512-V3T4cf+jVKiPYyBrSVHf3ZSnk4wIc1WEaaeFta56HccEGQCQpvAFKqDurmtMHer50Hhaxhn7IC3Oi5kPnvkNyQ==
+"@angular-devkit/schematics@10.0.7":
+  version "10.0.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.0.7.tgz#460272c3fa4a4838d2da65a0e3f512c557d486f1"
+  integrity sha512-eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg==
   dependencies:
-    "@angular-devkit/core" "10.0.6"
+    "@angular-devkit/core" "10.0.7"
     ora "4.0.4"
     rxjs "6.5.5"
 
@@ -974,13 +974,13 @@
   dependencies:
     "@types/node" ">= 8"
 
-"@schematics/schematics@0.1000.6":
-  version "0.1000.6"
-  resolved "https://registry.yarnpkg.com/@schematics/schematics/-/schematics-0.1000.6.tgz#49513d4e3253ec87627a57c689c616d1922d89d7"
-  integrity sha512-iBP/Pv3IpONx5IPnFSp2YMy5NuUJfgy6xYHz8GuJrqIdY8PD8O+297xOwbTUzKkzlTZUYrCjZTblSF2EWDzjFg==
+"@schematics/schematics@0.1000.7":
+  version "0.1000.7"
+  resolved "https://registry.yarnpkg.com/@schematics/schematics/-/schematics-0.1000.7.tgz#febdc9bd2ef81a46f825af392c95c1354a59b47a"
+  integrity sha512-mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw==
   dependencies:
-    "@angular-devkit/core" "10.0.6"
-    "@angular-devkit/schematics" "10.0.6"
+    "@angular-devkit/core" "10.0.7"
+    "@angular-devkit/schematics" "10.0.7"
 
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"