@yuw-cli-dev/init 1.0.38 → 1.0.39

package/lib/index.js

@@ -5,13 +5,21 @@ const path = require('path');
 const inquire = require('inquirer');
 const fse = require('fs-extra');
 const semver = require('semver');
+const userHome = require('user-home');
 const isValidFilename = require('valid-filename');
+const glob = require('glob');
+const ejs = require('ejs');
 const Command = require('@yuw-cli-dev/command');
 const log = require('@yuw-cli-dev/log');
+const Package = require('@yuw-cli-dev/package');
+const { spinnerStart, execSync } = require('@yuw-cli-dev/utils');
 const getProjectTemplate = require('./getProjectTemplate');
 
 const TYPE_PROJECT = 'project';
 const TYPE_COMPONENT = 'component';
+const TEMPLATE_TYPE_NORMAL = 'normal';
+const TEMPLATE_TYPE_CUSTOM = 'custom';
+const WHITE_COMMAND = ['npm', 'cnpm', 'yarn', 'pnpm'];
 
 class InitCommand extends Command {
   init() {
@@ -27,13 +35,201 @@ class InitCommand extends Command {
       if (projectInfo) {
         this.projectInfo = projectInfo;
         await this.downloadTemplate();
+        await this.installTemplate();
       }
     } catch (e) {
       log.error(e.message);
     }
   }
-  downloadTemplate() {
-    return getProjectTemplate();
+  checkCommand(cmd) {
+    if (WHITE_COMMAND.includes(cmd)) {
+      return cmd;
+    }
+    return null;
+  }
+
+  async execCmd(command, errMsg) {
+    const installCmdArr = command.split(' ');
+    const installCmd = installCmdArr[0];
+    const checkedCmd = this.checkCommand(installCmd);
+    if (!checkedCmd) {
+      throw new Error('命令不存在，请检查:', installCmd);
+    }
+    const installArgs = installCmdArr.slice(1);
+    const ret = await execSync(checkedCmd, installArgs, {
+      cwd: process.cwd(),
+      stdio: 'inherit',
+    });
+    if (ret !== 0) {
+      throw new Error(errMsg);
+    }
+  }
+
+  async ejsRender(options) {
+    const dir = process.cwd();
+    const projectInfo = this.projectInfo;
+    return new Promise((resolve, reject) => {
+      glob(
+        '**',
+        {
+          cwd: dir,
+          nodir: true,
+          ignore: options && options.ignore,
+        },
+        (err, files) => {
+          if (err) {
+            reject(err);
+            return;
+          }
+          Promise.all(
+            files.map(file => {
+              const filePath = path.join(dir, file);
+              return new Promise((res, rej) => {
+                ejs.renderFile(
+                  filePath,
+                  {
+                    className: projectInfo.projectName,
+                    version: projectInfo.projectVersion,
+                  },
+                  {},
+                  (e, result) => {
+                    if (e) {
+                      rej(e);
+                      return;
+                    }
+                    fse.writeFileSync(filePath, result);
+                    res();
+                  },
+                );
+              });
+            }),
+          )
+            .then(() => {
+              resolve();
+            })
+            .catch(e => {
+              reject(e);
+            });
+        },
+      );
+    });
+  }
+
+  async installTemplate() {
+    if (this.templateInfo) {
+      if (!this.templateInfo.type) {
+        this.templateInfo.type = TEMPLATE_TYPE_NORMAL;
+      }
+      if (this.templateInfo.type === TEMPLATE_TYPE_NORMAL) {
+        await this.installNormalTemplate();
+      } else if (this.templateInfo.type === TEMPLATE_TYPE_CUSTOM) {
+        await this.installCustomTemplate();
+      } else {
+        throw new Error('无法识别项目模板类型');
+      }
+    } else {
+      throw new Error('项目模板信息不存在');
+    }
+
+    // 进入指定目录
+    process.chdir(path.resolve(process.cwd(), this.projectInfo.projectName));
+
+    const ignore = ['node_modules/**', 'public/**'];
+    await this.ejsRender({ ignore });
+    // 安装依赖并启动项目
+    const { installCommand, startCommand } = this.templateInfo;
+    if (installCommand) {
+      await this.execCmd(installCommand, '依赖安装过程中失败');
+    }
+    if (startCommand) {
+      await this.execCmd(startCommand, '启动项目过程中失败');
+    }
+  }
+
+  async installNormalTemplate() {
+    let spinner;
+    try {
+      const templatePath = path.resolve(
+        this.templateNpm.cacheFilePath,
+        'template',
+      );
+      const targetPath = path.resolve(
+        process.cwd(),
+        this.projectInfo.projectName,
+      );
+      log.verbose('templatePath', templatePath);
+      log.verbose('targetPath', targetPath);
+
+      spinner = spinnerStart('正在安装模板...');
+      fse.ensureDirSync(templatePath);
+      fse.ensureDirSync(targetPath);
+      fse.copySync(templatePath, targetPath);
+    } catch (e) {
+      throw e;
+    } finally {
+      spinner.stop(true);
+      log.success('模板安装完成');
+    }
+  }
+  async installCustomTemplate() {
+    log.info('正在安装自定义模板...');
+  }
+  async downloadTemplate() {
+    const { projectTemplate } = this.projectInfo;
+    const templateInfo = this.template.find(
+      item => item.npmName === projectTemplate,
+    );
+    log.verbose('templateInfo', templateInfo);
+    this.templateInfo = templateInfo;
+
+    const targetPath = path.resolve(
+      userHome,
+      process.env.CLI_HOME_PATH,
+      'template',
+    );
+    const storeDir = path.resolve(
+      userHome,
+      process.env.CLI_HOME_PATH,
+      'template',
+      'node_modules',
+    );
+    log.verbose('targetPath', targetPath);
+    log.verbose('storeDir', storeDir);
+
+    const templateNpm = new Package({
+      targetPath,
+      storeDir,
+      packageName: templateInfo.npmName,
+      packageVersion: templateInfo.version,
+    });
+    if (!(await templateNpm.exists())) {
+      const spinner = spinnerStart('正在下载模板...');
+      try {
+        await templateNpm.install();
+      } catch (e) {
+        throw e;
+      } finally {
+        spinner.stop(true);
+        if (await templateNpm.exists()) {
+          this.templateNpm = templateNpm;
+          log.success('模板下载完成');
+        }
+      }
+    } else {
+      const spinner = spinnerStart('正在更新模板...');
+      try {
+        await templateNpm.update();
+      } catch (error) {
+        throw error;
+      } finally {
+        spinner.stop(true);
+        if (await templateNpm.exists()) {
+          this.templateNpm = templateNpm;
+          log.verbose('templateNpm-----------------', this.templateNpm);
+          log.success('模板更新完成');
+        }
+      }
+    }
   }
   async prepare() {
     const template = await getProjectTemplate();
@@ -65,8 +261,16 @@ class InitCommand extends Command {
           message: '是否确认清空当前目录下的文件？',
           default: false,
         });
+        let spinner;
         if (ifContinue) {
-          fse.emptyDirSync(localPath);
+          try {
+            spinner = spinnerStart('正在清空目录...');
+            fse.emptyDirSync(localPath);
+          } catch (error) {
+            throw error;
+          } finally {
+            spinner.stop(true);
+          }
         }
       }
     }
@@ -74,6 +278,11 @@ class InitCommand extends Command {
   }
   async getProjectInfo() {
     let projectInfo = {};
+    let isProjectNameValid = false;
+    if (isValidFilename(this.projectName)) {
+      isProjectNameValid = true;
+      projectInfo.projectName = this.projectName;
+    }
     const { type } = await inquire.prompt({
       type: 'list',
       name: 'type',
@@ -85,57 +294,60 @@ class InitCommand extends Command {
       ],
     });
     log.verbose('type', type);
+    const projectNamePrompt = {
+      type: 'input',
+      name: 'projectName',
+      message: '请输入项目名称',
+      default: '',
+      validate(v) {
+        const done = this.async();
+        setTimeout(() => {
+          if (!isValidFilename(v)) {
+            done('项目名称不合法');
+            return;
+          }
+          done(null, true);
+        }, 0);
+      },
+      filter(v) {
+        return v;
+      },
+    };
     if (type === TYPE_PROJECT) {
-      const project = await inquire.prompt([
-        {
-          type: 'input',
-          name: 'projectName',
-          message: '请输入项目名称',
-          default: '',
-          validate(v) {
-            const done = this.async();
-            setTimeout(() => {
-              if (!isValidFilename(v)) {
-                done('项目名称不合法');
-                return;
-              }
-              done(null, true);
-            }, 0);
-          },
-          filter(v) {
-            return v;
-          },
-        },
-        {
-          type: 'input',
-          name: 'projectVersion',
-          message: '请输入项目版本号',
-          default: '1.0.0',
-          validate(v) {
-            const done = this.async();
-            setTimeout(() => {
-              if (!!semver.valid(v) === false) {
-                done('项目版本号不合法');
-                return;
-              }
-              done(null, true);
-            }, 0);
-          },
-          filter(v) {
-            if (!!semver.valid(v)) {
-              return semver.valid(v);
+      const promptArr = [];
+      if (!isProjectNameValid) {
+        promptArr.push(projectNamePrompt);
+      }
+      promptArr.push({
+        type: 'input',
+        name: 'projectVersion',
+        message: '请输入项目版本号',
+        default: '1.0.0',
+        validate(v) {
+          const done = this.async();
+          setTimeout(() => {
+            if (!!semver.valid(v) === false) {
+              done('项目版本号不合法');
+              return;
             }
-            return v;
-          },
+            done(null, true);
+          }, 0);
         },
-        {
-          type: 'list',
-          name: 'projectTemplate',
-          message: '请选择项目模板',
-          choices: this.createTemplateChoices(),
+        filter(v) {
+          if (!!semver.valid(v)) {
+            return semver.valid(v);
+          }
+          return v;
         },
-      ]);
-      projectInfo = { ...project, type };
+      });
+      promptArr.push({
+        type: 'list',
+        name: 'projectTemplate',
+        message: '请选择项目模板',
+        choices: this.createTemplateChoices(),
+      });
+      const project = await inquire.prompt(promptArr);
+      projectInfo = { ...projectInfo, ...project, type };
     } else if (type === TYPE_COMPONENT) {
     }
     return projectInfo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuw-cli-dev/init",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "yuw-cli-dev init",
   "author": "yuwei <yuwei@huya.com>",
   "homepage": "https://github.com/yousanjin/yuw-cli#readme",
@@ -28,12 +28,17 @@
   },
   "dependencies": {
     "@yuw-cli-dev/command": "file:../../models/command",
-    "@yuw-cli-dev/log": "^1.0.36",
-    "@yuw-cli-dev/request": "^1.0.38",
+    "@yuw-cli-dev/log": "^1.0.39",
+    "@yuw-cli-dev/package": "file:../../models/package",
+    "@yuw-cli-dev/request": "^1.0.39",
+    "@yuw-cli-dev/utils": "^1.0.39",
+    "ejs": "^4.0.1",
     "fs-extra": "^9.0.1",
+    "glob": "^7.1.6",
     "inquirer": "^7.3.3",
     "semver": "^7.7.3",
+    "user-home": "^3.0.0",
     "valid-filename": "^3.1.0"
   },
-  "gitHead": "f92c3015d6799312f5c9b446775cfb5ed577eeed"
+  "gitHead": "7bcace542ccccc47f518b0537cbb0cce93229adf"
 }