zudoku 0.1.1-dev.4 → 0.1.1-dev.41

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "zudoku",
-  "version": "0.1.1-dev.4",
+  "version": "0.1.1-dev.41",
   "type": "module",
   "files": [
     "dist",
-    "src/app",
-    "cli.js"
+    "lib",
+    "cli.js",
+    "src/lib",
+    "src/app"
   ],
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,11 +18,17 @@
     ".": {
       "import": "./dist/index.js"
     },
-    "./auth": {
-      "import": "./dist/auth.js"
+    "./auth/clerk": {
+      "import": "./lib/zudoku.auth-clerk.js"
     },
     "./plugins": {
-      "import": "./dist/plugins.js"
+      "import": "./lib/zudoku.plugins.js"
+    },
+    "./openapi-worker": {
+      "import": "./lib/zudoku.openapi-worker.js"
+    },
+    "./components": {
+      "import": "./lib/zudoku.components.js"
     },
     "./vite": {
       "require": "./dist/vite/plugin.js",
@@ -30,81 +38,72 @@
       "require": "./dist/app/tailwind.js",
       "import": "./dist/app/tailwind.js"
     },
-    "./icons": {
-      "require": "./dist/app/core/icons.js",
-      "import": "./dist/app/core/icons.js"
-    },
     "./main.css": {
       "require": "./src/app/main.css",
       "import": "./src/app/main.css"
+    },
+    "./app/*": {
+      "import": "./src/app/*"
     }
   },
   "dependencies": {
-    "@cfworker/json-schema": "1.12.8",
-    "@clerk/clerk-js": "^5.2.2",
-    "@graphql-typed-document-node/core": "^3.2.0",
+    "@graphql-typed-document-node/core": "3.2.0",
     "@lekoarts/rehype-meta-as-attributes": "3.0.1",
     "@mdx-js/react": "3.0.1",
     "@mdx-js/rollup": "3.0.1",
+    "@monaco-editor/react": "^4.6.0",
     "@pothos/core": "3.41.0",
-    "@radix-ui/react-collapsible": "1.0.3",
-    "@radix-ui/react-dialog": "^1.1.1",
-    "@radix-ui/react-slot": "^1.1.0",
-    "@radix-ui/react-tabs": "^1.1.0",
-    "@sentry/node": "^8.11.0",
+    "@sentry/node": "8.11.0",
     "@stefanprobst/rehype-extract-toc": "2.2.0",
     "@tailwindcss/typography": "0.5.13",
-    "@tanstack/react-query": "5.35.1",
-    "@zudoku/httpsnippet": "10.0.9",
-    "@zuplo/pino-pretty-configurations": "^1.5.0",
+    "@vitejs/plugin-react": "4.3.1",
     "autoprefixer": "10.4.19",
-    "chalk": "^5.3.0",
-    "class-variance-authority": "0.7.0",
-    "clsx": "2.1.1",
-    "dotenv": "^16.4.5",
-    "esbuild": "^0.23.0",
-    "express": "^4.19.2",
-    "graphql": "^16.9.0",
+    "chokidar": "^3.6.0",
+    "dotenv": "16.4.5",
+    "esbuild": "0.23.0",
+    "express": "4.19.2",
+    "graphql": "16.9.0",
     "graphql-type-json": "0.3.2",
     "graphql-yoga": "5.2.0",
     "lru-cache": "10.2.0",
-    "lucide-react": "0.378.0",
-    "mdx": "^0.3.1",
-    "oauth4webapi": "2.10.4",
+    "mdx": "0.3.1",
     "object-hash": "3.0.0",
-    "pino": "^9.2.0",
-    "postcss": "8.4.38",
+    "openapi-types": "12.1.3",
+    "picocolors": "^1.0.1",
+    "postcss": "8.4.39",
     "posthog-node": "^4.0.1",
     "prism-react-renderer": "2.3.1",
     "prismjs": "1.29.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-helmet-async": "2.0.5",
+    "react-hook-form": "^7.52.1",
     "react-markdown": "9.0.1",
-    "react-router-dom": "6.23.0",
+    "react-router-dom": "6.24.1",
     "rehype-slug": "6.0.0",
     "remark-comment": "1.0.0",
     "remark-directive": "3.0.0",
     "remark-directive-rehype": "0.4.2",
     "remark-frontmatter": "5.0.0",
     "remark-gfm": "4.0.0",
-    "remark-mdx-frontmatter": "4.0.0",
-    "semver": "^7.6.2",
+    "remark-mdx-frontmatter": "5.0.0",
+    "semver": "7.6.2",
     "slugify": "1.6.6",
-    "strip-ansi": "^7.1.0",
-    "tailwind-merge": "2.3.0",
-    "tailwindcss": "3.4.3",
-    "ulid": "2.3.0",
+    "strip-ansi": "7.1.0",
+    "tailwindcss": "3.4.4",
+    "ulidx": "^2.3.0",
     "unist-util-visit": "5.0.0",
     "urql": "4.1.0",
-    "vite": "^5.3.1",
-    "vite-plugin-dts": "^3.9.1",
+    "vite": "5.3.3",
     "yaml": "2.4.1",
-    "yargs": "^17.7.2",
-    "zustand": "^4.5.2"
+    "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^5.0.2",
+    "@radix-ui/react-collapsible": "1.1.0",
+    "@radix-ui/react-dialog": "1.1.1",
+    "@radix-ui/react-slot": "1.1.0",
+    "@radix-ui/react-tabs": "1.1.0",
+    "@tanstack/react-query": "5.50.1",
     "@types/express": "^4.17.21",
     "@types/har-format": "^1.2.15",
     "@types/json-schema": "7.0.15",
@@ -115,13 +114,32 @@
     "@types/react-dom": "18.3.0",
     "@types/semver": "^7.5.8",
     "@types/yargs": "^17.0.32",
-    "@vitejs/plugin-react": "4.3.0",
-    "openapi-types": "12.1.3",
-    "typescript": "5.5.3"
+    "@zudoku/httpsnippet": "10.0.9",
+    "class-variance-authority": "0.7.0",
+    "clsx": "2.1.1",
+    "lucide-react": "0.378.0",
+    "oauth4webapi": "2.11.1",
+    "prism-react-renderer": "2.3.1",
+    "prismjs": "1.29.0",
+    "react-helmet-async": "2.0.5",
+    "react-router-dom": "6.24.1",
+    "react-markdown": "9.0.1",
+    "tailwind-merge": "2.3.0",
+    "typescript": "5.5.3",
+    "zustand": "4.5.4"
+  },
+  "peerDependencies": {
+    "react": ">18.0.0",
+    "react-dom": ">18.0.0"
+  },
+  "optionalDependencies": {
+    "@clerk/clerk-js": "5.2.2"
   },
   "scripts": {
-    "build": "tsc --project tsconfig.node.json",
-    "test": "node --test --enable-source-maps",
-    "codegen": "graphql-codegen --config ./scripts/codegen.ts"
+    "build": "tsc --project tsconfig.json",
+    "build:vite": "vite build && pnpm run hack:fix-worker-paths",
+    "hack:fix-worker-paths": "node ./scripts/hack-worker.mjs",
+    "clean": "tsc --build --clean",
+    "test": "node --test --enable-source-maps"
   }
 }

package/src/app/App.tsx

@@ -1,11 +1,20 @@
 import "./main.css";
 
-import DevPortal from "./DevPortal.js";
-import { markdownPlugin } from "./plugins/markdown/index.js";
-import { openApiPlugin } from "./plugins/openapi/index.js";
+// Virtual config
+import config from "virtual:zudoku-config";
 
-import config from "./config.js";
-// import markdowns from "./markdowns.js";
+// Virtual Plugins
+import { configuredApiPlugins } from "virtual:zudoku-api-plugins";
+import { configuredAuthProvider } from "virtual:zudoku-auth";
+import { configuredDocsPlugins } from "virtual:zudoku-docs-plugins";
+import { configuredApiKeysPlugin } from "virtual:zudoku-api-keys-plugin";
+import { configuredRedirectPlugin } from "virtual:zudoku-redirect-plugin";
+
+// Base React Component
+import { DevPortal } from "zudoku/components";
+
+// IMPORTANT: This component must not contain tailwind classes
+// This directory is not processed by the tailwind plugin
 
 export default function App() {
   return (
@@ -19,44 +28,12 @@ export default function App() {
           "https://cdn.zuplo.com/www/favicon.png",
       }}
       navigation={config.navigation ?? []}
-      // authentication={
-      //   config.authentication
-      //     ? getAuthProvider(config.authentication)
-      //     : undefined
-      // }
+      authentication={configuredAuthProvider}
       plugins={[
-        ...(config.docs
-          ? Array.isArray(config.docs)
-            ? config.docs
-            : [config.docs]
-          : []
-        ).map((docs) =>
-          markdownPlugin({
-            markdownFiles: docs?.files ?? {},
-          }),
-        ),
-        ...(config.apis
-          ? Array.isArray(config.apis)
-            ? config.apis
-            : [config.apis]
-          : []
-        ).map((api) => openApiPlugin(api)),
-        //     if (!accessToken) {
-        //       return;
-        //     }
-
-        //     const consumers = await fetch(
-        //       "https://zudoku-customer-main-b36fa2f.d2.zuplo.dev/v1/developer/api-keys",
-        //       {
-        //         headers: {
-        //           Authorization: `Bearer ${accessToken}`,
-        //         },
-        //       },
-        //     );
-
-        //     return { consumers: [await consumers.json()] };
-        //   },
-        // }),
+        ...configuredDocsPlugins,
+        ...configuredApiPlugins,
+        configuredApiKeysPlugin,
+        configuredRedirectPlugin,
       ]}
     />
   );

package/src/app/main.tsx

@@ -1,22 +1,9 @@
-import React from "react";
-import ReactDOM from "react-dom/client";
+import { StrictMode } from "react";
+import { createRoot } from "react-dom/client";
 import App from "./App.js";
 
-// if (import.meta.env.DEV) {
-//   const { default: wdyr } = await import(
-//     "@welldone-software/why-did-you-render"
-//   );
-//
-//   wdyr(React, {
-//     include: [/.*/],
-//     exclude: [/^BrowserRouter/, /^Link/, /^Route/],
-//     trackHooks: true,
-//     trackAllPureComponents: true,
-//   });
-// }
-
-ReactDOM.createRoot(document.getElementById("root")!).render(
-  <React.StrictMode>
+createRoot(document.getElementById("root")!).render(
+  <StrictMode>
     <App />
-  </React.StrictMode>,
+  </StrictMode>,
 );

package/src/{app → lib}/authentication/clerk.ts

@@ -1,14 +1,16 @@
-import { Clerk } from "@clerk/clerk-js";
+import type { Clerk } from "@clerk/clerk-js";
 import { type AuthProvider } from "./authentication.js";
 
-const clerkProvider = ({
-  clerkPubKey,
-}: {
-  clerkPubKey: string;
-}): AuthProvider => {
-  const clerkApi = new Clerk(clerkPubKey);
+const clerkAuth = ({ clerkPubKey }: { clerkPubKey: string }): AuthProvider => {
+  let clerkApi: Clerk;
 
-  const clerkIsLoaded = clerkApi.load({});
+  const clerkIsLoaded = (async () => {
+    const { Clerk } = await import("@clerk/clerk-js");
+    clerkApi = new Clerk(clerkPubKey);
+
+    await clerkApi.load({});
+    clerkApi.load({});
+  })();
 
   return {
     initialize: async (context) => {
@@ -44,4 +46,4 @@ const clerkProvider = ({
   };
 };
 
-export default clerkProvider;
+export default clerkAuth;

package/src/{app → lib/components}/DevPortal.tsx

@@ -1,25 +1,27 @@
-import { MDXProvider } from "@mdx-js/react";
+import { MDXProvider, useMDXComponents } from "@mdx-js/react";
 import { QueryClientProvider } from "@tanstack/react-query";
 import { memo, Suspense, useEffect, useMemo } from "react";
-import { createBrowserRouter, RouterProvider } from "react-router-dom";
-import { type AuthProvider } from "./authentication/authentication.js";
-import {
-  ComponentsProvider,
-  DEFAULT_COMPONENTS,
-  type ComponentsContextType,
-} from "./components/context/ComponentsContext.js";
-import { DevPortalProvider } from "./components/context/DevPortalProvider.js";
-import { ThemeProvider } from "./components/context/ThemeContext.js";
-import { ViewportAnchorProvider } from "./components/context/ViewportAnchorContext.js";
-import { Layout } from "./components/Layout.js";
+import { type AuthProvider } from "../authentication/authentication.js";
 import {
   DevPortalContext,
   queryClient,
   type NavigationItem,
-} from "./core/DevPortalContext.js";
-import { HelmetProvider } from "./core/helmet.js";
-import { isNavigationPlugin, type DevPortalPlugin } from "./core/plugins.js";
-import { MdxComponents, type MdxComponentsType } from "./util/MdxComponents.js";
+} from "../core/DevPortalContext.js";
+import { HelmetProvider } from "../core/helmet.js";
+import { type DevPortalPlugin } from "../core/plugins.js";
+import {
+  MdxComponents,
+  type MdxComponentsType,
+} from "../util/MdxComponents.js";
+import {
+  ComponentsProvider,
+  DEFAULT_COMPONENTS,
+  type ComponentsContextType,
+} from "./context/ComponentsContext.js";
+import { DevPortalProvider } from "./context/DevPortalProvider.js";
+import { ThemeProvider } from "./context/ThemeContext.js";
+import { ViewportAnchorProvider } from "./context/ViewportAnchorContext.js";
+import { Router } from "./Router.js";
 
 export const DevPortalSystemPaths = {
   Settings: "/settings",
@@ -44,28 +46,7 @@ export type DevPortalProps = {
   overrides?: ComponentsContextType;
 };
 
-const DevPortal = (props: DevPortalProps) => {
-  const router = useMemo(() => {
-    const routes = (props.plugins ?? []).flatMap((plugin) =>
-      isNavigationPlugin(plugin) ? plugin.getRoutes() : [],
-    );
-
-    return createBrowserRouter([
-      {
-        path: "/",
-        element: <Layout />,
-        errorElement: (
-          <Layout>
-            <div className="h-[75vh] flex items-center justify-center">
-              Error, look at the console
-            </div>
-          </Layout>
-        ),
-        children: routes,
-      },
-    ]);
-  }, [props.plugins]);
-
+const DevPortalInner = (props: DevPortalProps) => {
   const components = useMemo(
     () => ({ ...DEFAULT_COMPONENTS, ...props.overrides }),
     [props.overrides],
@@ -97,7 +78,7 @@ const DevPortal = (props: DevPortalProps) => {
                       </div>
                     }
                   >
-                    <RouterProvider router={router} />
+                    <Router plugins={props.plugins} />
                   </Suspense>
                 </ViewportAnchorProvider>
               </ComponentsProvider>
@@ -109,7 +90,7 @@ const DevPortal = (props: DevPortalProps) => {
   );
 };
 
-const MemoDevPortal = memo(DevPortal);
-MemoDevPortal.displayName = "DevPortal";
+const DevPortal = memo(DevPortalInner);
+DevPortal.displayName = "DevPortal";
 
-export default MemoDevPortal;
+export { DevPortal, useMDXComponents };

package/src/{app → lib}/components/Dialog.tsx

@@ -1,15 +1,15 @@
-import * as React from "react"
-import * as DialogPrimitive from "@radix-ui/react-dialog"
-import { XIcon } from "lucide-react"
+import * as React from "react";
+import * as DialogPrimitive from "@radix-ui/react-dialog";
+import { XIcon } from "lucide-react";
 import { cn } from "../util/cn.js";
 
-const Dialog = DialogPrimitive.Root
+const Dialog = DialogPrimitive.Root;
 
-const DialogTrigger = DialogPrimitive.Trigger
+const DialogTrigger = DialogPrimitive.Trigger;
 
-const DialogPortal = DialogPrimitive.Portal
+const DialogPortal = DialogPrimitive.Portal;
 
-const DialogClose = DialogPrimitive.Close
+const DialogClose = DialogPrimitive.Close;
 
 const DialogOverlay = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Overlay>,
@@ -19,12 +19,12 @@ const DialogOverlay = React.forwardRef<
     ref={ref}
     className={cn(
       "fixed inset-0 z-50 bg-black/80  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
-      className
+      className,
     )}
     {...props}
   />
-))
-DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
+));
+DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
 
 const DialogContent = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Content>,
@@ -35,8 +35,8 @@ const DialogContent = React.forwardRef<
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
-        className
+        "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg border-border",
+        className,
       )}
       {...props}
     >
@@ -47,36 +47,36 @@ const DialogContent = React.forwardRef<
       </DialogPrimitive.Close>
     </DialogPrimitive.Content>
   </DialogPortal>
-))
-DialogContent.displayName = DialogPrimitive.Content.displayName
+));
+DialogContent.displayName = DialogPrimitive.Content.displayName;
 
 const DialogHeader = ({
-                        className,
-                        ...props
-                      }: React.HTMLAttributes<HTMLDivElement>) => (
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
   <div
     className={cn(
       "flex flex-col space-y-1.5 text-center sm:text-left",
-      className
+      className,
     )}
     {...props}
   />
-)
-DialogHeader.displayName = "DialogHeader"
+);
+DialogHeader.displayName = "DialogHeader";
 
 const DialogFooter = ({
-                        className,
-                        ...props
-                      }: React.HTMLAttributes<HTMLDivElement>) => (
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
   <div
     className={cn(
       "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
-      className
+      className,
     )}
     {...props}
   />
-)
-DialogFooter.displayName = "DialogFooter"
+);
+DialogFooter.displayName = "DialogFooter";
 
 const DialogTitle = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Title>,
@@ -86,12 +86,12 @@ const DialogTitle = React.forwardRef<
     ref={ref}
     className={cn(
       "text-lg font-semibold leading-none tracking-tight",
-      className
+      className,
     )}
     {...props}
   />
-))
-DialogTitle.displayName = DialogPrimitive.Title.displayName
+));
+DialogTitle.displayName = DialogPrimitive.Title.displayName;
 
 const DialogDescription = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Description>,
@@ -102,8 +102,8 @@ const DialogDescription = React.forwardRef<
     className={cn("text-sm text-muted-foreground", className)}
     {...props}
   />
-))
-DialogDescription.displayName = DialogPrimitive.Description.displayName
+));
+DialogDescription.displayName = DialogPrimitive.Description.displayName;
 
 export {
   Dialog,
@@ -116,4 +116,4 @@ export {
   DialogFooter,
   DialogTitle,
   DialogDescription,
-}
+};

package/src/{app → lib}/components/Header.tsx

@@ -25,7 +25,7 @@ export const Header = memo(() => {
             </span>
           </div>
           <div className="grid grid-cols-[--sidecar-grid-cols] items-center gap-8">
-            <div className="w-full max-w-prose mx-auto">
+            <div className="w-full max-w-prose">
               <button className="flex items-center border border-input hover:bg-accent hover:text-accent-foreground p-4 relative h-8 justify-start rounded-lg bg-background text-sm text-muted-foreground shadow-none w-40 sm:w-72">
                 <div className="flex items-center gap-2 flex-grow">
                   <SearchIcon size={14} />
@@ -37,9 +37,9 @@ export const Header = memo(() => {
               </button>
             </div>
             <div className="items-center justify-self-end text-sm hidden lg:flex">
-              {!isLoggedIn ? (
+              {isLoggedIn ? (
                 <button
-                  className="cursor-pointer hover:bg-secondary p-1 px-2 mx-2 rounded"
+                  className="cursor-pointer hover:bg-secondary p-1 px-2 mx-2 rounded text-nowrap"
                   onClick={logout}
                 >
                   Logout {email ? `(${email})` : null}

package/src/{app → lib/components}/Heading.tsx

@@ -1,6 +1,6 @@
 import { type ReactNode } from "react";
-import { useRegisterAnchorElement } from "./components/context/ViewportAnchorContext.js";
-import { cn } from "./util/cn.js";
+import { cn } from "../util/cn.js";
+import { useRegisterAnchorElement } from "./context/ViewportAnchorContext.js";
 
 const getComponent = (level: number) => {
   switch (level) {

package/src/{app → lib}/components/Layout.tsx

@@ -41,15 +41,19 @@ export const Layout = ({ children }: { children?: ReactNode }) => {
         {meta?.favicon && <link rel="icon" href={meta.favicon} />}
       </Helmet>
       <Header />
+
       <div className="max-w-screen-2xl mx-auto pt-[--header-height] px-10 lg:px-12">
-        <Suspense
-          fallback={<SideNavigationWrapper>Loading...</SideNavigationWrapper>}
-        >
+        <Suspense fallback={<div />}>
           <SideNavigation />
+          <main
+            className="dark:border-white/10 translate-x-0
+          lg:overflow-visible
+          lg:peer-data-[navigation=true]:w-[calc(100%-var(--side-nav-width))]
+          lg:peer-data-[navigation=true]:translate-x-[--side-nav-width] peer-data-[navigation=true]:pl-12"
+          >
+            {children ?? <Outlet />}
+          </main>
         </Suspense>
-        <main className="dark:border-white/10 lg:overflow-visible translate-x-0 lg:w-[calc(100%-var(--side-nav-width))] lg:translate-x-[--side-nav-width] pl-12">
-          {children ?? <Outlet />}
-        </main>
       </div>
     </>
   );

package/src/lib/components/Link.tsx

@@ -0,0 +1 @@
+export { Link } from "../core/router.js";

package/src/lib/components/Router.tsx

@@ -0,0 +1,28 @@
+import { useMemo } from "react";
+import { createBrowserRouter, RouterProvider } from "react-router-dom";
+import { DevPortalPlugin, isNavigationPlugin } from "../core/plugins.js";
+import { Layout } from "./Layout.js";
+
+export function Router({ plugins }: { plugins?: DevPortalPlugin[] }) {
+  const router = useMemo(() => {
+    const routes = (plugins ?? []).flatMap((plugin) =>
+      isNavigationPlugin(plugin) ? plugin.getRoutes() : [],
+    );
+
+    return createBrowserRouter([
+      {
+        path: "/",
+        element: <Layout />,
+        errorElement: (
+          <Layout>
+            <div className="h-[75vh] flex items-center justify-center">
+              Error, look at the console
+            </div>
+          </Layout>
+        ),
+        children: routes,
+      },
+    ]);
+  }, [plugins]);
+  return <RouterProvider router={router} />;
+}