zudoku 0.19.0 → 0.20.1

package/lib/zudoku.plugin-markdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"zudoku.plugin-markdown.js","sources":["../src/lib/plugins/markdown/resolver.ts","../src/lib/plugins/markdown/index.tsx"],"sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\nimport {\n  ZudokuConfig,\n  ZudokuDocsConfig,\n} from \"../../../config/validators/validate.js\";\n\nconst DEFAULT_DOCS_FILES = \"/pages/**/*.{md,mdx}\";\n\n// TODO: This should be dynamic based on the glob selector\nconst SUPPORTED_EXTENSIONS = [\".md\", \".mdx\"];\n\n/**\n * Utilities for resolving markdown file paths and routes\n */\nexport class DocResolver {\n  constructor(private config: ZudokuConfig) {}\n\n  fileMap = new Map<string, string>();\n\n  /**\n   * Gets the default docs config from the zudoku config\n   */\n  getDocsConfigs() {\n    const docsConfigs: ZudokuDocsConfig[] = this.config.docs\n      ? Array.isArray(this.config.docs)\n        ? this.config.docs\n        : [this.config.docs]\n      : [{ files: DEFAULT_DOCS_FILES }];\n\n    return docsConfigs;\n  }\n\n  /**\n   * Resolves the first matching file system path for a given docId\n   * @param docId - The docId to resolve\n   * @returns\n   */\n  resolveFilePath(docId: string) {\n    const docsConfigs = this.getDocsConfigs();\n    let fsPath: string | undefined;\n\n    docsConfigs.forEach(({ files: fileGlob }) => {\n      if (fsPath) {\n        return;\n      }\n      const rootDir = DocResolver.getRootDir(fileGlob);\n      for (const ext of SUPPORTED_EXTENSIONS) {\n        if (fsPath) {\n          return;\n        }\n        const checkPath = path.join(rootDir, `${docId}${ext}`);\n        if (fs.existsSync(checkPath)) {\n          fsPath = checkPath;\n        }\n      }\n    });\n\n    return fsPath;\n  }\n\n  /**\n   * Gets the root directory from a files glob\n   */\n  private static getRootDir(filesGlob: string) {\n    let rootDir = filesGlob.split(\"**\")[0];\n    if (!rootDir) {\n      throw new Error(\"Invalid files glob. Must have '**' in the path.\");\n    }\n    rootDir = rootDir.replace(\"/**\", \"/\");\n    return rootDir;\n  }\n\n  /**\n   * Resolves the route path for a given file system path\n   * @param options - The options to resolve the route path\n   * @returns The string route path\n   */\n  static resolveRoutePath({\n    filesGlob,\n    fsPath,\n  }: {\n    filesGlob: string;\n    fsPath: string;\n  }) {\n    const rootDir = this.getRootDir(filesGlob);\n    const re = new RegExp(`^${rootDir}(.*).mdx?`);\n    const match = fsPath.match(re);\n    const routePath = match?.at(1);\n    return routePath;\n  }\n}\n","import type { Toc } from \"@stefanprobst/rehype-extract-toc\";\nimport type { MDXProps } from \"mdx/types.js\";\nimport { RouteObject } from \"react-router-dom\";\nimport { ZudokuDocsConfig } from \"../../../config/validators/validate.js\";\nimport type { ZudokuPlugin } from \"../../core/plugins.js\";\nimport { DocResolver } from \"./resolver.js\";\n\nexport interface MarkdownPluginOptions extends ZudokuDocsConfig {\n  fileImports: Record<string, () => Promise<MDXImport>>;\n}\nexport type MarkdownPluginDefaultOptions = Pick<\n  Frontmatter,\n  \"toc\" | \"disablePager\"\n>;\n\nexport type Frontmatter = {\n  title?: string;\n  description?: string;\n  category?: string;\n  toc?: boolean;\n  disablePager?: boolean;\n};\n\nexport type MDXImport = {\n  tableOfContents: Toc;\n  frontmatter: Frontmatter;\n  excerpt?: string;\n  default: (props: MDXProps) => JSX.Element;\n};\n\nexport const markdownPlugin = (\n  options: MarkdownPluginOptions[],\n): ZudokuPlugin => ({\n  getRoutes: () => {\n    const routeMap = new Map<string, RouteObject>();\n    options.forEach(({ fileImports, files, defaultOptions }) =>\n      Object.entries(fileImports).flatMap(([file, importPromise]) => {\n        const routePath = DocResolver.resolveRoutePath({\n          filesGlob: files,\n          fsPath: file,\n        });\n\n        if (!routePath) return [];\n\n        if (routeMap.has(routePath)) {\n          // eslint-disable-next-line no-console\n          console.warn(\n            `Duplicate route path found for ${routePath}. Skipping file at '${file}'.`,\n          );\n          return [];\n        }\n\n        const route: RouteObject = {\n          path: routePath,\n          lazy: async () => {\n            const { MdxPage } = await import(\"./MdxPage.js\");\n            const { default: Component, ...props } = await importPromise();\n            return {\n              element: (\n                <MdxPage\n                  file={file}\n                  mdxComponent={Component}\n                  {...props}\n                  defaultOptions={defaultOptions}\n                />\n              ),\n            };\n          },\n        };\n        routeMap.set(routePath, route);\n      }),\n    );\n    return [...routeMap.values()];\n  },\n});\n"],"names":["DEFAULT_DOCS_FILES","SUPPORTED_EXTENSIONS","DocResolver","config","__publicField","docId","docsConfigs","fsPath","fileGlob","rootDir","ext","checkPath","path","fs","filesGlob","re","match","markdownPlugin","options","routeMap","fileImports","files","defaultOptions","file","importPromise","routePath","route","MdxPage","Component","props","jsx"],"mappings":";;;;;AAOA,MAAMA,IAAqB,wBAGrBC,IAAuB,CAAC,OAAO,MAAM;AAKpC,MAAMC,EAAY;AAAA,EACvB,YAAoBC,GAAsB;AAE1C,IAAAC,EAAA,qCAAc;AAFM,SAAA,SAAAD;AAAA,EAAuB;AAAA;AAAA;AAAA;AAAA,EAO3C,iBAAiB;AAOR,WANiC,KAAK,OAAO,OAChD,MAAM,QAAQ,KAAK,OAAO,IAAI,IAC5B,KAAK,OAAO,OACZ,CAAC,KAAK,OAAO,IAAI,IACnB,CAAC,EAAE,OAAOH,EAAA,CAAoB;AAAA,EAGpC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,gBAAgBK,GAAe;AACvB,UAAAC,IAAc,KAAK;AACrB,QAAAC;AAEJ,WAAAD,EAAY,QAAQ,CAAC,EAAE,OAAOE,QAAe;AAC3C,UAAID;AACF;AAEI,YAAAE,IAAUP,EAAY,WAAWM,CAAQ;AAC/C,iBAAWE,KAAOT,GAAsB;AACtC,YAAIM;AACF;AAEI,cAAAI,IAAYC,EAAK,KAAKH,GAAS,GAAGJ,CAAK,GAAGK,CAAG,EAAE;AACjD,QAAAG,EAAG,WAAWF,CAAS,MAChBJ,IAAAI;AAAA,MAEb;AAAA,IAAA,CACD,GAEMJ;AAAA,EACT;AAAA;AAAA;AAAA;AAAA,EAKA,OAAe,WAAWO,GAAmB;AAC3C,QAAIL,IAAUK,EAAU,MAAM,IAAI,EAAE,CAAC;AACrC,QAAI,CAACL;AACG,YAAA,IAAI,MAAM,iDAAiD;AAEzD,WAAAA,IAAAA,EAAQ,QAAQ,OAAO,GAAG,GAC7BA;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,OAAO,iBAAiB;AAAA,IACtB,WAAAK;AAAA,IACA,QAAAP;AAAA,EAAA,GAIC;AACK,UAAAE,IAAU,KAAK,WAAWK,CAAS,GACnCC,IAAK,IAAI,OAAO,IAAIN,CAAO,WAAW,GACtCO,IAAQT,EAAO,MAAMQ,CAAE;AAEtB,WADWC,KAAA,gBAAAA,EAAO,GAAG;AAAA,EAE9B;AACF;AC7Da,MAAAC,IAAiB,CAC5BC,OACkB;AAAA,EAClB,WAAW,MAAM;AACT,UAAAC,wBAAe;AACb,WAAAD,EAAA;AAAA,MAAQ,CAAC,EAAE,aAAAE,GAAa,OAAAC,GAAO,gBAAAC,QACrC,OAAO,QAAQF,CAAW,EAAE,QAAQ,CAAC,CAACG,GAAMC,CAAa,MAAM;AACvD,cAAAC,IAAYvB,EAAY,iBAAiB;AAAA,UAC7C,WAAWmB;AAAA,UACX,QAAQE;AAAA,QAAA,CACT;AAEG,YAAA,CAACE,EAAW,QAAO;AAEnB,YAAAN,EAAS,IAAIM,CAAS;AAEhB,yBAAA;AAAA,YACN,kCAAkCA,CAAS,uBAAuBF,CAAI;AAAA,UAAA,GAEjE;AAGT,cAAMG,IAAqB;AAAA,UACzB,MAAMD;AAAA,UACN,MAAM,YAAY;AAChB,kBAAM,EAAE,SAAAE,EAAA,IAAY,MAAM,OAAO,uBAAc,GACzC,EAAE,SAASC,GAAW,GAAGC,EAAM,IAAI,MAAML;AACxC,mBAAA;AAAA,cACL,SACEM,gBAAAA,EAAA;AAAA,gBAACH;AAAA,gBAAA;AAAA,kBACC,MAAAJ;AAAA,kBACA,cAAcK;AAAA,kBACb,GAAGC;AAAA,kBACJ,gBAAAP;AAAA,gBAAA;AAAA,cACF;AAAA,YAAA;AAAA,UAGN;AAAA,QAAA;AAEO,QAAAH,EAAA,IAAIM,GAAWC,CAAK;AAAA,MAAA,CAC9B;AAAA,IAAA,GAEI,CAAC,GAAGP,EAAS,OAAA,CAAQ;AAAA,EAC9B;AACF;"}
+{"version":3,"file":"zudoku.plugin-markdown.js","sources":["../src/lib/plugins/markdown/resolver.ts","../src/lib/plugins/markdown/index.tsx"],"sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\nimport { ZudokuDocsConfig } from \"../../../config/validators/common.js\";\nimport { ZudokuConfig } from \"../../../config/validators/validate.js\";\n\nconst DEFAULT_DOCS_FILES = \"/pages/**/*.{md,mdx}\";\n\n// TODO: This should be dynamic based on the glob selector\nconst SUPPORTED_EXTENSIONS = [\".md\", \".mdx\"];\n\n/**\n * Utilities for resolving markdown file paths and routes\n */\nexport class DocResolver {\n  constructor(private config: ZudokuConfig) {}\n\n  fileMap = new Map<string, string>();\n\n  /**\n   * Gets the default docs config from the zudoku config\n   */\n  getDocsConfigs() {\n    const docsConfigs: ZudokuDocsConfig[] = this.config.docs\n      ? Array.isArray(this.config.docs)\n        ? this.config.docs\n        : [this.config.docs]\n      : [{ files: DEFAULT_DOCS_FILES }];\n\n    return docsConfigs;\n  }\n\n  /**\n   * Resolves the first matching file system path for a given docId\n   * @param docId - The docId to resolve\n   * @returns\n   */\n  resolveFilePath(docId: string) {\n    const docsConfigs = this.getDocsConfigs();\n    let fsPath: string | undefined;\n\n    docsConfigs.forEach(({ files: fileGlob }) => {\n      if (fsPath) {\n        return;\n      }\n      const rootDir = DocResolver.getRootDir(fileGlob);\n      for (const ext of SUPPORTED_EXTENSIONS) {\n        if (fsPath) {\n          return;\n        }\n        const checkPath = path.join(rootDir, `${docId}${ext}`);\n        if (fs.existsSync(checkPath)) {\n          fsPath = checkPath;\n        }\n      }\n    });\n\n    return fsPath;\n  }\n\n  /**\n   * Gets the root directory from a files glob\n   */\n  private static getRootDir(filesGlob: string) {\n    let rootDir = filesGlob.split(\"**\")[0];\n    if (!rootDir) {\n      throw new Error(\"Invalid files glob. Must have '**' in the path.\");\n    }\n    rootDir = rootDir.replace(\"/**\", \"/\");\n    return rootDir;\n  }\n\n  /**\n   * Resolves the route path for a given file system path\n   * @param options - The options to resolve the route path\n   * @returns The string route path\n   */\n  static resolveRoutePath({\n    filesGlob,\n    fsPath,\n  }: {\n    filesGlob: string;\n    fsPath: string;\n  }) {\n    const rootDir = this.getRootDir(filesGlob);\n    const re = new RegExp(`^${rootDir}(.*).mdx?`);\n    const match = fsPath.match(re);\n    const routePath = match?.at(1);\n    return routePath;\n  }\n}\n","import type { Toc } from \"@stefanprobst/rehype-extract-toc\";\nimport type { MDXProps } from \"mdx/types.js\";\nimport { RouteObject } from \"react-router-dom\";\nimport { ZudokuDocsConfig } from \"../../../config/validators/common.js\";\nimport type { ZudokuPlugin } from \"../../core/plugins.js\";\nimport { DocResolver } from \"./resolver.js\";\n\nexport interface MarkdownPluginOptions extends ZudokuDocsConfig {\n  fileImports: Record<string, () => Promise<MDXImport>>;\n}\nexport type MarkdownPluginDefaultOptions = Pick<\n  Frontmatter,\n  \"toc\" | \"disablePager\"\n>;\n\nexport type Frontmatter = {\n  title?: string;\n  description?: string;\n  category?: string;\n  toc?: boolean;\n  disablePager?: boolean;\n};\n\nexport type MDXImport = {\n  tableOfContents: Toc;\n  frontmatter: Frontmatter;\n  excerpt?: string;\n  default: (props: MDXProps) => JSX.Element;\n};\n\nexport const markdownPlugin = (\n  options: MarkdownPluginOptions[],\n): ZudokuPlugin => ({\n  getRoutes: () => {\n    const routeMap = new Map<string, RouteObject>();\n    options.forEach(({ fileImports, files, defaultOptions }) =>\n      Object.entries(fileImports).flatMap(([file, importPromise]) => {\n        const routePath = DocResolver.resolveRoutePath({\n          filesGlob: files,\n          fsPath: file,\n        });\n\n        if (!routePath) return [];\n\n        if (routeMap.has(routePath)) {\n          // eslint-disable-next-line no-console\n          console.warn(\n            `Duplicate route path found for ${routePath}. Skipping file at '${file}'.`,\n          );\n          return [];\n        }\n\n        const route: RouteObject = {\n          path: routePath,\n          lazy: async () => {\n            const { MdxPage } = await import(\"./MdxPage.js\");\n            const { default: Component, ...props } = await importPromise();\n            return {\n              element: (\n                <MdxPage\n                  file={file}\n                  mdxComponent={Component}\n                  {...props}\n                  defaultOptions={defaultOptions}\n                />\n              ),\n            };\n          },\n        };\n        routeMap.set(routePath, route);\n      }),\n    );\n    return [...routeMap.values()];\n  },\n});\n"],"names":["DEFAULT_DOCS_FILES","SUPPORTED_EXTENSIONS","DocResolver","config","__publicField","docId","docsConfigs","fsPath","fileGlob","rootDir","ext","checkPath","path","fs","filesGlob","re","match","markdownPlugin","options","routeMap","fileImports","files","defaultOptions","file","importPromise","routePath","route","MdxPage","Component","props","jsx"],"mappings":";;;;;AAKA,MAAMA,IAAqB,wBAGrBC,IAAuB,CAAC,OAAO,MAAM;AAKpC,MAAMC,EAAY;AAAA,EACvB,YAAoBC,GAAsB;AAE1C,IAAAC,EAAA,qCAAc;AAFM,SAAA,SAAAD;AAAA,EAAuB;AAAA;AAAA;AAAA;AAAA,EAO3C,iBAAiB;AAOR,WANiC,KAAK,OAAO,OAChD,MAAM,QAAQ,KAAK,OAAO,IAAI,IAC5B,KAAK,OAAO,OACZ,CAAC,KAAK,OAAO,IAAI,IACnB,CAAC,EAAE,OAAOH,EAAA,CAAoB;AAAA,EAGpC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,gBAAgBK,GAAe;AACvB,UAAAC,IAAc,KAAK;AACrB,QAAAC;AAEJ,WAAAD,EAAY,QAAQ,CAAC,EAAE,OAAOE,QAAe;AAC3C,UAAID;AACF;AAEI,YAAAE,IAAUP,EAAY,WAAWM,CAAQ;AAC/C,iBAAWE,KAAOT,GAAsB;AACtC,YAAIM;AACF;AAEI,cAAAI,IAAYC,EAAK,KAAKH,GAAS,GAAGJ,CAAK,GAAGK,CAAG,EAAE;AACjD,QAAAG,EAAG,WAAWF,CAAS,MAChBJ,IAAAI;AAAA,MAEb;AAAA,IAAA,CACD,GAEMJ;AAAA,EACT;AAAA;AAAA;AAAA;AAAA,EAKA,OAAe,WAAWO,GAAmB;AAC3C,QAAIL,IAAUK,EAAU,MAAM,IAAI,EAAE,CAAC;AACrC,QAAI,CAACL;AACG,YAAA,IAAI,MAAM,iDAAiD;AAEzD,WAAAA,IAAAA,EAAQ,QAAQ,OAAO,GAAG,GAC7BA;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,OAAO,iBAAiB;AAAA,IACtB,WAAAK;AAAA,IACA,QAAAP;AAAA,EAAA,GAIC;AACK,UAAAE,IAAU,KAAK,WAAWK,CAAS,GACnCC,IAAK,IAAI,OAAO,IAAIN,CAAO,WAAW,GACtCO,IAAQT,EAAO,MAAMQ,CAAE;AAEtB,WADWC,KAAA,gBAAAA,EAAO,GAAG;AAAA,EAE9B;AACF;AC3Da,MAAAC,IAAiB,CAC5BC,OACkB;AAAA,EAClB,WAAW,MAAM;AACT,UAAAC,wBAAe;AACb,WAAAD,EAAA;AAAA,MAAQ,CAAC,EAAE,aAAAE,GAAa,OAAAC,GAAO,gBAAAC,QACrC,OAAO,QAAQF,CAAW,EAAE,QAAQ,CAAC,CAACG,GAAMC,CAAa,MAAM;AACvD,cAAAC,IAAYvB,EAAY,iBAAiB;AAAA,UAC7C,WAAWmB;AAAA,UACX,QAAQE;AAAA,QAAA,CACT;AAEG,YAAA,CAACE,EAAW,QAAO;AAEnB,YAAAN,EAAS,IAAIM,CAAS;AAEhB,yBAAA;AAAA,YACN,kCAAkCA,CAAS,uBAAuBF,CAAI;AAAA,UAAA,GAEjE;AAGT,cAAMG,IAAqB;AAAA,UACzB,MAAMD;AAAA,UACN,MAAM,YAAY;AAChB,kBAAM,EAAE,SAAAE,EAAA,IAAY,MAAM,OAAO,uBAAc,GACzC,EAAE,SAASC,GAAW,GAAGC,EAAM,IAAI,MAAML;AACxC,mBAAA;AAAA,cACL,SACEM,gBAAAA,EAAA;AAAA,gBAACH;AAAA,gBAAA;AAAA,kBACC,MAAAJ;AAAA,kBACA,cAAcK;AAAA,kBACb,GAAGC;AAAA,kBACJ,gBAAAP;AAAA,gBAAA;AAAA,cACF;AAAA,YAAA;AAAA,UAGN;AAAA,QAAA;AAEO,QAAAH,EAAA,IAAIM,GAAWC,CAAK;AAAA,MAAA,CAC9B;AAAA,IAAA,GAEI,CAAC,GAAGP,EAAS,OAAA,CAAQ;AAAA,EAC9B;AACF;"}

package/lib/zudoku.plugin-redirect.js.map

@@ -1 +1 @@
-{"version":3,"file":"zudoku.plugin-redirect.js","sources":["../src/lib/plugins/redirect/index.tsx"],"sourcesContent":["import { redirect } from \"react-router-dom\";\nimport { ZudokuRedirect } from \"../../../config/validators/validate.js\";\nimport type { ZudokuPlugin } from \"../../core/plugins.js\";\n\nexport const redirectPlugin = (options: {\n  redirects: ZudokuRedirect[];\n}): ZudokuPlugin => {\n  return {\n    getRoutes: () =>\n      options.redirects.map(({ from, to }) => ({\n        path: from,\n        loader: () => redirect(to, 301),\n      })),\n  };\n};\n"],"names":["redirectPlugin","options","from","to","redirect"],"mappings":";AAIa,MAAAA,IAAiB,CAACC,OAGtB;AAAA,EACL,WAAW,MACTA,EAAQ,UAAU,IAAI,CAAC,EAAE,MAAAC,GAAM,IAAAC,SAAU;AAAA,IACvC,MAAMD;AAAA,IACN,QAAQ,MAAME,EAASD,GAAI,GAAG;AAAA,EAAA,EAC9B;AAAA;"}
+{"version":3,"file":"zudoku.plugin-redirect.js","sources":["../src/lib/plugins/redirect/index.tsx"],"sourcesContent":["import { redirect } from \"react-router-dom\";\nimport { ZudokuRedirect } from \"../../../config/validators/common.js\";\nimport type { ZudokuPlugin } from \"../../core/plugins.js\";\n\nexport const redirectPlugin = (options: {\n  redirects: ZudokuRedirect[];\n}): ZudokuPlugin => {\n  return {\n    getRoutes: () =>\n      options.redirects.map(({ from, to }) => ({\n        path: from,\n        loader: () => redirect(to, 301),\n      })),\n  };\n};\n"],"names":["redirectPlugin","options","from","to","redirect"],"mappings":";AAIa,MAAAA,IAAiB,CAACC,OAGtB;AAAA,EACL,WAAW,MACTA,EAAQ,UAAU,IAAI,CAAC,EAAE,MAAAC,GAAM,IAAAC,SAAU;AAAA,IACvC,MAAMD;AAAA,IACN,QAAQ,MAAME,EAASD,GAAI,GAAG;AAAA,EAAA,EAC9B;AAAA;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.19.0",
+  "version": "0.20.1",
   "type": "module",
   "homepage": "https://zudoku.dev",
   "repository": {
@@ -153,7 +153,6 @@
     "@types/react": "18.3.11",
     "@types/react-dom": "18.3.1",
     "@vitejs/plugin-react": "4.3.4",
-    "@zudoku/config": "0.19.0",
     "@zudoku/httpsnippet": "10.0.9",
     "@zudoku/react-helmet-async": "2.0.4",
     "autoprefixer": "10.4.20",
@@ -204,6 +203,7 @@
     "strip-ansi": "7.1.0",
     "tailwind-merge": "2.5.4",
     "tailwindcss": "3.4.13",
+    "tsx": "^4.19.2",
     "ulidx": "2.4.1",
     "unist-util-visit": "5.0.0",
     "urql": "4.1.0",

package/src/lib/components/TopNavigation.tsx

@@ -1,7 +1,7 @@
 import { cx } from "class-variance-authority";
 import { Suspense } from "react";
 import { NavLink, useNavigation } from "react-router-dom";
-import { TopNavigationItem } from "../../config/validators/validate.js";
+import { TopNavigationItem } from "../../config/validators/common.js";
 import { useAuth } from "../authentication/hook.js";
 import { ZudokuError } from "../util/invariant.js";
 import { joinPath } from "../util/joinPath.js";

package/src/lib/components/navigation/SidebarCategory.tsx

@@ -10,11 +10,9 @@ import { useIsCategoryOpen } from "./utils.js";
 
 export const SidebarCategory = ({
   category,
-  level,
   onRequestClose,
 }: {
   category: SidebarItemCategory;
-  level: number;
   onRequestClose?: () => void;
 }) => {
   const isCategoryOpen = useIsCategoryOpen(category);
@@ -67,7 +65,6 @@ export const SidebarCategory = ({
           onClick={() => setHasInteracted(true)}
           className={navigationListItem({
             isActive: false,
-            isTopLevel: level === 0,
             className: [
               "text-start",
               isCollapsible
@@ -79,10 +76,7 @@ export const SidebarCategory = ({
           {category.icon && (
             <category.icon
               size={16}
-              className={cn(
-                "align-[-0.125em] -translate-x-1",
-                isActive && "text-primary",
-              )}
+              className={cn("align-[-0.125em] ", isActive && "text-primary")}
             />
           )}
           {category.link?.type === "doc" ? (
@@ -118,9 +112,14 @@ export const SidebarCategory = ({
         className={cn(
           // CollapsibleContent class is used to animate and it should only be applied when the user has triggered the toggle
           hasInteracted && "CollapsibleContent",
+          "ms-6 my-1",
         )}
       >
-        <ul className="mt-1 border-l ms-0.5">
+        <ul
+          className={
+            "relative after:absolute after:-left-[--padding-nav-item] after:translate-x-[1.5px] after:top-0 after:bottom-0 after:w-px after:bg-border"
+          }
+        >
           {category.items.map((item) => (
             <SidebarItem
               key={
@@ -129,7 +128,6 @@ export const SidebarCategory = ({
                 item.label
               }
               onRequestClose={onRequestClose}
-              level={level + 1}
               item={item}
             />
           ))}

package/src/lib/components/navigation/SidebarItem.tsx

@@ -13,10 +13,6 @@ export const navigationListItem = cva(
   "flex items-center gap-2 px-[--padding-nav-item] py-1.5 rounded-lg hover:bg-accent transition-colors duration-300",
   {
     variants: {
-      isTopLevel: {
-        true: "font-medium -mx-[--padding-nav-item]",
-        false: "-mr-[--padding-nav-item] ml-[--padding-nav-item]",
-      },
       isActive: {
         true: "text-primary font-medium",
         false: "text-foreground/80",
@@ -36,11 +32,9 @@ export const DATA_ANCHOR_ATTR = "data-anchor";
 
 export const SidebarItem = ({
   item,
-  level = 0,
   onRequestClose,
 }: {
   item: SidebarItemType;
-  level?: number;
   onRequestClose?: () => void;
 }) => {
   const { activeAnchor } = useViewportAnchor();
@@ -49,18 +43,12 @@ export const SidebarItem = ({
   switch (item.type) {
     case "category":
       return (
-        <SidebarCategory
-          category={item}
-          level={level}
-          onRequestClose={onRequestClose}
-        />
+        <SidebarCategory category={item} onRequestClose={onRequestClose} />
       );
     case "doc":
       return (
         <NavLink
-          className={({ isActive }) =>
-            navigationListItem({ isActive, isTopLevel: level === 0 })
-          }
+          className={({ isActive }) => navigationListItem({ isActive })}
           to={joinPath(item.id)}
           onClick={onRequestClose}
         >
@@ -84,7 +72,6 @@ export const SidebarItem = ({
           {...{ [DATA_ANCHOR_ATTR]: item.href.slice(1) }}
           className={navigationListItem({
             isActive: item.href.slice(1) === activeAnchor,
-            isTopLevel: level === 0,
             className: item.badge?.placement !== "start" && "justify-between",
           })}
           onClick={onRequestClose}
@@ -120,7 +107,7 @@ export const SidebarItem = ({
         </NavLink>
       ) : (
         <a
-          className={navigationListItem({ isTopLevel: level === 0 })}
+          className={navigationListItem()}
           href={item.href}
           target="_blank"
           rel="noopener noreferrer"

package/src/lib/components/navigation/SidebarWrapper.tsx

@@ -13,7 +13,7 @@ export const SidebarWrapper = forwardRef<
     data-navigation={String(pushMainContent)}
     className={cn(
       "scrollbar peer hidden lg:flex flex-col fixed text-sm overflow-y-auto shrink-0",
-      "px-[--padding-nav-item] -mx-[--padding-nav-item] pb-20 mt-[--padding-content-top]",
+      "-mx-[--padding-nav-item] pb-20 mt-[--padding-content-top]",
       "w-[--side-nav-width] h-[calc(100%-var(--header-height))] scroll-pt-2 gap-2",
       className,
     )}

package/src/lib/core/ZudokuContext.ts

@@ -1,6 +1,6 @@
 import { ReactNode } from "react";
+import { TopNavigationItem } from "../../config/validators/common.js";
 import type { SidebarConfig } from "../../config/validators/SidebarSchema.js";
-import { TopNavigationItem } from "../../config/validators/validate.js";
 import { type AuthenticationProvider } from "../authentication/authentication.js";
 import type { ComponentsContextType } from "../components/context/ComponentsContext.js";
 import { Slotlets } from "../components/SlotletProvider.js";

package/src/lib/plugins/markdown/index.tsx

@@ -1,7 +1,7 @@
 import type { Toc } from "@stefanprobst/rehype-extract-toc";
 import type { MDXProps } from "mdx/types.js";
 import { RouteObject } from "react-router-dom";
-import { ZudokuDocsConfig } from "../../../config/validators/validate.js";
+import { ZudokuDocsConfig } from "../../../config/validators/common.js";
 import type { ZudokuPlugin } from "../../core/plugins.js";
 import { DocResolver } from "./resolver.js";
 

package/src/lib/plugins/markdown/resolver.ts

@@ -1,9 +1,7 @@
 import fs from "fs";
 import path from "path";
-import {
-  ZudokuConfig,
-  ZudokuDocsConfig,
-} from "../../../config/validators/validate.js";
+import { ZudokuDocsConfig } from "../../../config/validators/common.js";
+import { ZudokuConfig } from "../../../config/validators/validate.js";
 
 const DEFAULT_DOCS_FILES = "/pages/**/*.{md,mdx}";
 

package/src/lib/plugins/redirect/index.tsx

@@ -1,5 +1,5 @@
 import { redirect } from "react-router-dom";
-import { ZudokuRedirect } from "../../../config/validators/validate.js";
+import { ZudokuRedirect } from "../../../config/validators/common.js";
 import type { ZudokuPlugin } from "../../core/plugins.js";
 
 export const redirectPlugin = (options: {

package/src/lib/util/MdxComponents.tsx

@@ -1,14 +1,11 @@
-import { MDXProvider } from "@mdx-js/react";
-import type { ComponentProps } from "react";
+import { MDXComponents } from "mdx/types.js";
 import { Link } from "react-router-dom";
 import { Heading } from "../components/Heading.js";
 import { InlineCode } from "../components/InlineCode.js";
 import { SyntaxHighlight } from "../components/SyntaxHighlight.js";
 import { Callout } from "../ui/Callout.js";
 
-export type MdxComponentsType = ComponentProps<
-  typeof MDXProvider
->["components"];
+export type MdxComponentsType = Readonly<MDXComponents> | null | undefined;
 
 export const MdxComponents = {
   // @ts-expect-error Node is not in types but still gets passed