enhance: 优化 entry 识别 scan 代码

Author: anchengjian

bin/mpvue-simple

@@ -5,6 +5,11 @@ upgradeLogger()
 
 var argv = require('yargs').argv;
 
+if (argv.version || argv.v) {
+  const { version } = require('../package.json')
+  return process.stdout.write(version)
+}
+
 if (argv.build) {
   require('../build/build.js')
 } else {

config/argv.js

@@ -1,5 +1,6 @@
 var path = require('path')
 var fs = require('fs')
+var util = require('util')
 var resolve = require('resolve')
 var glob = require('glob')
 // const { NpmAutoInstallWebpackPlugin } = require('npm-auto-install-webpack-plugin')
@@ -24,40 +25,66 @@ export default {
   return fileSrc
 }
 
-// 如果有 main.js 就不找 app.vue 了，免得混乱
-function searchEntry(dir, config, entryName, mpType) {
-  let entryFiles = []
-  searchFilters.some(filter => {
-    entryFiles = glob.sync(filter, { cwd: dir })
-    return entryFiles.length
-  })
+function resolveEntry (src, cwd) {
+  try {
+    return resolve.sync(src, { basedir: cwd })
+  } catch (err) {
+    // console.log(err)
+  }
+  return ''
+}
 
-  if (!entryFiles || !entryFiles.length) {
-    return
+// 如果有 main.js 就不找 app.vue 了，免得混乱
+function searchEntry(pattern, entryName, cwd, config) {
+  const entryFiles = glob.sync(pattern, { cwd })
+  if (!entryFiles.length) {
+    return false
   }
 
   if (entryFiles.length === 1) {
-    config.entry[entryName || path.basename(dir)] = path.resolve(dir, entryFiles[0])
-    return
+    const realSrc = path.resolve(cwd, entryFiles[0])
+    config.entry[getEntryName(realSrc, entryName)] = realSrc
+    return true
   }
 
   entryFiles.forEach((k, i) => {
-    const src = path.resolve(dir, k)
-    const entryPath = path.extname(src) === '.vue' ? saveEntryMain(0, src, mpType) : src
-    config.entry[path.basename(dir)] = entryPath
+    const src = path.resolve(cwd, k)
+    config.entry[getEntryName(src)] = src
   })
+
+  return true
 }
 
-let argvOptions = null
-let searchPath = ['./', './src', './src/pages', './mpvue-pages']
-let searchFilters = ['**/**/main.js', '**/**/app.vue', '**/**/App.vue', '**/**/index.vue']
+function getEntryName (src, pageName) {
+  if (pageName) {
+    return pageName
+  }
+  const { dir, name } = path.parse(src)
+  if (['app', 'App', 'main', 'index'].includes(name)) {
+    return path.parse(dir).name
+  }
+  return name
+}
 
+// 暂时只想到这么做缓存
+let argvOptions = null
 function injectArgvOptions (options) {
   argvOptions = options
 }
 
+// 默认优先为完整路径的单文件
+// 其次是 glob 格式扫描到的文件
+// 其次是 node.js 本地运行时传递的 object
+// 再次是一个路径下，默认扫描
+// 最后才是默认路径，默认扫描
+// component 针对所有扫描到的 .vue SFC entry 才有用
+// 有且只有一个 entry 的时候 pageName 才有效
 function mergeArgvConfig (config) {
   // 默认初始化
+  const cwd = path.resolve()
+  const defConfig = { entry: {}, resolve: { alias: {} } }
+  const floders = ['./src/', './mpvue-pages/']
+  const searchFilters = ['./**/**/main.js', './**/**/app.vue', './**/**/App.vue', './**/**/index.vue']
   config.argvConfig = {
     // plugins: [
     //   new NpmAutoInstallWebpackPlugin()
@@ -67,54 +94,47 @@ function mergeArgvConfig (config) {
   // 拼接自定义的参数
   var argv = Object.assign({}, argvOptions, require('yargs').argv)
   const {
-    entry: argvEntry,                 // ./src/main.js, ./src/app.vue, undefined
-    output: argvOutput,               // pathString, undefined
+    entry: argvEntry,                 // ./src/main.js, ./src/app.vue, ./src/, ./src/**/main.js, { page: './page/main.js' }, undefined
     pageName: argvPageName,           // nameStrng, undefined
     component: argvComponent,         // true, undefined
-    searchPath: argvSearchPath,       // pathString, undefined
+    output: argvOutput,               // pathString, undefined
     config: argvCnf,                  // pathString, undefined
-    searchFilters: argvSearchFilters,
     ...resetConfig
   } = argv
-  const defConfig = { entry: {}, resolve: { alias: {} } }
   const mpType = argvComponent ? 'component' : 'page'
 
-  if (typeof argvPageName === 'string') {
-    searchPath = searchPath.concat(argvPageName.split(','))
-  }
-
-  if (typeof argvSearchFilters === 'string') {
-    searchFilters = argvSearchFilters,split(',')
-  }
-
-  // 为什么这里面的逻辑这么凌乱呢？
-  // 可能是因为还没思考清楚吧
+  // 开始获取 entry
   if (typeof argvEntry === 'string') {
-    let entryPath = resolve.sync(argvEntry, { basedir: path.resolve(), extensions: ['.js', '.vue'] })
-
-    if (path.extname(entryPath) === '.vue') {
-      entryPath = saveEntryMain(0, entryPath, mpType)
-    }
-
-    if (typeof argvPageName === 'string') {
-      const entryName = argvPageName || path.parse(entryPath).name
-      defConfig.entry[entryName] = entryPath
-    } else if (fs.existsSync(entryPath)) {
-      defConfig.entry[path.parse(entryPath).name] = entryPath
+    // 首先判断是不是完整路径
+    const curEntry = resolveEntry(argvEntry, cwd)
+    // const absEntry = path.resolve(argvEntry)
+    if (curEntry) {
+      defConfig.entry[getEntryName(curEntry, argvPageName)] = curEntry
     } else {
-      searchEntry(entryPath, defConfig, argvPageName, mpType)
+      // 先检查是否是 glob 格式的 filter
+      // 再检查这是不是路径
+      if (!searchEntry(argvEntry, argvPageName, cwd, defConfig)) {
+        floders.unpop()
+      }
     }
+  } else if (util.isObject(argvEntry)) {
+    defConfig.entry = argvEntry
   } else {
-    searchPath.forEach(s => {
-      searchEntry(path.resolve(s), defConfig, argvPageName, mpType)
+    const allPattern = floders.reduce((r, floder) => {
+      return r.concat(searchFilters.map(v => path.join(floder, v)))
+    }, [])
+    allPattern.some(pattern => {
+      return searchEntry(pattern, argvPageName, cwd, defConfig)
     })
   }
 
+  // 输出文件夹
   if (argvOutput) {
     const assetsRoot = path.resolve(argvOutput)
     defConfig.assetsRoot = assetsRoot
   }
 
+  // 合并自定义 webpack config
   if (typeof argvCnf === 'string') {
     try {
       config.argvConfig = require('webpack-merge')(config.argvConfig, require(path.resolve(argvCnf)))
@@ -124,12 +144,19 @@ function mergeArgvConfig (config) {
   Object.assign(config.build, resetConfig, defConfig)
   Object.assign(config.dev, resetConfig, defConfig)
 
-  console.log(defConfig)
+  const allEntry = Object.keys(defConfig.entry)
 
-  if (!Object.keys(defConfig.entry).length) {
+  if (!allEntry.length) {
     throw Error('At least one entry is needed: http://mpvue.com/mpvue/simple/')
   }
 
+  // 处理 component 和 .vue 的 entry
+  allEntry.forEach((v, i) => {
+    if (path.extname(v) === '.vue') {
+      defConfig.entry[v] = saveEntryMain(i, v, mpType)
+    }
+  })
+
   return config
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mpvue-simple",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "辅助 mpvue 快速开发 Page / Component 级小程序页面的工具",
   "main": "index.js",
   "bin": "bin/mpvue-simple",

utils/index.js

@@ -11,7 +11,7 @@ function upgradeLogger () {
   const latestVesion = pkg['dist-tags'].latest
 
   if (latestVesion !== currPkg.version) {
-    console.log(`${pkgName} 有新版本 ${latestVesion} 啦，请注意升级。\n例如: npm install ${pkgName} -g\n`)
+    process.stdout.write(`${pkgName} 有新版本 ${latestVesion} 啦，请注意升级。\n例如: npm install ${pkgName} -g\n`)
   }
 }