Merge pull request #2 from recifejs/feature/inserting-inquirer

Feature/inserting inquirer

Author: Oda2

package.json

@@ -20,9 +20,11 @@
     "recife-cli": "./bin/recife-cli"
   },
   "dependencies": {
-    "commander": "^5.1.0"
+    "commander": "^5.1.0",
+    "inquirer": "^7.3.0"
   },
   "devDependencies": {
+    "@types/inquirer": "^6.5.0",
     "@types/node": "^14.0.11",
     "typescript": "^3.0.0"
   },

src/generators/ProjectGenerator.ts

@@ -1,50 +1,95 @@
 import fs from 'fs';
 import path from 'path';
 import commander from 'commander';
-import copyFolder from '../utils/copyFolder';
+import inquirer from 'inquirer';
 
+import { replaceMaskFile } from '../utils/replaceMask';
+import copyFolder from '../utils/copyFolder';
 import createPackageJson from '../stages/CreatePackageJson';
 import installDependencies from '../stages/InstallDependencies';
 import initializeGit from '../stages/InitializeGit';
 import Log from '../Log';
 
-const createProject = (name: string) => {
-  if (name) {
-    Log.Instance.infoHeap(`Creating the project`);
+const createProject = (
+  projectName: string,
+  packageManager: 'yarn' | 'npm',
+  httpFramework: 'koa' | 'express' | 'hapi'
+) => {
+  Log.Instance.infoHeap(`Creating the project`);
 
-    const source = path.join(__dirname, '/../../templates/project');
-    const target = path.join(process.cwd(), name);
+  const source = path.join(__dirname, '/../../templates/project');
+  const target = path.join(process.cwd(), projectName);
 
-    try {
-      Log.Instance.infoHeap(`Copying files`);
-      fs.mkdirSync(name);
+  try {
+    Log.Instance.infoHeap(`Copying files`);
+    fs.mkdirSync(projectName);
 
-      copyFolder(source, target);
-      fs.renameSync(
-        path.join(target, 'gitignore'),
-        path.join(target, '.gitignore')
-      );
+    copyFolder(source, target);
+    fs.renameSync(
+      path.join(target, 'gitignore'),
+      path.join(target, '.gitignore')
+    );
+    replaceMaskFile(path.join(target, 'config/app.ts'), {
+      projectName,
+      httpFramework
+    });
 
-      createPackageJson(target, name);
-      installDependencies(target);
-      initializeGit(name);
+    createPackageJson(target, projectName, httpFramework);
+    installDependencies(target, packageManager);
+    initializeGit(projectName);
 
-      Log.Instance.successHeap(`The ${name} project was created.`);
-      Log.Instance.info(`Path: ${target}\n\n`);
-    } catch (err) {
-      Log.Instance.exception(err);
-    }
-  } else {
-    Log.Instance.errorHeap(`Specify the name project.`);
-    Log.Instance.info(
-      `For example: recife-cli project my-project-name\nRun --help for more information`
-    );
+    Log.Instance.successHeap(`The ${projectName} project was created.`);
+    Log.Instance.info(`Path: ${target}\n\n`);
+  } catch (err) {
+    Log.Instance.exception(err);
   }
 };
 
+const createProjectWithOptions = () => {
+  inquirer
+    .prompt([
+      {
+        name: 'projectName',
+        message: 'Project Name:',
+        type: 'string',
+        default: 'my-project'
+      },
+      {
+        name: 'packageManager',
+        message: 'Package Manager:',
+        type: 'list',
+        default: 'npm',
+        choices: ['npm', 'yarn']
+      },
+      {
+        name: 'httpFramework',
+        message: 'Http Framework:',
+        type: 'list',
+        default: 'koa',
+        choices: ['koa', 'express', 'hapi']
+      }
+    ])
+    .then((answers: any) => {
+      Log.Instance.jump();
+      createProject(
+        answers.projectName,
+        answers.packageManager,
+        answers.httpFramework
+      );
+    });
+};
+
 commander
   .name(`recife-cli project`)
-  .arguments('<project-name>')
-  .action(name => createProject(name))
+  .arguments('[project-name]')
+  .option('-p, --package-manager <packageManager>', 'Package Manager', 'npm')
+  .option('-h, --http-framework <httpFramework>', 'Http Framework', 'koa')
+  .action((name, cmd) => {
+    if (name) {
+      createProject(name, cmd.packageManager, cmd.httpFramework);
+    } else {
+      createProjectWithOptions();
+    }
+  })
   .allowUnknownOption(false)
   .parse(process.argv);

src/stages/CreatePackageJson.ts

@@ -2,10 +2,20 @@ import fs from 'fs';
 import path from 'path';
 import Log from '../Log';
 
-const createPackageJson = (target: string, name: string) => {
+const versions = {
+  koa: '^0.1.0',
+  express: '^0.1.0',
+  hapi: '^0.1.0'
+};
+
+const createPackageJson = (
+  target: string,
+  name: string,
+  httpFramework: 'koa' | 'express' | 'hapi'
+) => {
   Log.Instance.infoHeap(`Creating file package.json`);
 
-  const basePackageJson = {
+  let basePackageJson: any = {
     name: name,
     version: '0.0.1',
     license: 'MIT',
@@ -16,8 +26,7 @@ const createPackageJson = (target: string, name: string) => {
     },
     dependencies: {
       recife: '^0.7.0',
-      typescript: '^3.*',
-      'recife-koa': '^0.1.0'
+      typescript: '^3.*'
     },
     browserslist: {
       production: ['>0.2%', 'not dead', 'not op_mini all'],
@@ -29,6 +38,9 @@ const createPackageJson = (target: string, name: string) => {
     }
   };
 
+  basePackageJson.dependencies[`recife-${httpFramework}`] =
+    versions[httpFramework];
+
   fs.writeFileSync(
     path.join(target, 'package.json'),
     JSON.stringify(basePackageJson, null, 2)

src/stages/InstallDependencies.ts

@@ -1,24 +1,18 @@
 import { spawnSync } from 'child_process';
 import Log from '../Log';
 
-const yarnInstalled = () => {
-  try {
-    spawnSync('yarnpkg', ['--version'], { stdio: 'ignore' });
-    return true;
-  } catch (error) {
-    return false;
-  }
-};
-
-const installDependencies = (target: string) => {
+const installDependencies = (
+  target: string,
+  packageManager: 'yarn' | 'npm'
+) => {
   Log.Instance.infoHeap(`Installing dependencies`);
 
   const originalDirectory = process.cwd();
 
   try {
     process.chdir(target);
 
-    if (yarnInstalled()) {
+    if (packageManager === 'yarn') {
       spawnSync('yarnpkg', ['install'], { stdio: 'ignore' });
     } else {
       spawnSync('npm', ['install'], { stdio: 'ignore' });

src/utils/replaceMask.ts

@@ -1,3 +1,10 @@
+import fs from 'fs';
+
+export const replaceMaskFile = (path: string, values: any) => {
+  const contentFile = fs.readFileSync(path).toString();
+  fs.writeFileSync(path, replaceMask(contentFile, values));
+};
+
 const replaceMask = (content: string, values: any): string => {
   Object.keys(values).map(key => {
     content = content.split(`[[${key}]]`).join(values[key]);

templates/project/config/app.ts

@@ -1,9 +1,9 @@
 import { AppConfig } from 'recife';
 
 export const config: AppConfig = {
-  appName: 'APP_NAME',
+  appName: '[[projectName]]',
   basePath: 'src',
   port: 8100,
   host: 'localhost',
-  httpFramework: 'koa'
+  httpFramework: '[[httpFramework]]'
 };