@john-cli/init 1.0.16 → 1.0.18

package/lib/index.js

@@ -5,7 +5,9 @@ const inquirer = require('inquirer')
 const path = require('path')
 const fse = require('fs-extra')
 const semver = require('semver')
-const userHome = require('user-home')
+// const userHome = require('user-home')
+import { homedir as userHome } from 'os';
+
 const ejs = require('ejs')
 const Command = require('@john-cli/command')
 const log = require('@john-cli/log')
@@ -47,10 +49,10 @@ class InitCommand extends Command {
       log.verbose('projectInfo', projectInfo)
       this.projectInfo = projectInfo
       // if (projectInfo.type === TYPE_PROJECT) {
-        // 1.下载模板
-        await this.downloadTemplate()
-        // 2.安装模板
-        await this.installTemplate()
+      // 1.下载模板
+      await this.downloadTemplate()
+      // 2.安装模板
+      await this.installTemplate()
       // }
     } catch (e) {
       log.error(e.message)
@@ -97,7 +99,7 @@ class InitCommand extends Command {
         throw new Error(errMsg)
       }
       const args = cmdArr.slice(1)
-      ret = await execAsync(cmd,args, {
+      ret = await execAsync(cmd, args, {
         stdio: 'inherit',
         cwd: process.cwd()
       })
@@ -108,7 +110,7 @@ class InitCommand extends Command {
     return ret
   }
 
-  async ejsRender(option = {}) {
+  async ejsRender (option = {}) {
     const dir = process.cwd()
     const projectInfo = this.projectInfo
     return new Promise((resolve, reject) => {
@@ -125,7 +127,7 @@ class InitCommand extends Command {
           const filePath = path.join(dir, file)
           // console.log(filePath)
           return new Promise((resolve1, reject1) => {
-            ejs.renderFile(filePath, projectInfo, {}, (err,res) => {
+            ejs.renderFile(filePath, projectInfo, {}, (err, res) => {
               // console.log(err,res)
               if (err) {
                 reject1(err)
@@ -144,7 +146,7 @@ class InitCommand extends Command {
     })
   }
 
-  async installNormalTemplate() {
+  async installNormalTemplate () {
     console.log('templateNpm22:', this.templateNpm)
     // 拷贝模板代码至当前目录
     let spinner = spinnerStart('正在安装模板...')
@@ -164,7 +166,7 @@ class InitCommand extends Command {
     }
     const templateIgnore = this.templateInfo.ignore || []
     const ignore = ['**/node_modules/**', ...templateIgnore]
-    await this.ejsRender({ignore})
+    await this.ejsRender({ ignore })
     const { installCommand, startCommand } = this.templateInfo
     // 依赖安装 npm install
     await this.execCommand(installCommand, '安装依赖过程失败！')
@@ -172,7 +174,7 @@ class InitCommand extends Command {
     await this.execCommand(startCommand, '启动过程失败！')
   }
 
-  async installCustomTemplate() {
+  async installCustomTemplate () {
     console.log('安装自定义模板', this.templateNpm)
   }
 
@@ -185,7 +187,7 @@ class InitCommand extends Command {
     // console.log(this.projectInfo, this.template)
     const { projectTemplate } = this.projectInfo
     const templateInfo = this.template.find((item) => {
-        return item.npmName === projectTemplate
+      return item.npmName === projectTemplate
     })
 
     const targetPath = path.resolve(userHome, '.john-cli', 'template') // 缓存项目模板
@@ -267,7 +269,7 @@ class InitCommand extends Command {
       // 3.是否强制更新
       if (ifContinue || this.force) {
         // 给用户做二次确认
-        const { confirmDelete } = await  inquirer.prompt({
+        const { confirmDelete } = await inquirer.prompt({
           type: 'confirm',
           name: 'confirmDelete',
           message: '是否确认清空当前目录下的文件？',
@@ -303,115 +305,115 @@ class InitCommand extends Command {
       choices: [{
         name: '项目',
         value: TYPE_PROJECT
-      },{
+      }, {
         name: '组件',
         value: TYPE_COMPONENT
       }]
     })
     log.verbose('type', type)
     this.template = this.template.filter((template) => template.tag.includes(type))
-    console.log('template:::',this.template)
+    console.log('template:::', this.template)
     const title = type === TYPE_PROJECT ? '项目' : '组件'
     // 2.获取项目基本信息（名称、版本号、描述）
-      // 获取项目的基本信息
-      const projectNamePrompt = {
+    // 获取项目的基本信息
+    const projectNamePrompt = {
+      type: 'input',
+      name: 'projectName',
+      message: `请输入${title}名称`,
+      default: '',
+      validate: function (v) {
+        // 限制输入规则
+        // 1.输入的首字符必须为英文字符
+        // 2.尾字符必须为英文或数字，不能为字符
+        // 3.字符仅允许"-_"
+        // a-b a_b aaabbb  不能出现 a_  a-
+        // 合法：a,a-b,a_b,a-b-c,a_b_c,a-b1-c1, a_b1_c1
+        // 不合法：1, a_, a-, a_1, a-1
+        // 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 (!isValidName(v)) {
+            done('请输入合法的项目名称(a-zA-Z0-9 or a_zA_Z0_9)')
+            return;
+          }
+          done(null, true)
+        }, 0);
+      },
+      filter: function (v) {
+        return v
+      }
+    }
+    const projectPrompt = []
+    if (!isProjectNameValid) {
+      projectPrompt.push(projectNamePrompt)
+    }
+    projectPrompt.push(
+      {
         type: 'input',
-        name: 'projectName',
-        message: `请输入${title}名称`,
-        default: '',
+        name: 'projectVersion',
+        message: `请输入${title}版本号`,
+        default: '1.0.0',
         validate: function (v) {
-          // 限制输入规则
-          // 1.输入的首字符必须为英文字符
-          // 2.尾字符必须为英文或数字，不能为字符
-          // 3.字符仅允许"-_"
-          // a-b a_b aaabbb  不能出现 a_  a-
-          // 合法：a,a-b,a_b,a-b-c,a_b_c,a-b1-c1, a_b1_c1
-          // 不合法：1, a_, a-, a_1, a-1
-          // 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 (!isValidName(v)) {
-              done('请输入合法的项目名称(a-zA-Z0-9 or a_zA_Z0_9)')
+          setTimeout(function () {
+            if (!(!!semver.valid(v))) {
+              done('请输入合法的版本号（如：v1.0.0 or 1.0.0）')
               return;
             }
             done(null, true)
           }, 0);
         },
         filter: function (v) {
-          return 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
       }
-      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
+    } 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;
             }
-          }
-        },{
-          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
+            done(null, true)
+          }, 0);
         }
       }
+      projectPrompt.push(descriptionPrompt)
+      const component = await inquirer.prompt(projectPrompt)
+      projectInfo = {
+        ...projectInfo,
+        type,
+        ...component
+      }
+    }
 
     // 生成className
     if (projectInfo.projectName) {
       projectInfo.name = projectInfo.projectName
-      projectInfo.className = require('kebab-case')(projectInfo.projectName).replace(/^-/,'')
+      projectInfo.className = require('kebab-case')(projectInfo.projectName).replace(/^-/, '')
     }
     if (projectInfo.projectVersion) {
       projectInfo.version = projectInfo.projectVersion
@@ -444,7 +446,7 @@ class InitCommand extends Command {
 
 }
 
-function init(argv) {
+function init (argv) {
   // console.log('init', projectName, cmdObj.force, process.env.CLI_TARGET_PATH)
   return new InitCommand(argv);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@john-cli/init",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "john-cli init",
   "author": "tanhongjian <350089447@qq.com>",
   "homepage": "",
@@ -36,5 +36,5 @@
     "kebab-case": "^1.0.1",
     "semver": "^7.3.7"
   },
-  "gitHead": "cc34ba2c8cc3f3374718208f1f163dafa24b661f"
+  "gitHead": "ae66a3697eee394edb189b39c57927dd5d8dbe8f"
 }