feature: update schematics engine, refactor

Author: kamilmysliwiec

.gitignore

@@ -1,6 +1,7 @@
 .idea/
 .envrc
 node_modules/
+.DS_Store
 
 # output
 lib/**/*.js

.npmignore

@@ -1,5 +1,6 @@
 .idea/
 .gitignore
+.prettierrc
 .travis.yml
 Makefile
 

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all"
+}

actions/info.action.ts

@@ -3,11 +3,14 @@ import { readFile } from 'fs';
 import { platform, release } from 'os';
 import osName = require('os-name');
 import { join } from 'path';
-import { AbstractPackageManager, PackageManagerFactory } from '../lib/package-managers';
+import {
+  AbstractPackageManager,
+  PackageManagerFactory,
+} from '../lib/package-managers';
 import { BANNER, messages } from '../lib/ui';
 import { AbstractAction } from './abstract.action';
 
-interface PacakgeJsonDependencies {
+interface PackageJsonDependencies {
   [key: string]: string;
 }
 
@@ -39,61 +42,74 @@ const displayPackageManagerVersion = async () => {
   const manager: AbstractPackageManager = await PackageManagerFactory.find();
   try {
     const version: string = await manager.version();
-    console.info(`${ manager.name } Version    :`, chalk.blue(version));
+    console.info(`${manager.name} Version    :`, chalk.blue(version));
   } catch {
-    console.error(`${ manager.name } Version    :`, chalk.red('Unknown'));
+    console.error(`${manager.name} Version    :`, chalk.red('Unknown'));
   }
 };
 
 const displayNestInformation = async () => {
   console.info(chalk.green('[Nest Information]'));
   try {
-    const dependencies: PacakgeJsonDependencies = await readProjectPackageJsonDependencies();
+    const dependencies: PackageJsonDependencies = await readProjectPackageJsonDependencies();
     displayNestVersions(dependencies);
   } catch {
     console.error(chalk.red(messages.NEST_INFORMATION_PACKAGE_MANAGER_FAILED));
   }
 };
 
-const readProjectPackageJsonDependencies = async (): Promise<PacakgeJsonDependencies> => {
-  return new Promise<PacakgeJsonDependencies>((resolve, reject) => {
-    readFile(join(process.cwd(), 'package.json'), (error: NodeJS.ErrnoException, buffer: Buffer) => {
-      if (error !== undefined && error !== null) {
-        reject(error);
-      } else {
-        resolve(JSON.parse(buffer.toString()).dependencies);
-      }
-    });
+const readProjectPackageJsonDependencies = async (): Promise<
+  PackageJsonDependencies
+> => {
+  return new Promise<PackageJsonDependencies>((resolve, reject) => {
+    readFile(
+      join(process.cwd(), 'package.json'),
+      (error: NodeJS.ErrnoException, buffer: Buffer) => {
+        if (error !== undefined && error !== null) {
+          reject(error);
+        } else {
+          resolve(JSON.parse(buffer.toString()).dependencies);
+        }
+      },
+    );
   });
 };
 
-const displayNestVersions = (dependencies: PacakgeJsonDependencies) => {
-  buildNestVersionsMessage(dependencies)
-    .forEach((dependency) => console.info(dependency.name, chalk.blue(dependency.value)));
+const displayNestVersions = (dependencies: PackageJsonDependencies) => {
+  buildNestVersionsMessage(dependencies).forEach(dependency =>
+    console.info(dependency.name, chalk.blue(dependency.value)),
+  );
 };
 
-const buildNestVersionsMessage = (dependencies: PacakgeJsonDependencies): NestDependency[] => {
+const buildNestVersionsMessage = (
+  dependencies: PackageJsonDependencies,
+): NestDependency[] => {
   const nestDependencies = collectNestDependencies(dependencies);
   return format(nestDependencies);
 };
 
-const collectNestDependencies = (dependencies: PacakgeJsonDependencies): NestDependency[] => {
+const collectNestDependencies = (
+  dependencies: PackageJsonDependencies,
+): NestDependency[] => {
   const nestDependencies: NestDependency[] = [];
-  Object.keys(dependencies).forEach((key) => {
+  Object.keys(dependencies).forEach(key => {
     if (key.indexOf('@nestjs') > -1) {
       nestDependencies.push({
-        name: `${ key.replace(/@nestjs\//, '') } version`,
-        value: dependencies[ key ],
+        name: `${key.replace(/@nestjs\//, '')} version`,
+        value: dependencies[key],
       });
     }
   });
   return nestDependencies;
 };
 
 const format = (dependencies: NestDependency[]): NestDependency[] => {
-  const sorted = dependencies.sort((dependencyA, dependencyB) => dependencyB.name.length - dependencyA.name.length);
-  const length = sorted[ 0 ].name.length;
-  sorted.forEach((dependency) => {
+  const sorted = dependencies.sort(
+    (dependencyA, dependencyB) =>
+      dependencyB.name.length - dependencyA.name.length,
+  );
+  const length = sorted[0].name.length;
+  sorted.forEach(dependency => {
     if (dependency.name.length < length) {
       dependency.name = rightPad(dependency.name, length);
     }

actions/new.action.ts

@@ -3,13 +3,15 @@ import chalk from 'chalk';
 import { execSync } from 'child_process';
 import * as inquirer from 'inquirer';
 import { Answers, PromptModule, Question } from 'inquirer';
+import { join } from 'path';
 import { Input } from '../commands';
 import {
   AbstractPackageManager,
   PackageManager,
   PackageManagerFactory,
 } from '../lib/package-managers';
 import { generateInput, generateSelect } from '../lib/questions/questions';
+import { GitRunner } from '../lib/runners/git.runner';
 import {
   AbstractCollection,
   Collection,
@@ -24,23 +26,42 @@ export class NewAction extends AbstractAction {
     const questions: Question[] = generateQuestionsForMissingInputs(inputs);
     const answers: Answers = await askForMissingInformation(questions);
     const args: Input[] = replaceInputMissingInformation(inputs, answers);
-    await generateApplicationFiles(inputs, options);
+
+    const dryRunOption = options.find(option => option.name === 'dry-run');
+    const isDryRunEnabled = dryRunOption && dryRunOption.value;
+    await generateApplicationFiles(
+      inputs,
+      options,
+      isDryRunEnabled as boolean,
+    ).catch(exit);
+
     const shouldSkipInstall = options.some(
-      (option) => option.name === 'skip-install' && option.value === true,
+      option => option.name === 'skip-install' && option.value === true,
     );
+    const projectDirectory = dasherize(inputs.find(
+      input => input.name === 'name',
+    )!.value as string);
+
     if (!shouldSkipInstall) {
-      await installPackages(inputs, options);
+      await installPackages(
+        options,
+        isDryRunEnabled as boolean,
+        projectDirectory,
+      );
+    }
+    if (!isDryRunEnabled) {
+      await initializeGitRepository(projectDirectory);
+      printCollective();
     }
-    printCollective();
   }
 }
 
 const generateQuestionsForMissingInputs = (inputs: Input[]): Question[] => {
   return inputs
-    .map((input) =>
+    .map(input =>
       generateInput(input.name)(input.value)(generateDefaultAnswer(input.name)),
     )
-    .filter((question) => question !== undefined) as Array<Question<Answers>>;
+    .filter(question => question !== undefined) as Array<Question<Answers>>;
 };
 
 const generateDefaultAnswer = (name: string) => {
@@ -64,8 +85,10 @@ const askForMissingInformation = async (
   console.info(messages.PROJECT_INFORMATION_START);
   console.info(messages.ADDITIONAL_INFORMATION);
   console.info();
+
   const prompt: PromptModule = inquirer.createPromptModule();
   const answers: Answers = await prompt(questions);
+
   console.info();
   console.info(messages.PROJECT_INFORMATION_COLLECTED);
   console.info();
@@ -77,13 +100,17 @@ const replaceInputMissingInformation = (
   answers: Answers,
 ): Input[] => {
   return inputs.map(
-    (input) =>
+    input =>
       (input.value =
         input.value !== undefined ? input.value : answers[input.name]),
   );
 };
 
-const generateApplicationFiles = async (args: Input[], options: Input[]) => {
+const generateApplicationFiles = async (
+  args: Input[],
+  options: Input[],
+  isDryRunEnabled: boolean,
+) => {
   const collection: AbstractCollection = CollectionFactory.create(
     Collection.NESTJS,
   );
@@ -92,9 +119,7 @@ const generateApplicationFiles = async (args: Input[], options: Input[]) => {
   );
   await collection.execute('application', schematicOptions);
 
-  const dryRunOption = options.find((option) => option.name === 'dry-run');
-  const isDryRunEnabled = dryRunOption && dryRunOption.value;
-  if (isDryRunEnabled) {
+  if (!isDryRunEnabled) {
     await generateConfigurationFile(args, options, collection);
   }
   console.info();
@@ -148,15 +173,15 @@ const mapConfigurationSchematicOptions = (
   );
 };
 
-const installPackages = async (inputs: Input[], options: Input[]) => {
-  const installDirectory = dasherize(inputs.find(
-    (input) => input.name === 'name',
-  )!.value as string);
-  const dryRunMode = options.find((option) => option.name === 'dry-run')!
-    .value as boolean;
+const installPackages = async (
+  options: Input[],
+  dryRunMode: boolean,
+  installDirectory: string,
+) => {
   const inputPackageManager: string = options.find(
-    (option) => option.name === 'package-manager',
+    option => option.name === 'package-manager',
   )!.value as string;
+
   let packageManager: AbstractPackageManager;
   if (dryRunMode) {
     console.info();
@@ -198,6 +223,13 @@ const askForPackageManager = async (): Promise<Answers> => {
   return await prompt(questions);
 };
 
+const initializeGitRepository = async (dir: string) => {
+  const runner = new GitRunner();
+  await runner.run('init', true, join(process.cwd(), dir)).catch(() => {
+    console.error(chalk.red(messages.GIT_INITIALIZATION_ERROR));
+  });
+};
+
 const printCollective = () => {
   const dim = print('dim');
   const yellow = print('yellow');
@@ -239,3 +271,5 @@ export const retrieveCols = () => {
     return defaultCols;
   }
 };
+
+export const exit = () => process.exit(1);

actions/update.action.ts

@@ -6,13 +6,15 @@ import { AbstractAction } from './abstract.action';
 
 export class UpdateAction extends AbstractAction {
   public async handle(inputs: Input[], options: Input[]) {
-    const force = options.find((option) => option.name === 'force') as Input;
-    const tag = options.find((option) => option.name === 'tag') as Input;
+    const force = options.find(option => option.name === 'force') as Input;
+    const tag = options.find(option => option.name === 'tag') as Input;
 
     if (force.value && tag.value === undefined) {
       console.error(chalk.red('You should specify a tag when force update.'));
     } else {
-      const manager = new NestDependencyManager(await PackageManagerFactory.find());
+      const manager = new NestDependencyManager(
+        await PackageManagerFactory.find(),
+      );
       await manager.update(force.value as boolean, tag.value as string);
     }
   }

commands/command.loader.ts

@@ -1,3 +1,4 @@
+import chalk from 'chalk';
 import { CommanderStatic } from 'commander';
 import { GenerateAction, InfoAction, NewAction } from '../actions';
 import { AddAction } from '../actions/add.action';
@@ -15,5 +16,15 @@ export class CommandLoader {
     new InfoCommand(new InfoAction()).load(program);
     new UpdateCommand(new UpdateAction()).load(program);
     new AddCommand(new AddAction()).load(program);
+
+    this.handleInvalidCommand(program);
+  }
+
+  private static handleInvalidCommand(program: CommanderStatic) {
+    program.on('command:*', () => {
+      console.error(chalk.red('Invalid command: %s'), program.args.join(' '));
+      console.log('See --help for a list of available commands.');
+      process.exit(1);
+    });
   }
 }

commands/new.command.ts

@@ -15,18 +15,34 @@ export class NewCommand extends AbstractCommand {
         'Allow to specify package manager to skip package-manager selection.',
       )
       .option('-l, --language [language]', 'Specify ts or js language to use')
-      .action(async (name: string, description: string, version: string, author: string, command: Command) => {
-        const options: Input[] = [];
-        options.push({ name: 'dry-run', value: !!command.dryRun });
-        options.push({ name: 'skip-install', value: !!command.skipInstall });
-        options.push({ name: 'package-manager', value: command.packageManager });
-        options.push({ name: 'language', value: !!command.language ? command.language : 'ts' });
-        const inputs: Input[] = [];
-        inputs.push({ name: 'name', value: name });
-        inputs.push({ name: 'description', value: description });
-        inputs.push({ name: 'version', value: version });
-        inputs.push({ name: 'author', value: author });
-        await this.action.handle(inputs, options);
-      });
+      .action(
+        async (
+          name: string,
+          description: string,
+          version: string,
+          author: string,
+          command: Command,
+        ) => {
+          const options: Input[] = [];
+          options.push({ name: 'dry-run', value: !!command.dryRun });
+          options.push({ name: 'skip-install', value: !!command.skipInstall });
+          options.push({
+            name: 'package-manager',
+            value: command.packageManager,
+          });
+          options.push({
+            name: 'language',
+            value: !!command.language ? command.language : 'ts',
+          });
+
+          const inputs: Input[] = [];
+          inputs.push({ name: 'name', value: name });
+          inputs.push({ name: 'description', value: description });
+          inputs.push({ name: 'version', value: version });
+          inputs.push({ name: 'author', value: author });
+
+          await this.action.handle(inputs, options);
+        },
+      );
   }
 }

commands/update.command.ts

@@ -9,7 +9,10 @@ export class UpdateCommand extends AbstractCommand {
       .alias('u')
       .description('Update @nestjs dependencies.')
       .option('-f, --force', 'Call for upgrading instead of updating.')
-      .option('-t, --tag <tag>', 'Call for upgrading to latest | beta | rc | next tag.')
+      .option(
+        '-t, --tag <tag>',
+        'Call for upgrading to latest | beta | rc | next tag.',
+      )
       .action(async (command: Command) => {
         const options: Input[] = [];
         options.push({ name: 'force', value: !!command.force });