@john-cli/init 1.0.7 → 1.0.8

package/lib/index.js

@@ -6,6 +6,7 @@ const path = require('path')
 const fse = require('fs-extra')
 const semver = require('semver')
 const userHome = require('user-home')
+const ejs = require('ejs')
 const Command = require('@john-cli/command')
 const log = require('@john-cli/log')
 const Package = require('@john-cli/package')
@@ -45,14 +46,17 @@ class InitCommand extends Command {
       const projectInfo = await this.prepare()
       log.verbose('projectInfo', projectInfo)
       this.projectInfo = projectInfo
-      if (projectInfo.type === TYPE_PROJECT) {
+      // if (projectInfo.type === TYPE_PROJECT) {
         // 1.下载模板
         await this.downloadTemplate()
         // 2.安装模板
         await this.installTemplate()
-      }
+      // }
     } catch (e) {
       log.error(e.message)
+      if (process.env.LOG_LEVEL === 'verbose') {
+        console.log(e)
+      }
     }
   }
 
@@ -104,6 +108,42 @@ class InitCommand extends Command {
     return ret
   }
 
+  async ejsRender(option = {}) {
+    const dir = process.cwd()
+    const projectInfo = this.projectInfo
+    return new Promise((resolve, reject) => {
+      require('glob')('**', {
+        cwd: dir,
+        ignore: option.ignore || '',
+        nodir: true
+      }, (err, files) => {
+        if (err) {
+          reject(err)
+        }
+        // console.log(files)
+        Promise.all(files.map(file => {
+          const filePath = path.join(dir, file)
+          // console.log(filePath)
+          return new Promise((resolve1, reject1) => {
+            ejs.renderFile(filePath, projectInfo, {}, (err,res) => {
+              // console.log(err,res)
+              if (err) {
+                reject1(err)
+              } else {
+                fse.writeFileSync(filePath, res)
+                resolve1(res)
+              }
+            })
+          })
+        })).then(() => {
+          resolve()
+        }).catch(err => {
+          reject(err)
+        })
+      })
+    })
+  }
+
   async installNormalTemplate() {
     console.log('templateNpm22:', this.templateNpm)
     // 拷贝模板代码至当前目录
@@ -122,6 +162,9 @@ class InitCommand extends Command {
       spinner.stop(true)
       log.success('模板安装成功')
     }
+    const templateIgnore = this.templateInfo.ignore || []
+    const ignore = ['**/node_modules/**', ...templateIgnore]
+    await this.ejsRender({ignore})
     const { installCommand, startCommand } = this.templateInfo
     // 依赖安装 npm install
     await this.execCommand(installCommand, '安装依赖过程失败！')
@@ -242,7 +285,15 @@ class InitCommand extends Command {
   }
 
   async getProjectInfo () {
+    function isValidName (projectName) {
+      return /^[a-zA-Z]+([-][a-zA-Z][a-zA-Z0-9]*|[_][a-zA-Z][a-zA-Z0-9]*|[a-zA-Z0-9])*$/.test(projectName)
+    }
     let projectInfo = {}
+    let isProjectNameValid = false
+    if (isValidName(this.projectName)) {
+      isProjectNameValid = true
+      projectInfo.projectName = this.projectName
+    }
     // 1.获取项目类型（项目/组件）
     const { type } = await inquirer.prompt({
       type: 'list',
@@ -258,13 +309,15 @@ class InitCommand extends Command {
       }]
     })
     log.verbose('type', type)
+    this.template = this.template.filter((template) => template.tag.includes(type))
+    console.log('template:::',this.template)
+    const title = type === TYPE_PROJECT ? '项目' : '组件'
     // 2.获取项目基本信息（名称、版本号、描述）
-    if (type === TYPE_PROJECT) {
       // 获取项目的基本信息
-      const project = await inquirer.prompt([{
+      const projectNamePrompt = {
         type: 'input',
         name: 'projectName',
-        message: '请输入项目的名称',
+        message: `请输入${title}名称`,
         default: '',
         validate: function (v) {
           // 限制输入规则
@@ -277,7 +330,7 @@ class InitCommand extends Command {
           // return /^[a-zA-Z]+([-][a-zA-Z][a-zA-Z0-9]*|[_][a-zA-Z][a-zA-Z0-9]*|[a-zA-Z0-9])*$/.test(v)
           const done = this.async()
           setTimeout(function() {
-            if (!/^[a-zA-Z]+([-][a-zA-Z][a-zA-Z0-9]*|[_][a-zA-Z][a-zA-Z0-9]*|[a-zA-Z0-9])*$/.test(v)) {
+            if (!isValidName(v)) {
               done('请输入合法的项目名称(a-zA-Z0-9 or a_zA_Z0_9)')
               return;
             }
@@ -287,47 +340,85 @@ class InitCommand extends Command {
         filter: function (v) {
           return v
         }
-      },{
-        type: 'input',
-        name: 'projectVersion',
-        message: '请输入项目版本号',
-        default: '1.0.0',
-        validate: function (v) {
-          const done = this.async()
-          setTimeout(function() {
-            if (!(!!semver.valid(v))) {
-              done('请输入合法的版本号（如：v1.0.0 or 1.0.0）')
-              return;
+      }
+      const projectPrompt = []
+      if (!isProjectNameValid) {
+        projectPrompt.push(projectNamePrompt)
+      }
+      projectPrompt.push(
+        {
+          type: 'input',
+          name: 'projectVersion',
+          message: `请输入${title}版本号`,
+          default: '1.0.0',
+          validate: function (v) {
+            const done = this.async()
+            setTimeout(function() {
+              if (!(!!semver.valid(v))) {
+                done('请输入合法的版本号（如：v1.0.0 or 1.0.0）')
+                return;
+              }
+              done(null, true)
+            }, 0);
+          },
+          filter: function (v) {
+            if (!!semver.valid(v)) {
+              return semver.valid(v)
+            } else {
+              return v
             }
-            done(null, true)
-          }, 0);
-        },
-        filter: function (v) {
-          if (!!semver.valid(v)) {
-            return semver.valid(v)
-          } else {
-            return v
           }
+        },{
+          type: 'list',
+          name: 'projectTemplate',
+          message: `请选择${title}模板`,
+          choices: this.createTemplateChoice()
+        }
+      )
+      if (type === TYPE_PROJECT) {
+        const project = await inquirer.prompt(projectPrompt)
+        projectInfo = {
+          ...projectInfo,
+          type,
+          ...project
+        }
+      } else if (type === TYPE_COMPONENT) {
+        const descriptionPrompt = {
+          type: 'input',
+          name: 'componentDescription',
+          message: '请输入组件描述信息',
+          default: '1.0.0',
+          validate: function (v) {
+            const done = this.async()
+            setTimeout(function() {
+              if (!(v)) {
+                done('请输入组件描述信息')
+                return;
+              }
+              done(null, true)
+            }, 0);
+          }
+        }
+        projectPrompt.push(descriptionPrompt)
+        const component = await inquirer.prompt(projectPrompt)
+        projectInfo = {
+          ...projectInfo,
+          type,
+          ...component
         }
-      },{
-        type: 'list',
-        name: 'projectTemplate',
-        message: '请选择项目模板',
-        choices: this.createTemplateChoice()
-      }
-      ])
-      projectInfo = {
-        type,
-        ...project
       }
-    } else if (type === TYPE_COMPONENT) {
-
-    }
 
     // 生成className
     if (projectInfo.projectName) {
+      projectInfo.name = projectInfo.projectName
       projectInfo.className = require('kebab-case')(projectInfo.projectName).replace(/^-/,'')
     }
+    if (projectInfo.projectVersion) {
+      projectInfo.version = projectInfo.projectVersion
+    }
+    if (projectInfo.componentDescription) {
+      projectInfo.description = projectInfo.componentDescription
+    }
 
     // return 项目的基本信息(Object)
     return projectInfo

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@john-cli/init",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "john-cli init",
   "author": "tanhongjian <350089447@qq.com>",
   "homepage": "",
@@ -26,13 +26,15 @@
   "dependencies": {
     "@john-cli/command": "file:../../mocels/command",
     "@john-cli/log": "file:../../log/log",
-    "@john-cli/package": "^1.0.7",
+    "@john-cli/package": "^1.0.8",
     "@john-cli/request": "^1.0.7",
     "@john-cli/utils": "^1.0.7",
+    "ejs": "^3.1.8",
     "fs-extra": "^10.1.0",
+    "glob": "^8.0.3",
     "inquirer": "^8.0.0",
     "kebab-case": "^1.0.1",
     "semver": "^7.3.7"
   },
-  "gitHead": "dca53a0950924ea93b55b1354100343ed7c902cb"
+  "gitHead": "c91f71eb3d680aabeacdbd1122bf7f0d7919747b"
 }