@tarojs/cli-convertor 3.6.20 → 3.6.21

package/dist/index.js

@@ -13,8 +13,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const template_1 = require("@babel/template");
 const traverse_1 = require("@babel/traverse");
 const t = require("@babel/types");
+const binding_1 = require("@tarojs/binding");
 const cli_1 = require("@tarojs/cli");
 const helper_1 = require("@tarojs/helper");
+const shared_1 = require("@tarojs/shared");
 const taroize = require("@tarojs/taroize");
 const transformer_wx_1 = require("@tarojs/transformer-wx");
 const path = require("path");
@@ -42,7 +44,7 @@ const babylonConfig = {
     ],
 };
 const OUTPUT_STYLE_EXTNAME = '.scss';
-const WX_GLOBAL_FN = new Set(['getApp', 'getCurrentPages', 'requirePlugin', 'Behavior']);
+const WX_GLOBAL_FN = new Set(['getApp', 'getCurrentPages', 'Behavior']);
 function processStyleImports(content, processFn) {
     // 获取css中的引用样式文件路径集合
     const imports = (0, util_1.getWxssImports)(content);
@@ -88,35 +90,178 @@ class Convertor {
         this.hadBeenBuiltComponents = new Set();
         this.hadBeenBuiltImports = new Set();
         this.reportErroMsg = [];
+        this.projectConfig = { pluginRoot: '', compileType: '' };
+        this.pluginInfo = {
+            pluginRoot: '',
+            pluginName: '',
+            pages: new Set(),
+            pagesMap: new Map(),
+            publicComponents: new Set(),
+            entryFilePath: '',
+        };
         this.init();
     }
     init() {
         console.log(helper_1.chalk.green('开始代码转换...'));
-        this.initConvert();
-        this.getConvertConfig();
-        this.getApp();
-        this.getPages();
-        this.getSitemapLocation();
-        this.getSubPackages();
+        try {
+            this.initConvert();
+            this.getApp();
+            this.getPages();
+            this.getSitemapLocation();
+            this.getSubPackages();
+        }
+        catch (error) {
+            throw new Error(`初始化失败 ${(0, util_1.getLineBreak)()} ${error.message}`);
+        }
     }
     initConvert() {
-        if (helper_1.fs.existsSync(this.convertRoot)) {
-            (0, helper_1.emptyDirectory)(this.convertRoot, { excludes: ['node_modules'] });
+        try {
+            // 清空taroConvert目录，保留taroConvert下node_modules目录
+            if (helper_1.fs.existsSync(this.convertRoot)) {
+                (0, helper_1.emptyDirectory)(this.convertRoot, { excludes: ['node_modules'] });
+            }
+            else {
+                helper_1.fs.ensureDirSync(this.convertRoot);
+            }
+            // 转换自定义配置文件，如：tsconfig.json
+            this.convertSelfDefinedConfig();
+            // 创建.convert目录，存放转换中间数据，如日志数据
+            (0, util_1.generateDir)(path.join(this.convertRoot, '.convert'));
+            global_1.globals.logFilePath = path.join(this.convertRoot, '.convert', 'convert.log');
+            // 读取convert.config.json配置文件
+            this.getConvertConfig();
+            // 读取project.config.json文件
+            this.parseProjectConfig();
+            // 解析插件的配置信息
+            if (this.projectConfig.compileType === "plugin" /* Constants.PLUGIN */) {
+                this.parsePluginConfig(this.pluginInfo);
+            }
         }
-        else {
-            helper_1.fs.ensureDirSync(this.convertRoot);
+        catch (error) {
+            throw new Error(`初始化convert失败 ${(0, util_1.getLineBreak)()} ${error.message}`);
         }
-        this.convertSelfDefinedConfig();
-        // 创建.convert目录，存放转换中间数据
-        (0, util_1.generateDir)(path.join(this.convertRoot, '.convert'));
-        global_1.globals.logFilePath = path.join(this.convertRoot, '.convert', 'convert.log');
     }
-    parseAst({ ast, sourceFilePath, outputFilePath, importStylePath, depComponents, imports = [] }) {
+    /**
+     * 遍历AST，为元素或方法可能为undefined的数据添加可选链操作符
+     * @param ast
+     */
+    convertToOptional(ast) {
+        // 需要添加可选链运算符的数据
+        const optionalData = new Set();
+        const thisData = new Set();
+        (0, traverse_1.default)(ast, {
+            ObjectProperty(astPath) {
+                // xxx({ data: {...} })，获取data属性中符合的数据
+                const node = astPath.node;
+                const key = node.key;
+                if (!t.isIdentifier(key) || key.name !== 'data') {
+                    return;
+                }
+                const value = node.value;
+                if (!t.isObjectExpression(value)) {
+                    return;
+                }
+                const properties = value.properties;
+                properties.forEach((property) => {
+                    if (!t.isObjectProperty(property)) {
+                        return;
+                    }
+                    const key = property.key;
+                    if (!t.isIdentifier(key)) {
+                        return;
+                    }
+                    const data = key.name;
+                    thisData.add(data);
+                    // 数据初始化为undefined、空字符串''、空数组[]，收集
+                    const assign = property.value;
+                    const isUndefined = t.isIdentifier(assign) && assign.name === 'undefined';
+                    const isEmptyString = t.isStringLiteral(assign) && assign.value === '';
+                    const isEmptyArray = t.isArrayExpression(assign) && assign.elements.length === 0;
+                    if (isUndefined || isEmptyString || isEmptyArray) {
+                        optionalData.add(data);
+                    }
+                });
+            },
+            CallExpression(astPath) {
+                // 用setData进行初始化的数据
+                const node = astPath.node;
+                const callee = node.callee;
+                if (!t.isMemberExpression(callee)) {
+                    return;
+                }
+                const property = callee.property;
+                if (!t.isIdentifier(property) || property.name !== 'setData') {
+                    return;
+                }
+                if (node.arguments.length === 0) {
+                    return;
+                }
+                const arg = node.arguments[0];
+                // 除去data中的数据，setData中其余全部的数据都收集
+                if (arg.type === 'ObjectExpression') {
+                    arg.properties.forEach((property) => {
+                        if (!t.isObjectProperty(property)) {
+                            return;
+                        }
+                        const key = property.key;
+                        if (!t.isIdentifier(key)) {
+                            return;
+                        }
+                        const data = key.name;
+                        if (thisData.has(data)) {
+                            return;
+                        }
+                        optionalData.add(data);
+                    });
+                }
+            },
+            ClassBody(astPath) {
+                astPath.traverse({
+                    MemberExpression(path) {
+                        var _a, _b, _c;
+                        // 遇到成员表达式，抽取表达式的来源数据
+                        const code = path.toString();
+                        const optionMatch = (_a = code.match(/^(.*?)\./)) === null || _a === void 0 ? void 0 : _a[1];
+                        let data;
+                        if (optionMatch) {
+                            const computedMatch = (_b = optionMatch.match(/^(.*?)\[/)) === null || _b === void 0 ? void 0 : _b[1];
+                            data = computedMatch || optionMatch;
+                        }
+                        else {
+                            const computedMatch = (_c = code.match(/^(.*?)\[/)) === null || _c === void 0 ? void 0 : _c[1];
+                            if (!computedMatch) {
+                                return;
+                            }
+                            data = computedMatch;
+                        }
+                        // 如果数据不需要添加可选链操作符，返回
+                        if (!optionalData.has(data)) {
+                            return;
+                        }
+                        // 利用正则表达式匹配，添加可选链操作符
+                        const parentPath = path.parentPath;
+                        if (parentPath.isCallExpression()) {
+                            path.replaceWithSourceString(code.replace(/\./g, '?.').replace(/\[/g, '?.['));
+                            const callee = parentPath.node.callee;
+                            const args = parentPath.node.arguments;
+                            parentPath.replaceWith(t.optionalCallExpression(callee, args, false));
+                        }
+                        else {
+                            path.replaceWithSourceString(code.replace(/\./g, '?.').replace(/\[/g, '?.['));
+                        }
+                    },
+                });
+            },
+        });
+    }
+    parseAst({ ast, sourceFilePath, outputFilePath, importStylePath, depComponents, imports = [], pluginComponents, }) {
         const scriptFiles = new Set();
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const self = this;
         // 转换后js页面的所有自定义标签
         const scriptComponents = [];
+        // js页面所有的导入模块
+        const scriptImports = [];
         let componentClassName;
         let needInsertImportTaro = false;
         let hasCacheOptionsRequired = false;
@@ -147,6 +292,7 @@ class Convertor {
                             }
                         },
                         ClassExpression(astPath) {
+                            (0, util_1.printToLogFile)(`package: taro-cli-convertor, 解析ClassExpression: ${astPath} ${(0, util_1.getLineBreak)()}`);
                             const node = astPath.node;
                             if (node.superClass) {
                                 let isTaroComponent = false;
@@ -202,13 +348,20 @@ class Convertor {
                             const node = astPath.node;
                             const source = node.source;
                             const value = source.value;
-                            (0, util_1.analyzeImportUrl)(self.root, sourceFilePath, scriptFiles, source, value, self.isTsProject);
+                            (0, util_1.analyzeImportUrl)(self.root, sourceFilePath, scriptFiles, source, value, self.isTsProject, self.pluginInfo.pluginName);
+                            // 获取导入语句中的所有导入名称（importName）并将其添加到scriptImports里面
+                            const specifiers = node.specifiers;
+                            specifiers.forEach((specifier) => {
+                                const importName = specifier.local.name;
+                                scriptImports.push(importName);
+                            });
                         },
                         CallExpression(astPath) {
-                            (0, util_1.printToLogFile)(`解析CallExpression: ${astPath} ${(0, util_1.getLineBreak)()}`);
+                            (0, util_1.printToLogFile)(`package: taro-cli-convertor, 解析CallExpression: ${astPath} ${(0, util_1.getLineBreak)()}`);
                             const node = astPath.node;
                             const calleePath = astPath.get('callee');
                             const callee = calleePath.node;
+                            const args = astPath.get('arguments');
                             if (callee.type === 'Identifier') {
                                 if (callee.name === 'require') {
                                     const args = node.arguments;
@@ -221,7 +374,7 @@ class Convertor {
                                         throw new Error(`require暂不支持动态导入, filePath: ${sourceFilePath}, context: ${astPath}`);
                                     }
                                     const value = args[0].value;
-                                    (0, util_1.analyzeImportUrl)(self.root, sourceFilePath, scriptFiles, args[0], value, self.isTsProject);
+                                    (0, util_1.analyzeImportUrl)(self.root, sourceFilePath, scriptFiles, args[0], value, self.isTsProject, self.pluginInfo.pluginName);
                                 }
                                 else if (WX_GLOBAL_FN.has(callee.name)) {
                                     calleePath.replaceWith(t.memberExpression(t.identifier('Taro'), callee));
@@ -244,6 +397,17 @@ class Convertor {
                                         hasCacheOptionsRequired = true;
                                     }
                                 }
+                                else if (callee.name === 'requirePlugin') {
+                                    if (args.length === 1 && args[0].isStringLiteral()) {
+                                        // 在小程序中调用plugin中模块，相对路径需要使用转换后的
+                                        const pluginEntryFilePathTrans = self.pluginInfo.entryFilePath.replace(self.pluginInfo.pluginRoot, path.join(self.convertDir, self.pluginInfo.pluginName));
+                                        const sourceFilePathTarns = self.getDistFilePath(sourceFilePath);
+                                        const newRequire = t.callExpression(t.identifier('require'), [
+                                            t.stringLiteral((0, helper_1.normalizePath)(path.relative(path.dirname(sourceFilePathTarns), pluginEntryFilePathTrans))),
+                                        ]);
+                                        astPath.replaceWith(newRequire);
+                                    }
+                                }
                             }
                         },
                         MemberExpression(astPath) {
@@ -270,6 +434,7 @@ class Convertor {
                             }
                         },
                         OptionalMemberExpression(astPath) {
+                            (0, util_1.printToLogFile)(`package: taro-cli-convertor, 解析OptionalMemberExpression: ${astPath} ${(0, util_1.getLineBreak)()}`);
                             const node = astPath.node;
                             const object = node.object;
                             const prettier = node.property;
@@ -295,6 +460,10 @@ class Convertor {
                             if (jsxName.isJSXIdentifier()) {
                                 const componentName = jsxName.node.name;
                                 if (!util_1.DEFAULT_Component_SET.has(componentName) && scriptComponents.indexOf(componentName) === -1) {
+                                    // 比较引入组件名和标签名是否同名，若同名，则在组件名上加入后缀Component
+                                    if (scriptImports.includes(componentName)) {
+                                        jsxName.node.name = `${componentName}Component`;
+                                    }
                                     scriptComponents.push(componentName);
                                 }
                                 if (/^\S(\S)*Tmpl$/.test(componentName)) {
@@ -451,23 +620,22 @@ class Convertor {
                         }
                         if (imports && imports.length) {
                             imports.forEach(({ name, ast, wxs }) => {
-                                const importName = wxs ? name : (0, helper_1.pascalCase)(name);
-                                if (componentClassName === importName) {
+                                if (componentClassName === name) {
                                     return;
                                 }
-                                const importPath = path.join(self.importsDir, importName + (wxs ? self.wxsIncrementId() : '') + (self.isTsProject ? '.ts' : '.js'));
+                                const importPath = path.join(self.importsDir, name + (wxs ? self.wxsIncrementId() : '') + (self.isTsProject ? '.ts' : '.js'));
                                 if (!self.hadBeenBuiltImports.has(importPath)) {
                                     self.hadBeenBuiltImports.add(importPath);
                                     self.writeFileToTaro(importPath, prettier.format((0, astConvert_1.generateMinimalEscapeCode)(ast), prettierJSConfig));
                                 }
-                                if (scriptComponents.indexOf(importName) !== -1 || (wxs && wxs === true)) {
-                                    lastImport.insertAfter((0, template_1.default)(`import ${importName} from '${(0, helper_1.promoteRelativePath)(path.relative(outputFilePath, importPath))}'`, babylonConfig)());
+                                if (scriptComponents.indexOf(name) !== -1 || (wxs && wxs === true)) {
+                                    lastImport.insertAfter((0, template_1.default)(`import ${name} from '${(0, helper_1.promoteRelativePath)(path.relative(outputFilePath, importPath))}'`, babylonConfig)());
                                 }
                             });
                         }
                         if (depComponents && depComponents.size) {
                             depComponents.forEach((componentObj) => {
-                                const name = (0, helper_1.pascalCase)(componentObj.name.toLowerCase());
+                                let name = (0, helper_1.pascalCase)(componentObj.name.toLowerCase());
                                 // 如果不是js页面用到的组件，无需导入
                                 if (scriptComponents.indexOf(name) === -1) {
                                     return;
@@ -475,17 +643,40 @@ class Convertor {
                                 // 如果用到了，从scriptComponents中移除
                                 const index = scriptComponents.indexOf(name);
                                 scriptComponents.splice(index, 1);
+                                // 同名的自定义组件名称加后缀区分后，其组件标签也要加上Component保持统一
+                                if (scriptImports.includes(name)) {
+                                    name = `${name}Component`;
+                                }
                                 let componentPath = componentObj.path;
-                                if (componentPath.indexOf(self.root) !== -1) {
-                                    componentPath = path.relative(sourceFilePath, componentPath);
+                                if (!componentPath.startsWith(self.root) && !componentPath.startsWith(self.pluginInfo.pluginRoot)) {
+                                    console.error(`exception: 无效的组件路径，componentPath: ${componentPath}, 请在${outputFilePath}中手动引入`);
+                                    return;
                                 }
+                                componentPath = path.relative(sourceFilePath, componentPath);
                                 lastImport.insertAfter((0, template_1.default)(`import ${name} from '${(0, helper_1.promoteRelativePath)(componentPath)}'`, babylonConfig)());
                             });
                         }
+                        // 页面中引用的插件组件增加引用信息
+                        if (pluginComponents && pluginComponents.size) {
+                            pluginComponents.forEach((pluginComponent) => {
+                                const componentName = (0, helper_1.pascalCase)(pluginComponent.name.toLowerCase());
+                                const componentPath = pluginComponent.path;
+                                if (!componentPath.startsWith(self.pluginInfo.pluginRoot)) {
+                                    console.error(`exception: 在页面${sourceFilePath}引用了无效的插件组件路径${componentPath}, 请在${outputFilePath}中手动引入`);
+                                    return;
+                                }
+                                // 插件组件转换后的绝对路径
+                                const conponentTransPath = componentPath.replace(self.pluginInfo.pluginRoot, path.join(self.convertDir, self.pluginInfo.pluginName));
+                                // 由于插件转换后路径的变化，此处需根据转换后的路径获取相对路径
+                                const componentRelPath = path.relative(self.getDistFilePath(sourceFilePath), conponentTransPath);
+                                lastImport.insertAfter((0, template_1.default)(`import ${componentName} from '${(0, helper_1.promoteRelativePath)(componentRelPath)}'`, babylonConfig)());
+                            });
+                        }
                     }
                 },
             },
         });
+        this.convertToOptional(ast);
         // 遍历 ast ,将多次 const { xxx } = require('@tarojs/with-weapp')  引入压缩为一次引入
         (0, traverse_1.default)(ast, {
             VariableDeclaration(astPath) {
@@ -590,21 +781,36 @@ class Convertor {
             }
         }
     }
-    getApp() {
-        try {
-            const projectConfigPath = path.join(this.root, `project.config${this.fileTypes.CONFIG}`); // project.config.json 文件路径
-            // 解析 project.config.json 文件，获取 miniprogramRoot 字段的值
-            const projectConfig = JSON.parse(helper_1.fs.readFileSync(projectConfigPath, 'utf8'));
-            this.miniprogramRoot = projectConfig.miniprogramRoot;
-        }
-        catch (err) {
-            console.error('读取 project.config.json 文件失败:', err);
-            process.exit(1);
-        }
-        // 如果找到 miniprogramRoot字段，则以对应目录作为小程序逻辑目录
-        if (this.miniprogramRoot) {
-            this.root = path.resolve(this.miniprogramRoot);
+    /**
+     * 解析project.config.json配置文件
+     *
+     */
+    parseProjectConfig() {
+        // 处理project.config.json，并存储到projectConfig中
+        const projectConfigFilePath = path.join(this.root, `project.config${this.fileTypes.CONFIG}`);
+        if (helper_1.fs.existsSync(projectConfigFilePath)) {
+            try {
+                const projectConfigJson = JSON.parse(String(helper_1.fs.readFileSync(projectConfigFilePath, 'utf8')));
+                if (projectConfigJson && projectConfigJson.compileType === "plugin" /* Constants.PLUGIN */) {
+                    const pluginRoot = projectConfigJson.pluginRoot;
+                    if (pluginRoot === '' || (0, shared_1.isNull)(pluginRoot) || (0, shared_1.isUndefined)(pluginRoot)) {
+                        console.log('project.config,json中pluginRoot为空或未配置，请确认配置是否正确');
+                        process.exit(1);
+                    }
+                    this.projectConfig = Object.assign({}, projectConfigJson);
+                    this.pluginInfo.pluginRoot = path.join(this.root, projectConfigJson.pluginRoot.replace(/\/+$/, ''));
+                }
+                // 解析miniprogramRoot字段，如果存在则更新小程序root
+                if (projectConfigJson.miniprogramRoot) {
+                    this.root = path.join(this.root, projectConfigJson.miniprogramRoot.replace(/\/+$/, ''));
+                }
+            }
+            catch (err) {
+                throw new Error(`project.config${this.fileTypes.CONFIG} 解析失败，请检查！`);
+            }
         }
+    }
+    getApp() {
         if (this.isTsProject) {
             this.entryJSPath = path.join(this.miniprogramRoot, `app${this.fileTypes.SCRIPT}`);
             this.entryJSONPath = path.join(this.miniprogramRoot, `app${this.fileTypes.CONFIG}`);
@@ -615,12 +821,6 @@ class Convertor {
             this.entryJSONPath = path.join(this.root, `app${this.fileTypes.CONFIG}`);
             this.entryStylePath = path.join(this.root, `app${this.fileTypes.STYLE}`);
         }
-        // 如果在 miniprogramRoot 目录下找到 app.json 文件，则将入口文件和配置文件路径修改为对应的路径
-        if (this.miniprogramRoot && helper_1.fs.existsSync(path.join(this.root, `app${this.fileTypes.CONFIG}`))) {
-            this.entryJSPath = path.join(this.root, `app${this.fileTypes.SCRIPT}`);
-            this.entryJSONPath = path.join(this.root, `app${this.fileTypes.CONFIG}`);
-            this.entryStylePath = path.join(this.root, `app${this.fileTypes.STYLE}`);
-        }
         try {
             this.entryJSON = JSON.parse(String(helper_1.fs.readFileSync(this.entryJSONPath)));
             const using = this.entryJSON.usingComponents;
@@ -637,6 +837,10 @@ class Convertor {
                 this.entryUsingComponents = using;
                 delete this.entryJSON.usingComponents;
             }
+            // 当小程序中包含plugin时，从app.json中解析pluginName，当前只支持一个plugin
+            if (this.projectConfig && this.projectConfig.compileType === "plugin" /* Constants.PLUGIN */) {
+                this.parsePluginName(this.entryJSON);
+            }
             (0, helper_1.printLog)("convert" /* processTypeEnum.CONVERT */, '入口文件', this.generateShowPath(this.entryJSPath));
             (0, helper_1.printLog)("convert" /* processTypeEnum.CONVERT */, '入口配置', this.generateShowPath(this.entryJSONPath));
             if (helper_1.fs.existsSync(this.entryStylePath)) {
@@ -650,6 +854,21 @@ class Convertor {
             process.exit(1);
         }
     }
+    /**
+     * 从app.json中解析pluginName，当前只支持一个plugin
+     *
+     * @param app.json
+     */
+    parsePluginName(entryJSON) {
+        const plugins = entryJSON.plugins;
+        if (plugins && Object.keys(plugins).length) {
+            this.pluginInfo.pluginName = Object.keys(plugins)[0];
+        }
+        else {
+            console.log('当前应用没有注册插件，请检查app.json中的plugins字段是否配置正确');
+            process.exit(1);
+        }
+    }
     getPages() {
         const pages = this.entryJSON.pages;
         if (!pages || !pages.length) {
@@ -708,7 +927,7 @@ class Convertor {
                 }
                 try {
                     const code = helper_1.fs.readFileSync(file).toString();
-                    let outputFilePath = file.replace(this.isTsProject ? this.miniprogramRoot : this.root, this.convertDir);
+                    let outputFilePath = this.getDistFilePath(file);
                     const extname = path.extname(outputFilePath);
                     if (/\.wxs/.test(extname)) {
                         outputFilePath += '.js';
@@ -718,6 +937,7 @@ class Convertor {
                         sourcePath: file,
                         isNormal: true,
                         isTyped: helper_1.REG_TYPESCRIPT.test(file),
+                        logFilePath: global_1.globals.logFilePath,
                     });
                     const { ast, scriptFiles } = this.parseAst({
                         ast: transformResult.ast,
@@ -747,12 +967,22 @@ class Convertor {
         else
             return component + '/index' + extname;
     }
+    /**
+     * 根据源文件路径获取转换后文件路径
+     *
+     * @param { string } src 源文件路径
+     * @param { 文件后缀 } extname
+     * @returns { string } 转换后文件路径
+     */
     getDistFilePath(src, extname) {
-        if (!extname)
-            return src.replace(this.isTsProject ? this.miniprogramRoot : this.root, this.convertDir);
-        return src
-            .replace(this.isTsProject ? this.miniprogramRoot : this.root, this.convertDir)
-            .replace(path.extname(src), extname);
+        let filePath;
+        if (this.isTraversePlugin) {
+            filePath = src.replace(this.pluginInfo.pluginRoot, path.join(this.convertDir, this.pluginInfo.pluginName));
+        }
+        else {
+            filePath = src.replace(this.root, this.convertDir);
+        }
+        return extname ? filePath.replace(path.extname(src), extname) : filePath;
     }
     getConfigFilePath(src) {
         const { dir, name } = path.parse(src);
@@ -769,7 +999,7 @@ class Convertor {
     formatFile(jsCode, template = '') {
         let code = jsCode;
         const config = Object.assign({}, prettierJSConfig);
-        if (this.framework === 'vue') {
+        if (this.framework === "Vue" /* FrameworkType.Vue */) {
             code = `
 ${template}
 <script>
@@ -785,7 +1015,7 @@ ${code}
     generateEntry() {
         try {
             const entryJS = String(helper_1.fs.readFileSync(this.entryJSPath));
-            const entryJSON = JSON.stringify(this.entryJSON);
+            let entryJSON = JSON.stringify(this.entryJSON);
             const entryDistJSPath = this.getDistFilePath(this.entryJSPath);
             const taroizeResult = taroize({
                 json: entryJSON,
@@ -806,6 +1036,10 @@ ${code}
                     : null,
                 isApp: true,
             });
+            // 将插件信息转换为子包信息添加到入口配置文件中
+            if (this.projectConfig.compileType === "plugin" /* Constants.PLUGIN */) {
+                entryJSON = this.addSubpackages(this.entryJSON);
+            }
             const jsCode = (0, astConvert_1.generateMinimalEscapeCode)(ast);
             this.writeFileToTaro(entryDistJSPath, jsCode);
             this.writeFileToConfig(entryDistJSPath, entryJSON);
@@ -823,6 +1057,33 @@ ${code}
             console.log(err);
         }
     }
+    /**
+     * 将plugin信息转换为subpackage并添加到入口配置文件中
+     *
+     * @param entryJSON
+     * @returns
+     */
+    addSubpackages(entryJSON) {
+        // 删除plugins字段
+        if (entryJSON && entryJSON.plugins) {
+            delete entryJSON.plugins;
+        }
+        const subPackageInfo = {
+            root: `${this.pluginInfo.pluginName}/`,
+            pages: [...this.pluginInfo.pages],
+        };
+        // 子包的字段可以为subpackages 或 subPackages
+        if (entryJSON.subpackages) {
+            entryJSON.subpackages.push(subPackageInfo);
+        }
+        else if (entryJSON.subPackages) {
+            entryJSON.subPackages.push(subPackageInfo);
+        }
+        else {
+            entryJSON.subPackages = [subPackageInfo];
+        }
+        return JSON.stringify(entryJSON);
+    }
     generateTabBarIcon(tabBar) {
         const { list = [] } = tabBar;
         const icons = new Set();
@@ -855,7 +1116,7 @@ ${code}
         }
     }
     getComponentDest(file) {
-        if (this.framework === 'react') {
+        if (this.framework === "React" /* FrameworkType.React */) {
             return file;
         }
         return path.join(path.dirname(file), path.basename(file, path.extname(file)) + '.vue');
@@ -895,15 +1156,15 @@ ${code}
         }
         return true;
     }
-    traversePages() {
-        this.pages.forEach((page) => {
+    traversePages(root, pages) {
+        pages.forEach((page) => {
             var _a;
             (0, util_1.printToLogFile)(`开始转换页面 ${page} ${(0, util_1.getLineBreak)()}`);
-            const pagePath = this.isTsProject ? path.join(this.miniprogramRoot, page) : path.join(this.root, page);
+            const pagePath = this.isTsProject ? path.join(this.miniprogramRoot, page) : path.join(root, page);
             // 处理不转换的页面，可在convert.config.json中external字段配置
             const matchUnconvertDir = (0, util_1.getMatchUnconvertDir)(pagePath, (_a = this.convertConfig) === null || _a === void 0 ? void 0 : _a.external);
             if (matchUnconvertDir !== null) {
-                (0, util_1.handleUnconvertDir)(matchUnconvertDir, this.root, this.convertDir);
+                (0, util_1.handleUnconvertDir)(matchUnconvertDir, root, this.convertDir);
                 return;
             }
             const pageJSPath = pagePath + this.fileTypes.SCRIPT;
@@ -912,7 +1173,6 @@ ${code}
             const pageStylePath = pagePath + this.fileTypes.STYLE;
             const pageTemplPath = pagePath + this.fileTypes.TEMPL;
             try {
-                const depComponents = new Set();
                 if (!helper_1.fs.existsSync(pageJSPath)) {
                     throw new Error(`页面 ${page} 没有 JS 文件！`);
                 }
@@ -927,8 +1187,11 @@ ${code}
                 else if (this.entryUsingComponents) {
                     pageConfig = {};
                 }
+                const depComponents = new Set();
+                const pluginComponents = new Set();
                 if (pageConfig) {
-                    if (this.entryUsingComponents) {
+                    // app.json中注册的组件为公共组件
+                    if (this.entryUsingComponents && !this.isTraversePlugin) {
                         pageConfig.usingComponents = Object.assign(Object.assign({}, pageConfig.usingComponents), this.entryUsingComponents);
                     }
                     const pageUsingComponents = pageConfig.usingComponents;
@@ -938,22 +1201,26 @@ ${code}
                         Object.keys(pageUsingComponents).forEach((component) => {
                             var _a;
                             const unResolveComponentPath = pageUsingComponents[component];
+                            let componentPath;
                             if (unResolveComponentPath.startsWith('plugin://')) {
-                                usingComponents[component] = unResolveComponentPath;
+                                componentPath = (0, util_1.replacePluginComponentUrl)(unResolveComponentPath, this.pluginInfo);
+                                pluginComponents.add({
+                                    name: component,
+                                    path: componentPath,
+                                });
                             }
                             else if (this.isThirdPartyLib(unResolveComponentPath, path.resolve(pagePath, '..'))) {
-                                (0, util_1.handleThirdPartyLib)(unResolveComponentPath, (_a = this.convertConfig) === null || _a === void 0 ? void 0 : _a.nodePath, this.root, this.convertRoot);
+                                (0, util_1.handleThirdPartyLib)(unResolveComponentPath, (_a = this.convertConfig) === null || _a === void 0 ? void 0 : _a.nodePath, root, this.convertRoot);
                             }
                             else {
-                                let componentPath;
-                                if (unResolveComponentPath.startsWith(this.root)) {
+                                if (unResolveComponentPath.startsWith(root)) {
                                     componentPath = unResolveComponentPath;
                                 }
                                 else {
-                                    componentPath = path.resolve(pageConfigPath, '..', pageUsingComponents[component]);
+                                    componentPath = path.join(pageConfigPath, '..', pageUsingComponents[component]);
                                     // 支持将组件库放在工程根目录下
                                     if (!helper_1.fs.existsSync((0, helper_1.resolveScriptPath)(componentPath))) {
-                                        componentPath = path.join(this.root, pageUsingComponents[component]);
+                                        componentPath = path.join(root, pageUsingComponents[component]);
                                     }
                                 }
                                 depComponents.add({
@@ -983,7 +1250,8 @@ ${code}
                     pageStyle = String(helper_1.fs.readFileSync(pageStylePath));
                 }
                 param.path = path.dirname(pageJSPath);
-                param.rootPath = this.root;
+                param.rootPath = root;
+                param.pluginInfo = this.pluginInfo;
                 param.logFilePath = global_1.globals.logFilePath;
                 const taroizeResult = taroize(Object.assign(Object.assign({}, param), { framework: this.framework }));
                 const { ast, scriptFiles } = this.parseAst({
@@ -991,8 +1259,9 @@ ${code}
                     sourceFilePath: pageJSPath,
                     outputFilePath: pageDistJSPath,
                     importStylePath: pageStyle ? pageStylePath.replace(path.extname(pageStylePath), OUTPUT_STYLE_EXTNAME) : null,
-                    depComponents,
+                    depComponents: depComponents,
                     imports: taroizeResult.imports,
+                    pluginComponents: pluginComponents,
                 });
                 const jsCode = (0, astConvert_1.generateMinimalEscapeCode)(ast);
                 this.writeFileToTaro(this.getComponentDest(pageDistJSPath), this.formatFile(jsCode, taroizeResult.template));
@@ -1008,7 +1277,7 @@ ${code}
             catch (err) {
                 (0, helper_1.printLog)("error" /* processTypeEnum.ERROR */, '页面转换', this.generateShowPath(pageJSPath));
                 console.log(err);
-                (0, util_1.printToLogFile)(`转换页面异常 ${err.stack} ${(0, util_1.getLineBreak)()}`);
+                (0, util_1.printToLogFile)(`package: taro-cli-convertor, 转换页面异常 ${err.stack} ${(0, util_1.getLineBreak)()}`);
             }
         });
     }
@@ -1017,6 +1286,7 @@ ${code}
             return;
         }
         components.forEach((componentObj) => {
+            (0, util_1.printToLogFile)(`package: taro-cli-convertor, 开始转换组件 ${componentObj.path} ${(0, util_1.getLineBreak)()}`);
             const component = componentObj.path;
             if (this.hadBeenBuiltComponents.has(component))
                 return;
@@ -1093,6 +1363,7 @@ ${code}
             catch (err) {
                 (0, helper_1.printLog)("error" /* processTypeEnum.ERROR */, '组件转换', this.generateShowPath(componentJSPath));
                 console.log(err);
+                (0, util_1.printToLogFile)(`package: taro-cli-convertor, 转换组件异常 ${err.stack} ${(0, util_1.getLineBreak)()}`);
             }
         });
     }
@@ -1133,6 +1404,7 @@ ${code}
     }
     traverseStyle(filePath, style) {
         return __awaiter(this, void 0, void 0, function* () {
+            (0, util_1.printToLogFile)(`package: taro-cli-convertor, 开始转换样式 ${filePath} ${(0, util_1.getLineBreak)()}`);
             const { imports, content } = processStyleImports(style, (str, stylePath) => {
                 let relativePath = stylePath;
                 if (path.isAbsolute(relativePath)) {
@@ -1158,71 +1430,109 @@ ${code}
             }
         });
     }
+    /**
+     * 转换插件
+     */
+    traversePlugin() {
+        if (this.projectConfig.compileType !== "plugin" /* Constants.PLUGIN */) {
+            return;
+        }
+        this.isTraversePlugin = true;
+        // 转换插件plugin.json中导出的页面
+        this.traversePages(this.pluginInfo.pluginRoot, this.pluginInfo.pages);
+        // 转换插件plugin.json中导出的组件
+        this.traverseComponents(this.pluginInfo.publicComponents);
+        // 转换插件的工具文件
+        this.generateScriptFiles(new Set([this.pluginInfo.entryFilePath]));
+    }
+    /**
+     * 解析插件配置信息
+     *
+     * @param pluginInfo
+     */
+    parsePluginConfig(pluginInfo) {
+        // 处理plugin.json，并存储到pluginInfo中
+        const pluginConfigPath = path.join(pluginInfo.pluginRoot, "plugin.json" /* Constants.PLUGIN_JSON */);
+        if (helper_1.fs.existsSync(pluginConfigPath)) {
+            try {
+                const pluginConfigJson = JSON.parse(String(helper_1.fs.readFileSync(pluginConfigPath)));
+                if (!pluginConfigJson) {
+                    console.log('插件配置信息为空，请检查！');
+                    return;
+                }
+                // 解析publicComponents信息
+                const publicComponents = pluginConfigJson.publicComponents;
+                if (publicComponents && Object.keys(publicComponents).length) {
+                    for (const key in publicComponents) {
+                        pluginInfo.publicComponents.add({
+                            name: key,
+                            path: path.join(pluginInfo.pluginRoot, publicComponents[key]),
+                        });
+                    }
+                }
+                // 解析pages信息
+                const pages = pluginConfigJson.pages;
+                if (pages && Object.keys(pages).length) {
+                    for (const pageName in pages) {
+                        const pagePath = pages[pageName];
+                        pluginInfo.pages.add(pagePath);
+                        pluginInfo.pagesMap.set(pageName, pagePath);
+                    }
+                }
+                // 解析入口文件信息
+                const entryFilePath = pluginConfigJson.main;
+                if (entryFilePath) {
+                    pluginInfo.entryFilePath = path.join(pluginInfo.pluginRoot, entryFilePath);
+                }
+            }
+            catch (err) {
+                console.log('解析plugin.json失败，请检查！');
+                process.exit(1);
+            }
+        }
+    }
     generateConfigFiles() {
-        const creator = new cli_1.Creator();
+        const creator = new binding_1.Creator((0, cli_1.getRootPath)(), this.convertRoot);
+        const dateObj = new Date();
+        const date = `${dateObj.getFullYear()}-${dateObj.getMonth() + 1}-${dateObj.getDate()}`;
         const templateName = 'default';
-        const configDir = path.join(this.convertRoot, 'config');
-        const pkgPath = path.join(this.convertRoot, 'package.json');
         const projectName = 'taroConvert';
-        const description = '';
         const version = (0, util_1.getPkgVersion)();
-        const dateObj = new Date();
-        const date = `${dateObj.getFullYear()}-${dateObj.getMonth() + 1}-${dateObj.getDate()}`;
-        creator.template(templateName, 'package.json.tmpl', pkgPath, {
+        const description = '';
+        const ps = [];
+        const createOpts = {
+            css: "Sass" /* CSSType.Sass */,
+            cssExt: '.scss',
+            framework: this.framework,
             description,
             projectName,
             version,
-            css: 'sass',
-            typescript: false,
-            template: templateName,
-            framework: this.framework,
-            compiler: 'webpack5',
-        });
-        creator.template(templateName, path.join('config', 'index.js'), path.join(configDir, 'index.js'), {
             date,
-            projectName,
-            framework: this.framework,
-            compiler: 'webpack5',
-            typescript: false,
-        });
-        creator.template(templateName, path.join('config', 'dev.js'), path.join(configDir, 'dev.js'), {
-            framework: this.framework,
-            compiler: 'webpack5',
-            typescript: false,
-        });
-        creator.template(templateName, path.join('config', 'prod.js'), path.join(configDir, 'prod.js'), {
-            framework: this.framework,
-            typescript: false,
-        });
-        creator.template(templateName, 'project.config.json', path.join(this.convertRoot, 'project.config.json'), {
-            description,
-            projectName,
-            framework: this.framework,
-        });
-        creator.template(templateName, '.gitignore', path.join(this.convertRoot, '.gitignore'));
-        creator.template(templateName, '.editorconfig', path.join(this.convertRoot, '.editorconfig'));
-        creator.template(templateName, '.eslintrc.js', path.join(this.convertRoot, '.eslintrc.js'), {
             typescript: false,
-            framework: this.framework,
-        });
-        creator.template(templateName, 'babel.config.js', path.join(this.convertRoot, 'babel.config.js'), {
-            typescript: false,
-            framework: this.framework,
-        });
-        creator.template(templateName, path.join('src', 'index.html'), path.join(this.convertDir, 'index.html'), {
-            projectName,
-        });
-        creator.fs.commit(() => {
-            const pkgObj = JSON.parse(helper_1.fs.readFileSync(pkgPath).toString());
+            template: templateName,
+            compiler: "Webpack5" /* CompilerType.Webpack5 */,
+        };
+        ps.push(creator.createFileFromTemplate(templateName, 'package.json.tmpl', 'package.json', createOpts));
+        ps.push(creator.createFileFromTemplate(templateName, 'config/index.js', 'config/index.js', createOpts));
+        ps.push(creator.createFileFromTemplate(templateName, 'config/dev.js', 'config/dev.js', createOpts));
+        ps.push(creator.createFileFromTemplate(templateName, 'config/prod.js', 'config/prod.js', createOpts));
+        ps.push(creator.createFileFromTemplate(templateName, 'project.config.json', 'project.config.json', createOpts));
+        ps.push(creator.createFileFromTemplate(templateName, '.gitignore', '.gitignore', createOpts));
+        ps.push(creator.createFileFromTemplate(templateName, '.editorconfig', '.editorconfig', createOpts));
+        ps.push(creator.createFileFromTemplate(templateName, '.eslintrc.js', '.eslintrc.js', createOpts));
+        ps.push(creator.createFileFromTemplate(templateName, 'babel.config.js', 'babel.config.js', createOpts));
+        ps.push(creator.createFileFromTemplate(templateName, 'src/index.html', 'src/index.html', createOpts));
+        Promise.all(ps).then(() => {
+            const pkgObj = JSON.parse(helper_1.fs.readFileSync(path.join(this.convertRoot, 'package.json')).toString());
             pkgObj.dependencies['@tarojs/with-weapp'] = `^${version}`;
-            helper_1.fs.writeJSONSync(pkgPath, pkgObj, {
+            helper_1.fs.writeJSONSync(path.join(this.convertRoot, 'package.json'), pkgObj, {
                 spaces: 2,
-                EOL: '\n',
+                EOL: '\n'
             });
-            (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(configDir, 'index.js')));
-            (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(configDir, 'dev.js')));
-            (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(configDir, 'prod.js')));
-            (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(pkgPath));
+            (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(this.convertRoot, 'package.json')));
+            (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(this.convertRoot, 'config/index.js')));
+            (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(this.convertRoot, 'config/dev.js')));
+            (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(this.convertRoot, 'config/prod')));
             (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(this.convertRoot, 'project.config.json')));
             (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(this.convertRoot, '.gitignore')));
             (0, helper_1.printLog)("generate" /* processTypeEnum.GENERATE */, '文件', this.generateShowPath(path.join(this.convertRoot, '.editorconfig')));
@@ -1247,9 +1557,10 @@ ${code}
         console.log(`转换报告已生成，请在浏览器中打开 ${path.join(this.convertRoot, 'report', 'report.html')} 查看转换报告`);
     }
     run() {
-        this.framework = 'react';
+        this.framework = "React" /* FrameworkType.React */;
         this.generateEntry();
-        this.traversePages();
+        this.traversePages(this.root, this.pages);
+        this.traversePlugin();
         this.generateConfigFiles();
         this.generateReport();
     }