vite-plugin-pages2 0.34.10 → 0.34.12

package/dist/index.d.cts

@@ -1,11 +1,6 @@
 import { Logger, ViteDevServer, Plugin } from 'vite';
 import * as debug from 'debug';
 
-/**
- * Promise, or maybe not
- */
-type Awaitable<T> = T | PromiseLike<T>;
-
 interface PageRoute {
     path: string;
     route: string;
@@ -78,6 +73,7 @@ interface VueRoute extends Omit<Optional<VueRouteBase, 'rawRoute' | 'name'>, 'ch
 }
 declare function vueResolver(): PageResolver;
 
+type Awaitable<T> = T | Promise<T>;
 type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
 type ImportMode = 'sync' | 'async';
 type ImportModeResolver = (filepath: string, pluginOptions: ResolvedOptions) => ImportMode;
@@ -223,4 +219,4 @@ declare const syncIndexResolver: ImportModeResolver;
 
 declare function pagesPlugin(userOptions?: UserOptions): Plugin;
 
-export { type CustomBlock, type ImportMode, type ImportModeResolver, type InternalPageResolvers, type Optional, PageContext, type PageOptions, type PageResolver, type ParsedJSX, type ReactRoute, type ResolvedOptions, type SolidRoute, type UserOptions, type VueRoute, pagesPlugin as default, reactResolver, solidResolver, syncIndexResolver, vueResolver };
+export { type Awaitable, type CustomBlock, type ImportMode, type ImportModeResolver, type InternalPageResolvers, type Optional, PageContext, type PageOptions, type PageResolver, type ParsedJSX, type ReactRoute, type ResolvedOptions, type SolidRoute, type UserOptions, type VueRoute, pagesPlugin as default, reactResolver, solidResolver, syncIndexResolver, vueResolver };

package/dist/index.d.ts

@@ -1,11 +1,6 @@
 import { Logger, ViteDevServer, Plugin } from 'vite';
 import * as debug from 'debug';
 
-/**
- * Promise, or maybe not
- */
-type Awaitable<T> = T | PromiseLike<T>;
-
 interface PageRoute {
     path: string;
     route: string;
@@ -78,6 +73,7 @@ interface VueRoute extends Omit<Optional<VueRouteBase, 'rawRoute' | 'name'>, 'ch
 }
 declare function vueResolver(): PageResolver;
 
+type Awaitable<T> = T | Promise<T>;
 type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
 type ImportMode = 'sync' | 'async';
 type ImportModeResolver = (filepath: string, pluginOptions: ResolvedOptions) => ImportMode;
@@ -223,4 +219,4 @@ declare const syncIndexResolver: ImportModeResolver;
 
 declare function pagesPlugin(userOptions?: UserOptions): Plugin;
 
-export { type CustomBlock, type ImportMode, type ImportModeResolver, type InternalPageResolvers, type Optional, PageContext, type PageOptions, type PageResolver, type ParsedJSX, type ReactRoute, type ResolvedOptions, type SolidRoute, type UserOptions, type VueRoute, pagesPlugin as default, reactResolver, solidResolver, syncIndexResolver, vueResolver };
+export { type Awaitable, type CustomBlock, type ImportMode, type ImportModeResolver, type InternalPageResolvers, type Optional, PageContext, type PageOptions, type PageResolver, type ParsedJSX, type ReactRoute, type ResolvedOptions, type SolidRoute, type UserOptions, type VueRoute, pagesPlugin as default, reactResolver, solidResolver, syncIndexResolver, vueResolver };

package/dist/index.js

@@ -36,23 +36,12 @@ var cacheAllRouteRE = /^\[\.{3}(.*)\]$/;
 var replaceDynamicRouteRE = /^\[(?:\.{3})?(.*)\]$/;
 var nuxtDynamicRouteRE = /^_(.*)$/;
 var nuxtCacheAllRouteRE = /^_$/;
-var countSlashRE = /\//g;
 var replaceIndexRE = /\/?index$/;
 
 // src/context.ts
 import { join as join2, resolve as resolve3 } from "path";
 import process2 from "process";
 
-// node_modules/.pnpm/@antfu+utils@9.3.0/node_modules/@antfu/utils/dist/index.mjs
-function toArray(array) {
-  array = array != null ? array : [];
-  return Array.isArray(array) ? array : [array];
-}
-function slash(str) {
-  return str.replace(/\\/g, "/");
-}
-var VOID = Symbol("p-void");
-
 // src/files.ts
 import { join } from "path";
 import { globSync } from "tinyglobby";
@@ -62,6 +51,15 @@ import { resolve, win32 } from "path";
 import { URLSearchParams } from "url";
 import Debug from "debug";
 import micromatch from "micromatch";
+var slashRE = /\\/g;
+function slash(str) {
+  return str.replace(slashRE, "/");
+}
+function toArray(value) {
+  if (value == null)
+    return [];
+  return Array.isArray(value) ? value : [value];
+}
 var debug = {
   hmr: Debug("vite-plugin-pages:hmr"),
   routeBlock: Debug("vite-plugin-pages:routeBlock"),
@@ -76,7 +74,12 @@ function extsToGlob(extensions) {
   return extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0] || "";
 }
 function countSlash(value) {
-  return (value.match(countSlashRE) || []).length;
+  let count = 0;
+  for (let i = 0; i < value.length; i++) {
+    if (value[i] === "/")
+      count++;
+  }
+  return count;
 }
 function isPagesDir(path, options) {
   for (const page of options.dirs) {
@@ -202,6 +205,7 @@ function parsePageRequest(id) {
 }
 
 // src/files.ts
+var VUE_MD_EXT_RE = /\/$/;
 function getPageDirs(PageOptions, root, exclude) {
   const dirs = globSync(slash(PageOptions.dir), {
     ignore: exclude,
@@ -211,7 +215,7 @@ function getPageDirs(PageOptions, root, exclude) {
     cwd: root
   });
   const pageDirs = dirs.map((dir) => __spreadProps(__spreadValues({}, PageOptions), {
-    dir: dir.replace(/\/$/, "")
+    dir: dir.replace(VUE_MD_EXT_RE, "")
   }));
   return pageDirs;
 }
@@ -240,9 +244,10 @@ var componentRE = /"(?:component|element)":("(.*?)")/g;
 var hasFunctionRE = /"(?:props|beforeEnter)":("(.*?)")/g;
 var multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//g;
 var singlelineCommentsRE = /\/\/.*/g;
+var VUE_MD_EXT_RE2 = /(\s)/g;
 function replaceFunction(_, value) {
-  if (typeof value === "function" || typeof value === "function") {
-    const fnBody = value.toString().replace(multilineCommentsRE, "").replace(singlelineCommentsRE, "").replace(/(\s)/g, "");
+  if (typeof value === "function") {
+    const fnBody = value.toString().replace(multilineCommentsRE, "").replace(singlelineCommentsRE, "").replace(VUE_MD_EXT_RE2, "");
     if (fnBody.length < 8 || fnBody.substring(0, 8) !== "function")
       return `_NuFrRa_${fnBody}`;
     return fnBody;
@@ -291,11 +296,33 @@ export default routes;`;
 }
 
 // src/resolvers/react.ts
+var VUE_MD_EXT_RE3 = /^\//;
+function sortReactRoutes(routes) {
+  routes.sort((a, b) => {
+    const weight = (r) => {
+      var _a;
+      const p = (_a = r.path) != null ? _a : "";
+      if (p === "/")
+        return 0;
+      if (p === "*")
+        return 3;
+      if (p.startsWith(":"))
+        return 2;
+      return 1;
+    };
+    return weight(a) - weight(b);
+  });
+  for (const route of routes) {
+    if (route.children)
+      sortReactRoutes(route.children);
+  }
+  return routes;
+}
 function prepareRoutes(routes, options, parent) {
   var _a, _b;
   for (const route of routes) {
     if (parent)
-      route.path = (_a = route.path) == null ? void 0 : _a.replace(/^\//, "");
+      route.path = (_a = route.path) == null ? void 0 : _a.replace(VUE_MD_EXT_RE3, "");
     if (route.children)
       route.children = prepareRoutes(route.children, options, route);
     delete route.rawRoute;
@@ -345,6 +372,7 @@ async function computeReactRoutes(ctx) {
         parentRoutes.push(route);
     }
   });
+  sortReactRoutes(routes);
   let finalRoutes = prepareRoutes(routes, ctx.options);
   finalRoutes = await ((_b = (_a = ctx.options).onRoutesGenerated) == null ? void 0 : _b.call(_a, finalRoutes)) || finalRoutes;
   return finalRoutes;
@@ -380,11 +408,12 @@ ${code}`
 }
 
 // src/resolvers/solid.ts
+var VUE_MD_EXT_RE4 = /^\//;
 function prepareRoutes2(options, routes, parent) {
   var _a, _b;
   for (const route of routes) {
     if (parent)
-      route.path = (_a = route.path) == null ? void 0 : _a.replace(/^\//, "");
+      route.path = (_a = route.path) == null ? void 0 : _a.replace(VUE_MD_EXT_RE4, "");
     if (route.children)
       route.children = prepareRoutes2(options, route.children, route);
     delete route.rawRoute;
@@ -475,12 +504,13 @@ import { dequal } from "dequal";
 import colors from "picocolors";
 
 // src/customBlock.ts
-import fs from "fs";
+import { readFile } from "fs/promises";
 import extractComments from "extract-comments";
 import JSON5 from "json5";
 import { importModule } from "local-pkg";
 import { parse as YAMLParser } from "yaml";
 var routeJSXReg = /^\s+(route)\s+/gm;
+var _compilerSfc;
 function parseJSX(code) {
   return extractComments(code).slice(0, 1).filter((comment) => routeJSXReg.test(comment.value) && comment.value.includes(":") && comment.loc.start.line === 1);
 }
@@ -500,7 +530,9 @@ ${err.message}`);
 }
 async function parseSFC(code) {
   try {
-    const { parse } = await importModule("@vue/compiler-sfc");
+    if (!_compilerSfc)
+      _compilerSfc = await importModule("@vue/compiler-sfc");
+    const { parse } = _compilerSfc;
     return parse(code, {
       pad: "space"
     }).descriptor || parse({
@@ -538,7 +570,7 @@ ${err.message}`);
   }
 }
 async function getRouteBlock(path, options) {
-  const content = fs.readFileSync(path, "utf8");
+  const content = await readFile(path, "utf8");
   const parsedSFC = await parseSFC(content);
   const blockStr = parsedSFC == null ? void 0 : parsedSFC.customBlocks.find((b) => b.type === "route");
   const parsedJSX = parseJSX(content);
@@ -553,13 +585,15 @@ async function getRouteBlock(path, options) {
 }
 
 // src/resolvers/vue.ts
+var VUE_MD_EXT_RE5 = /^\//;
 function prepareRoutes3(ctx, routes, parent) {
   var _a, _b, _c, _d;
+  const indexSuffixRE = new RegExp(`${ctx.options.routeNameSeparator}index$`);
   for (const route of routes) {
     if (route.name)
-      route.name = route.name.replace(new RegExp(`${ctx.options.routeNameSeparator}index$`), "");
+      route.name = route.name.replace(indexSuffixRE, "");
     if (parent)
-      route.path = (_a = route.path) == null ? void 0 : _a.replace(/^\//, "");
+      route.path = (_a = route.path) == null ? void 0 : _a.replace(VUE_MD_EXT_RE5, "");
     if (route.children)
       route.children = prepareRoutes3(ctx, route.children, route);
     if ((_b = route.children) == null ? void 0 : _b.find((c) => c.name === route.name))
@@ -579,6 +613,7 @@ async function computeVueRoutes(ctx, customBlockMap) {
   const { routeStyle, caseSensitive, importPath, routeNameSeparator } = ctx.options;
   const pageRoutes = [...ctx.pageRouteMap.values()].sort((a, b) => countSlash(a.route) - countSlash(b.route));
   const routes = [];
+  const routePaths = new Set(pageRoutes.map((p) => p.route));
   pageRoutes.forEach((page) => {
     const pathNodes = page.route.split("/");
     const component = importPath === "relative" ? page.path.replace(ctx.root, "") : page.path;
@@ -621,10 +656,7 @@ async function computeVueRoutes(ctx, customBlockMap) {
             else
               route.path += "(.*)";
           } else if (nuxtStyle && i === pathNodes.length - 1) {
-            const isIndexFound = pageRoutes.find(({ route: route2 }) => {
-              return route2 === page.route.replace(pathNodes[i], "index");
-            });
-            if (!isIndexFound)
+            if (!routePaths.has(page.route.replace(pathNodes[i], "index")))
               route.path += "?";
           }
         } else {
@@ -698,12 +730,14 @@ function vueResolver() {
 }
 
 // src/options.ts
+var VUE_MD_EXT_RE6 = /^\//;
+var VUE_MD_EXT_RE1 = /\/$/;
 function resolvePageDirs(dirs, root, exclude) {
   dirs = toArray(dirs);
   return dirs.flatMap((dir) => {
     const option = typeof dir === "string" ? { dir, baseRoute: "" } : dir;
     option.dir = slash(resolve2(root, option.dir)).replace(`${root}/`, "");
-    option.baseRoute = option.baseRoute.replace(/^\//, "").replace(/\/$/, "");
+    option.baseRoute = option.baseRoute.replace(VUE_MD_EXT_RE6, "").replace(VUE_MD_EXT_RE1, "");
     return getPageDirs(option, root, exclude);
   });
 }
@@ -882,10 +916,10 @@ function pagesPlugin(userOptions = {}) {
     name: "vite-plugin-pages",
     enforce: "pre",
     async configResolved(config) {
-      if (!userOptions.resolver && config.plugins.find((i) => i.name.includes("vite:react"))) {
+      if (!userOptions.resolver && config.plugins.some((i) => i.name.includes("vite:react"))) {
         userOptions.resolver = "react";
       }
-      if (!userOptions.resolver && config.plugins.find((i) => i.name.includes("solid"))) {
+      if (!userOptions.resolver && config.plugins.some((i) => i.name.includes("solid"))) {
         userOptions.resolver = "solid";
       }
       ctx = new PageContext(userOptions, config.root);