befly-vite 1.5.16 → 1.5.17

package/index.browser.js

@@ -8,69 +8,80 @@
  */
 
 /**
- * 内部扁平结构：一条“最终路由 path + 选用布局 + 页面组件”。
- * @typedef {Object} LayoutConfig
- * @property {string} path
- * @property {string} layoutName
- * @property {any} component
- * @property {Record<string, any>=} meta
- */
-
-/**
- * 内部实现：根据文件名后缀 _数字 判断使用哪个布局，输出扁平布局配置。
+ * 内部实现：根据文件名后缀 _数字 判断使用哪个布局，并直接输出最终路由。
  *
  * 注意：该函数仅供 befly-vite 包内部使用，不作为对外 API。
  *
  * @param {RouteConfig[]} routes
+ * @param {(layoutName: string) => any} resolveLayoutComponent
+ * @param {string=} parentPath
  * @param {string=} inheritLayout
- * @returns {LayoutConfig[]}
+ * @returns {import('vue-router').RouteRecordRaw[]}
  */
-function buildLayoutConfigs(routes, inheritLayout = "") {
-    /** @type {LayoutConfig[]} */
+function parseRoutePath(path) {
+    const rawPath = String(path || "");
+    const match = rawPath.match(/_(\d+)$/);
+
+    return {
+        layoutName: match ? match[1] : "",
+        path: match ? rawPath.slice(0, match.index) : rawPath
+    };
+}
+
+function normalizeRoutePath(path) {
+    return String(path || "")
+        .split("/")
+        .filter(Boolean)
+        .map((segment) => {
+            if (segment.startsWith(":")) {
+                return segment;
+            }
+
+            return segment
+                .replace(/_/g, "-")
+                .replace(/([a-z0-9])([A-Z])/g, "$1-$2")
+                .toLowerCase();
+        })
+        .join("/");
+}
+
+function joinRoutePath(parentPath, childPath) {
+    if (!parentPath) {
+        return childPath;
+    }
+
+    if (!childPath) {
+        return parentPath;
+    }
+
+    return `${parentPath}/${childPath}`;
+}
+
+function buildLayoutRoutes(routes, resolveLayoutComponent, parentPath = "", inheritLayout = "") {
+    /** @type {import('vue-router').RouteRecordRaw[]} */
     const result = [];
 
     for (const route of routes) {
-        const currentPath = route.path || "";
-
-        const pathMatch = currentPath.match(/_(\d+)$/);
-        const currentLayout = pathMatch ? pathMatch[1] : inheritLayout;
+        const { layoutName, path } = parseRoutePath(route.path);
+        const currentLayout = layoutName || inheritLayout;
+        const currentPath = path === "index" ? "" : normalizeRoutePath(path);
+        const fullPath = joinRoutePath(parentPath, currentPath);
 
-        // 中间节点：递归处理子路由，不包裹布局
         if (route.children && route.children.length > 0) {
-            const cleanPath = pathMatch ? currentPath.replace(/_\d+$/, "") : currentPath;
-            const childConfigs = buildLayoutConfigs(route.children, currentLayout);
-
-            for (const child of childConfigs) {
-                const mergedPath = cleanPath ? `${cleanPath}/${child.path}`.replace(/\/+/, "/") : child.path;
-                result.push({
-                    path: mergedPath,
-                    layoutName: child.layoutName,
-                    component: child.component,
-                    meta: child.meta
-                });
-            }
+            result.push(...buildLayoutRoutes(route.children, resolveLayoutComponent, fullPath, currentLayout));
             continue;
         }
 
-        // 叶子节点：包裹布局
-        const lastPart = currentPath;
-        const match = lastPart.match(/_(\d+)$/);
-        const layoutName = match ? match[1] : currentLayout || "default";
-
-        let cleanPath = "";
-        if (lastPart === "index" || (lastPart.startsWith("index_") && match)) {
-            cleanPath = "";
-        } else if (match) {
-            cleanPath = lastPart.replace(/_\d+$/, "");
-        } else {
-            cleanPath = lastPart;
-        }
-
         result.push({
-            path: cleanPath,
-            layoutName: layoutName,
-            component: route.component,
-            meta: route.meta
+            path: fullPath,
+            component: resolveLayoutComponent(currentLayout || "default"),
+            meta: route.meta,
+            children: [
+                {
+                    path: "",
+                    component: route.component
+                }
+            ]
         });
     }
 
@@ -100,23 +111,7 @@ export function Layouts(routes, rootRedirectPath, resolveLayoutComponent) {
 
     const trimmedRootRedirectPath = typeof rootRedirectPath === "string" ? rootRedirectPath.trim() : "";
 
-    const configs = buildLayoutConfigs(routes);
-
-    const layoutRoutes = configs.map((config) => {
-        const layoutComponent = resolveLayoutComponent(config.layoutName);
-
-        return {
-            path: config.path,
-            component: layoutComponent,
-            meta: config.meta,
-            children: [
-                {
-                    path: "",
-                    component: config.component
-                }
-            ]
-        };
-    });
+    const layoutRoutes = buildLayoutRoutes(routes, resolveLayoutComponent);
 
     if (trimmedRootRedirectPath && trimmedRootRedirectPath !== "/") {
         return [

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly-vite",
-    "version": "1.5.16",
-    "gitHead": "29606d61e67d0e446c4b7df92a5104ed05ac909d",
+    "version": "1.5.17",
+    "gitHead": "7e5f2dee776d284ec29cec8aaf9ebc0acf24385d",
     "private": false,
     "description": "Befly Vite 配置预设和插件集合",
     "keywords": [