@appthen/cli 1.2.1 → 1.2.2

package/dist/index.js

@@ -329,49 +329,127 @@ var svgToBase64 = function (svgString) {
 var alphabet = '0123456789abcdefghijklmnopqrstuvwxyz';
 var nanoid = customAlphabet(alphabet, 6);
 /**
- * 清理文件名，移除无效字符
+ * 文件名管理器，确保全局唯一性
+ */
+var FileNameManager = /** @class */ (function () {
+    function FileNameManager() {
+        this.usedNames = new Set();
+        this.usedIdentifiers = new Set();
+        this.nameCounters = new Map();
+        this.identifierCounters = new Map();
+    }
+    /**
+     * 生成唯一的文件名
+     * @param baseName 基础文件名
+     * @param extension 文件扩展名（包含点号，如 '.png'）
+     * @returns 唯一的文件名
+     */
+    FileNameManager.prototype.generateUniqueFileName = function (baseName, extension) {
+        var cleanBaseName = this.sanitizeFileName(baseName);
+        var finalName = "".concat(cleanBaseName).concat(extension);
+        // 如果名称已存在，使用计数器生成唯一名称
+        if (this.usedNames.has(finalName.toLowerCase())) {
+            var counter = (this.nameCounters.get(cleanBaseName) || 0) + 1;
+            this.nameCounters.set(cleanBaseName, counter);
+            finalName = "".concat(cleanBaseName, "_").concat(counter).concat(extension);
+            // 如果计数器名称仍然存在，使用 nanoid 确保唯一性
+            while (this.usedNames.has(finalName.toLowerCase())) {
+                finalName = "".concat(cleanBaseName, "_").concat(counter, "_").concat(nanoid(4)).concat(extension);
+            }
+        }
+        this.usedNames.add(finalName.toLowerCase());
+        return finalName;
+    };
+    /**
+     * 生成唯一的 JavaScript 标识符名称
+     * @param baseName 基础标识符名
+     * @returns 唯一的标识符名称
+     */
+    FileNameManager.prototype.generateUniqueIdentifier = function (baseName) {
+        var cleanBaseName = this.sanitizeIdentifier(baseName);
+        var finalName = cleanBaseName;
+        // 如果标识符已存在，使用计数器生成唯一名称
+        if (this.usedIdentifiers.has(finalName.toLowerCase())) {
+            var counter = (this.identifierCounters.get(cleanBaseName) || 0) + 1;
+            this.identifierCounters.set(cleanBaseName, counter);
+            finalName = "".concat(cleanBaseName, "_").concat(counter);
+            // 如果计数器名称仍然存在，使用 nanoid 确保唯一性
+            while (this.usedIdentifiers.has(finalName.toLowerCase())) {
+                finalName = "".concat(cleanBaseName, "_").concat(counter, "_").concat(nanoid(4));
+            }
+        }
+        this.usedIdentifiers.add(finalName.toLowerCase());
+        return finalName;
+    };
+    /**
+     * 清理文件名，移除无效字符
+     * @param rawName 原始文件名
+     * @returns 清理后的文件名
+     */
+    FileNameManager.prototype.sanitizeFileName = function (rawName) {
+        if (!rawName)
+            return "file_".concat(nanoid(6));
+        var cleaned = rawName
+            // 移除或替换无效的文件名字符
+            .replace(/[<>:"/\\|?*]/g, '') // 移除文件系统不允许的字符
+            .replace(/\s+/g, '_') // 空格替换为下划线
+            .replace(/[^\w\-_.]/g, '') // 只保留字母、数字、下划线、连字符和点
+            .replace(/_{2,}/g, '_') // 多个连续下划线替换为单个
+            .replace(/^[_-]+|[_-]+$/g, '') // 移除开头和结尾的下划线和连字符
+            .substring(0, 30); // 限制长度
+        return cleaned || "file_".concat(nanoid(6));
+    };
+    /**
+     * 清理JavaScript标识符，确保符合变量命名规范
+     * @param rawName 原始标识符名
+     * @returns 清理后的标识符名
+     */
+    FileNameManager.prototype.sanitizeIdentifier = function (rawName) {
+        if (!rawName)
+            return "id_".concat(nanoid(6));
+        var cleaned = rawName
+            // 移除或替换无效的标识符字符
+            .replace(/[^\w]/g, '_') // 只保留字母、数字、下划线
+            .replace(/_{2,}/g, '_') // 多个连续下划线替换为单个
+            .replace(/^[_\d]+|[_]+$/g, '') // 移除开头的数字和下划线，结尾的下划线
+            .substring(0, 30); // 限制长度
+        return cleaned || "id_".concat(nanoid(6));
+    };
+    /**
+     * 重置管理器状态
+     */
+    FileNameManager.prototype.reset = function () {
+        this.usedNames.clear();
+        this.usedIdentifiers.clear();
+        this.nameCounters.clear();
+        this.identifierCounters.clear();
+    };
+    return FileNameManager;
+}());
+// 全局文件名管理器实例
+var fileNameManager = new FileNameManager();
+/**
+ * 清理文件名，移除无效字符（保持向后兼容）
  * @param rawName 原始文件名
  * @returns 清理后的文件名
  */
 function sanitizeFileName(rawName) {
-    if (!rawName)
-        return '';
-    return rawName
-        // 移除或替换无效的文件名字符
-        .replace(/[<>:"/\\|?*]/g, '') // 移除文件系统不允许的字符
-        .replace(/\s+/g, '_') // 空格替换为下划线
-        .replace(/[^\w\-_.]/g, '') // 只保留字母、数字、下划线、连字符和点
-        .replace(/_{2,}/g, '_') // 多个连续下划线替换为单个
-        .replace(/^[_-]+|[_-]+$/g, '') // 移除开头和结尾的下划线和连字符
-        .substring(0, 50) // 限制长度
-        || "fallback_".concat(nanoid(6)); // 如果清理后为空，使用fallback名称
-}
-/**
- * 清理JavaScript标识符，确保符合变量命名规范
- * @param rawName 原始标识符名
- * @returns 清理后的标识符名
- */
-function sanitizeIdentifier(rawName) {
-    if (!rawName)
-        return "id_".concat(nanoid(6));
-    return rawName
-        // 移除或替换无效的标识符字符
-        .replace(/[^\w]/g, '_') // 只保留字母、数字、下划线
-        .replace(/_{2,}/g, '_') // 多个连续下划线替换为单个
-        .replace(/^[_\d]+|[_]+$/g, '') // 移除开头的数字和下划线，结尾的下划线
-        .substring(0, 30) // 限制长度
-        || "id_".concat(nanoid(6)); // 如果清理后为空，使用fallback名称
+    return fileNameManager['sanitizeFileName'](rawName);
 }
 var transformJsx = function (file, solution, outputPath) {
     // const componentsDeps: string[] = [];
     var images = [];
     var svgs = [];
+    // 重置文件名管理器，确保每次转换都从干净状态开始
+    fileNameManager.reset();
     // 全局数据相关状态追踪
     var hasGlobalDataDecorator = false;
     var usesGlobalData = false;
     var classDeclarationPath = null;
     // 简单判断组件还是页面
-    var componentType = file.path.includes('/src/components/') ? 'Component' : 'Page';
+    var componentType = file.path.includes('/src/components/')
+        ? 'Component'
+        : 'Page';
     var source = fs__namespace.readFileSync(file.path + '/' + file.fileName, 'utf-8');
     // 检测源码中是否使用了 this.globalData
     if (source.includes('this.globalData')) {
@@ -401,7 +479,8 @@ var transformJsx = function (file, solution, outputPath) {
             var decorators = path.node.decorators;
             if (decorators) {
                 var hasGlobalDataDec = decorators.some(function (decorator) {
-                    if (t__namespace.isDecorator(decorator) && t__namespace.isIdentifier(decorator.expression)) {
+                    if (t__namespace.isDecorator(decorator) &&
+                        t__namespace.isIdentifier(decorator.expression)) {
                         return decorator.expression.name === 'GlobalDataDecorator';
                     }
                     return false;
@@ -462,12 +541,18 @@ var transformJsx = function (file, solution, outputPath) {
                 body.splice(lastImportIndex + 2, 0, importDeclaration);
             }
             if (componentType === 'Page' && solution === 'vite') {
-                var importDeclaration = t__namespace.importDeclaration([t__namespace.importSpecifier(t__namespace.identifier('withRouter'), t__namespace.identifier('withRouter'))], t__namespace.stringLiteral('@/utils/router'));
+                var importDeclaration = t__namespace.importDeclaration([
+                    t__namespace.importSpecifier(t__namespace.identifier('withRouter'), t__namespace.identifier('withRouter')),
+                ], t__namespace.stringLiteral('@/utils/router'));
                 body.splice(lastImportIndex + (haveChildren ? 3 : 2), 0, importDeclaration);
             }
             if (usesGlobalData && !hasGlobalDataDecorator) {
-                var globalDataImport = t__namespace.importDeclaration([t__namespace.importSpecifier(t__namespace.identifier('GlobalDataDecorator'), t__namespace.identifier('GlobalDataDecorator'))], t__namespace.stringLiteral('@/utils'));
-                body.splice(lastImportIndex + (haveChildren ? 3 : 2) + (componentType === 'Page' && solution === 'vite' ? 1 : 0), 0, globalDataImport);
+                var globalDataImport = t__namespace.importDeclaration([
+                    t__namespace.importSpecifier(t__namespace.identifier('GlobalDataDecorator'), t__namespace.identifier('GlobalDataDecorator')),
+                ], t__namespace.stringLiteral('@/utils'));
+                body.splice(lastImportIndex +
+                    (haveChildren ? 3 : 2) +
+                    (componentType === 'Page' && solution === 'vite' ? 1 : 0), 0, globalDataImport);
             }
         },
         ImportDeclaration: function (path) {
@@ -540,7 +625,7 @@ var transformJsx = function (file, solution, outputPath) {
             if (nodePath.parent.name.name === 'AtIcon' &&
                 nodePath.node.name.name === 'svg' &&
                 ((_a = nodePath.node) === null || _a === void 0 ? void 0 : _a.value.type) === 'StringLiteral') {
-                var fileName_1 = '';
+                var fileName = '';
                 var color = '';
                 if (Array.isArray(nodePath.container)) {
                     var valueNode = nodePath.container.find(function (item) { return item.name.name === 'value'; });
@@ -549,25 +634,18 @@ var transformJsx = function (file, solution, outputPath) {
                         // @ts-ignore
                         )) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.value) || '';
                     if (valueNode) {
-                        fileName_1 = "svg_".concat(((_d = valueNode === null || valueNode === void 0 ? void 0 : valueNode.value) === null || _d === void 0 ? void 0 : _d.value) || nanoid(6));
-                        //   const classNameArr = fileName.split('__');
-                        //   fileName =
-                        //     (classNameArr.length > 0
-                        //       ? classNameArr[classNameArr.length - 1]
-                        //       : fileName) + '.png';
+                        var baseName = "svg_".concat(((_d = valueNode === null || valueNode === void 0 ? void 0 : valueNode.value) === null || _d === void 0 ? void 0 : _d.value) || nanoid(6));
+                        fileName = fileNameManager.generateUniqueFileName(baseName, '');
                     }
                 }
-                if (!fileName_1) {
-                    fileName_1 = "svg_".concat(nanoid(6));
-                }
-                // 文件名去重
-                if (svgs.findIndex(function (item) { return item.fileName === fileName_1; }) > -1) {
-                    fileName_1 = "".concat(fileName_1, "_").concat(nanoid(6));
+                if (!fileName) {
+                    var baseName = "svg_".concat(nanoid(6));
+                    fileName = fileNameManager.generateUniqueFileName(baseName, '');
                 }
                 // 替换
                 var node = nodePath.node;
                 var svgStr = node.value.value;
-                if (fileName_1 && svgStr) {
+                if (fileName && svgStr) {
                     // 替换颜色
                     if (svgStr && color) {
                         svgStr = svgStr.replace(/currentColor/g, color);
@@ -577,54 +655,50 @@ var transformJsx = function (file, solution, outputPath) {
                         svgStr = svgStr.replace(/width="100%"/g, '');
                         svgStr = svgStr.replace(/height="100%"/g, '');
                     }
-                    nodePath.replaceWith(t__namespace.jsxAttribute(t__namespace.jsxIdentifier('svg'), t__namespace.jsxExpressionContainer(t__namespace.memberExpression(t__namespace.identifier('ICONS'), t__namespace.stringLiteral(fileName_1), true))));
+                    nodePath.replaceWith(t__namespace.jsxAttribute(t__namespace.jsxIdentifier('svg'), t__namespace.jsxExpressionContainer(t__namespace.memberExpression(t__namespace.identifier('ICONS'), t__namespace.stringLiteral(fileName), true))));
                     svgs.push({
                         svgStr: svgStr,
-                        fileName: fileName_1,
+                        fileName: fileName,
                     });
                 }
             }
             if (nodePath.parent.name.name === 'Image' &&
                 nodePath.node.name.name === 'src' &&
                 ((_e = nodePath.node) === null || _e === void 0 ? void 0 : _e.value.type) === 'StringLiteral') {
-                var fileName_2 = '';
+                var fileName = '';
                 if (Array.isArray(nodePath.container)) {
                     var classNameNode = nodePath.container.find(function (item) { return item.name.name === 'className'; });
                     if (classNameNode) {
                         var rawClassName = (_f = classNameNode === null || classNameNode === void 0 ? void 0 : classNameNode.value) === null || _f === void 0 ? void 0 : _f.value;
                         if (rawClassName) {
                             // 处理 Tailwind CSS 类名和其他复杂类名
-                            fileName_2 = sanitizeFileName(rawClassName);
-                            var classNameArr = fileName_2.split('__');
-                            fileName_2 =
-                                (classNameArr.length > 0
-                                    ? classNameArr[classNameArr.length - 1]
-                                    : fileName_2) + '.png';
+                            var cleanedName = sanitizeFileName(rawClassName);
+                            var classNameArr = cleanedName.split('__');
+                            var baseName = classNameArr.length > 0
+                                ? classNameArr[classNameArr.length - 1]
+                                : cleanedName;
+                            fileName = fileNameManager.generateUniqueFileName(baseName, '.png');
                         }
                     }
                 }
                 // 如果没有从className获取到有效文件名，使用随机名称
-                if (!fileName_2) {
-                    fileName_2 = "image_".concat(nanoid(6), ".png");
-                }
-                // 文件名去重
-                if (images.findIndex(function (item) { return item.fileName === fileName_2.toLowerCase(); }) >
-                    -1) {
-                    fileName_2 = "r".concat(images.length, "_").concat(fileName_2.toLowerCase());
+                if (!fileName) {
+                    var baseName = "image_".concat(nanoid(6));
+                    fileName = fileNameManager.generateUniqueFileName(baseName, '.png');
                 }
                 // 替换
                 var node = nodePath.node;
                 var imageSrc = node.value.value;
-                var staticFileName = fileName_2.toLowerCase();
-                var staticInentifierName = "static_".concat(sanitizeIdentifier(staticFileName.split('.')[0]));
-                if (fileName_2 && imageSrc) {
+                var staticFileName = fileName.toLowerCase();
+                var staticInentifierName = fileNameManager.generateUniqueIdentifier("static_".concat(staticFileName.split('.')[0]));
+                if (fileName && imageSrc) {
                     var func = t__namespace.jSXExpressionContainer(t__namespace.identifier(staticInentifierName));
                     // const func = t.jSXExpressionContainer(
                     //   t.callExpression(t.identifier('require'), [
                     //     t.stringLiteral(`./images/${staticFileName}`),
                     //   ])
                     // );
-                    nodePath.node.value = fileName_2 ? func : null;
+                    nodePath.node.value = fileName ? func : null;
                     images.push({
                         url: imageSrc,
                         fileName: staticFileName,
@@ -674,10 +748,12 @@ var transformJsx = function (file, solution, outputPath) {
             if (componentType === 'Page' && solution === 'vite') {
                 var declaration = path.node.declaration;
                 // @ts-ignore
-                var withRouterCall = t__namespace.callExpression(t__namespace.identifier('withRouter'), [declaration]);
+                var withRouterCall = t__namespace.callExpression(t__namespace.identifier('withRouter'), [
+                    declaration,
+                ]);
                 path.node.declaration = withRouterCall;
             }
-        }
+        },
     });
     // 处理装饰器自动添加
     if (usesGlobalData && !hasGlobalDataDecorator && classDeclarationPath) {
@@ -730,7 +806,7 @@ var transformJsx = function (file, solution, outputPath) {
                     var base64String = svgToBase64(node.value);
                     path.replaceWith(t__namespace.stringLiteral(base64String));
                 }
-            }
+            },
         });
         if (isHaveSvg_1)
             code = generate__default["default"](astTree).code;
@@ -19537,7 +19613,7 @@ var createDataSourceCode = function (dataSourceConfig) {
             },
         }), ";\n");
     }
-    var code = "\n// \u517C\u5BB9\u6027\uFF1A\u4FDD\u7559\u65E7\u7684\u5168\u5C40\u6570\u636E API\uFF0C\u4F46\u4F7F\u7528\u65B0\u7684\u5168\u5C40\u6570\u636E\u5B58\u50A8\nimport { globalDataStore } from './globalData';\n".concat(dataSourceConfigCode, "\n// \u517C\u5BB9\u65E7\u7248\u672C\u7684 API\nexport const setGlobalData = (key, value) => globalDataStore.set(key, value);\nexport const getGlobalData = (key) => globalDataStore.get(key);\nexport const reloadGlobalData = (key, options) => globalDataStore.load(key, options);\nexport const globalDataSourceMap = globalDataStore.dataSourceMap;\n    ");
+    var code = "\n// \u517C\u5BB9\u6027\uFF1A\u4FDD\u7559\u65E7\u7684\u5168\u5C40\u6570\u636E API\uFF0C\u4F46\u4F7F\u7528\u65B0\u7684\u5168\u5C40\u6570\u636E\u5B58\u50A8\nimport { globalDataStore } from './globalData';\n".concat(dataSourceConfigCode, "\n// \u517C\u5BB9\u65E7\u7248\u672C\u7684 API\nexport const setGlobalData = (key, value) => globalDataStore.set(key, value);\nexport const getGlobalData = (key) => globalDataStore.get(key);\nexport const reloadGlobalData = (key, options) => globalDataStore.loadDataSource(key, options);\nexport const globalDataSourceMap = globalDataStore.dataSourceMap;\n    ");
     return code;
 };
 function wrapAsFunction$1(value, scope) {
@@ -19702,7 +19778,10 @@ var transformUtils = function (file, schema, project, solution, outputPath) {
             globalFunctionNames.add('getGlobalData');
             globalFunctionNames.add('reloadGlobalData');
             globalFunctionNames.add('globalDataSourceMap');
-            utilsFunctionNames.add('dataSource');
+            globalFunctionNames.add('renderComponent');
+            globalFunctionNames.add('showComponentModal');
+            globalFunctionNames.add('dataSource');
+            globalFunctionNames.add('_');
             body.splice(1, 0, t__namespace.importDeclaration(Array.from(utilsFunctionNames)
                 .filter(function (name) {
                 return !globalFunctionNames.has(name) &&
@@ -19711,9 +19790,7 @@ var transformUtils = function (file, schema, project, solution, outputPath) {
             })
                 .map(function (name) {
                 return t__namespace.importSpecifier(t__namespace.identifier(name), t__namespace.identifier(name));
-            }), t__namespace.stringLiteral(solution === 'vite'
-                ? '@appthen/utils'
-                : 'cross-ui/utils')));
+            }), t__namespace.stringLiteral(solution === 'vite' ? '@appthen/utils' : 'cross-ui/utils')));
             body.splice(2, 0, t__namespace.importDeclaration(['requestHandle'].map(function (name) {
                 return t__namespace.importSpecifier(t__namespace.identifier(name), t__namespace.identifier(name));
             }), t__namespace.stringLiteral('./dataSource')));
@@ -19739,7 +19816,9 @@ var transformUtils = function (file, schema, project, solution, outputPath) {
                         // 创建 VariableDeclarator 节点，表示 const Fuck = constants.Fuck
                         var variableDeclarator = t__namespace.variableDeclarator(t__namespace.identifier(util.name), memberExpression);
                         // 创建 VariableDeclaration 节点，表示 const Fuck 的声明
-                        var variableDeclaration = t__namespace.variableDeclaration('const', [variableDeclarator]);
+                        var variableDeclaration = t__namespace.variableDeclaration('const', [
+                            variableDeclarator,
+                        ]);
                         // 创建 ExportNamedDeclaration 节点，表示 export const Fuck
                         var exportNamedDeclaration = t__namespace.exportNamedDeclaration(variableDeclaration);
                         body.splice(4 + index, 0, exportNamedDeclaration);
@@ -19794,7 +19873,8 @@ var transformUtils = function (file, schema, project, solution, outputPath) {
     if (extendsCodes.length > 0) {
         code = extendsCodes.join('\n') + '\n' + code;
     }
-    code = code + "\n\nexport {\n  addPortal,\n  removePortal,\n  registerPartalComponent,\n  showComponentModal,\n  renderComponentPortal,\n  renderComponent,\n} from '@appthen/react';\n";
+    code =
+        "import {\n  addPortal,\n  removePortal,\n  registerPartalComponent,\n  showComponentModal,\n  renderComponentPortal,\n  renderComponent\n} from '@appthen/react';\n\nexport {\n  addPortal,\n  removePortal,\n  registerPartalComponent,\n  showComponentModal,\n  renderComponentPortal,\n  renderComponent,\n} from '@appthen/react';\n" + code;
     fs__namespace.writeFileSync(file.path + '/' + file.fileName, code);
     return { code: code };
 };
@@ -32909,30 +32989,21 @@ var createRouter = function (project) {
     if (!router || ((_a = router.routes) === null || _a === void 0 ? void 0 : _a.length) === 0) {
         return;
     }
-    // const router = {
-    //   routes: [
-    //     {
-    //       path: '/',
-    //       page: 'antdBackgroundManagementSystem',
-    //       children: [
-    //         {
-    //           path: '/dashboard',
-    //           page: 'dashboard',
-    //         },
-    //       ],
-    //     },
-    //     {
-    //       path: '/admin',
-    //       redirect: '/admin/fuck',
-    //     },
-    //     {
-    //       path: '/antdBackgroundManagementSystem',
-    //       page: 'antdBackgroundManagementSystem',
-    //     },
-    //   ],
-    // };
+    console.log('router: ', router.routes[0]);
+    console.log('🔍 原始路由数据:', JSON.stringify(router.routes, null, 2));
+    // 保存调试数据到文件
+    var fs = require('fs');
+    try {
+        fs.writeFileSync('./router-debug.json', JSON.stringify({
+            routes: router.routes,
+            timestamp: new Date().toISOString(),
+        }, null, 2));
+        console.log('📝 路由调试数据已保存到 router-debug.json');
+    }
+    catch (error) {
+        console.log('⚠️ 无法保存调试数据:', error.message);
+    }
     var allPages = [];
-    // const routeElements: any[] = [];
     // 遍历router.routes，生成路由
     var checkRoutes = function (routes) {
         routes.forEach(function (route) {
@@ -32945,7 +33016,8 @@ var createRouter = function (project) {
         });
     };
     checkRoutes(router.routes);
-    var routeElements = router.routes.map(function (route) { return createNestedRoutes(route); });
+    // 处理路由结构，正确处理布局和嵌套路由
+    var routeElements = processRoutesWithLayout(router.routes);
     var fileLazyImports = allPages.map(function (_) {
         return createLazyImport(_, "./pages/".concat(_));
     });
@@ -32954,6 +33026,68 @@ var createRouter = function (project) {
         routeElements: routeElements,
     };
 };
+// 处理路由结构，正确处理布局和嵌套路由
+function processRoutesWithLayout(routes) {
+    var e_1, _a, e_2, _b;
+    var result = [];
+    console.log('🔧 开始处理路由结构...');
+    try {
+        for (var routes_1 = __values(routes), routes_1_1 = routes_1.next(); !routes_1_1.done; routes_1_1 = routes_1.next()) {
+            var route = routes_1_1.value;
+            console.log("\uD83D\uDCCD \u5904\u7406\u8DEF\u7531: ".concat(route.path, ", page: ").concat(route.page));
+            // 检查是否为独立路由
+            if (route.noLayout) {
+                console.log("  \uD83D\uDEAA \u72EC\u7ACB\u8DEF\u7531");
+                var routeElement = createNestedRoutesWithLayout(route);
+                result.push(routeElement);
+                continue;
+            }
+            // 检查是否为布局组件（有 children）
+            var isLayoutRoute = route.children && route.children.length > 0;
+            if (isLayoutRoute) {
+                console.log("  \uD83C\uDFE0 \u8BC6\u522B\u4E3A\u5E03\u5C40\u8DEF\u7531\uFF0C\u5B50\u8DEF\u7531\u6570\u91CF: ".concat(route.children.length));
+                // 创建布局路由，包含子路由
+                var layoutChildren = route.children
+                    .filter(function (child) { return !child.noLayout; }) // 过滤掉 noLayout 的子路由
+                    .map(function (child) { return createNestedRoutesWithLayout(child); });
+                var layoutElement = createNestedRoutesWithLayout(route, layoutChildren);
+                result.push(layoutElement);
+                // 处理 noLayout 的子路由，作为独立路由
+                var independentChildren = route.children.filter(function (child) { return child.noLayout; });
+                try {
+                    for (var independentChildren_1 = (e_2 = void 0, __values(independentChildren)), independentChildren_1_1 = independentChildren_1.next(); !independentChildren_1_1.done; independentChildren_1_1 = independentChildren_1.next()) {
+                        var independentChild = independentChildren_1_1.value;
+                        console.log("  \uD83D\uDEAA \u5904\u7406\u72EC\u7ACB\u5B50\u8DEF\u7531: ".concat(independentChild.path));
+                        var childElement = createNestedRoutesWithLayout(independentChild);
+                        result.push(childElement);
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (independentChildren_1_1 && !independentChildren_1_1.done && (_b = independentChildren_1.return)) _b.call(independentChildren_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+            }
+            else {
+                // 普通路由
+                console.log("  \uD83D\uDCC4 \u5904\u7406\u666E\u901A\u8DEF\u7531");
+                var routeElement = createNestedRoutesWithLayout(route);
+                result.push(routeElement);
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (routes_1_1 && !routes_1_1.done && (_a = routes_1.return)) _a.call(routes_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    console.log("\u2705 \u8DEF\u7531\u5904\u7406\u5B8C\u6210\uFF0C\u751F\u6210 ".concat(result.length, " \u4E2A\u8DEF\u7531\u5143\u7D20"));
+    return result;
+}
 // Create a component with lazy loading
 function createLazyImport(varName, source) {
     var _varName = varName.slice(0, 1).toUpperCase() + varName.slice(1);
@@ -32965,17 +33099,18 @@ function createLazyImport(varName, source) {
 }
 // const indexLazyImport = createLazyImport('index', './pages/index');
 // 助手函数，用于创建<Route> JSX元素
-function createRoute(path, componentName, exact, children) {
+function createRoute(path, componentName, exact, children, isLayout) {
     if (exact === void 0) { exact = false; }
     if (children === void 0) { children = null; }
+    if (isLayout === void 0) { isLayout = false; }
     var props = [
         t__namespace.jsxAttribute(t__namespace.jsxIdentifier('path'), t__namespace.stringLiteral(path)),
     ];
     if (exact) {
         props.push(t__namespace.jsxAttribute(t__namespace.jsxIdentifier('exact')));
     }
-    var openingElement = t__namespace.jsxOpeningElement(t__namespace.jsxIdentifier('Route'), props, !children);
-    if (!componentName && !children) {
+    var openingElement = t__namespace.jsxOpeningElement(t__namespace.jsxIdentifier('Route'), props, !children && !isLayout);
+    if (!componentName && !children && !isLayout) {
         return t__namespace.jsxElement(openingElement, t__namespace.jsxClosingElement(t__namespace.jsxIdentifier('Route')), [], false);
     }
     // 添加component属性如果存在
@@ -33001,21 +33136,61 @@ function codeToAST(code) {
         return null;
     }
 }
-// 递归函数，为每个路由创建JSX节点，包括嵌套的子路由
-function createNestedRoutes(route) {
-    var children = [];
-    if (route.children) {
-        children = route.children.map(function (childRoute) {
-            return createNestedRoutes(childRoute);
-        });
-    }
+// 新的路由创建函数，处理实际的数据格式
+function createNestedRoutesWithLayout(route, children) {
+    console.log("  \uD83D\uDD27 \u521B\u5EFA\u8DEF\u7531\u5143\u7D20: ".concat(route.path, ", page: ").concat(route.page));
+    // 处理重定向路由
     if (route.redirect) {
+        console.log("    \u21AA\uFE0F \u91CD\u5B9A\u5411\u8DEF\u7531: ".concat(route.path, " -> ").concat(route.redirect));
         return codeToAST("<Route path=\"".concat(route.path, "\" element={<Navigate to=\"").concat(route.redirect, "\"/>}></Route>"));
-        // return createRedirect(route.redirect);
     }
-    return createRoute(route.path, route.page, route.exact, children);
+    // 如果传入了 children，说明这是一个布局路由
+    if (children && children.length > 0) {
+        console.log("    \uD83C\uDFE0 \u5E03\u5C40\u8DEF\u7531\uFF0C\u5305\u542B ".concat(children.length, " \u4E2A\u5B50\u8DEF\u7531"));
+        return createRoute(route.path, route.page || '', route.exact, children, true // isLayout = true
+        );
+    }
+    // 普通页面路由
+    console.log("    \uD83D\uDCC4 \u666E\u901A\u9875\u9762\u8DEF\u7531");
+    return createRoute(route.path, route.page || '', route.exact, null, false);
 }
 
+/**
+ * 创建详细的错误信息，包含代码片段和位置信息
+ */
+function createDetailedError(error, context) {
+    var operation = context.operation, _a = context.filePath, filePath = _a === void 0 ? './src/App.jsx' : _a, code = context.code, suggestion = context.suggestion;
+    var errorMessage = "".concat(operation, "\u5931\u8D25: ").concat(error.message);
+    if (error.loc) {
+        errorMessage += " (\u7B2C".concat(error.loc.line, "\u884C\u7B2C").concat(error.loc.column, "\u5217)");
+    }
+    console.error("\u274C ".concat(operation, "\u5931\u8D25:"), {
+        filePath: filePath,
+        error: error.message,
+        type: error.name || 'Error',
+        position: error.loc
+            ? "\u7B2C".concat(error.loc.line, "\u884C\u7B2C").concat(error.loc.column, "\u5217")
+            : '未知位置',
+        snippet: error.loc && code
+            ? (function () {
+                var lines = code.split('\n');
+                var errorLine = error.loc.line - 1;
+                var start = Math.max(0, errorLine - 2);
+                var end = Math.min(lines.length, errorLine + 3);
+                return lines
+                    .slice(start, end)
+                    .map(function (line, index) {
+                    var lineNum = start + index + 1;
+                    var marker = lineNum === error.loc.line ? '>>> ' : '    ';
+                    return "".concat(marker).concat(lineNum.toString().padStart(3), ": ").concat(line);
+                })
+                    .join('\n');
+            })()
+            : '无法获取代码片段',
+        suggestion: suggestion || '请检查代码语法和结构是否正确',
+    });
+    return new Error(errorMessage);
+}
 function manageImports(ast, imports) {
     // 记录需要处理的导入名称和包
     var targetImports = new Map(imports.map(function (imp) { return [imp.name, imp]; }));
@@ -33049,14 +33224,16 @@ function manageImports(ast, imports) {
             }
             // 移除原有的目标包导入声明
             path.remove();
-        }
+        },
     });
     // 添加新的导入到对应的包
     imports.forEach(function (imp) {
         if (!packageImports.has(imp.from)) {
             packageImports.set(imp.from, new Set());
         }
-        packageImports.get(imp.from).add(t__namespace.importSpecifier(t__namespace.identifier(imp.as || imp.name), t__namespace.identifier(imp.name)));
+        packageImports
+            .get(imp.from)
+            .add(t__namespace.importSpecifier(t__namespace.identifier(imp.as || imp.name), t__namespace.identifier(imp.name)));
     });
     // 第二遍：添加新的导入
     traverse__default["default"](ast, {
@@ -33066,21 +33243,49 @@ function manageImports(ast, imports) {
                 var _b = __read(_a, 2), source = _b[0], specifiers = _b[1];
                 if (specifiers.size > 0) {
                     // 找到第一个导入声明
-                    var firstImport = path.node.body.find(function (node) { return t__namespace.isImportDeclaration(node); });
-                    var insertIndex = firstImport ? path.node.body.indexOf(firstImport) : 0;
+                    var firstImport = path.node.body.find(function (node) {
+                        return t__namespace.isImportDeclaration(node);
+                    });
+                    var insertIndex = firstImport
+                        ? path.node.body.indexOf(firstImport)
+                        : 0;
                     path.node.body.splice(insertIndex, 0, t__namespace.importDeclaration(Array.from(specifiers), t__namespace.stringLiteral(source)));
                 }
             });
-        }
+        },
     });
 }
 var createAppFile = function (project, solution, outputPath) {
-    var _a, _b, _c, _d;
-    var appFile = fs__namespace.readFileSync('./src/App.jsx', 'utf8');
-    var astTree = parser__namespace.parse("".concat(appFile), {
-        sourceType: 'module',
-        plugins: ['jsx', 'typescript', 'decorators-legacy'],
-    });
+    var _a, _b, _c, _d, _e;
+    var appFile;
+    var astTree;
+    try {
+        appFile = fs__namespace.readFileSync('./src/App.jsx', 'utf8');
+    }
+    catch (error) {
+        console.error('❌ 读取 App.jsx 文件失败:', {
+            filePath: './src/App.jsx',
+            error: error.message,
+            suggestion: '请确保 src/App.jsx 文件存在且可读',
+        });
+        throw new Error("\u65E0\u6CD5\u8BFB\u53D6 App.jsx \u6587\u4EF6: ".concat(error.message));
+    }
+    try {
+        astTree = parser__namespace.parse("".concat(appFile), {
+            sourceType: 'module',
+            plugins: ['jsx', 'typescript', 'decorators-legacy'],
+        });
+    }
+    catch (error) {
+        throw createDetailedError(error, {
+            operation: 'App.jsx 文件解析',
+            code: appFile,
+            suggestion: '请检查 App.jsx 文件的语法是否正确，特别注意：\n' +
+                '- 是否有未闭合的标签或括号\n' +
+                '- 是否有未完成的变量声明（const/let/var）\n' +
+                '- 是否有语法错误的 JSX 表达式',
+        });
+    }
     astTree.program.body = astTree.program.body.filter(function (item) {
         var _a, _b, _c, _d;
         var isPageFile = item.type === 'VariableDeclaration' &&
@@ -33089,110 +33294,167 @@ var createAppFile = function (project, solution, outputPath) {
         return !isPageFile;
     });
     // 添加路由
-    var router = createRouter(project);
-    if (router) {
-        var fileLazyImports_1 = router.fileLazyImports, routeElements_1 = router.routeElements;
-        traverse__default["default"](astTree, {
-            Program: function (nodePath) {
-                var body = nodePath.node.body;
-                var componentIndex = body.findIndex(function (item) { return item.type === 'ExportDefaultDeclaration'; });
-                body.splice.apply(body, __spreadArray([componentIndex, 0], __read(fileLazyImports_1), false));
-            },
-            JSXElement: function (nodePath) {
-                var _a, _b;
-                var node = nodePath.node;
-                // @ts-ignore
-                if (((_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.name) === 'Routes') {
-                    node.children = routeElements_1;
-                }
-            },
+    try {
+        var router = createRouter(project);
+        if (router) {
+            var fileLazyImports_1 = router.fileLazyImports, routeElements_1 = router.routeElements;
+            traverse__default["default"](astTree, {
+                Program: function (nodePath) {
+                    var body = nodePath.node.body;
+                    var componentIndex = body.findIndex(function (item) { return item.type === 'ExportDefaultDeclaration'; });
+                    body.splice.apply(body, __spreadArray([componentIndex, 0], __read(fileLazyImports_1), false));
+                },
+                JSXElement: function (nodePath) {
+                    var _a, _b;
+                    var node = nodePath.node;
+                    // @ts-ignore
+                    if (((_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.name) === 'Routes') {
+                        node.children = routeElements_1;
+                    }
+                },
+            });
+            console.log('✅ 路由配置已添加');
+        }
+    }
+    catch (error) {
+        console.error('❌ 路由处理失败:', {
+            error: error.message,
+            type: error.name || 'RouterError',
+            suggestion: '请检查项目配置中的路由信息是否正确',
         });
+        throw new Error("\u8DEF\u7531\u5904\u7406\u5931\u8D25: ".concat(error.message));
     }
     // 增加全局配置
     var schema = project.schema;
     var config = schema.config;
     if ((_a = config === null || config === void 0 ? void 0 : config.layout) === null || _a === void 0 ? void 0 : _a.componentName) {
-        var _e = config.layout, componentName = _e.componentName, props_1 = _e.props;
-        var code_1 = "\n      <".concat(componentName, "\n        ").concat(Object.keys(props_1 || {})
-            .map(function (k) {
-            var valueStr = '';
-            if (typeof props_1[k] === 'string') {
-                valueStr = "'".concat(props_1[k], "'");
-            }
-            else if (typeof props_1[k] === 'number') {
-                valueStr = "".concat(props_1[k]);
-            }
-            else if (typeof props_1[k] === 'object') {
-                valueStr = "{".concat(JSON.stringify(props_1[k]), "}");
-            }
-            return "".concat(k, "=").concat(valueStr);
-        })
-            .join('\n'), "\n      ><AntdApp></AntdApp></").concat(componentName, ">\n    ");
-        var layoutAstNode = codeToAST(code_1);
-        var elNode_1 = layoutAstNode.expression;
-        /**
-         * 找到 AntdApp 下的 HashRouter 节点
-         */
-        var routerNode_1;
-        traverse__default["default"](astTree, {
-            JSXElement: function (nodePath) {
-                var _a, _b;
-                var node = nodePath.node;
-                // @ts-ignore
-                if (((_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.name) === 'HashRouter') {
-                    routerNode_1 = nodePath;
+        try {
+            var _f = config.layout, componentName = _f.componentName, props_1 = _f.props;
+            var code = "\n        <".concat(componentName, "\n          ").concat(Object.keys(props_1 || {})
+                .map(function (k) {
+                var valueStr = '';
+                if (typeof props_1[k] === 'string') {
+                    valueStr = "'".concat(props_1[k], "'");
                 }
-            },
-        });
-        var once_1 = false;
-        traverse__default["default"](astTree, {
-            JSXElement: function (nodePath) {
-                var _a, _b, _c, _d;
-                var node = nodePath.node;
-                // @ts-ignore
-                if (((_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.name) === 'ConfigProvider' && !once_1) {
-                    if (appFile.includes('<AntdApp>') && routerNode_1) {
-                        // @ts-ignore
-                        elNode_1.children[0].children = routerNode_1.parent.children;
+                else if (typeof props_1[k] === 'number') {
+                    valueStr = "".concat(props_1[k]);
+                }
+                else if (typeof props_1[k] === 'object') {
+                    valueStr = "{".concat(JSON.stringify(props_1[k]), "}");
+                }
+                return "".concat(k, "=").concat(valueStr);
+            })
+                .join('\n'), "\n        ><AntdApp></AntdApp></").concat(componentName, ">\n      ");
+            var layoutAstNode = codeToAST(code);
+            var elNode_1 = layoutAstNode.expression;
+            /**
+             * 找到 AntdApp 下的 HashRouter 节点
+             */
+            var routerNode_1;
+            traverse__default["default"](astTree, {
+                JSXElement: function (nodePath) {
+                    var _a, _b;
+                    var node = nodePath.node;
+                    // @ts-ignore
+                    if (((_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.name) === 'HashRouter') {
+                        routerNode_1 = nodePath;
                     }
-                    else {
-                        // @ts-ignore
-                        elNode_1.children[0].children = node.children;
+                },
+            });
+            var once_1 = false;
+            traverse__default["default"](astTree, {
+                JSXElement: function (nodePath) {
+                    var _a, _b, _c, _d;
+                    var node = nodePath.node;
+                    // @ts-ignore
+                    if (((_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.name) === 'ConfigProvider' && !once_1) {
+                        if (appFile.includes('<AntdApp>') && routerNode_1) {
+                            // @ts-ignore
+                            elNode_1.children[0].children = routerNode_1.parent.children;
+                        }
+                        else {
+                            // @ts-ignore
+                            elNode_1.children[0].children = node.children;
+                        }
+                        nodePath.replaceWith(elNode_1);
+                        once_1 = true;
                     }
-                    nodePath.replaceWith(elNode_1);
-                    once_1 = true;
-                }
-                // @ts-ignore
-                if (((_d = (_c = node.openingElement) === null || _c === void 0 ? void 0 : _c.name) === null || _d === void 0 ? void 0 : _d.name) === 'HashRouter' && !once_1) {
                     // @ts-ignore
-                    elNode_1.children[0].children = [node];
-                    nodePath.replaceWith(elNode_1);
-                    once_1 = true;
-                }
-            },
-        });
+                    if (((_d = (_c = node.openingElement) === null || _c === void 0 ? void 0 : _c.name) === null || _d === void 0 ? void 0 : _d.name) === 'HashRouter' && !once_1) {
+                        // @ts-ignore
+                        elNode_1.children[0].children = [node];
+                        nodePath.replaceWith(elNode_1);
+                        once_1 = true;
+                    }
+                },
+            });
+            console.log('✅ 布局配置已添加');
+        }
+        catch (error) {
+            console.error('❌ 布局配置处理失败:', {
+                error: error.message,
+                type: error.name || 'LayoutError',
+                componentName: (_b = config === null || config === void 0 ? void 0 : config.layout) === null || _b === void 0 ? void 0 : _b.componentName,
+                suggestion: '请检查布局组件配置是否正确，包括组件名称和属性',
+            });
+            throw new Error("\u5E03\u5C40\u914D\u7F6E\u5904\u7406\u5931\u8D25: ".concat(error.message));
+        }
     }
     // 处理导入语句
-    if ((_d = (_c = (_b = project.schema) === null || _b === void 0 ? void 0 : _b.config) === null || _c === void 0 ? void 0 : _c.layout) === null || _d === void 0 ? void 0 : _d.componentName) {
-        var requiredImports = [
-            {
-                name: 'App',
-                as: 'AntdApp',
-                from: 'antd',
-                priority: 2,
-                protected: true // App 必须从 antd 导入
-            },
-            {
-                name: 'ConfigProvider',
-                from: '@appthen/antd',
-                priority: 1
-            }
-        ];
-        manageImports(astTree, requiredImports);
+    if ((_e = (_d = (_c = project.schema) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.layout) === null || _e === void 0 ? void 0 : _e.componentName) {
+        try {
+            var requiredImports = [
+                {
+                    name: 'App',
+                    as: 'AntdApp',
+                    from: 'antd',
+                    priority: 2,
+                    protected: true, // App 必须从 antd 导入
+                },
+                {
+                    name: 'ConfigProvider',
+                    from: '@appthen/antd',
+                    priority: 1,
+                },
+            ];
+            manageImports(astTree, requiredImports);
+            console.log('✅ 导入语句已处理');
+        }
+        catch (error) {
+            console.error('❌ 导入语句处理失败:', {
+                error: error.message,
+                type: error.name || 'ImportError',
+                suggestion: '请检查导入配置是否正确，确保相关包已安装',
+            });
+            throw new Error("\u5BFC\u5165\u8BED\u53E5\u5904\u7406\u5931\u8D25: ".concat(error.message));
+        }
+    }
+    var generatedCode;
+    try {
+        var result = generate__default["default"](astTree);
+        generatedCode = result.code;
+    }
+    catch (error) {
+        console.error('❌ 代码生成失败:', {
+            error: error.message,
+            type: error.name || 'GenerateError',
+            suggestion: '请检查 AST 结构是否正确，可能是在处理过程中产生了无效的 AST 节点',
+        });
+        throw new Error("\u4EE3\u7801\u751F\u6210\u5931\u8D25: ".concat(error.message));
+    }
+    try {
+        // 删除之前的字符串处理逻辑
+        fs__namespace.writeFileSync('./src/App.jsx', generatedCode, 'utf8');
+        console.log('✅ App.jsx 文件已成功更新');
+    }
+    catch (error) {
+        console.error('❌ 写入 App.jsx 文件失败:', {
+            filePath: './src/App.jsx',
+            error: error.message,
+            suggestion: '请确保有写入权限，且磁盘空间充足',
+        });
+        throw new Error("\u5199\u5165 App.jsx \u6587\u4EF6\u5931\u8D25: ".concat(error.message));
     }
-    var code = generate__default["default"](astTree).code;
-    // 删除之前的字符串处理逻辑
-    fs__namespace.writeFileSync('./src/App.jsx', code, 'utf8');
 };
 
 var writePackageJSON = function (packageJSON) {
@@ -36715,11 +36977,11 @@ var lastTimeKey$1 = '$__cacheTime';
  * @returns {Promise<number>} 错误码
  */
 function run(args, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function () {
-        var cacheDirPath, keyCacheDirPath, currentLastTimeKey, cacheTime, afterTime, result, schema, project, documents, componentDocs, packageJSON, projectDocuments, projectDocumentNames_1, subPageDocumentNames_1, clientType, isWeb, solution, outputPath_1, builder, envInfoItem, generatedSourceCodes, publisher, subPageRoot_1, subPagePath, subPagePathIsExist, getPageUrl_1, transformFilePath, existFiles, existSubFiles, _e, files, syncMap, _loop_1, i, indexPage_1, indexPageUrl_1, globalStyle, globalStyleWithoutFirstLine, globalStyle, globalStyleWithoutFirstLine, appContent, appContentWithImport, portalImportCode, haveUpdate, installCmd, e_1;
-        return __generator(this, function (_f) {
-            switch (_f.label) {
+        var cacheDirPath, keyCacheDirPath, currentLastTimeKey, cacheTime, afterTime, result, schema, project, documents, componentDocs, packageJSON, projectDocuments, projectDocumentNames_1, subPageDocumentNames_1, clientType, isWeb, solution, outputPath_1, builder, envInfoItem, schemaStr, generatedSourceCodes, publisher, subPageRoot_1, subPagePath, subPagePathIsExist, getPageUrl_1, transformFilePath, existFiles, existSubFiles, _g, files, syncMap, _loop_1, i, indexPage_1, indexPageUrl_1, globalStyle, globalStyleWithoutFirstLine, globalStyle, globalStyleWithoutFirstLine, appContent, appContentWithImport, utilsFilePath, portalImportCode, haveUpdate, installCmd, e_1;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
                     cacheDirPath = path__default["default"].join(os__default["default"].homedir(), '.cache', 'mengti_temp');
                     keyCacheDirPath = path__default["default"].join(os__default["default"].homedir(), '.cache', 'mengti_translate');
@@ -36728,9 +36990,9 @@ function run(args, options) {
                         removeDir(keyCacheDirPath);
                     }
                     currentLastTimeKey = path__default["default"].join(process.cwd() + '/' + (options.output || '')) + lastTimeKey$1;
-                    _f.label = 1;
+                    _h.label = 1;
                 case 1:
-                    _f.trys.push([1, 15, , 16]);
+                    _h.trys.push([1, 15, , 16]);
                     cacheTime = cache$1.getKey(currentLastTimeKey);
                     console.log('[最后同步时间] ', cacheTime ? new Date(Number(cacheTime)).toLocaleString() : '无');
                     afterTime = cacheTime && !options.clear ? Number(cacheTime) : 0;
@@ -36746,13 +37008,16 @@ function run(args, options) {
                             afterTime: afterTime,
                         })];
                 case 2:
-                    result = _f.sent();
+                    result = _h.sent();
                     console.log('[INFO] 项目下载完成... ');
                     schema = result.schema;
+                    console.log('🔍 原始路由数据:', 
+                    // @ts-ignore
+                    JSON.stringify((_a = schema.router) === null || _a === void 0 ? void 0 : _a.routes, null, 2));
                     project = result.project, documents = result.documents, componentDocs = result.componentDocs, packageJSON = result.packageJSON;
                     projectDocuments = project.documents || [];
                     projectDocumentNames_1 = projectDocuments.map(function (_) { return _.fileName; });
-                    subPageDocumentNames_1 = ((_a = project.appConfig) === null || _a === void 0 ? void 0 : _a.subPages) || [];
+                    subPageDocumentNames_1 = ((_b = project.appConfig) === null || _b === void 0 ? void 0 : _b.subPages) || [];
                     clientType = options.frame || (project === null || project === void 0 ? void 0 : project.type);
                     isWeb = clientType === 'web';
                     solution = isWeb ? 'vite' : 'taro';
@@ -36761,7 +37026,7 @@ function run(args, options) {
                     return [4 /*yield*/, updateProjectTemplate(solution)];
                 case 3:
                     // 更新项目模板
-                    _f.sent();
+                    _h.sent();
                     console.log('[INFO] 项目模板更新完成... ');
                     // 检查是否有文件需要更新
                     if (!project || documents.length === 0) {
@@ -36777,20 +37042,21 @@ function run(args, options) {
                     console.log('[INFO] 创建项目构建器... ');
                     // 处理环境配置
                     if (options.env) {
-                        envInfoItem = (_c = (_b = project.envInfo) === null || _b === void 0 ? void 0 : _b.list) === null || _c === void 0 ? void 0 : _c.find(function (_) { return _.alias === options.env; });
+                        envInfoItem = (_d = (_c = project.envInfo) === null || _c === void 0 ? void 0 : _c.list) === null || _d === void 0 ? void 0 : _d.find(function (_) { return _.alias === options.env; });
                         if (envInfoItem) {
                             schema.constants = __assign(__assign({}, schema.constants), getPureValue(envInfoItem.data));
                         }
                     }
                     console.log('[INFO] 处理环境配置... ');
-                    // const schemaStr = JSON.stringify(schema);
+                    schemaStr = JSON.stringify((_e = schema.componentsTree) === null || _e === void 0 ? void 0 : _e.slice(0, 20).map(function (item) { return item.fileName; }));
+                    console.log('schemaStr: ', schemaStr);
                     // const isHaveCheckicon = schemaStr.indexOf('icon.style');
                     // console.log('isHaveCheck', schemaStr.slice(isHaveCheckicon - 20000, isHaveCheckicon + 20000));
                     // 生成代码
                     console.log('[INFO] 开始生成代码... ');
-                    return [4 /*yield*/, builder.generateProject(schema)];
+                    return [4 /*yield*/, builder.generateProject(JSON.parse(JSON.stringify(schema)))];
                 case 4:
-                    generatedSourceCodes = _f.sent();
+                    generatedSourceCodes = _h.sent();
                     console.log('[INFO] 代码生成完成... ');
                     generatedSourceCodes.files = generatedSourceCodes.files.filter(function (item) { return item.ext === 'css' || item.ext === 'jsx'; });
                     console.log('[INFO] 过滤代码... ');
@@ -36807,7 +37073,7 @@ function run(args, options) {
                             createProjectFolder: false,
                         })];
                 case 5:
-                    _f.sent();
+                    _h.sent();
                     console.log('[INFO] 代码生成完成... ');
                     if (!fs.existsSync("./".concat(outputPath_1, "/"))) {
                         fs.mkdirSync("./".concat(outputPath_1, "/"), {
@@ -36833,27 +37099,29 @@ function run(args, options) {
                         return "".concat(pagesPath, "/").concat(file.name, "/index");
                     };
                     transformFilePath = function (file) {
-                        if (subPageRoot_1 && file.path.includes('pages') && subPageDocumentNames_1.includes(file.name)) {
+                        if (subPageRoot_1 &&
+                            file.path.includes('pages') &&
+                            subPageDocumentNames_1.includes(file.name)) {
                             return file.path.replace('pages', subPageRoot_1);
                         }
                         return file.path;
                     };
                     return [4 /*yield*/, getAllFile("./".concat(outputPath_1, "/"))];
                 case 6:
-                    existFiles = _f.sent();
+                    existFiles = _h.sent();
                     if (!subPagePathIsExist) return [3 /*break*/, 8];
                     return [4 /*yield*/, getAllFile(subPagePath)];
                 case 7:
-                    _e = _f.sent();
+                    _g = _h.sent();
                     return [3 /*break*/, 9];
                 case 8:
-                    _e = [];
-                    _f.label = 9;
+                    _g = [];
+                    _h.label = 9;
                 case 9:
-                    existSubFiles = _e;
+                    existSubFiles = _g;
                     return [4 /*yield*/, getAllFile(cacheDirPath + '/')];
                 case 10:
-                    files = _f.sent();
+                    files = _h.sent();
                     syncMap = {
                         components: existFiles
                             .filter(function (_) { return ['tsx', 'jsx'].includes(_.ext) && _.path.includes('components'); })
@@ -36905,12 +37173,17 @@ function run(args, options) {
                             .map(function (_) { return getPageUrl_1(_, subPageRoot_1); }),
                     };
                     _loop_1 = function (i) {
-                        var file, fileName_1, extName, cssFilePath, cssStr, doc, _g, code, images, svgs, configJsCode, iconsFile, iconsConsts, index, svg, index, image, e_2, realFilePath;
-                        return __generator(this, function (_h) {
-                            switch (_h.label) {
+                        var file, fileName_1, extName, cssFilePath, cssStr, doc, _j, code, images, svgs, configJsCode, iconsFile, iconsConsts, index, svg, index, image, e_2, realFilePath;
+                        return __generator(this, function (_k) {
+                            switch (_k.label) {
                                 case 0:
                                     file = files[i];
-                                    console.log('[BUILD FILE]', file.name);
+                                    if (process.env.DEV) {
+                                        console.log('[BUILD FILE]', file);
+                                    }
+                                    else {
+                                        console.log('[BUILD FILE]', file.name);
+                                    }
                                     if (!!file.path.includes('/BasicLayout/')) return [3 /*break*/, 10];
                                     fileName_1 = file.name;
                                     extName = file.ext;
@@ -36919,8 +37192,8 @@ function run(args, options) {
                                     if (!(file.fileName === 'utils.js')) return [3 /*break*/, 2];
                                     return [4 /*yield*/, transformUtils(file, schema, project, solution)];
                                 case 1:
-                                    _h.sent();
-                                    _h.label = 2;
+                                    _k.sent();
+                                    _k.label = 2;
                                 case 2:
                                     if (extName === 'css' || extName === 'scss') {
                                         cssFilePath = file.path + '/' + file.fileName;
@@ -36945,15 +37218,18 @@ function run(args, options) {
                                     }
                                     if (!(extName === 'jsx' || extName === 'tsx')) return [3 /*break*/, 10];
                                     doc = documents.concat(componentDocs).find(function (_) {
+                                        console.log('fileName: ', fileName_1, _.fileName);
                                         return _.fileName.toLowerCase() === fileName_1.toLowerCase();
                                     });
                                     // 判断是否是页面
                                     if ((doc === null || doc === void 0 ? void 0 : doc.type) === 'Page') {
-                                        if (!syncMap.pages.includes(fileName_1) && !subPageDocumentNames_1.includes(fileName_1)) {
+                                        if (!syncMap.pages.includes(fileName_1) &&
+                                            !subPageDocumentNames_1.includes(fileName_1)) {
                                             syncMap.pages.push(fileName_1);
                                             syncMap.pageUrls.push(getPageUrl_1(file));
                                         }
-                                        if (!syncMap.subPages.includes(fileName_1) && subPageDocumentNames_1.includes(fileName_1)) {
+                                        if (!syncMap.subPages.includes(fileName_1) &&
+                                            subPageDocumentNames_1.includes(fileName_1)) {
                                             syncMap.subPages.push(fileName_1);
                                             syncMap.subPageUrls.push(getPageUrl_1(file, subPageRoot_1));
                                         }
@@ -36966,7 +37242,7 @@ function run(args, options) {
                                     }
                                     return [4 /*yield*/, transformJsx(file, solution, outputPath_1)];
                                 case 3:
-                                    _g = _h.sent(), code = _g.code, images = _g.images, svgs = _g.svgs;
+                                    _j = _k.sent(), code = _j.code, images = _j.images, svgs = _j.svgs;
                                     console.log('[BUILD SUCCESS]', file.name);
                                     // 写入暂存文件夹
                                     fs.writeFileSync(file.path + '/' + file.fileName, code);
@@ -37012,30 +37288,32 @@ function run(args, options) {
                                             .join('\n'));
                                     }
                                     index = 0;
-                                    _h.label = 4;
+                                    _k.label = 4;
                                 case 4:
                                     if (!(index < images.length)) return [3 /*break*/, 9];
                                     image = images[index];
                                     if (!(image.url && image.fileName)) return [3 /*break*/, 8];
-                                    _h.label = 5;
+                                    _k.label = 5;
                                 case 5:
-                                    _h.trys.push([5, 7, , 8]);
+                                    _k.trys.push([5, 7, , 8]);
                                     if (!fs.existsSync(file.path + '/images')) {
                                         fs.mkdirSync(file.path + '/images');
                                     }
                                     return [4 /*yield*/, downloadFile(image.url, file.path + '/images/' + image.fileName)];
                                 case 6:
-                                    _h.sent();
+                                    _k.sent();
                                     return [3 /*break*/, 8];
                                 case 7:
-                                    e_2 = _h.sent();
+                                    e_2 = _k.sent();
                                     console.log('[downloadFile Error] ', e_2);
                                     return [3 /*break*/, 8];
                                 case 8:
                                     index++;
                                     return [3 /*break*/, 4];
                                 case 9:
-                                    realFilePath = "./".concat(subPageDocumentNames_1.includes(file.name) ? outputPath_1 === null || outputPath_1 === void 0 ? void 0 : outputPath_1.replace('pages', subPageRoot_1) : outputPath_1, "/").concat(file.name);
+                                    realFilePath = "./".concat(subPageDocumentNames_1.includes(file.name)
+                                        ? outputPath_1 === null || outputPath_1 === void 0 ? void 0 : outputPath_1.replace('pages', subPageRoot_1)
+                                        : outputPath_1, "/").concat(file.name);
                                     if ((doc === null || doc === void 0 ? void 0 : doc.type) === 'Component') {
                                         realFilePath = "./".concat(outputPath_1, "/components/").concat(file.name);
                                     }
@@ -37043,32 +37321,35 @@ function run(args, options) {
                                     if (fs.existsSync(realFilePath)) {
                                         removeDir(realFilePath);
                                     }
+                                    console.log('realFilePath: ', realFilePath, doc === null || doc === void 0 ? void 0 : doc.fileName, doc === null || doc === void 0 ? void 0 : doc.type);
                                     if ((doc === null || doc === void 0 ? void 0 : doc.type) === 'Page') {
-                                        fs.copySync("".concat(cacheDirPath, "/src/pages/").concat(file.name), realFilePath);
+                                        console.log('realFilePath: ', realFilePath);
+                                        fs.copySync("".concat(cacheDirPath, "/src/pages/").concat(file.name), realFilePath.replace(file.name, doc.fileName));
                                     }
                                     if ((doc === null || doc === void 0 ? void 0 : doc.type) === 'Component') {
-                                        fs.copySync("".concat(cacheDirPath, "/src/components/").concat(file.name), realFilePath);
+                                        console.log('realFilePath1: ', realFilePath);
+                                        fs.copySync("".concat(cacheDirPath, "/src/components/").concat(file.name), realFilePath.replace(file.name, doc.fileName));
                                     }
-                                    _h.label = 10;
+                                    _k.label = 10;
                                 case 10: return [2 /*return*/];
                             }
                         });
                     };
                     i = 0;
-                    _f.label = 11;
+                    _h.label = 11;
                 case 11:
                     if (!(i < files.length)) return [3 /*break*/, 14];
                     return [5 /*yield**/, _loop_1(i)];
                 case 12:
-                    _f.sent();
-                    _f.label = 13;
+                    _h.sent();
+                    _h.label = 13;
                 case 13:
                     i++;
                     return [3 /*break*/, 11];
                 case 14:
                     // 更新同步时间
                     cache$1.setKey(currentLastTimeKey, String(Date.now()));
-                    indexPage_1 = (_d = project.appConfig) === null || _d === void 0 ? void 0 : _d.indexPage;
+                    indexPage_1 = (_f = project.appConfig) === null || _f === void 0 ? void 0 : _f.indexPage;
                     if (indexPage_1) {
                         // 首页排序
                         syncMap.pages = syncMap.pages.sort(function (a, b) {
@@ -37120,11 +37401,21 @@ function run(args, options) {
                             fs.writeFileSync('./src/app.tsx', appContentWithImport);
                         }
                     }
+                    utilsFilePath = "".concat(cacheDirPath, "/src/utils.js");
+                    if (process.env.DEV) {
+                        console.log('[utilsFilePath]', utilsFilePath);
+                    }
                     // 生成 utils & constants
-                    fs.copyFileSync("".concat(cacheDirPath, "/src/utils.js"), './src/utils/utils.js');
+                    fs.copyFileSync(utilsFilePath, './src/utils/utils.js');
                     fs.copyFileSync("".concat(cacheDirPath, "/src/constants.js"), './src/utils/constants.js');
+                    if (process.env.DEV) {
+                        console.log('[Start CreatePartalImport]');
+                    }
                     portalImportCode = createPartalImport(project, outputPath_1, solution);
                     fs.writeFileSync('./src/utils/portal.js', portalImportCode);
+                    if (process.env.DEV) {
+                        console.log('[End CreatePartalImport]');
+                    }
                     if (!isWeb) {
                         // 小程序配置
                         genAppConfig(options.frame || project.type, project, syncMap);
@@ -37132,6 +37423,9 @@ function run(args, options) {
                     else {
                         createAppFile(project);
                     }
+                    if (process.env.DEV) {
+                        console.log('[End GenAppConfig]');
+                    }
                     haveUpdate = writePackageJSON(packageJSON);
                     if (haveUpdate) {
                         console.log('[INFO] package.json 文件已更新，将重新安装依赖');
@@ -37146,7 +37440,7 @@ function run(args, options) {
                     console.log("[INFO ".concat(new Date().toLocaleString(), "] \u4EE3\u7801\u589E\u91CF\u540C\u6B65\u5B8C\u6210"));
                     return [2 /*return*/, 0];
                 case 15:
-                    e_1 = _f.sent();
+                    e_1 = _h.sent();
                     console.log(chalk__default["default"].red(getErrorMessage(e_1) || "Unexpected error: ".concat(e_1)));
                     // 保存缓存
                     cache$1.removeKey(currentLastTimeKey);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthen/cli",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Appthen Cli Tool",
   "files": [
     "dist",