@moluoxixi/vite-config 0.0.26 → 0.0.27

package/es/index.mjs

@@ -829,6 +829,17 @@ function createVirtualPlugin(userConfig) {
     ...restHooks
   };
 }
+function cleanRoute(route) {
+  const cleaned = { ...route };
+  if (cleaned.children) {
+    if (Array.isArray(cleaned.children) && cleaned.children.length > 0) {
+      cleaned.children = cleaned.children.map(cleanRoute);
+    } else {
+      delete cleaned.children;
+    }
+  }
+  return cleaned;
+}
 function findParentRouteHandle(modules2, parentPath) {
   for (const route of modules2) {
     if (route.path === parentPath) {
@@ -842,24 +853,48 @@ function findParentRouteHandle(modules2, parentPath) {
   }
   return void 0;
 }
+function parseModulePath(modulePath) {
+  const pathArr = modulePath.split("/").filter((item) => item && !item.includes("."));
+  if (pathArr.at(-1) === "src") {
+    pathArr.pop();
+  }
+  const componentName = pathArr.at(-1);
+  const path2 = `/${pathArr.join("/")}`;
+  const parentPath = `/${pathArr.slice(0, -1).join("/")}`;
+  return { pathArr, componentName, path: path2, parentPath };
+}
+function processComponent(componentLoader, componentName, eager) {
+  if (eager) {
+    return {
+      component: componentLoader,
+      metaTitle: (componentLoader == null ? void 0 : componentLoader.name) || componentName
+    };
+  }
+  return {
+    component: typeof componentLoader === "function" ? componentLoader : componentLoader,
+    metaTitle: componentName
+  };
+}
 function generateRoutes(files, prefix = "", baseRoute, eager = false) {
   const newBaseRoute = typeof baseRoute === "string" ? { name: baseRoute } : baseRoute;
   const modules2 = newBaseRoute ? [newBaseRoute] : [];
-  return Object.keys(files).sort((a, b) => {
+  const fileKeys = Object.keys(files);
+  if (fileKeys.length === 0) {
+    return [];
+  }
+  return fileKeys.sort((a, b) => {
     const aLength = a.split("/").length;
     const bLength = b.split("/").length;
     return bLength > aLength ? -1 : 1;
   }).reduce((modules22 = [], modulePath) => {
     const componentLoader = files[modulePath];
-    if (!componentLoader || modulePath === "install")
+    if (!componentLoader || modulePath === "install") {
+      return modules22;
+    }
+    const { path: path2, parentPath, componentName } = parseModulePath(modulePath);
+    if (!componentName) {
       return modules22;
-    const pathArr = modulePath.split("/").filter((item) => item && !item.includes("."));
-    if (pathArr.at(-1) === "src") {
-      pathArr.pop();
     }
-    const componentName = pathArr.at(-1);
-    const path2 = `/${pathArr.join("/")}`;
-    const parentPath = `/${pathArr.slice(0, -1).join("/")}`;
     let parentRoute;
     if (newBaseRoute) {
       newBaseRoute.children = newBaseRoute.children || [];
@@ -869,56 +904,64 @@ function generateRoutes(files, prefix = "", baseRoute, eager = false) {
     } else {
       parentRoute = findParentRouteHandle(modules22, parentPath);
     }
-    let component;
-    let metaTitle = componentName;
-    if (eager) {
-      component = componentLoader;
-      metaTitle = (component == null ? void 0 : component.name) || componentName;
-    } else {
-      component = typeof componentLoader === "function" ? componentLoader : componentLoader;
-      metaTitle = componentName;
-    }
+    const { component, metaTitle } = processComponent(componentLoader, componentName, eager);
+    const routeItem = {
+      path: path2,
+      name: componentName,
+      meta: {
+        title: metaTitle
+      },
+      component
+    };
     if (parentRoute) {
-      if (!parentRoute.children)
+      if (!parentRoute.children) {
         parentRoute.children = [];
-      parentRoute.children.push({
-        path: path2,
-        name: componentName,
-        meta: {
-          title: metaTitle
-        },
-        component
-      });
+      }
+      parentRoute.children.push(routeItem);
     } else {
-      modules22.push({
-        path: path2,
-        name: componentName,
-        meta: {
-          title: metaTitle
-        },
-        component
-      });
+      modules22.push(routeItem);
     }
     return modules22;
-  }, modules2);
+  }, modules2).map(cleanRoute).filter((route) => {
+    return !(route.children && Array.isArray(route.children) && route.children.length === 0);
+  });
 }
 function findDefaultRouteHandle(routes) {
   var _a, _b, _c;
+  if (!routes || routes.length === 0) {
+    return "";
+  }
   for (const route of routes) {
     if ((_a = route.meta) == null ? void 0 : _a.default) {
-      return route.path;
-    } else {
-      if ((_b = route.children) == null ? void 0 : _b.length) {
-        return findDefaultRouteHandle(route.children);
+      return route.path || "";
+    }
+    if ((_b = route.children) == null ? void 0 : _b.length) {
+      const childPath = findDefaultRouteHandle(route.children);
+      if (childPath) {
+        return childPath;
       }
     }
   }
-  return (_c = routes == null ? void 0 : routes[0]) == null ? void 0 : _c.path;
+  return ((_c = routes[0]) == null ? void 0 : _c.path) || "";
+}
+function extractGlob(globVal) {
+  return globVal.glob || globVal;
+}
+function getEagerOption(globVal, globalEager) {
+  return globVal.eager ?? globalEager ?? false;
+}
+function generateImportCode(varName, glob, eager) {
+  if (eager) {
+    return `const ${varName} = import.meta.glob(${JSON.stringify(glob)}, { eager: true, import: 'default' });
+`;
+  }
+  return `const ${varName} = import.meta.glob(${JSON.stringify(glob)});
+`;
 }
 function createAutoRoutesPlugin({ routeConfig, virtualModuleId, dts, root, eager: globalEager }) {
   const VIRTUAL_MODULE_ID = virtualModuleId || "virtual:auto-routes";
   const watchGlobs = Object.values(routeConfig).flatMap((globVal) => {
-    const g = globVal.glob || globVal;
+    const g = extractGlob(globVal);
     return Array.isArray(g) ? g : [g];
   });
   return createVirtualPlugin(
@@ -934,33 +977,29 @@ function createAutoRoutesPlugin({ routeConfig, virtualModuleId, dts, root, eager
         const routes = [];
         Object.entries(routeConfig).forEach(([prefix, globVal], index2) => {
           const varName = `files${index2}`;
-          const glob = globVal.glob || globVal;
-          const eager = globVal.eager ?? globalEager ?? false;
-          if (eager) {
-            imports.push(
-              `const ${varName} = import.meta.glob(${JSON.stringify(glob)}, { eager: true, import: 'default' });
-`
-            );
-          } else {
-            imports.push(
-              `const ${varName} = import.meta.glob(${JSON.stringify(glob)});
-`
-            );
-          }
+          const glob = extractGlob(globVal);
+          const eager = getEagerOption(globVal, globalEager);
           const baseRoute = globVal.baseRoute;
-          routes.push(`...generateRoutes(${varName}, '${prefix}',${JSON.stringify(baseRoute)}, ${eager})`);
+          const baseRouteParam = baseRoute !== void 0 ? JSON.stringify(baseRoute) : "undefined";
+          imports.push(generateImportCode(varName, glob, eager));
+          routes.push(`...generateRoutes(${varName}, '${prefix}',${baseRouteParam}, ${eager})`);
         });
+        const routesCode = routes.length > 0 ? `[${routes.join(",\n")}]` : "[]";
         return `
           ${imports.join("\n")}
+          ${findParentRouteHandle}
+          ${parseModulePath}
+          ${processComponent}
+          ${cleanRoute}
+          ${findDefaultRouteHandle}
+
           const findParentRoute = ${findParentRouteHandle}
 
           const generateRoutes = ${generateRoutes};
 
           const findDefaultRoute = ${findDefaultRouteHandle};
 
-          ${findParentRouteHandle}
-          ${findDefaultRouteHandle}
-          const routes = [${routes.join(",\n")}];
+          const routes = ${routesCode}.flat().filter(Boolean);
 
           export { routes, findDefaultRoute };
           export default routes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moluoxixi/vite-config",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description": "ViteConfig 组件",
   "sideEffects": [
     "*.css",