zudoku 0.4.3-dev.9 → 0.4.4-dev.0

package/lib/zudoku.plugin-api-keys.js

@@ -1,12 +1,12 @@
 import { j as e } from "./jsx-runtime-B6kdoens.js";
-import { S as p, R as g } from "./SlotletProvider-Bdzag6MN.js";
-import { u as j, a as u, I as k, S as v, b as w, c as b, d as K, e as N, f as y } from "./Input-BqnnTL7-.js";
+import { S as p, R as g } from "./SlotletProvider-BOqq0WiS.js";
+import { u as j, a as u, I as k, S as v, b as w, c as b, d as K, e as N, f as y } from "./Input-C81a88Ux.js";
 import { e as E, L as x, O as A } from "./index-ChhUJhLT.js";
 import { u as m, t as C, j as S } from "./ZudokuContext-BHNQL3XO.js";
-import { B as l, p as I } from "./Combination-C1wKWZ28.js";
-import { D as P } from "./DeveloperHint-Bv958_pY.js";
+import { B as l, p as I } from "./Combination-B46-2_PR.js";
+import { D as P } from "./DeveloperHint-CCKk5wYF.js";
 import { useState as h } from "react";
-import { c as d, a as D, C as R, g as q } from "./Markdown-C3hatKS5.js";
+import { c as d, a as D, C as R, g as q } from "./Markdown-DWiGXWrs.js";
 /**
  * @license lucide-react v0.378.0 - ISC
  *

package/lib/zudoku.plugin-custom-page.js

@@ -1,5 +1,5 @@
 import { j as m } from "./jsx-runtime-B6kdoens.js";
-import { P as o } from "./Markdown-C3hatKS5.js";
+import { P as o } from "./Markdown-DWiGXWrs.js";
 const l = (s) => ({
   getRoutes: () => s.map(({ path: e, element: t }) => ({
     path: e,

package/lib/zudoku.plugin-markdown.js

@@ -1,31 +1,29 @@
-import { j as m } from "./jsx-runtime-B6kdoens.js";
-const u = (t, e) => Object.entries(t).flatMap(([a, r]) => {
+import { j as c } from "./jsx-runtime-B6kdoens.js";
+const i = (t, e) => Object.entries(t).flatMap(([a, s]) => {
   const n = a.match(/pages\/(.*).mdx?$/), o = n == null ? void 0 : n.at(1);
-  if (!o) return [];
-  const s = o.split("/");
-  return {
-    path: s.at(-1) === "index" ? s.slice(0, -1).join("/") : o,
+  return o ? {
+    path: o,
     lazy: async () => {
-      const { MdxPage: i } = await import("./MdxPage-BEG8cDoF.js"), { default: p, ...c } = await r();
+      const { MdxPage: r } = await import("./MdxPage-DKD6W5vO.js"), { default: p, ...m } = await s();
       return {
-        element: /* @__PURE__ */ m.jsx(
-          i,
+        element: /* @__PURE__ */ c.jsx(
+          r,
           {
             mdxComponent: p,
-            ...c,
+            ...m,
             defaultOptions: e
           }
         )
       };
     }
-  };
-}), g = ({
+  } : [];
+}), x = ({
   markdownFiles: t,
   defaultOptions: e
 }) => ({
-  getRoutes: () => u(t, e)
+  getRoutes: () => i(t, e)
 });
 export {
-  g as markdownPlugin
+  x as markdownPlugin
 };
 //# sourceMappingURL=zudoku.plugin-markdown.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"zudoku.plugin-markdown.js","sources":["../src/lib/plugins/markdown/generateRoutes.tsx","../src/lib/plugins/markdown/index.tsx"],"sourcesContent":["import { type RouteObject } from \"react-router-dom\";\n\nimport {\n  MarkdownPluginDefaultOptions,\n  MarkdownPluginOptions,\n} from \"./index.js\";\n\nexport const generateRoutes = (\n  markdownFiles: MarkdownPluginOptions[\"markdownFiles\"],\n  defaultOptions?: MarkdownPluginDefaultOptions,\n): RouteObject[] =>\n  Object.entries(markdownFiles).flatMap(([file, importPromise]) => {\n    // @todo we can pass in the folder name and then filter the markdown files based on that path\n    const match = file.match(/pages\\/(.*).mdx?$/);\n    const path = match?.at(1);\n\n    if (!path) return [];\n\n    const pathSegments = path.split(\"/\");\n    const isIndexFile = pathSegments.at(-1) === \"index\";\n    const routePath = isIndexFile ? pathSegments.slice(0, -1).join(\"/\") : path;\n\n    return {\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              mdxComponent={Component}\n              {...props}\n              defaultOptions={defaultOptions}\n            />\n          ),\n        };\n      },\n    } satisfies RouteObject;\n  });\n","import type { Toc } from \"@stefanprobst/rehype-extract-toc\";\nimport type { MDXProps } from \"mdx/types.js\";\nimport type { DevPortalPlugin } from \"../../core/plugins.js\";\nimport { generateRoutes } from \"./generateRoutes.js\";\n\nexport type MarkdownPluginOptions = {\n  markdownFiles: Record<string, () => Promise<MDXImport>>;\n  defaultOptions?: MarkdownPluginDefaultOptions;\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  default: (props: MDXProps) => JSX.Element;\n};\n\nexport const markdownPlugin = ({\n  markdownFiles,\n  defaultOptions,\n}: MarkdownPluginOptions): DevPortalPlugin => ({\n  getRoutes: () => generateRoutes(markdownFiles, defaultOptions),\n});\n"],"names":["generateRoutes","markdownFiles","defaultOptions","file","importPromise","match","path","pathSegments","MdxPage","Component","props","jsx","markdownPlugin"],"mappings":";AAOO,MAAMA,IAAiB,CAC5BC,GACAC,MAEA,OAAO,QAAQD,CAAa,EAAE,QAAQ,CAAC,CAACE,GAAMC,CAAa,MAAM;AAEzD,QAAAC,IAAQF,EAAK,MAAM,mBAAmB,GACtCG,IAAOD,KAAA,gBAAAA,EAAO,GAAG;AAEnB,MAAA,CAACC,EAAM,QAAO;AAEZ,QAAAC,IAAeD,EAAK,MAAM,GAAG;AAI5B,SAAA;AAAA,IACL,MAJkBC,EAAa,GAAG,EAAE,MAAM,UACZA,EAAa,MAAM,GAAG,EAAE,EAAE,KAAK,GAAG,IAAID;AAAA,IAIpE,MAAM,YAAY;AAChB,YAAM,EAAE,SAAAE,EAAA,IAAY,MAAM,OAAO,uBAAc,GACzC,EAAE,SAASC,GAAW,GAAGC,EAAM,IAAI,MAAMN;AACxC,aAAA;AAAA,QACL,SACEO,gBAAAA,EAAA;AAAA,UAACH;AAAA,UAAA;AAAA,YACC,cAAcC;AAAA,YACb,GAAGC;AAAA,YACJ,gBAAAR;AAAA,UAAA;AAAA,QACF;AAAA,MAAA;AAAA,IAGN;AAAA,EAAA;AAEJ,CAAC,GCVUU,IAAiB,CAAC;AAAA,EAC7B,eAAAX;AAAA,EACA,gBAAAC;AACF,OAA+C;AAAA,EAC7C,WAAW,MAAMF,EAAeC,GAAeC,CAAc;AAC/D;"}
+{"version":3,"file":"zudoku.plugin-markdown.js","sources":["../src/lib/plugins/markdown/generateRoutes.tsx","../src/lib/plugins/markdown/index.tsx"],"sourcesContent":["import { type RouteObject } from \"react-router-dom\";\n\nimport {\n  MarkdownPluginDefaultOptions,\n  MarkdownPluginOptions,\n} from \"./index.js\";\n\nexport const generateRoutes = (\n  markdownFiles: MarkdownPluginOptions[\"markdownFiles\"],\n  defaultOptions?: MarkdownPluginDefaultOptions,\n): RouteObject[] =>\n  Object.entries(markdownFiles).flatMap(([file, importPromise]) => {\n    // @todo we can pass in the folder name and then filter the markdown files based on that path\n    const match = file.match(/pages\\/(.*).mdx?$/);\n    const path = match?.at(1);\n\n    if (!path) return [];\n\n    return {\n      path,\n      lazy: async () => {\n        const { MdxPage } = await import(\"./MdxPage.js\");\n        const { default: Component, ...props } = await importPromise();\n        return {\n          element: (\n            <MdxPage\n              mdxComponent={Component}\n              {...props}\n              defaultOptions={defaultOptions}\n            />\n          ),\n        };\n      },\n    } satisfies RouteObject;\n  });\n","import type { Toc } from \"@stefanprobst/rehype-extract-toc\";\nimport type { MDXProps } from \"mdx/types.js\";\nimport type { DevPortalPlugin } from \"../../core/plugins.js\";\nimport { generateRoutes } from \"./generateRoutes.js\";\n\nexport type MarkdownPluginOptions = {\n  markdownFiles: Record<string, () => Promise<MDXImport>>;\n  defaultOptions?: MarkdownPluginDefaultOptions;\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  default: (props: MDXProps) => JSX.Element;\n};\n\nexport const markdownPlugin = ({\n  markdownFiles,\n  defaultOptions,\n}: MarkdownPluginOptions): DevPortalPlugin => ({\n  getRoutes: () => generateRoutes(markdownFiles, defaultOptions),\n});\n"],"names":["generateRoutes","markdownFiles","defaultOptions","file","importPromise","match","path","MdxPage","Component","props","jsx","markdownPlugin"],"mappings":";AAOO,MAAMA,IAAiB,CAC5BC,GACAC,MAEA,OAAO,QAAQD,CAAa,EAAE,QAAQ,CAAC,CAACE,GAAMC,CAAa,MAAM;AAEzD,QAAAC,IAAQF,EAAK,MAAM,mBAAmB,GACtCG,IAAOD,KAAA,gBAAAA,EAAO,GAAG;AAEnB,SAACC,IAEE;AAAA,IACL,MAAAA;AAAA,IACA,MAAM,YAAY;AAChB,YAAM,EAAE,SAAAC,EAAA,IAAY,MAAM,OAAO,uBAAc,GACzC,EAAE,SAASC,GAAW,GAAGC,EAAM,IAAI,MAAML;AACxC,aAAA;AAAA,QACL,SACEM,gBAAAA,EAAA;AAAA,UAACH;AAAA,UAAA;AAAA,YACC,cAAcC;AAAA,YACb,GAAGC;AAAA,YACJ,gBAAAP;AAAA,UAAA;AAAA,QACF;AAAA,MAAA;AAAA,IAGN;AAAA,EAAA,IAhBgB;AAkBpB,CAAC,GCNUS,IAAiB,CAAC;AAAA,EAC7B,eAAAV;AAAA,EACA,gBAAAC;AACF,OAA+C;AAAA,EAC7C,WAAW,MAAMF,EAAeC,GAAeC,CAAc;AAC/D;"}

package/lib/zudoku.plugin-openapi.js

@@ -1,11 +1,11 @@
 import "./jsx-runtime-B6kdoens.js";
-import { o as s } from "./index-ClDFRC39.js";
+import { o as s } from "./index-CcnRjD7X.js";
 import "./urql-YhcsXYy8.js";
 import "./ZudokuContext-BHNQL3XO.js";
 import "zudoku/openapi-worker";
-import "./Combination-C1wKWZ28.js";
-import "./ErrorPage-CcBjrY_g.js";
-import "./Markdown-C3hatKS5.js";
+import "./Combination-B46-2_PR.js";
+import "./ErrorPage-BUyRN_4w.js";
+import "./Markdown-DWiGXWrs.js";
 import "./joinPath-B7kNnUX4.js";
 import "./router-BiRCp01d.js";
 import "./index-ChhUJhLT.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.4.3-dev.9",
+  "version": "0.4.4-dev.0",
   "type": "module",
   "files": [
     "dist",
@@ -134,7 +134,7 @@
     "remark-frontmatter": "5.0.0",
     "remark-gfm": "4.0.0",
     "remark-mdx-frontmatter": "5.0.0",
-    "rollup": "^4.18.1",
+    "rollup": "^4.21.2",
     "semver": "7.6.2",
     "slugify": "1.6.6",
     "strip-ansi": "7.1.0",
@@ -147,8 +147,8 @@
     "yaml": "2.5.0",
     "yargs": "17.7.2",
     "zod": "3.23.8",
-    "zod-validation-error": "3.3.0",
-    "zustand": "4.5.4"
+    "zod-validation-error": "3.3.1",
+    "zustand": "4.5.5"
   },
   "devDependencies": {
     "@radix-ui/react-dialog": "1.1.1",

package/src/app/demo.tsx

@@ -3,6 +3,7 @@ import { createRoot } from "react-dom/client";
 import { createBrowserRouter } from "react-router-dom";
 import { Bootstrap } from "zudoku/components";
 import type { ZudokuConfig } from "../config/validators/validate.js";
+import DemoAnnouncement from "../lib/demo/DemoAnnouncement.js";
 import { openApiPlugin } from "../lib/plugins/openapi/index.js";
 import { themeToggle } from "../lib/themeToggle.js";
 import "../lib/util/logInit.js";
@@ -41,6 +42,9 @@ const config = {
       label: "API Reference",
     },
   ],
+  slotlets: {
+    "layout-before-head": <DemoAnnouncement />,
+  },
   plugins: [
     // Using the plugin directly because there's no config file to load in the virtual plugins
     openApiPlugin({

package/src/app/entry.client.tsx

@@ -20,9 +20,8 @@ if (root.childElementCount > 0) {
 }
 
 async function hydrateLazyRoutes(routes: RouteObject[]) {
-  const lazyMatches = matchRoutes(routes, window.location)?.filter(
-    (m) => m.route.lazy,
-  );
+  const path = window.location.pathname.slice(config.basePath?.length ?? 0);
+  const lazyMatches = matchRoutes(routes, path)?.filter((m) => m.route.lazy);
 
   if (lazyMatches?.length) {
     await Promise.all(
@@ -35,13 +34,17 @@ async function hydrateLazyRoutes(routes: RouteObject[]) {
 }
 
 function render(routes: RouteObject[]) {
-  const router = createBrowserRouter(routes);
+  const router = createBrowserRouter(routes, {
+    basename: config.basePath,
+  });
   createRoot(root).render(<Bootstrap router={router} />);
 }
 
 async function hydrate(routes: RouteObject[]) {
   await hydrateLazyRoutes(routes);
-  const router = createBrowserRouter(routes);
+  const router = createBrowserRouter(routes, {
+    basename: config.basePath,
+  });
 
   hydrateRoot(root, <Bootstrap hydrate router={router} />);
 }

package/src/app/entry.server.tsx

@@ -29,7 +29,9 @@ export const render = async ({
   config: ZudokuConfig;
 }) => {
   const routes = getRoutesByConfig(config);
-  const { query, dataRoutes } = createStaticHandler(routes);
+  const { query, dataRoutes } = createStaticHandler(routes, {
+    basename: config.basePath,
+  });
 
   const request =
     baseRequest instanceof Request

package/src/app/main.css

@@ -92,7 +92,7 @@
 
   html,
   body {
-    @apply h-full;
+    @apply h-full overscroll-none;
   }
 
   #root {

package/src/lib/components/Layout.tsx

@@ -45,6 +45,7 @@ export const Layout = ({ children }: { children?: ReactNode }) => {
         )}
         {meta?.favicon && <link rel="icon" href={meta.favicon} />}
       </Helmet>
+      <Slotlet name="layout-before-head" />
       <Header />
 
       <div className="w-full max-w-screen-2xl mx-auto px-10 lg:px-12">

package/src/lib/components/SyntaxHighlight.tsx

@@ -15,6 +15,8 @@ import("prismjs/components/prism-ruby.min.js");
 // @ts-expect-error This is untyped
 import("prismjs/components/prism-markup-templating.js");
 // @ts-expect-error This is untyped
+import("prismjs/components/prism-markup.js");
+// @ts-expect-error This is untyped
 import("prismjs/components/prism-php.min.js");
 // @ts-expect-error This is untyped
 import("prismjs/components/prism-json.min.js");
@@ -24,6 +26,12 @@ import("prismjs/components/prism-java.min.js");
 import("prismjs/components/prism-csharp.min.js");
 // @ts-expect-error This is untyped
 import("prismjs/components/prism-objectivec.min.js");
+// @ts-expect-error This is untyped
+import("prismjs/components/prism-markdown.min.js");
+// @ts-expect-error This is untyped
+import("prismjs/components/prism-javascript.min.js");
+// @ts-expect-error This is untyped
+import("prismjs/components/prism-typescript.min.js");
 
 import { useState } from "react";
 import { cn } from "../util/cn.js";

package/src/lib/components/TopNavigation.tsx

@@ -8,7 +8,7 @@ export const TopNavigation = () => {
 
   // Hide top nav if there is only one item
   if (topNavigation.length <= 1) {
-    return null;
+    return <style>{`:root { --top-nav-height: 0px; }`}</style>;
   }
 
   return (

package/src/lib/demo/DemoAnnouncement.tsx

@@ -0,0 +1,14 @@
+export const DemoAnnouncement = () => (
+  <div className="h-12 w-full bg-pink-900 text-pink-100 text-center text-sm font-medium py-2 flex items-center justify-center ">
+    This demo hosting of your OpenAPI isn't as fast or flexible as self-hosting;{" "}
+    <a
+      href="https://github.com/zuplo/zudoku"
+      className="px-1 underline hover:white"
+    >
+      Get started here
+    </a>{" "}
+    to see Zudoku at full tilt.
+  </div>
+);
+
+export default DemoAnnouncement;

package/src/lib/oas/parser/index.ts

@@ -73,10 +73,17 @@ const parseSchemaInput = async (
         );
       }
 
+      const schemaText = await response.text();
+
       try {
-        return (await response.json()) as JSONSchema;
+        if (schemaText.trim().startsWith("{")) {
+          return JSON.parse(schemaText) as JSONSchema;
+        } else {
+          const yaml = await import("yaml");
+          return yaml.parse(schemaText) as JSONSchema;
+        }
       } catch (err) {
-        throw new GraphQLError("Fetched invalid JSON schema", {
+        throw new GraphQLError("Fetched invalid schema", {
           originalError: err,
         });
       }

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

@@ -16,12 +16,8 @@ export const generateRoutes = (
 
     if (!path) return [];
 
-    const pathSegments = path.split("/");
-    const isIndexFile = pathSegments.at(-1) === "index";
-    const routePath = isIndexFile ? pathSegments.slice(0, -1).join("/") : path;
-
     return {
-      path: routePath,
+      path,
       lazy: async () => {
         const { MdxPage } = await import("./MdxPage.js");
         const { default: Component, ...props } = await importPromise();

package/src/lib/plugins/openapi/Sidecar.tsx

@@ -178,7 +178,7 @@ export const Sidecar = ({
             operation={operation}
           />
         </SidecarBox.Head>
-        <SidecarBox.Body>
+        <SidecarBox.Body className="max-h-[480px]">
           <SyntaxHighlight
             language={selectedLang}
             noBackground
@@ -193,7 +193,10 @@ export const Sidecar = ({
             value={selectedLang}
             onChange={(e) => {
               startTransition(() => {
-                setSearchParams({ lang: e.target.value });
+                setSearchParams((prev) => {
+                  prev.set("lang", e.target.value);
+                  return prev;
+                });
               });
             }}
             options={[