next-vite-router 1.2.3 → 1.3.0

package/dist/index.js

@@ -1,193 +1,227 @@
-import { n as p, b as z } from "./tree-HwBRWJNI.js";
-import { a as V, e as W } from "./tree-HwBRWJNI.js";
-import c, { Suspense as d, lazy as b, createContext as v, useContext as L } from "react";
-import { useParams as A } from "react-router-dom";
-const M = {
+import { p as h, r as F, b } from "./tree-DfnssFxU.js";
+import { a as et, c as nt, e as rt, n as at } from "./tree-DfnssFxU.js";
+import u, { lazy as v, Suspense as z, createContext as $, useContext as A } from "react";
+import { useParams as k } from "react-router-dom";
+const d = {
   enableLazyLoading: !0
 };
-let m = { ...M };
-function j(e) {
-  m = { ...m, ...e };
-}
-function k() {
-  return m;
-}
-let g = [];
-function q(e, t) {
-  g.push({ pattern: e, middleware: t });
-}
-function B() {
-  g = [];
-}
-function h(e, t) {
-  let n = t;
-  for (const r of g)
-    r.pattern.lastIndex = 0, r.pattern.test(e) && (n = r.middleware(n)), r.pattern.lastIndex = 0;
-  return n;
-}
-const S = () => c.createElement("div"), C = /* @__PURE__ */ new Map();
-function R(e, t, n) {
-  const r = k();
-  if (r.enableLazyLoading === !1) {
-    const s = c.lazy(e), i = c.createElement(
-      d,
-      { fallback: null },
-      // No loading fallback when disabled
-      c.createElement(s)
-    );
-    return n ? h(n, i) : i;
-  }
-  let a = C.get(t);
-  a || (a = b(e), C.set(t, a));
-  const l = r.loadingFallback || S, o = c.createElement(
-    d,
-    { fallback: c.createElement(l) },
-    c.createElement(a)
+let i = { ...d };
+function U(t) {
+  i = { ...i, ...t };
+}
+function V() {
+  i = { ...d };
+}
+function N() {
+  return i;
+}
+let p = [];
+function W(t, e) {
+  p.push({ pattern: t, middleware: e });
+}
+function X() {
+  p = [];
+}
+function R(t, e) {
+  let r = e;
+  for (const n of p)
+    n.pattern.lastIndex = 0, n.pattern.test(t) && (r = n.middleware(r)), n.pattern.lastIndex = 0;
+  return r;
+}
+const M = () => u.createElement("div"), m = /* @__PURE__ */ new Map();
+function T() {
+  const t = N();
+  if (t.enableLazyLoading === !1)
+    return null;
+  const e = t.loadingFallback || M;
+  return u.createElement(e);
+}
+function Y() {
+  m.clear();
+}
+function C(t, e, r) {
+  let n = m.get(e);
+  n || (n = v(t), m.set(e, n));
+  const a = u.createElement(
+    z,
+    { fallback: u.createElement(T) },
+    u.createElement(n)
   );
-  return n ? h(n, o) : o;
+  return r ? R(r, a) : a;
 }
-const w = v(void 0);
-function D({
-  name: e,
-  children: t
+const y = $(void 0);
+function I({
+  name: t,
+  children: e
 }) {
-  return c.createElement(
-    w.Provider,
-    { value: e },
-    t
+  return u.createElement(
+    y.Provider,
+    { value: t },
+    e
   );
 }
-function N() {
-  return L(w);
-}
-function y(e, t) {
-  return h(e, c.createElement(t));
-}
-function T(e) {
-  return /^\[\[\.\.\..+\]\]$/.test(e);
-}
-function f(e, t, n = !1) {
-  const r = e.page;
-  if (!r)
-    throw new Error(`Route node "${e.fullPath}" has no page loader`);
-  const a = R(
-    async () => ({ default: (await r()).default }),
-    `page:${e.fullPath || t}`,
-    t
-  ), l = e.segment.match(/^\[\[?\.\.\.(.+?)\]\]?$/), o = l ? c.createElement(D, {
-    name: l[1],
+function S() {
+  return A(y);
+}
+function P(t, e) {
+  return R(t, u.createElement(e));
+}
+function D(t) {
+  const e = h(t)[0];
+  return (e == null ? void 0 : e.kind) === "catchAll" && e.optional;
+}
+function g(t) {
+  const e = h(t)[0];
+  return e ? F(e) : "";
+}
+function c(t, e) {
+  return f(t, e, !0);
+}
+function f(t, e, r = !1) {
+  const n = t.page;
+  if (!n)
+    throw new Error(`Route node "${t.fullPath}" has no page loader`);
+  const a = C(
+    async () => ({ default: (await n()).default }),
+    `page:${t.fullPath || e}`,
+    e
+  ), o = h(t.segment)[0], l = (o == null ? void 0 : o.kind) === "catchAll" ? u.createElement(I, {
+    name: o.name,
     children: a
   }) : a;
-  return n ? { index: !0, element: o } : { path: p(e.segment), element: o };
+  return r ? { index: !0, element: l } : { path: g(t.segment), element: l };
 }
-function P(e) {
-  const t = e.notFound;
-  if (!t)
-    throw new Error(`Route node "${e.fullPath}" has no not-found loader`);
-  const n = e.fullPath ? `/${e.fullPath}` : "/";
+function G(t) {
+  const e = t.notFound;
+  if (!e)
+    throw new Error(`Route node "${t.fullPath}" has no not-found loader`);
+  const r = t.fullPath ? `/${t.fullPath}` : "/";
   return {
     path: "*",
-    element: R(
-      async () => ({ default: (await t()).default }),
-      `notfound:${e.fullPath}`,
-      n
+    element: C(
+      async () => ({ default: (await e()).default }),
+      `notfound:${t.fullPath}`,
+      r
     )
   };
 }
-function F(e, t) {
-  const n = [];
-  return [...e.children.entries()].sort(([r], [a]) => r.localeCompare(a)).forEach(([r, a]) => {
-    const l = p(r), o = l ? t ? `${t}/${l}` : `/${l}` : t;
-    n.push(...$(a, !1, o));
-  }), n;
+function E(t) {
+  return t.notFound ? [G(t)] : [];
 }
-function E(e, t) {
-  const n = [];
-  return e.page && n.push(f(e, t || "/", !0)), n.push(...F(e, t)), e.notFound && n.push(P(e)), n;
+function O(t, e, r, n) {
+  return {
+    ...e ? { path: e } : {},
+    element: P(t, r),
+    children: n.length > 0 ? n : void 0
+  };
 }
-function $(e, t = !1, n = "") {
+function w(t, e) {
   const r = [];
-  if (t) {
-    const u = E(e, "");
-    return e.layout ? (r.push({
-      path: "/",
-      element: y("/", e.layout),
-      children: u
-    }), r) : e.page ? u.length > 1 ? [{
-      path: "/",
-      children: u
-    }] : [{
-      path: "/",
-      element: f(e, "/", !1).element
-    }] : e.notFound ? (r.push({
-      path: "/",
-      children: u
-    }), r) : u;
-  }
-  const a = p(e.segment), l = !a, o = l ? n : n + "/" + a, s = F(e, o), i = e.notFound ? [P(e)] : [];
-  if (e.layout) {
-    const u = E(e, o);
-    return [{
-      ...l ? {} : { path: a },
-      element: y(o, e.layout),
-      children: u.length > 0 ? u : void 0
-    }];
-  }
-  if (e.page && !l) {
-    if (T(e.segment)) {
-      const u = f(e, n, !0), x = {
-        path: a,
-        element: f(e, o).element,
-        children: [...s, ...i].length > 0 ? [...s, ...i] : void 0
-      };
-      return [u, x];
-    }
-    return s.length > 0 || i.length > 0 ? [{
-      path: a,
-      children: [
-        f(e, o, !0),
-        ...s,
-        ...i
-      ]
-    }] : [{
-      path: a,
-      element: f(e, o).element
-    }];
-  }
-  if (e.page || e.notFound || !l) {
-    const u = [
-      ...e.page ? [f(e, o, !0)] : [],
-      ...s,
-      ...i
+  return [...t.children.entries()].sort(([n], [a]) => n.localeCompare(a)).forEach(([n, a]) => {
+    const o = g(n), l = o ? e ? `${e}/${o}` : `/${o}` : e;
+    r.push(...x(a, !1, l));
+  }), r;
+}
+function L(t, e) {
+  const r = [];
+  return t.page && r.push(c(t, e || "/")), r.push(...w(t, e)), r.push(...E(t)), r;
+}
+function j(t, e, r, n, a, o) {
+  if (D(t.segment)) {
+    const l = [...a, ...o];
+    return [
+      c(t, e),
+      {
+        path: n,
+        element: f(t, r).element,
+        children: l.length > 0 ? l : void 0
+      }
     ];
-    return [{
-      ...l ? {} : { path: a },
-      children: u.length > 0 ? u : void 0
-    }];
   }
-  return s;
-}
-function H(e, t, n, r) {
+  return a.length > 0 || o.length > 0 ? [{
+    path: n,
+    children: [
+      c(t, r),
+      ...a,
+      ...o
+    ]
+  }] : [{
+    path: n,
+    element: f(t, r).element
+  }];
+}
+function q(t, e, r, n) {
+  const a = [
+    ...t.page ? [c(t, e)] : [],
+    ...r,
+    ...n
+  ];
+  return [{
+    children: a.length > 0 ? a : void 0
+  }];
+}
+function B(t) {
+  const e = L(t, "");
+  return t.layout ? [{
+    path: "/",
+    element: P("/", t.layout),
+    children: e
+  }] : t.page ? e.length > 1 ? [{ path: "/", children: e }] : [{
+    path: "/",
+    element: f(t, "/", !1).element
+  }] : t.notFound ? [{ path: "/", children: e }] : e;
+}
+function x(t, e = !1, r = "") {
+  if (e)
+    return B(t);
+  const n = g(t.segment), a = !n, o = a ? r : r + "/" + n, l = w(t, o), s = E(t);
+  return t.layout ? [O(
+    o,
+    a ? "" : n,
+    t.layout,
+    L(t, o)
+  )] : t.page && !a ? j(
+    t,
+    r,
+    o,
+    n,
+    l,
+    s
+  ) : t.page || t.notFound || !a ? a ? q(t, o, l, s) : [{
+    path: n,
+    children: [
+      ...t.page ? [c(t, o)] : [],
+      ...l,
+      ...s
+    ]
+  }] : l;
+}
+function Z(t, e, r, n) {
   return () => {
-    const a = z(e, t, n, r);
-    return $(a, !0);
+    const a = b(t, e, r, n);
+    return x(a, !0);
   };
 }
-function J() {
-  const e = A(), t = N();
-  return typeof t == "string" && e["*"] !== void 0 ? { ...e, [t]: e["*"] } : e;
+function _() {
+  const t = k(), e = S();
+  return typeof e == "string" && t["*"] !== void 0 ? { ...t, [e]: t["*"] } : t;
 }
 export {
-  D as CatchAllParamProvider,
-  V as assertNoDuplicateRoutes,
-  z as buildRouteTree,
-  B as clearMiddlewares,
-  j as configureRouter,
-  R as createLazyElement,
-  H as createRouteGenerator,
-  W as extractRoutePath,
-  p as normalizeSegment,
-  q as registerMiddleware,
-  $ as treeToRoutes,
-  J as useParams
+  I as CatchAllParamProvider,
+  et as assertNoDuplicateRoutes,
+  nt as assertNoRouteConflicts,
+  b as buildRouteTree,
+  Y as clearLazyCache,
+  X as clearMiddlewares,
+  U as configureRouter,
+  C as createLazyElement,
+  Z as createRouteGenerator,
+  rt as extractRoutePath,
+  at as normalizeSegment,
+  h as parseRouteSegments,
+  W as registerMiddleware,
+  V as resetRouterConfig,
+  F as routeSegmentToPath,
+  x as treeToRoutes,
+  _ as useParams
 };

package/dist/plugin.cjs

@@ -0,0 +1,63 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("node:fs"),m=require("node:path"),x=require("./tree-hc1dSMdb.cjs");function w(n){const a=n.map(x.routeSegmentToPath).filter(Boolean);return a.length>0?`/${a.join("/")}`:"/"}function S(n){const a=[["pagesDir",n.pagesDir],["pageFile",n.pageFile],["layoutFile",n.layoutFile],["notFoundFile",n.notFoundFile]];for(const[t,e]of a)if(!e.trim())throw new Error(`nextViteRouter option "${t}" must not be empty.`);const s=a.slice(1),i=s.find(([,t],e)=>s.slice(e+1).some(([,r])=>r===t));if(i)throw new Error(`nextViteRouter file options must be distinct; "${i[0]}" is duplicated.`)}function T(n){return n.replace(/\\/g,"/").replace(/^\.\//,"").replace(/^\/|\/$/g,"")}function k(n,a,s){const i=a.pageFile??"page.tsx",t=new Map;for(const e of R(n,i,s)){const r=x.extractRoutePath(e,a),l=x.parseRouteSegments(r),d=l.filter(u=>u.kind==="dynamic"||u.kind==="catchAll").map(u=>({name:u.name,optional:u.kind==="catchAll"&&u.optional})),c=w(l);t.set(c,{path:c,params:d});const f=l[l.length-1];if((f==null?void 0:f.kind)==="catchAll"&&f.optional){const u=w(l.slice(0,-1));t.has(u)||t.set(u,{path:u,params:[]})}}return[...t.values()].sort((e,r)=>e.path.localeCompare(r.path))}function R(n,a,s){const i=[];function t(e){for(const r of b.readdirSync(e,{withFileTypes:!0})){const l=m.join(e,r.name);if(r.isDirectory())t(l);else if(r.isFile()&&r.name===a){const d=m.relative(n,l).replace(/\\/g,"/");i.push(`/${s}/${d}`)}}}return b.existsSync(n)&&t(n),i}function G(n){const a=n.map(({path:i})=>`  | ${JSON.stringify(i)}`).join(`
+`),s=n.map(({path:i,params:t})=>{const e=t.length>0?[...t.map(({name:r,optional:l})=>`    ${r}${l?"?":""}: string;`)].join(`
+`):"    [key: string]: never;";return`  ${JSON.stringify(i)}: {
+${e}
+  };`}).join(`
+`);return`declare module 'virtual:next-vite-router' {
+  import type { ReactElement } from 'react';
+  import type { RouteObject } from 'react-router-dom';
+
+  export type RoutePath =
+${a||'  | "/"'};
+
+  export type RouteParams<P extends RoutePath> = P extends keyof RoutePathParams
+    ? RoutePathParams[P]
+    : never;
+
+  export interface RoutePathParams {
+${s}
+  }
+
+  export const generateRoutes: () => RouteObject[];
+  export function Router(): ReactElement | null;
+  export function useParams<T extends Record<string, string | undefined> = Record<string, string | undefined>>(): T;
+  export { Link, useRoutes } from 'react-router-dom';
+}
+`}function O(n={}){const{pagesDir:a="src/app",pageFile:s="page.tsx",layoutFile:i="layout.tsx",notFoundFile:t="not-found.tsx"}=n;S({pagesDir:a,pageFile:s,layoutFile:i,notFoundFile:t});const e=T(a),r={pagesDir:e,pageFile:s,layoutFile:i,notFoundFile:t},l="virtual:next-vite-router",d="\0"+l;let c="",f="",u,h;function F(){const o=G(k(c,r,e));b.writeFileSync(f,o,"utf-8")}return{name:"next-vite-router",configResolved(o){c=m.resolve(o.root,a),f=m.join(m.dirname(c),"virtual-next-vite-router.d.ts"),x.assertNoRouteConflicts(R(c,s,e),R(c,t,e),r),F()},configureServer(o){if(u===o)return;h==null||h(),u=o;const g=$=>{if(m.relative(c,$).startsWith("..")||![s,i,t].includes(m.basename($)))return;try{x.assertNoRouteConflicts(R(c,s,e),R(c,t,e),r)}catch(P){o.config.logger.error(P instanceof Error?P.message:String(P));return}F();const v=o.moduleGraph.getModuleById(d);v&&(o.moduleGraph.invalidateModule(v),p&&clearTimeout(p),p=setTimeout(()=>{p=void 0,o.ws.send({type:"full-reload",path:"*"})},0))};let p;const y=()=>{p&&(clearTimeout(p),p=void 0),o.watcher.off("add",g),o.watcher.off("unlink",g),o.watcher.off("close",y),u===o&&(u=void 0,h=void 0)};o.watcher.on("add",g),o.watcher.on("unlink",g),o.watcher.once("close",y),h=y},resolveId(o){if(o===l)return d},load(o){if(o===d){const g=`/${e}/**/${s}`,p=`/${e}/**/${i}`,y=`/${e}/**/${t}`;return`
+import { buildRouteTree, treeToRoutes, normalizeSegment, createLazyElement, useParams } from 'next-vite-router';
+import { Link, useRoutes } from 'react-router-dom';
+
+const pagesGlob = import.meta.glob(${JSON.stringify(g)});
+const layoutsGlob = import.meta.glob(${JSON.stringify(p)}, { eager: true });
+const notFoundsGlob = import.meta.glob(${JSON.stringify(y)});
+
+// Keep the raw root-relative glob keys. extractRoutePath (via buildRouteTree)
+// is the single place that strips the pagesDir prefix; stripping it here as
+// well would double-remove it and let the prefix regex match a same-named
+// nested folder (e.g. pagesDir "app" turning "app/docs/app" into "/").
+const pages = pagesGlob;
+const layouts = layoutsGlob;
+const notFounds = notFoundsGlob;
+
+export function generateRoutes() {
+  const tree = buildRouteTree(pages, layouts, notFounds, ${JSON.stringify(r)});
+  const routes = treeToRoutes(tree, true);
+  return routes;
+}
+
+export function Router() {
+  routes ??= generateRoutes();
+  return useRoutes(routes);
+}
+
+let routes;
+
+if (import.meta.hot) {
+  import.meta.hot.accept(() => {
+    routes = undefined;
+  });
+}
+
+export { Link, useRoutes };
+export { useParams };
+`}}}}exports.nextViteRouter=O;

package/dist/plugin.d.cts

@@ -0,0 +1,12 @@
+import { Plugin as Plugin_2 } from 'vite';
+
+export declare function nextViteRouter(options?: NextViteRouterPluginOptions): Plugin_2;
+
+export declare type NextViteRouterPluginOptions = {
+    pagesDir?: string;
+    pageFile?: string;
+    layoutFile?: string;
+    notFoundFile?: string;
+};
+
+export { }