next-vite-router 1.2.1 → 1.2.2

package/dist/cli.cjs

@@ -408,6 +408,10 @@ function startViteConfig(projectDir, src) {
   if (!viteConfigContent) throw new Error("Vite config empty");
   if (!viteConfigContent.includes("import { resolve }")) {
     viteConfigContent = `import { resolve } from "path";
+` + viteConfigContent;
+  }
+  if (!viteConfigContent.includes("import { fileURLToPath }")) {
+    viteConfigContent = `import { fileURLToPath } from "node:url";
 ` + viteConfigContent;
   }
   if (!viteConfigContent.includes("import { nextViteRouter }")) {
@@ -416,7 +420,7 @@ function startViteConfig(projectDir, src) {
   }
   const resolveConfig = `  resolve: {
     alias: {
-      "@": resolve(__dirname, "./${src ? "src" : "."}"),
+      "@": resolve(fileURLToPath(new URL("./${src ? "src" : "."}", import.meta.url))),
     },
   },`;
   const defineConfigRegex = /defineConfig\(\s*{/;
@@ -430,7 +434,7 @@ ${resolveConfig}
   }
   const pluginsRegex = /plugins\s*:\s*\[(.*?)\]/s;
   const match = viteConfigContent.match(pluginsRegex);
-  const pluginString = `nextViteRouter({ pagesDir: "${src ? "src/app" : "app"}", pageFile: "page.tsx", layoutFile: "layout.tsx", notFoundFile: "not-found.tsx" })`;
+  const pluginString = "nextViteRouter()";
   if (match) {
     const existing = match[1].trim();
     const newPlugins = existing ? `${existing}, ${pluginString}` : pluginString;
@@ -544,7 +548,7 @@ const init = new commander.Command().name("init").description(
 Project "${projectName}" is ready!
 `);
 });
-const version = "1.2.1";
+const version = "1.2.2";
 const pkg = {
   version
 };

package/dist/index.d.ts

@@ -3,6 +3,8 @@ import { default as default_2 } from 'react';
 import { ReactElement } from 'react';
 import { RouteObject } from 'react-router-dom';
 
+export declare function assertNoDuplicateRoutes(filePaths: string[], fileOptions?: RouteFileOptions): void;
+
 export declare function buildRouteTree(pages: Record<string, () => Promise<any>>, layouts: Record<string, any>, notFounds: Record<string, () => Promise<any>>, fileOptions?: RouteFileOptions): RouteNode;
 
 export declare function CatchAllParamProvider({ name, children, }: {

package/dist/index.js

@@ -1,93 +1,69 @@
-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 { 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 k = {
+const M = {
   enableLazyLoading: !0
 };
-let d = { ...k };
-function B(e) {
-  d = { ...d, ...e };
+let m = { ...M };
+function j(e) {
+  m = { ...m, ...e };
 }
-function S() {
-  return d;
+function k() {
+  return m;
 }
-let E = [];
-function H(e, t) {
-  E.push({ pattern: e, middleware: t });
+let g = [];
+function q(e, t) {
+  g.push({ pattern: e, middleware: t });
 }
-function J() {
-  E = [];
+function B() {
+  g = [];
 }
-function p(e, t) {
+function h(e, t) {
   let n = t;
-  for (const r of E)
+  for (const r of g)
     r.pattern.lastIndex = 0, r.pattern.test(e) && (n = r.middleware(n)), r.pattern.lastIndex = 0;
   return n;
 }
-const T = () => i.createElement("div"), y = /* @__PURE__ */ new Map();
+const S = () => c.createElement("div"), C = /* @__PURE__ */ new Map();
 function R(e, t, n) {
-  const r = S();
+  const r = k();
   if (r.enableLazyLoading === !1) {
-    const u = i.lazy(e), s = i.createElement(
-      C,
+    const s = c.lazy(e), i = c.createElement(
+      d,
       { fallback: null },
       // No loading fallback when disabled
-      i.createElement(u)
+      c.createElement(s)
     );
-    return n ? p(n, s) : s;
+    return n ? h(n, i) : i;
   }
-  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)
+  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)
   );
-  return n ? p(n, o) : o;
-}
-function m(e, t, n, r, a) {
-  const l = z(t, a), o = l ? l.split("/") : [];
-  let u = e, s = "";
-  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), h === o.length - 1 && (u[r] = n);
-  }), o.length === 0 && (e[r] = n);
-}
-function j(e, t, n, r) {
-  const a = {
-    segment: "",
-    fullPath: "",
-    children: /* @__PURE__ */ new Map()
-  };
-  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 = L(void 0);
-function N({
+  return n ? h(n, o) : o;
+}
+const w = v(void 0);
+function D({
   name: e,
   children: t
 }) {
-  return i.createElement(
-    F.Provider,
+  return c.createElement(
+    w.Provider,
     { value: e },
     t
   );
 }
-function D() {
-  return M(F);
+function N() {
+  return L(w);
 }
-function P(e, t) {
-  return p(e, i.createElement(t));
+function y(e, t) {
+  return h(e, c.createElement(t));
 }
-function I(e) {
+function T(e) {
   return /^\[\[\.\.\..+\]\]$/.test(e);
 }
 function f(e, t, n = !1) {
@@ -98,13 +74,13 @@ function f(e, t, n = !1) {
     async () => ({ default: (await r()).default }),
     `page:${e.fullPath || t}`,
     t
-  ), l = e.segment.match(/^\[\[?\.\.\.(.+?)\]\]?$/), o = l ? i.createElement(N, {
+  ), l = e.segment.match(/^\[\[?\.\.\.(.+?)\]\]?$/), o = l ? c.createElement(D, {
     name: l[1],
     children: a
   }) : a;
-  return n ? { index: !0, element: o } : { path: g(e.segment), element: o };
+  return n ? { index: !0, element: o } : { path: p(e.segment), element: o };
 }
-function $(e) {
+function P(e) {
   const t = e.notFound;
   if (!t)
     throw new Error(`Route node "${e.fullPath}" has no not-found loader`);
@@ -118,91 +94,100 @@ function $(e) {
     )
   };
 }
-function b(e, t) {
+function F(e, t) {
   const n = [];
   return [...e.children.entries()].sort(([r], [a]) => r.localeCompare(a)).forEach(([r, a]) => {
-    const l = g(r), o = l ? t ? `${t}/${l}` : `/${l}` : t;
-    n.push(...v(a, !1, o));
+    const l = p(r), o = l ? t ? `${t}/${l}` : `/${l}` : t;
+    n.push(...$(a, !1, o));
   }), n;
 }
-function w(e, t) {
+function E(e, t) {
   const n = [];
-  return e.page && n.push(f(e, t || "/", !0)), n.push(...b(e, t)), e.notFound && n.push($(e)), n;
+  return e.page && n.push(f(e, t || "/", !0)), n.push(...F(e, t)), e.notFound && n.push(P(e)), n;
 }
-function v(e, t = !1, n = "") {
+function $(e, t = !1, n = "") {
   const r = [];
   if (t) {
-    const c = w(e, "");
+    const u = E(e, "");
     return e.layout ? (r.push({
       path: "/",
-      element: P("/", e.layout),
-      children: c
-    }), r) : e.page ? (r.push({
+      element: y("/", e.layout),
+      children: u
+    }), r) : e.page ? u.length > 1 ? [{
+      path: "/",
+      children: u
+    }] : [{
       path: "/",
-      element: f(e, "/", !1).element,
-      children: c.slice(1).length > 0 ? c.slice(1) : void 0
-    }), r) : e.notFound ? (r.push({
+      element: f(e, "/", !1).element
+    }] : e.notFound ? (r.push({
       path: "/",
-      children: c
-    }), r) : c;
+      children: u
+    }), r) : u;
   }
-  const a = g(e.segment), l = !a, o = l ? n : n + "/" + a, u = b(e, o), s = e.notFound ? [$(e)] : [];
+  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 c = w(e, o);
+    const u = E(e, o);
     return [{
       ...l ? {} : { path: a },
-      element: P(o, e.layout),
-      children: c.length > 0 ? c : void 0
+      element: y(o, e.layout),
+      children: u.length > 0 ? u : void 0
     }];
   }
   if (e.page && !l) {
-    if (I(e.segment)) {
-      const c = f(e, n, !0), h = {
+    if (T(e.segment)) {
+      const u = f(e, n, !0), x = {
         path: a,
         element: f(e, o).element,
-        children: [...u, ...s].length > 0 ? [...u, ...s] : void 0
+        children: [...s, ...i].length > 0 ? [...s, ...i] : void 0
       };
-      return [c, h];
+      return [u, x];
     }
-    return [{
+    return s.length > 0 || i.length > 0 ? [{
+      path: a,
+      children: [
+        f(e, o, !0),
+        ...s,
+        ...i
+      ]
+    }] : [{
       path: a,
-      element: f(e, o).element,
-      children: [...u, ...s].length > 0 ? [...u, ...s] : void 0
+      element: f(e, o).element
     }];
   }
   if (e.page || e.notFound || !l) {
-    const c = [
+    const u = [
       ...e.page ? [f(e, o, !0)] : [],
-      ...u,
-      ...s
+      ...s,
+      ...i
     ];
     return [{
       ...l ? {} : { path: a },
-      children: c.length > 0 ? c : void 0
+      children: u.length > 0 ? u : void 0
     }];
   }
-  return u;
+  return s;
 }
-function Q(e, t, n, r) {
+function H(e, t, n, r) {
   return () => {
-    const a = j(e, t, n, r);
-    return v(a, !0);
+    const a = z(e, t, n, r);
+    return $(a, !0);
   };
 }
-function U() {
-  const e = A(), t = D();
+function J() {
+  const e = A(), t = N();
   return typeof t == "string" && e["*"] !== void 0 ? { ...e, [t]: e["*"] } : e;
 }
 export {
-  N as CatchAllParamProvider,
-  j as buildRouteTree,
-  J as clearMiddlewares,
-  B as configureRouter,
+  D as CatchAllParamProvider,
+  V as assertNoDuplicateRoutes,
+  z as buildRouteTree,
+  B as clearMiddlewares,
+  j as configureRouter,
   R as createLazyElement,
-  Q as createRouteGenerator,
-  z as extractRoutePath,
-  g as normalizeSegment,
-  H as registerMiddleware,
-  v as treeToRoutes,
-  U as useParams
+  H as createRouteGenerator,
+  W as extractRoutePath,
+  p as normalizeSegment,
+  q as registerMiddleware,
+  $ as treeToRoutes,
+  J as useParams
 };

package/dist/plugin.js

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

package/dist/tree-HwBRWJNI.js

@@ -0,0 +1,64 @@
+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
+};

package/package.json

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

package/dist/path-BodMUTCM.js

@@ -1,14 +0,0 @@
-function $(e) {
-  return /^\([^)]+\)$/.test(e) ? "" : /^\[\[\.\.\.(.+)\]\]$/.test(e) || /^\[\.\.\.(.+)\]$/.test(e) ? "*" : /^\[([^\]]+)\]$/.test(e) ? e.replace(/^\[([^\]]+)\]$/, ":$1") : e;
-}
-function u(e, { pagesDir: t, pageFile: a = "page.tsx", layoutFile: n = "layout.tsx", notFoundFile: c = "not-found.tsx" } = {}) {
-  const o = e.replace(/\\/g, "/"), r = t == null ? void 0 : t.replace(/\\/g, "/").replace(/^\/|\/$/g, ""), l = [a, n, c].map((p) => p.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
-  return o.replace(
-    r ? new RegExp(`^.*(?:^|/)${r}/`) : /^.*(?:^|\/)(?:app|pages)\//,
-    ""
-  ).replace(/\\/g, "/").replace(new RegExp(`/?(?:${l})$`), "");
-}
-export {
-  u as e,
-  $ as n
-};