feat(alita): 添加 --comp参数， 添加转化完成的log

Author: ykforerlang

src/filewatch/index.js

@@ -7,20 +7,47 @@
  */
 
 import addFile from './addFile'
+
 const chokidar = require('chokidar')
+const events = require('events');
+// 创建 eventEmitter 对象
+const eventEmitter = new events.EventEmitter();
+
+const DONE_EVENT = 'DONE_EVENT'
 
 export default (ignored) => {
     const {INPUT_DIR, watchMode} = global.execArgs
-    console.log('watchMode:', watchMode)
 
+    const fileSet = new Set([])
     const watcher = chokidar.watch(INPUT_DIR,
         {
-            persistent: false,
+            persistent: watchMode,
             ignored,
         })
 
-    watcher.on('add', async (path) => {
-        const allFilepaths = await addFile(path)
-        console.log(path, ' ok! 生成:', allFilepaths)
-    })
+    watcher
+        .on('add', async (path) => {
+            fileSet.add(path)
+            const allFilepaths = await addFile(path)
+            fileSet.delete(path)
+
+            if (fileSet.size === 0) {
+                eventEmitter.emit(DONE_EVENT)
+            }
+        })
+        .on('change', async path => {
+            console.log(path, ' changed!')
+        })
+        .on('unlink', async path => {
+            console.log(path, ' delete!')
+        })
+        .on('ready', () => {
+            eventEmitter.on(DONE_EVENT, () => {
+                if (watchMode) {
+                    console.log(`转化完成！监听文件修改...`.info)
+                } else {
+                    console.log('转化完成!'.info)
+                }
+            })
+        })
 }

src/index.js

@@ -8,7 +8,7 @@
  */
 
 import fse from 'fs-extra'
-import {geneWXFileStruc, exitStruc} from './struc/index'
+import {geneWXFileStruc} from './struc/index'
 import {getDependenciesMap, getRNCompList, emptyDir} from './util/util'
 import packagz from '../package.json'
 import filewatch from './filewatch/index'
@@ -37,7 +37,8 @@ const options = getopts(process.argv, {
         w: 'watch',
         v: 'version',
         config: 'config',
-        beta: 'beta'
+        beta: 'beta',
+        comp: 'component'
     },
 })
 
@@ -89,9 +90,6 @@ emptyDir(OUT_DIR, new Set([
 ]))
 console.log('输出目录清理完成'.info)
 
-const watchMode = options.watch
-
-
 const CONFIGPATH = path.resolve(INPUT_DIR, options.config || 'alita.config.js')
 let configObj = DEFAULTCONFIG
 
@@ -121,7 +119,8 @@ const {extCompPathMaps, extChildComp, allExtComp, extReactComp, jsxPropsMap} = g
 global.execArgs = {
     INPUT_DIR,
     OUT_DIR,
-    watchMode,
+    watchMode: !!options.watch,
+    tranComp: !!options.component,
     configObj,
     extCompPathMaps,
     extChildComp,
@@ -249,10 +248,6 @@ async function main() {
     // 生成微信package.json文件
     geneWXPackgejson(configObj)
 
-    process.on('beforeExit', (code) => {
-        exitStruc()
-    })
-
     const ignored = /node_modules|\.git|\.expo|android|ios|\.idea|__tests__|.ios\.js|.android\.js|\.web\.js|\.sh|\.iml|\.vs_code|alita\.config\.js|babel\.config\.js|metro\.config\.js|\.gitignore|app\.json|package\.json|package-lock\.json|\.eslintrc\.js|\.eslintrc\.json|\.eslintrc|yarn\.lock|\.test\.js|.watchmanconfig/
     filewatch(ignored)
 }

src/struc/index.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
- 
+
 import fse from 'fs-extra'
 import {getFileInfo, parseCode} from '../util/uast'
 import {isStaticRes, base64Encode} from '../util/util'
@@ -28,6 +28,9 @@ let entryFilePath = null
  * @returns {Promise<void>}
  */
 export default async function (srcpath, targetpath) {
+    //如果tranComp为true，表明只是单纯的转化组件，而不是整个项目
+    const tranComp = global.execArgs.tranComp
+
     const fsStat = await fse.stat(srcpath)
     if (fsStat.isDirectory()) {
         return []
@@ -41,10 +44,10 @@ export default async function (srcpath, targetpath) {
         if (isRNEntry) return []
 
         if (isEntry && isRF) { // 入口文件 保证入口文件一定最先处理
-            const entryResult  =  handleEntry(ast, targetpath)
+            const entryResult = handleEntry(ast, targetpath)
             entryFilePath = entryResult.filepath
             allCompSet = entryResult.allCompSet
-            for(let i = 0; i<RFFileList.length; i++ ) {
+            for (let i = 0; i < RFFileList.length; i++) {
                 const {ast, targetpath, srcpath, isFuncComp, isStatelessComp, done} = RFFileList[i]
                 try {
                     const allFilepaths = handleRF(ast, targetpath, isFuncComp, entryFilePath, isPageComp(targetpath, allCompSet), isStatelessComp)
@@ -55,13 +58,18 @@ export default async function (srcpath, targetpath) {
             }
             return [targetpath]
         } else if (isRF) {
-            if (entryFilePath) {
+            if (tranComp) {
+                try {
+                    return handleRF(ast, targetpath, isFuncComp, entryFilePath, false, isStatelessComp)
+                } catch (e) {
+                    console.log(colors.error(`tran ${srcpath} error ! reason: `), e)
+                }
+            } else if (entryFilePath) {
                 try {
                     return handleRF(ast, targetpath, isFuncComp, entryFilePath, isPageComp(targetpath, allCompSet), isStatelessComp)
                 } catch (e) {
                     console.log(colors.error(`tran ${srcpath} error ! reason: `), e)
                 }
-
             } else {
                 // 保证入口文件一定最先处理， 如果入口文件还未被处理，则把react文件先入队列
                 return new Promise((resolve) => {
@@ -92,26 +100,6 @@ export async function geneWXFileStruc(targetpath) {
     await fse.copy(mptempDir, targetpath)
 }
 
-/**
- * 程序退出之前的操作
- */
-export async function exitStruc() {
-    // 没有入口文件
-    if (!entryFilePath) {
-        for(let i = 0; i< RFFileList.length; i++ ) {
-            const {ast, targetpath, srcpath, isFuncComp, isStatelessComp} = RFFileList[i]
-            try {
-                handleRF(ast, targetpath, isFuncComp, entryFilePath, false, isStatelessComp)
-            } catch (e) {
-                console.log(colors.error(`tran ${srcpath} error ! reason: `), e)
-            }
-        }
-        // 以免再次触发 exitStruc
-        entryFilePath = "DONE"
-    }
-}
-
-
 function isPageComp(targetpath, allCompSet) {
     const originPath = targetpath
         .replace(global.execArgs.OUT_DIR + path.sep, '')