next-vite-router 1.2.3 → 1.3.0

package/dist/plugin.js

@@ -1,60 +1,73 @@
-import h from "node:fs";
-import l from "node:path";
-import { a as b, n as j } from "./tree-HwBRWJNI.js";
-function $(n) {
-  const e = n.split(l.sep).filter(Boolean).map(j).filter(Boolean);
-  return e.length > 0 ? `/${e.join("/")}` : "/";
+import P from "node:fs";
+import f from "node:path";
+import { c as v, e as S, p as T, r as k } from "./tree-DfnssFxU.js";
+function w(n) {
+  const a = n.map(k).filter(Boolean);
+  return a.length > 0 ? `/${a.join("/")}` : "/";
 }
-function T(n, e) {
-  const r = /* @__PURE__ */ new Map();
-  function i(a) {
-    for (const o of h.readdirSync(a, { withFileTypes: !0 })) {
-      const p = l.join(a, o.name);
-      if (o.isDirectory())
-        i(p);
-      else if (o.isFile() && o.name === e) {
-        const s = l.relative(n, a), u = s.split(l.sep).filter(Boolean), y = u.map((t) => {
-          const c = t.match(/^\[\[\.\.\.(.+)\]\]$/);
-          if (c)
-            return { name: c[1], optional: !0 };
-          const m = t.match(/^\[\.\.\.(.+)\]$/);
-          return m ? { name: m[1], optional: !1 } : void 0;
-        }).filter((t) => !!t), d = $(s);
-        r.set(d, { path: d, params: y });
-        const f = u[u.length - 1];
-        if (f == null ? void 0 : f.match(/^\[\[\.\.\.(.+)\]\]$/)) {
-          const t = u.slice(0, -1).join(l.sep), c = $(t);
-          r.has(c) || r.set(c, { path: c, params: [] });
-        }
-      }
+function G(n) {
+  const a = [
+    ["pagesDir", n.pagesDir],
+    ["pageFile", n.pageFile],
+    ["layoutFile", n.layoutFile],
+    ["notFoundFile", n.notFoundFile]
+  ];
+  for (const [e, t] of a)
+    if (!t.trim())
+      throw new Error(`nextViteRouter option "${e}" must not be empty.`);
+  const s = a.slice(1), i = s.find(
+    ([, e], t) => s.slice(t + 1).some(([, r]) => r === e)
+  );
+  if (i)
+    throw new Error(
+      `nextViteRouter file options must be distinct; "${i[0]}" is duplicated.`
+    );
+}
+function O(n) {
+  return n.replace(/\\/g, "/").replace(/^\.\//, "").replace(/^\/|\/$/g, "");
+}
+function j(n, a, s) {
+  const i = a.pageFile ?? "page.tsx", e = /* @__PURE__ */ new Map();
+  for (const t of R(n, i, s)) {
+    const r = S(t, a), l = T(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);
+    e.set(c, { path: c, params: d });
+    const m = l[l.length - 1];
+    if ((m == null ? void 0 : m.kind) === "catchAll" && m.optional) {
+      const u = w(l.slice(0, -1));
+      e.has(u) || e.set(u, { path: u, params: [] });
     }
   }
-  return h.existsSync(n) && i(n), [...r.values()].sort((a, o) => a.path.localeCompare(o.path));
+  return [...e.values()].sort((t, r) => t.path.localeCompare(r.path));
 }
-function F(n, e) {
-  const r = [];
-  function i(a) {
-    for (const o of h.readdirSync(a, { withFileTypes: !0 })) {
-      const p = l.join(a, o.name);
-      o.isDirectory() ? i(p) : o.isFile() && o.name === e && r.push(l.relative(n, p));
+function R(n, a, s) {
+  const i = [];
+  function e(t) {
+    for (const r of P.readdirSync(t, { withFileTypes: !0 })) {
+      const l = f.join(t, r.name);
+      if (r.isDirectory())
+        e(l);
+      else if (r.isFile() && r.name === a) {
+        const d = f.relative(n, l).replace(/\\/g, "/");
+        i.push(`/${s}/${d}`);
+      }
     }
   }
-  return h.existsSync(n) && i(n), r;
+  return P.existsSync(n) && e(n), i;
 }
-function k(n) {
-  const e = n.match(/^\/(?:\[\.\.\.|:)([^/\]]+)\]?$/);
-  return e == null ? void 0 : e[1];
-}
-function w(n) {
-  const e = n.map(({ path: i }) => `  | "${i}"`).join(`
-`), r = n.map(({ path: i, params: a }) => {
-    const o = i.split("/").map((s) => k(`/${s}`)).filter((s) => !!s), p = o.length > 0 || a.length > 0 ? [
-      ...o.map((s) => `    ${s}: string;`),
-      ...a.map(({ name: s, optional: u }) => `    ${s}${u ? "?" : ""}: string;`)
+function D(n) {
+  const a = n.map(({ path: i }) => `  | ${JSON.stringify(i)}`).join(`
+`), s = n.map(({ path: i, params: e }) => {
+    const t = e.length > 0 ? [
+      ...e.map(({ name: r, optional: l }) => `    ${r}${l ? "?" : ""}: string;`)
     ].join(`
 `) : "    [key: string]: never;";
-    return `  "${i}": {
-${p}
+    return `  ${JSON.stringify(i)}: {
+${t}
   };`;
   }).join(`
 `);
@@ -63,14 +76,14 @@ ${p}
   import type { RouteObject } from 'react-router-dom';
 
   export type RoutePath =
-${e || '  | "/"'};
+${a || '  | "/"'};
 
   export type RouteParams<P extends RoutePath> = P extends keyof RoutePathParams
     ? RoutePathParams[P]
     : never;
 
   export interface RoutePathParams {
-${r}
+${s}
   }
 
   export const generateRoutes: () => RouteObject[];
@@ -80,78 +93,85 @@ ${r}
 }
 `;
 }
-function D(n = {}) {
+function z(n = {}) {
   const {
-    pagesDir: e = "src/app",
-    pageFile: r = "page.tsx",
+    pagesDir: a = "src/app",
+    pageFile: s = "page.tsx",
     layoutFile: i = "layout.tsx",
-    notFoundFile: a = "not-found.tsx"
-  } = n, o = { pagesDir: e, pageFile: r, layoutFile: i, notFoundFile: a }, p = "virtual:next-vite-router", s = "\0" + p;
-  let u = "", y = "", d, f;
-  function g() {
-    const t = w(T(u, r));
-    h.writeFileSync(y, t, "utf-8");
+    notFoundFile: e = "not-found.tsx"
+  } = n;
+  G({ pagesDir: a, pageFile: s, layoutFile: i, notFoundFile: e });
+  const t = O(a), r = { pagesDir: t, pageFile: s, layoutFile: i, notFoundFile: e }, l = "virtual:next-vite-router", d = "\0" + l;
+  let c = "", m = "", u, h;
+  function F() {
+    const o = D(j(c, r, t));
+    P.writeFileSync(m, o, "utf-8");
   }
   return {
     name: "next-vite-router",
-    configResolved(t) {
-      u = l.resolve(t.root, e), y = l.join(l.dirname(u), "virtual-next-vite-router.d.ts"), b(F(u, r), o), g();
+    configResolved(o) {
+      c = f.resolve(o.root, a), m = f.join(f.dirname(c), "virtual-next-vite-router.d.ts"), v(
+        R(c, s, t),
+        R(c, e, t),
+        r
+      ), F();
     },
-    configureServer(t) {
-      if (d === t)
+    configureServer(o) {
+      if (u === o)
         return;
-      f == null || f(), d = t;
-      const c = (P) => {
-        if (l.relative(u, P).startsWith("..") || ![r, i, a].includes(l.basename(P)))
+      h == null || h(), u = o;
+      const g = (b) => {
+        if (f.relative(c, b).startsWith("..") || ![s, i, e].includes(f.basename(b)))
           return;
         try {
-          b(F(u, r), o);
+          v(
+            R(c, s, t),
+            R(c, e, t),
+            r
+          );
         } catch (x) {
-          t.config.logger.error(
+          o.config.logger.error(
             x instanceof Error ? x.message : String(x)
           );
           return;
         }
-        g();
-        const v = t.moduleGraph.getModuleById(s);
-        v && (t.moduleGraph.invalidateModule(v), m && clearTimeout(m), m = setTimeout(() => {
-          m = void 0, t.ws.send({ type: "full-reload", path: "*" });
+        F();
+        const $ = o.moduleGraph.getModuleById(d);
+        $ && (o.moduleGraph.invalidateModule($), p && clearTimeout(p), p = setTimeout(() => {
+          p = void 0, o.ws.send({ type: "full-reload", path: "*" });
         }, 0));
       };
-      let m;
-      const R = () => {
-        m && (clearTimeout(m), m = void 0), t.watcher.off("add", c), t.watcher.off("unlink", c), t.watcher.off("close", R), d === t && (d = void 0, f = void 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);
       };
-      t.watcher.on("add", c), t.watcher.on("unlink", c), t.watcher.once("close", R), f = R;
+      o.watcher.on("add", g), o.watcher.on("unlink", g), o.watcher.once("close", y), h = y;
     },
-    resolveId(t) {
-      if (t === p)
-        return s;
+    resolveId(o) {
+      if (o === l)
+        return d;
     },
-    load(t) {
-      if (t === s)
+    load(o) {
+      if (o === d) {
+        const g = `/${t}/**/${s}`, p = `/${t}/**/${i}`, y = `/${t}/**/${e}`;
         return `
 import { buildRouteTree, treeToRoutes, normalizeSegment, createLazyElement, useParams } from 'next-vite-router';
 import { Link, useRoutes } from 'react-router-dom';
 
-const pagesGlob = import.meta.glob('/${e}/**/${r}');
-const layoutsGlob = import.meta.glob('/${e}/**/${i}', { eager: true });
-const notFoundsGlob = import.meta.glob('/${e}/**/${a}');
+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)});
 
-const transformPath = (path) => path.replace('/${e}/', '');
-
-const pages = Object.fromEntries(
-  Object.entries(pagesGlob).map(([key, value]) => [transformPath(key), value])
-);
-const layouts = Object.fromEntries(
-  Object.entries(layoutsGlob).map(([key, value]) => [transformPath(key), value])
-);
-const notFounds = Object.fromEntries(
-  Object.entries(notFoundsGlob).map(([key, value]) => [transformPath(key), value])
-);
+// 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(o)});
+  const tree = buildRouteTree(pages, layouts, notFounds, ${JSON.stringify(r)});
   const routes = treeToRoutes(tree, true);
   return routes;
 }
@@ -172,9 +192,10 @@ if (import.meta.hot) {
 export { Link, useRoutes };
 export { useParams };
 `;
+      }
     }
   };
 }
 export {
-  D as nextViteRouter
+  z as nextViteRouter
 };

package/dist/tree-DfnssFxU.js

@@ -0,0 +1,143 @@
+function R(t) {
+  return /^\([^)]+\)$/.test(t) ? "" : /^\[\[\.\.\.(.+)\]\]$/.test(t) || /^\[\.\.\.(.+)\]$/.test(t) ? "*" : /^\[([^\]]+)\]$/.test(t) ? t.replace(/^\[([^\]]+)\]$/, ":$1") : t;
+}
+const P = /^[A-Za-z_][A-Za-z0-9_]*$/;
+function A(t) {
+  return t.kind === "group" ? "" : t.kind === "dynamic" ? `:${t.name}` : t.kind === "catchAll" ? "*" : t.name;
+}
+function m(t) {
+  const s = t ? t.split("/").filter(Boolean) : [], o = [], c = /* @__PURE__ */ new Set();
+  for (const a of s) {
+    const n = a.match(/^\(([^)]+)\)$/), e = a.match(/^\[\[\.\.\.(.+)\]\]$/), r = a.match(/^\[\.\.\.(.+)\]$/), i = a.match(/^\[([^\]]+)\]$/), l = e ? { name: e[1], optional: !0, kind: "catchAll" } : r ? { name: r[1], optional: !1, kind: "catchAll" } : i ? { name: i[1], optional: !1, kind: "dynamic" } : void 0;
+    if (n)
+      o.push({ kind: "group", name: n[1] });
+    else if (l) {
+      if (!P.test(l.name))
+        throw new Error(
+          `Invalid route parameter name "${l.name}" in segment "${a}". Parameter names must start with a letter or underscore and contain only letters, numbers, and underscores.`
+        );
+      if (c.has(l.name))
+        throw new Error(
+          `Duplicate route parameter "${l.name}" in route "${t || "/"}".`
+        );
+      c.add(l.name), o.push(l);
+    } else
+      o.push({ kind: "static", name: a });
+  }
+  return o;
+}
+function f(t, { pagesDir: s, pageFile: o = "page.tsx", layoutFile: c = "layout.tsx", notFoundFile: a = "not-found.tsx" } = {}) {
+  const n = t.replace(/\\/g, "/"), e = s == null ? void 0 : s.replace(/\\/g, "/").replace(/^\.\//, "").replace(/^\/|\/$/g, ""), r = e == null ? void 0 : e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), i = [o, c, a].map((l) => l.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+  return n.replace(
+    e ? new RegExp(`^.*?(?:^|/)${r}/`) : /^.*?(?:^|\/)(?:app|pages)\//,
+    ""
+  ).replace(/\\/g, "/").replace(new RegExp(`/?(?:${i})$`), "");
+}
+function $(t) {
+  return t.kind === "group" ? "" : t.kind === "catchAll" ? "*" : t.kind === "dynamic" ? ":param" : A(t);
+}
+function g(t, s) {
+  const o = f(t, s), c = m(o), a = c.map($).filter(Boolean), n = [
+    a.length > 0 ? `/${a.join("/")}` : "/"
+  ], e = c[c.length - 1];
+  if ((e == null ? void 0 : e.kind) === "catchAll" && e.optional) {
+    const r = a.slice(0, -1);
+    n.push(r.length > 0 ? `/${r.join("/")}` : "/");
+  }
+  return n;
+}
+function w(t) {
+  return /(^|\/)(:param|\*)($|\/)/.test(t) ? "pattern" : "literal";
+}
+function j(t, s, o) {
+  const c = t.flatMap((n) => {
+    const e = f(n, o), r = m(e), i = r[r.length - 1];
+    if ((i == null ? void 0 : i.kind) !== "catchAll")
+      return [];
+    const l = r.map($).filter(Boolean), u = l.length > 0 ? `/${l.join("/")}` : "/", p = l.slice(0, -1), k = p.length > 0 ? `/${p.join("/")}` : "/";
+    return [{ filePath: n, paths: /* @__PURE__ */ new Set([u, k]) }];
+  }), a = /* @__PURE__ */ new Map();
+  for (const n of s)
+    for (const e of g(n, o))
+      for (const r of c)
+        if (r.paths.has(e)) {
+          const i = `${e}\0${r.filePath}\0${n}`;
+          a.set(i, {
+            routePath: e,
+            pageFile: r.filePath,
+            notFoundFile: n
+          });
+        }
+  if (a.size > 0)
+    throw new Error(
+      [...a.values()].sort((n, e) => n.routePath.localeCompare(e.routePath)).map(
+        ({ routePath: n, pageFile: e, notFoundFile: r }) => `Conflicting fallback routes "${n}" detected:
+  catch-all page: ${e}
+  not-found file: ${r}
+A not-found route and a catch-all page cannot coexist at the same route level.`
+      ).join(`
+
+`)
+    );
+}
+function d(t, s) {
+  const o = /* @__PURE__ */ new Map();
+  for (const a of t)
+    for (const n of g(a, s)) {
+      const e = o.get(n) ?? [];
+      e.push({ kind: w(n), filePath: a }), o.set(n, e);
+    }
+  const c = [...o.entries()].filter(([, a]) => a.length > 1).sort(([a], [n]) => a.localeCompare(n));
+  if (c.length > 0)
+    throw new Error(
+      c.map(
+        ([a, n]) => `${n[0].kind === "pattern" ? "Ambiguous route pattern" : "Duplicate route"} "${a}" detected:
+${n.sort((e, r) => e.filePath.localeCompare(r.filePath)).map((e) => `  ${e.filePath}`).join(`
+`)}`
+      ).join(`
+
+`)
+    );
+}
+function E(t, s, o) {
+  d(t, o), d(s, o), j(t, s, o);
+}
+function h(t, s, o, c, a) {
+  const n = f(s, a), e = n ? n.split("/") : [];
+  let r = t, i = "";
+  e.forEach((l, u) => {
+    i = i ? `${i}/${l}` : l, r.children.has(l) || r.children.set(l, {
+      segment: l,
+      fullPath: i,
+      children: /* @__PURE__ */ new Map()
+    }), r = r.children.get(l), u === e.length - 1 && (r[c] = o);
+  }), e.length === 0 && (t[c] = o);
+}
+function b(t, s, o, c) {
+  E(
+    Object.keys(t),
+    Object.keys(o),
+    c
+  );
+  const a = {
+    segment: "",
+    fullPath: "",
+    children: /* @__PURE__ */ new Map()
+  };
+  return Object.entries(s).forEach(([n, e]) => {
+    h(a, n, e.default, "layout", c);
+  }), Object.entries(t).forEach(([n, e]) => {
+    h(a, n, e, "page", c);
+  }), Object.entries(o).forEach(([n, e]) => {
+    h(a, n, e, "notFound", c);
+  }), a;
+}
+export {
+  d as a,
+  b,
+  E as c,
+  f as e,
+  R as n,
+  m as p,
+  A as r
+};

package/dist/tree-hc1dSMdb.cjs

@@ -0,0 +1,10 @@
+"use strict";function w(t){return/^\([^)]+\)$/.test(t)?"":/^\[\[\.\.\.(.+)\]\]$/.test(t)||/^\[\.\.\.(.+)\]$/.test(t)?"*":/^\[([^\]]+)\]$/.test(t)?t.replace(/^\[([^\]]+)\]$/,":$1"):t}const R=/^[A-Za-z_][A-Za-z0-9_]*$/;function $(t){return t.kind==="group"?"":t.kind==="dynamic"?`:${t.name}`:t.kind==="catchAll"?"*":t.name}function d(t){const s=t?t.split("/").filter(Boolean):[],o=[],c=new Set;for(const a of s){const n=a.match(/^\(([^)]+)\)$/),e=a.match(/^\[\[\.\.\.(.+)\]\]$/),r=a.match(/^\[\.\.\.(.+)\]$/),i=a.match(/^\[([^\]]+)\]$/),l=e?{name:e[1],optional:!0,kind:"catchAll"}:r?{name:r[1],optional:!1,kind:"catchAll"}:i?{name:i[1],optional:!1,kind:"dynamic"}:void 0;if(n)o.push({kind:"group",name:n[1]});else if(l){if(!R.test(l.name))throw new Error(`Invalid route parameter name "${l.name}" in segment "${a}". Parameter names must start with a letter or underscore and contain only letters, numbers, and underscores.`);if(c.has(l.name))throw new Error(`Duplicate route parameter "${l.name}" in route "${t||"/"}".`);c.add(l.name),o.push(l)}else o.push({kind:"static",name:a})}return o}function u(t,{pagesDir:s,pageFile:o="page.tsx",layoutFile:c="layout.tsx",notFoundFile:a="not-found.tsx"}={}){const n=t.replace(/\\/g,"/"),e=s==null?void 0:s.replace(/\\/g,"/").replace(/^\.\//,"").replace(/^\/|\/$/g,""),r=e==null?void 0:e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"),i=[o,c,a].map(l=>l.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")).join("|");return n.replace(e?new RegExp(`^.*?(?:^|/)${r}/`):/^.*?(?:^|\/)(?:app|pages)\//,"").replace(/\\/g,"/").replace(new RegExp(`/?(?:${i})$`),"")}function g(t){return t.kind==="group"?"":t.kind==="catchAll"?"*":t.kind==="dynamic"?":param":$(t)}function P(t,s){const o=u(t,s),c=d(o),a=c.map(g).filter(Boolean),n=[a.length>0?`/${a.join("/")}`:"/"],e=c[c.length-1];if((e==null?void 0:e.kind)==="catchAll"&&e.optional){const r=a.slice(0,-1);n.push(r.length>0?`/${r.join("/")}`:"/")}return n}function j(t){return/(^|\/)(:param|\*)($|\/)/.test(t)?"pattern":"literal"}function E(t,s,o){const c=t.flatMap(n=>{const e=u(n,o),r=d(e),i=r[r.length-1];if((i==null?void 0:i.kind)!=="catchAll")return[];const l=r.map(g).filter(Boolean),h=l.length>0?`/${l.join("/")}`:"/",m=l.slice(0,-1),A=m.length>0?`/${m.join("/")}`:"/";return[{filePath:n,paths:new Set([h,A])}]}),a=new Map;for(const n of s)for(const e of P(n,o))for(const r of c)if(r.paths.has(e)){const i=`${e}\0${r.filePath}\0${n}`;a.set(i,{routePath:e,pageFile:r.filePath,notFoundFile:n})}if(a.size>0)throw new Error([...a.values()].sort((n,e)=>n.routePath.localeCompare(e.routePath)).map(({routePath:n,pageFile:e,notFoundFile:r})=>`Conflicting fallback routes "${n}" detected:
+  catch-all page: ${e}
+  not-found file: ${r}
+A not-found route and a catch-all page cannot coexist at the same route level.`).join(`
+
+`))}function p(t,s){const o=new Map;for(const a of t)for(const n of P(a,s)){const e=o.get(n)??[];e.push({kind:j(n),filePath:a}),o.set(n,e)}const c=[...o.entries()].filter(([,a])=>a.length>1).sort(([a],[n])=>a.localeCompare(n));if(c.length>0)throw new Error(c.map(([a,n])=>`${n[0].kind==="pattern"?"Ambiguous route pattern":"Duplicate route"} "${a}" detected:
+${n.sort((e,r)=>e.filePath.localeCompare(r.filePath)).map(e=>`  ${e.filePath}`).join(`
+`)}`).join(`
+
+`))}function k(t,s,o){p(t,o),p(s,o),E(t,s,o)}function f(t,s,o,c,a){const n=u(s,a),e=n?n.split("/"):[];let r=t,i="";e.forEach((l,h)=>{i=i?`${i}/${l}`:l,r.children.has(l)||r.children.set(l,{segment:l,fullPath:i,children:new Map}),r=r.children.get(l),h===e.length-1&&(r[c]=o)}),e.length===0&&(t[c]=o)}function b(t,s,o,c){k(Object.keys(t),Object.keys(o),c);const a={segment:"",fullPath:"",children:new Map};return Object.entries(s).forEach(([n,e])=>{f(a,n,e.default,"layout",c)}),Object.entries(t).forEach(([n,e])=>{f(a,n,e,"page",c)}),Object.entries(o).forEach(([n,e])=>{f(a,n,e,"notFound",c)}),a}exports.assertNoDuplicateRoutes=p;exports.assertNoRouteConflicts=k;exports.buildRouteTree=b;exports.extractRoutePath=u;exports.normalizeSegment=w;exports.parseRouteSegments=d;exports.routeSegmentToPath=$;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-vite-router",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "description": "Next.js-like file-based routing for React + Vite",
   "type": "module",
   "main": "./dist/index.js",
@@ -11,12 +11,24 @@
   },
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     },
     "./plugin": {
-      "import": "./dist/plugin.js",
-      "types": "./dist/plugin.d.ts"
+      "import": {
+        "types": "./dist/plugin.d.ts",
+        "default": "./dist/plugin.js"
+      },
+      "require": {
+        "types": "./dist/plugin.d.cts",
+        "default": "./dist/plugin.cjs"
+      }
     }
   },
   "files": [
@@ -36,7 +48,7 @@
   "author": "Rlzee",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Rlzee/next-vite-router"
+    "url": "git+https://github.com/Rlzee/next-vite-router.git"
   },
   "homepage": "https://github.com/Rlzee/next-vite-router#readme",
   "license": "MIT",
@@ -62,7 +74,8 @@
   },
   "scripts": {
     "dev": "vite build --watch",
-    "build": "vite build && vite build -c vite.config.cli.ts",
+    "build": "vite build && vite build -c vite.config.cli.ts && node -e \"import fs from 'node:fs'; for (const f of ['index','plugin']) fs.copyFileSync('dist/'+f+'.d.ts','dist/'+f+'.d.cts')\"",
+    "test": "pnpm run test:params && pnpm run test:generator && pnpm run test:routes && pnpm run test:local && pnpm run test:compatibility",
     "test:local": "node test/test-package.js",
     "test:routes": "node test/test-route-types.js",
     "test:generator": "node --test test/routes.test.js",

package/dist/tree-HwBRWJNI.js

@@ -1,64 +0,0 @@
-function p(t) {
-  return /^\([^)]+\)$/.test(t) ? "" : /^\[\[\.\.\.(.+)\]\]$/.test(t) || /^\[\.\.\.(.+)\]$/.test(t) ? "*" : /^\[([^\]]+)\]$/.test(t) ? t.replace(/^\[([^\]]+)\]$/, ":$1") : t;
-}
-function h(t, { pagesDir: c, pageFile: a = "page.tsx", layoutFile: o = "layout.tsx", notFoundFile: r = "not-found.tsx" } = {}) {
-  const n = t.replace(/\\/g, "/"), e = c == null ? void 0 : c.replace(/\\/g, "/").replace(/^\/|\/$/g, ""), l = [a, o, r].map((u) => u.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
-  return n.replace(
-    e ? new RegExp(`^.*(?:^|/)${e}/`) : /^.*(?:^|\/)(?:app|pages)\//,
-    ""
-  ).replace(/\\/g, "/").replace(new RegExp(`/?(?:${l})$`), "");
-}
-function $(t, c) {
-  const a = h(t, c), o = a ? a.split("/").map(p).filter(Boolean) : [];
-  return o.length > 0 ? `/${o.join("/")}` : "/";
-}
-function d(t, c) {
-  const a = /* @__PURE__ */ new Map();
-  for (const r of t) {
-    const n = $(r, c), e = a.get(n) ?? [];
-    e.push(r), a.set(n, e);
-  }
-  const o = [...a.entries()].filter(([, r]) => r.length > 1).sort(([r], [n]) => r.localeCompare(n));
-  if (o.length > 0)
-    throw new Error(
-      o.map(
-        ([r, n]) => `Duplicate route "${r}" detected:
-${n.sort((e, l) => e.localeCompare(l)).map((e) => `  ${e}`).join(`
-`)}`
-      ).join(`
-
-`)
-    );
-}
-function i(t, c, a, o, r) {
-  const n = h(c, r), e = n ? n.split("/") : [];
-  let l = t, u = "";
-  e.forEach((s, f) => {
-    u = u ? `${u}/${s}` : s, l.children.has(s) || l.children.set(s, {
-      segment: s,
-      fullPath: u,
-      children: /* @__PURE__ */ new Map()
-    }), l = l.children.get(s), f === e.length - 1 && (l[o] = a);
-  }), e.length === 0 && (t[o] = a);
-}
-function P(t, c, a, o) {
-  d(Object.keys(t), o);
-  const r = {
-    segment: "",
-    fullPath: "",
-    children: /* @__PURE__ */ new Map()
-  };
-  return Object.entries(c).forEach(([n, e]) => {
-    i(r, n, e.default, "layout", o);
-  }), Object.entries(t).forEach(([n, e]) => {
-    i(r, n, e, "page", o);
-  }), Object.entries(a).forEach(([n, e]) => {
-    i(r, n, e, "notFound", o);
-  }), r;
-}
-export {
-  d as a,
-  P as b,
-  h as e,
-  p as n
-};