next-vite-router 1.2.0 → 1.2.1

package/README.md

@@ -238,12 +238,13 @@ replace React Router.
 For an interactive setup:
 
 ```bash
-npx create-next-vite-router init
+npx next-vite-router init
 ```
 
 The CLI creates a Vite React project, installs the package and
 `react-router-dom@^7.0.0`, configures the plugin, and adds an example route
-tree.
+tree. The CLI is published as part of `next-vite-router`; `create-next-vite-router`
+is its executable name, not a separate npm package.
 
 ## Compatibility
 

package/dist/cli.cjs

@@ -544,7 +544,7 @@ const init = new commander.Command().name("init").description(
 Project "${projectName}" is ready!
 `);
 });
-const version = "1.2.0";
+const version = "1.2.1";
 const pkg = {
   version
 };

package/dist/index.js

@@ -1,60 +1,60 @@
-import { e as z, n as p } from "./path-BodMUTCM.js";
-import i, { Suspense as E, lazy as L, createContext as M, useContext as x } from "react";
-import { useParams as k } from "react-router-dom";
-const A = {
+import { e as z, n as g } from "./path-BodMUTCM.js";
+import i, { Suspense as C, lazy as x, createContext as L, useContext as M } from "react";
+import { useParams as A } from "react-router-dom";
+const k = {
   enableLazyLoading: !0
 };
-let m = { ...A };
+let d = { ...k };
 function B(e) {
-  m = { ...m, ...e };
+  d = { ...d, ...e };
 }
 function S() {
-  return m;
+  return d;
 }
-let g = [];
+let E = [];
 function H(e, t) {
-  g.push({ pattern: e, middleware: t });
+  E.push({ pattern: e, middleware: t });
 }
-function I() {
-  g = [];
+function J() {
+  E = [];
 }
-function d(e, t) {
+function p(e, t) {
   let n = t;
-  for (const r of g)
-    r.pattern.test(e) && (n = r.middleware(n));
+  for (const r of E)
+    r.pattern.lastIndex = 0, r.pattern.test(e) && (n = r.middleware(n)), r.pattern.lastIndex = 0;
   return n;
 }
-const T = () => i.createElement("div"), C = /* @__PURE__ */ new Map();
-function w(e, t, n) {
+const T = () => i.createElement("div"), y = /* @__PURE__ */ new Map();
+function R(e, t, n) {
   const r = S();
   if (r.enableLazyLoading === !1) {
     const u = i.lazy(e), s = i.createElement(
-      E,
+      C,
       { fallback: null },
       // No loading fallback when disabled
       i.createElement(u)
     );
-    return n ? d(n, s) : s;
+    return n ? p(n, s) : s;
   }
-  let a = C.get(t);
-  a || (a = L(e), C.set(t, a));
-  const o = r.loadingFallback || T, l = i.createElement(
-    E,
-    { fallback: i.createElement(o) },
+  let a = y.get(t);
+  a || (a = x(e), y.set(t, a));
+  const l = r.loadingFallback || T, o = i.createElement(
+    C,
+    { fallback: i.createElement(l) },
     i.createElement(a)
   );
-  return n ? d(n, l) : l;
+  return n ? p(n, o) : o;
 }
-function h(e, t, n, r, a) {
-  const o = z(t, a), l = o ? o.split("/") : [];
+function m(e, t, n, r, a) {
+  const l = z(t, a), o = l ? l.split("/") : [];
   let u = e, s = "";
-  l.forEach((c, v) => {
+  o.forEach((c, h) => {
     s = s ? `${s}/${c}` : c, u.children.has(c) || u.children.set(c, {
       segment: c,
       fullPath: s,
       children: /* @__PURE__ */ new Map()
-    }), u = u.children.get(c), v === l.length - 1 && (u[r] = n);
-  }), l.length === 0 && (e[r] = n);
+    }), u = u.children.get(c), h === o.length - 1 && (u[r] = n);
+  }), o.length === 0 && (e[r] = n);
 }
 function j(e, t, n, r) {
   const a = {
@@ -62,15 +62,15 @@ function j(e, t, n, r) {
     fullPath: "",
     children: /* @__PURE__ */ new Map()
   };
-  return Object.entries(t).forEach(([o, l]) => {
-    h(a, o, l.default, "layout", r);
-  }), Object.entries(e).forEach(([o, l]) => {
-    h(a, o, l, "page", r);
-  }), Object.entries(n).forEach(([o, l]) => {
-    h(a, o, l, "notFound", r);
+  return Object.entries(t).forEach(([l, o]) => {
+    m(a, l, o.default, "layout", r);
+  }), Object.entries(e).forEach(([l, o]) => {
+    m(a, l, o, "page", r);
+  }), Object.entries(n).forEach(([l, o]) => {
+    m(a, l, o, "notFound", r);
   }), a;
 }
-const F = M(void 0);
+const F = L(void 0);
 function N({
   name: e,
   children: t
@@ -82,54 +82,57 @@ function N({
   );
 }
 function D() {
-  return x(F);
+  return M(F);
 }
 function P(e, t) {
-  return d(e, i.createElement(t));
+  return p(e, i.createElement(t));
+}
+function I(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 = w(
+  const a = R(
     async () => ({ default: (await r()).default }),
     `page:${e.fullPath || t}`,
     t
-  ), o = e.segment.match(/^\[\[?\.\.\.(.+?)\]\]?$/), l = o ? i.createElement(N, {
-    name: o[1],
+  ), l = e.segment.match(/^\[\[?\.\.\.(.+?)\]\]?$/), o = l ? i.createElement(N, {
+    name: l[1],
     children: a
   }) : a;
-  return n ? { index: !0, element: l } : { path: p(e.segment), element: l };
+  return n ? { index: !0, element: o } : { path: g(e.segment), element: o };
 }
-function R(e) {
+function $(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}` : "/";
   return {
     path: "*",
-    element: w(
+    element: R(
       async () => ({ default: (await t()).default }),
       `notfound:${e.fullPath}`,
       n
     )
   };
 }
-function $(e, t) {
+function b(e, t) {
   const n = [];
   return [...e.children.entries()].sort(([r], [a]) => r.localeCompare(a)).forEach(([r, a]) => {
-    const o = p(r), l = o ? t ? `${t}/${o}` : `/${o}` : t;
-    n.push(...b(a, !1, l));
+    const l = g(r), o = l ? t ? `${t}/${l}` : `/${l}` : t;
+    n.push(...v(a, !1, o));
   }), n;
 }
-function y(e, t) {
+function w(e, t) {
   const n = [];
-  return e.page && n.push(f(e, t || "/", !0)), n.push(...$(e, t)), e.notFound && n.push(R(e)), n;
+  return e.page && n.push(f(e, t || "/", !0)), n.push(...b(e, t)), e.notFound && n.push($(e)), n;
 }
-function b(e, t = !1, n = "") {
+function v(e, t = !1, n = "") {
   const r = [];
   if (t) {
-    const c = y(e, "");
+    const c = w(e, "");
     return e.layout ? (r.push({
       path: "/",
       element: P("/", e.layout),
@@ -143,54 +146,63 @@ function b(e, t = !1, n = "") {
       children: c
     }), r) : c;
   }
-  const a = p(e.segment), o = !a, l = o ? n : n + "/" + a, u = $(e, l), s = e.notFound ? [R(e)] : [];
+  const a = g(e.segment), l = !a, o = l ? n : n + "/" + a, u = b(e, o), s = e.notFound ? [$(e)] : [];
   if (e.layout) {
-    const c = y(e, l);
+    const c = w(e, o);
     return [{
-      ...o ? {} : { path: a },
-      element: P(l, e.layout),
+      ...l ? {} : { path: a },
+      element: P(o, e.layout),
       children: c.length > 0 ? c : void 0
     }];
   }
-  if (e.page && !o)
+  if (e.page && !l) {
+    if (I(e.segment)) {
+      const c = f(e, n, !0), h = {
+        path: a,
+        element: f(e, o).element,
+        children: [...u, ...s].length > 0 ? [...u, ...s] : void 0
+      };
+      return [c, h];
+    }
     return [{
       path: a,
-      element: f(e, l).element,
+      element: f(e, o).element,
       children: [...u, ...s].length > 0 ? [...u, ...s] : void 0
     }];
-  if (e.page || e.notFound || !o) {
+  }
+  if (e.page || e.notFound || !l) {
     const c = [
-      ...e.page ? [f(e, l, !0)] : [],
+      ...e.page ? [f(e, o, !0)] : [],
       ...u,
       ...s
     ];
     return [{
-      ...o ? {} : { path: a },
+      ...l ? {} : { path: a },
       children: c.length > 0 ? c : void 0
     }];
   }
   return u;
 }
-function J(e, t, n, r) {
+function Q(e, t, n, r) {
   return () => {
     const a = j(e, t, n, r);
-    return b(a, !0);
+    return v(a, !0);
   };
 }
-function Q() {
-  const e = k(), t = D();
+function U() {
+  const e = A(), t = D();
   return typeof t == "string" && e["*"] !== void 0 ? { ...e, [t]: e["*"] } : e;
 }
 export {
   N as CatchAllParamProvider,
   j as buildRouteTree,
-  I as clearMiddlewares,
+  J as clearMiddlewares,
   B as configureRouter,
-  w as createLazyElement,
-  J as createRouteGenerator,
+  R as createLazyElement,
+  Q as createRouteGenerator,
   z as extractRoutePath,
-  p as normalizeSegment,
+  g as normalizeSegment,
   H as registerMiddleware,
-  b as treeToRoutes,
-  Q as useParams
+  v as treeToRoutes,
+  U as useParams
 };

package/dist/plugin.js

@@ -1,31 +1,48 @@
-import m from "node:fs";
-import i from "node:path";
-import { n as g } from "./path-BodMUTCM.js";
-function h(o) {
-  const e = o.split(i.sep).filter(Boolean).map(g).filter(Boolean);
+import d from "node:fs";
+import u from "node:path";
+import { n as R } from "./path-BodMUTCM.js";
+function g(r) {
+  const e = r.split(u.sep).filter(Boolean).map(R).filter(Boolean);
   return e.length > 0 ? `/${e.join("/")}` : "/";
 }
-function x(o, e) {
-  const s = /* @__PURE__ */ new Set();
-  function r(n) {
-    for (const u of m.readdirSync(n, { withFileTypes: !0 })) {
-      const a = i.join(n, u.name);
-      u.isDirectory() ? r(a) : u.isFile() && u.name === e && s.add(h(i.relative(o, n)));
+function v(r, e) {
+  const i = /* @__PURE__ */ new Map();
+  function a(n) {
+    for (const s of d.readdirSync(n, { withFileTypes: !0 })) {
+      const m = u.join(n, s.name);
+      if (s.isDirectory())
+        a(m);
+      else if (s.isFile() && s.name === e) {
+        const o = u.relative(r, n), f = o.split(u.sep).filter(Boolean).map((c) => {
+          const t = c.match(/^\[\[\.\.\.(.+)\]\]$/);
+          if (t)
+            return { name: t[1], optional: !0 };
+          const p = c.match(/^\[\.\.\.(.+)\]$/);
+          return p ? { name: p[1], optional: !1 } : void 0;
+        }).filter((c) => !!c);
+        i.set(g(o), {
+          path: g(o),
+          params: f
+        });
+      }
     }
   }
-  return m.existsSync(o) && r(o), [...s].sort();
+  return d.existsSync(r) && a(r), [...i.values()].sort((n, s) => n.path.localeCompare(s.path));
 }
-function v(o) {
-  const e = o.match(/^\/(?:\[\.\.\.|:)([^/\]]+)\]?$/);
+function x(r) {
+  const e = r.match(/^\/(?:\[\.\.\.|:)([^/\]]+)\]?$/);
   return e == null ? void 0 : e[1];
 }
-function P(o) {
-  const e = o.map((r) => `  | "${r}"`).join(`
-`), s = o.map((r) => {
-    const n = r.split("/").map((a) => v(`/${a}`)).filter((a) => !!a), u = n.length > 0 ? n.map((a) => `    ${a}: string;`).join(`
+function P(r) {
+  const e = r.map(({ path: a }) => `  | "${a}"`).join(`
+`), i = r.map(({ path: a, params: n }) => {
+    const s = a.split("/").map((o) => x(`/${o}`)).filter((o) => !!o), m = s.length > 0 || n.length > 0 ? [
+      ...s.map((o) => `    ${o}: string;`),
+      ...n.map(({ name: o, optional: l }) => `    ${o}${l ? "?" : ""}: string;`)
+    ].join(`
 `) : "    [key: string]: never;";
-    return `  "${r}": {
-${u}
+    return `  "${a}": {
+${m}
   };`;
   }).join(`
 `);
@@ -41,7 +58,7 @@ ${e || '  | "/"'};
     : never;
 
   export interface RoutePathParams {
-${s}
+${i}
   }
 
   export const generateRoutes: () => RouteObject[];
@@ -51,45 +68,45 @@ ${s}
 }
 `;
 }
-function k(o = {}) {
+function k(r = {}) {
   const {
     pagesDir: e = "src/app",
-    pageFile: s = "page.tsx",
-    layoutFile: r = "layout.tsx",
+    pageFile: i = "page.tsx",
+    layoutFile: a = "layout.tsx",
     notFoundFile: n = "not-found.tsx"
-  } = o, u = { pagesDir: e, pageFile: s, layoutFile: r, notFoundFile: n }, a = "virtual:next-vite-router", c = "\0" + a;
-  let l = "", p = "";
-  function d() {
-    const t = P(x(l, s));
-    m.writeFileSync(p, t, "utf-8");
+  } = r, s = { pagesDir: e, pageFile: i, layoutFile: a, notFoundFile: n }, m = "virtual:next-vite-router", o = "\0" + m;
+  let l = "", f = "";
+  function c() {
+    const t = P(v(l, i));
+    d.writeFileSync(f, t, "utf-8");
   }
   return {
     name: "next-vite-router",
     configResolved(t) {
-      l = i.resolve(t.root, e), p = i.join(i.dirname(l), "virtual-next-vite-router.d.ts"), d();
+      l = u.resolve(t.root, e), f = u.join(u.dirname(l), "virtual-next-vite-router.d.ts"), c();
     },
     configureServer(t) {
-      const f = (y) => {
-        if (i.relative(l, y).startsWith("..") || ![s, r, n].includes(i.basename(y)))
+      const p = (h) => {
+        if (u.relative(l, h).startsWith("..") || ![i, a, n].includes(u.basename(h)))
           return;
-        d();
-        const R = t.moduleGraph.getModuleById(c);
-        R && (t.moduleGraph.invalidateModule(R), t.ws.send({ type: "full-reload", path: "*" }));
+        c();
+        const y = t.moduleGraph.getModuleById(o);
+        y && (t.moduleGraph.invalidateModule(y), t.ws.send({ type: "full-reload", path: "*" }));
       };
-      t.watcher.on("add", f), t.watcher.on("unlink", f);
+      t.watcher.on("add", p), t.watcher.on("unlink", p);
     },
     resolveId(t) {
-      if (t === a)
-        return c;
+      if (t === m)
+        return o;
     },
     load(t) {
-      if (t === c)
+      if (t === o)
         return `
 import { buildRouteTree, treeToRoutes, normalizeSegment, createLazyElement, useParams } from 'next-vite-router';
 import { Link, useRoutes } from 'react-router-dom';
 
-const pagesGlob = import.meta.glob('/${e}/**/${s}');
-const layoutsGlob = import.meta.glob('/${e}/**/${r}', { eager: true });
+const pagesGlob = import.meta.glob('/${e}/**/${i}');
+const layoutsGlob = import.meta.glob('/${e}/**/${a}', { eager: true });
 const notFoundsGlob = import.meta.glob('/${e}/**/${n}');
 
 const transformPath = (path) => path.replace('/${e}/', '');
@@ -105,7 +122,7 @@ const notFounds = Object.fromEntries(
 );
 
 export function generateRoutes() {
-  const tree = buildRouteTree(pages, layouts, notFounds, ${JSON.stringify(u)});
+  const tree = buildRouteTree(pages, layouts, notFounds, ${JSON.stringify(s)});
   const routes = treeToRoutes(tree, true);
   return routes;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-vite-router",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Next.js-like file-based routing for React + Vite",
   "type": "module",
   "main": "./dist/index.js",