feat(*): relative path for template

Author: Val-istar-Guo

src/commands/init.js

@@ -25,7 +25,7 @@ module.exports = async (options = {}) => {
   } = options
 
   // template repository
-  const repository = formatTemplateLink(options.repository)
+  const repository = formatTemplateLink(options.repository, cwd)
   if (!force) await securityCheck(process.cwd())
 
   const templateStoragePath = await getTemplateStorage(repository)

src/extractProgectBaseInfo.js

@@ -1,18 +1,10 @@
 const { join } = require('path')
 const git = require('simple-git/promise')
-const { readJson } = require('./utils')
+const { readJson, isRepo } = require('./utils')
 
 
 const gitUrlRegexp = /((git|ssh|http(s)?)|(git@[\w.]+))(:(\/\/)?)([\w.@:/\-~]+)(\.git)(\/)?$/
 
-const isRepo = async path => {
-  if (!await git(path).checkIsRepo()) return false
-  const toplevel = await git(path).revparse(['--show-toplevel'])
-  if (toplevel.replace(/\n$/, '') !== path) return false
-
-  return true
-}
-
 module.exports = async path => {
   const view = {}
 

src/formatTemplateLink.js

@@ -1,10 +1,32 @@
-// github:xx/xx
 const throwError = require('./throwError')
+const fs = require('fs-extra')
+const { join, isAbsolute } = require('path')
+
 const githubSH = /^(github:)?[-a-zA-Z0-9@:%._\+~#=]+\/[-a-zA-Z0-9@:%._\+~#=]+$/
 const cloneLink = /((git|ssh|http(s)?)|(git@[\w.]+))(:(\/\/)?)([\w.@:/\-~]+)(\.git)(\/)?/
+const isRelative = path => /^\.\.?\//.test(path)
+const isLocalPath = path => join(path) === path
+
+
+const dirExist = async link => {
+  const exist = await fs.pathExists(link)
+  if (!exist) return false
+
+  const stats = await fs.stat(link)
+  if (stats.isDirectory()) return true
+
+  return false
+}
+
+module.exports = (link, cwd) => {
+  if (isRelative(link) || isAbsolute(link)) {
+    if (isAbsolute(link) && dirExist(link)) return link
+
+    link = join(cwd, link)
+    if (dirExist(link)) return link
 
-module.exports = link => {
-  if (githubSH.test(link)) {
+    throwError('Template path cannot be found. Ensure it is an exist directory.')
+  } else if (githubSH.test(link)) {
     return `https://github.com/${link.replace(/^github:/, '')}.git`
   } else if (cloneLink.test(link)) {
     return link

src/getTemplate/clone.js

@@ -1,14 +1,8 @@
 const fs = require('fs-extra')
 const git = require('simple-git/promise')
-const throwError = require('../throwError')
-const semver = require('semver')
 const log = require('../log')
 
 
-const createRevert = (storage, branch) => async () => {
-  git(storage).checkout(branch)
-}
-
 const repositoryExisted = async (repository, storage) => {
   if (!await fs.pathExists(storage)) return false
 
@@ -18,7 +12,7 @@ const repositoryExisted = async (repository, storage) => {
   return true
 }
 
-module.exports = async (repository, version, storage) => {
+module.exports = async (repository, storage) => {
   if (await repositoryExisted(repository, storage)) {
     log.info(`pull template from ${repository}...`)
     await git(storage).pull()
@@ -27,33 +21,4 @@ module.exports = async (repository, version, storage) => {
     await fs.remove(storage)
     await git().clone(repository, storage)
   }
-
-  const gitT = git(storage)
-  let tags = await gitT.tags()
-  tags = tags.all
-    .filter(semver.valid)
-    .sort(semver.compare)
-    .reverse()
-
-  const branchSummary = await gitT.branch()
-  const currentBranch = branchSummary.current
-
-  if (version) {
-    version = `v${version}`
-    if (!tags.includes(version)) {
-      throwError([
-        'No corresponding template version was found',
-        'Please confirm that the version number exists in the tags of the template repository.',
-        `Expected template version: ${version}`
-      ].join('\n'))
-    }
-
-    await gitT.checkout(version)
-    log.info(`template version: ${version}`)
-  } else if (tags.length) {
-    await gitT.checkout(tags[0])
-    log.info(`template version: ${tags[0]}`)
-  }
-
-  return createRevert(storage, currentBranch)
 }

src/getTemplate/copy.js

@@ -0,0 +1,9 @@
+const fs = require('fs-extra')
+const log = require('../log')
+
+
+module.exports = async (path, storage) => {
+  await fs.emptyDir(storage)
+  log.info(`copy template from ${path}`)
+  await fs.copy(path, storage)
+}

src/getTemplate/index.js

@@ -1,7 +1,51 @@
+const { isAbsolute } = require('path')
+const semver = require('semver')
+const git = require('simple-git/promise')
+
+const throwError = require('../throwError')
+const log = require('../log')
+const { isRepo } = require('../utils')
+
+const copy = require('./copy')
 const clone = require('./clone')
 
 
+const createRevert = (storage, branch) => async () => {
+  git(storage).checkout(branch)
+}
+
 module.exports = async (path, storage, version) => {
-  if (/^[.|/]/.test(path)) return () => {}
-  else return clone(path, version, storage)
+  if (isAbsolute(path)) await copy(path, storage)
+  else await clone(path, storage)
+
+  if (await isRepo(storage)) {
+    const gitT = git(storage)
+    let tags = await gitT.tags()
+    tags = tags.all
+      .filter(semver.valid)
+      .sort(semver.compare)
+      .reverse()
+
+    const branchSummary = await gitT.branch()
+    const currentBranch = branchSummary.current
+
+    if (version) {
+      version = `v${version}`
+      if (!tags.includes(version)) {
+        throwError([
+          'No corresponding template version was found',
+          'Please confirm that the version number exists in the tags of the template repository.',
+          `Expected template version: ${version}`
+        ].join('\n'))
+      }
+
+      await gitT.checkout(version)
+      log.info(`template version: ${version}`)
+    } else if (tags.length) {
+      await gitT.checkout(tags[0])
+      log.info(`template version: ${tags[0]}`)
+    }
+
+    return createRevert(storage, currentBranch)
+  }
 }

src/utils.js

@@ -1,5 +1,6 @@
 const fs = require('fs')
 const { promisify } = require('util')
+const git = require('simple-git/promise')
 
 
 const readFile = promisify(fs.readFile)
@@ -15,3 +16,11 @@ exports.flatten = arr => arr.reduce((result, item) => {
   }
   else return [...result, item]
 }, [])
+
+exports.isRepo = async path => {
+  if (!await git(path).checkIsRepo()) return false
+  const toplevel = await git(path).revparse(['--show-toplevel'])
+  if (toplevel.replace(/\n$/, '') !== path) return false
+
+  return true
+}