zudoku 0.1.1-dev.2 → 0.1.1-dev.21

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "zudoku",
-  "version": "0.1.1-dev.2",
+  "version": "0.1.1-dev.21",
   "type": "module",
   "files": [
     "dist",
-    "src/app",
-    "cli.js"
+    "lib",
+    "cli.js",
+    "src/lib",
+    "src/app"
   ],
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,10 +19,13 @@
       "import": "./dist/index.js"
     },
     "./auth": {
-      "import": "./dist/auth.js"
+      "import": "./lib/zudoku.auth.js"
     },
     "./plugins": {
-      "import": "./dist/plugins.js"
+      "import": "./lib/zudoku.plugins.js"
+    },
+    "./components": {
+      "import": "./lib/zudoku.components.js"
     },
     "./vite": {
       "require": "./dist/vite/plugin.js",
@@ -30,74 +35,81 @@
       "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/*"
+    },
+    "./open-api-worker": {
+      "import": "./lib/zudoku.openapi-worker.js"
     }
   },
   "dependencies": {
-    "@cfworker/json-schema": "1.12.8",
-    "@clerk/clerk-js": "^5.2.2",
+    "@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",
     "@pothos/core": "3.41.0",
-    "@radix-ui/react-collapsible": "1.0.3",
-    "@sentry/node": "^8.11.0",
+    "@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",
+    "@sentry/node": "8.11.0",
     "@stefanprobst/rehype-extract-toc": "2.2.0",
     "@tailwindcss/typography": "0.5.13",
-    "@tanstack/react-query": "5.35.1",
+    "@tanstack/react-query": "5.50.1",
+    "@vitejs/plugin-react": "4.3.1",
+    "@zudoku/httpsnippet": "10.0.9",
     "autoprefixer": "10.4.19",
-    "chalk": "^5.3.0",
     "class-variance-authority": "0.7.0",
     "clsx": "2.1.1",
-    "dotenv": "^16.4.5",
-    "express": "^4.19.2",
-    "gql.tada": "1.7.5",
+    "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",
+    "mdx": "0.3.1",
     "oauth4webapi": "2.10.4",
     "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-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",
+    "strip-ansi": "7.1.0",
     "tailwind-merge": "2.3.0",
-    "tailwindcss": "3.4.3",
+    "tailwindcss": "3.4.4",
     "ulid": "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",
+    "vite-plugin-dts": "3.9.1",
     "yaml": "2.4.1",
-    "yargs": "^17.7.2",
-    "zustand": "^4.5.2"
+    "yargs": "17.7.2",
+    "zustand": "4.5.4"
   },
   "devDependencies": {
+    "@clerk/clerk-js": "5.2.2",
     "@types/express": "^4.17.21",
+    "@types/har-format": "^1.2.15",
     "@types/json-schema": "7.0.15",
     "@types/mdx": "2.0.13",
     "@types/node": "20.12.10",
@@ -106,12 +118,18 @@
     "@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.4.5"
+    "typescript": "5.5.3"
+  },
+  "peerDependencies": {
+    "@mdx-js/react": "3.0.1",
+    "react": ">18.0.0",
+    "react-dom": ">18.0.0"
   },
   "scripts": {
-    "build": "tsc",
-    "build:css": "cp ./src/app/main.css ./dist/app/main.css"
+    "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

@@ -0,0 +1,33 @@
+import "./main.css";
+
+// Virtual config
+import config from "virtual:zudoku-config";
+
+// Virtual Plugins
+import { configuredApiPlugins } from "virtual:zudoku-api-plugins";
+import { configuredAuthProvider } from "virtual:zudoku-auth";
+import { configuredDocsPlugins } from "virtual:zudoku-docs-plugins";
+
+// Base React Component
+import { DevPortal } from "virtual:zudoku-component";
+
+// IMPORTANT: This component must not contain tailwind classes
+// This directory is not processed by the tailwind plugin
+
+export default function App() {
+  return (
+    <DevPortal
+      meta={{
+        headerTitle: config?.ui?.headerTitle ?? "Developer Portal",
+        pageTitle: config?.ui?.pageTitle ?? "%s | Dev Portal",
+        logo: config?.ui?.logo ?? "https://cdn.zuplo.com/www/favicon.png",
+        favicon:
+          config?.ui?.metadata?.favicon ??
+          "https://cdn.zuplo.com/www/favicon.png",
+      }}
+      navigation={config.navigation ?? []}
+      authentication={configuredAuthProvider}
+      plugins={[...configuredDocsPlugins, ...configuredApiPlugins]}
+    />
+  );
+}

package/src/app/main.tsx

@@ -1,22 +1,9 @@
-import React from "react";
-import ReactDOM from "react-dom/client";
-import App from "./app.js";
+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}/DevPortal.tsx

@@ -1,7 +1,6 @@
 import { MDXProvider } 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,
@@ -11,14 +10,14 @@ import {
 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 {
   DevPortalContext,
   queryClient,
   type NavigationItem,
 } from "./core/DevPortalContext.js";
 import { HelmetProvider } from "./core/helmet.js";
-import { isNavigationPlugin, type DevPortalPlugin } from "./core/plugins.js";
+import { type DevPortalPlugin } from "./core/plugins.js";
+import { Router } from "./Router.js";
 import { MdxComponents, type MdxComponentsType } from "./util/MdxComponents.js";
 
 export const DevPortalSystemPaths = {
@@ -44,28 +43,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 +75,7 @@ const DevPortal = (props: DevPortalProps) => {
                       </div>
                     }
                   >
-                    <RouterProvider router={router} />
+                    <Router plugins={props.plugins} />
                   </Suspense>
                 </ViewportAnchorProvider>
               </ComponentsProvider>
@@ -109,7 +87,7 @@ const DevPortal = (props: DevPortalProps) => {
   );
 };
 
-const MemoDevPortal = memo(DevPortal);
-MemoDevPortal.displayName = "DevPortal";
+const DevPortal = memo(DevPortalInner);
+DevPortal.displayName = "DevPortal";
 
-export default MemoDevPortal;
+export { DevPortal };

package/src/lib/Router.tsx

@@ -0,0 +1,28 @@
+import { useMemo } from "react";
+import { createBrowserRouter, RouterProvider } from "react-router-dom";
+import { Layout } from "./components/Layout.js";
+import { DevPortalPlugin, isNavigationPlugin } from "./core/plugins.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} />;
+}

package/src/lib/auth.ts

@@ -0,0 +1 @@
+export { clerkAuth } from "./authentication/clerk.js";

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

@@ -1,7 +1,7 @@
 import { Clerk } from "@clerk/clerk-js";
 import { type AuthProvider } from "./authentication.js";
 
-const clerkProvider = ({
+export const clerkAuth = ({
   clerkPubKey,
 }: {
   clerkPubKey: string;
@@ -43,5 +43,3 @@ const clerkProvider = ({
     },
   };
 };
-
-export default clerkProvider;

package/src/lib/components/Dialog.tsx

@@ -0,0 +1,119 @@
+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 DialogTrigger = DialogPrimitive.Trigger
+
+const DialogPortal = DialogPrimitive.Portal
+
+const DialogClose = DialogPrimitive.Close
+
+const DialogOverlay = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Overlay
+    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
+    )}
+    {...props}
+  />
+))
+DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
+
+const DialogContent = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+  <DialogPortal>
+    <DialogOverlay />
+    <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
+      )}
+      {...props}
+    >
+      {children}
+      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+        <XIcon className="h-4 w-4" />
+        <span className="sr-only">Close</span>
+      </DialogPrimitive.Close>
+    </DialogPrimitive.Content>
+  </DialogPortal>
+))
+DialogContent.displayName = DialogPrimitive.Content.displayName
+
+const DialogHeader = ({
+                        className,
+                        ...props
+                      }: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col space-y-1.5 text-center sm:text-left",
+      className
+    )}
+    {...props}
+  />
+)
+DialogHeader.displayName = "DialogHeader"
+
+const DialogFooter = ({
+                        className,
+                        ...props
+                      }: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
+      className
+    )}
+    {...props}
+  />
+)
+DialogFooter.displayName = "DialogFooter"
+
+const DialogTitle = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Title>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Title
+    ref={ref}
+    className={cn(
+      "text-lg font-semibold leading-none tracking-tight",
+      className
+    )}
+    {...props}
+  />
+))
+DialogTitle.displayName = DialogPrimitive.Title.displayName
+
+const DialogDescription = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Description>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Description
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+))
+DialogDescription.displayName = DialogPrimitive.Description.displayName
+
+export {
+  Dialog,
+  DialogPortal,
+  DialogOverlay,
+  DialogTrigger,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogFooter,
+  DialogTitle,
+  DialogDescription,
+}

package/src/lib/components/Input.tsx

@@ -0,0 +1,24 @@
+import * as React from "react";
+import { cn } from "../util/cn.js";
+
+export interface InputProps
+  extends React.InputHTMLAttributes<HTMLInputElement> {}
+
+const Input = React.forwardRef<HTMLInputElement, InputProps>(
+  ({ className, type, ...props }, ref) => {
+    return (
+      <input
+        type={type}
+        className={cn(
+          "flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
+          className,
+        )}
+        ref={ref}
+        {...props}
+      />
+    );
+  },
+);
+Input.displayName = "Input";
+
+export { Input };

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

@@ -19,6 +19,8 @@ if (!import.meta.env.SSR) {
   import("prismjs/components/prism-php.min.js");
   // @ts-expect-error This is untyped
   import("prismjs/components/prism-json.min.js");
+  // @ts-expect-error This is untyped
+  import("prismjs/components/prism-java.min.js");
 }
 
 import { useState } from "react";

package/src/lib/components.ts

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

package/src/{app → lib}/plugins/openapi/ColorizedParam.tsx

@@ -3,34 +3,42 @@ import { useTheme } from "../../components/context/ThemeContext.js";
 import { cn } from "../../util/cn.js";
 import { pastellize } from "../../util/pastellize.js";
 
-const DATA_ATTR = "data-linked-param";
+export const DATA_ATTR = "data-linked-param";
+
+export const usePastellizedColor = (name: string) => {
+  const [isDark] = useTheme();
+  return pastellize(
+    name,
+    !isDark ? { saturation: 100, lightness: 70 } : undefined,
+  );
+};
 
 export const ColorizedParam = ({
   name,
+  value,
   className,
   backgroundOpacity = "100%",
   slug,
   children,
+  onClick,
 }: {
   name: string;
+  value?: string;
   className?: string;
   backgroundOpacity?: string;
   slug?: string;
   children?: ReactNode;
+  onClick?: () => void;
 }) => {
   const ref = useRef<HTMLSpanElement>(null);
-  const [isDark] = useTheme();
   const normalized = name.replace("{", "").replace("}", "");
-
-  const color = pastellize(
-    normalized,
-    !isDark ? { saturation: 100, lightness: 70 } : undefined,
-  );
+  const color = usePastellizedColor(normalized);
 
   const borderColor = `hsl(${color})`;
   const backgroundColor = `hsl(${color} / ${backgroundOpacity})`;
 
   useEffect(() => {
+    if (!slug) return;
     if (!ref.current) return;
 
     const onMouseEnter = () => {
@@ -62,12 +70,13 @@ export const ColorizedParam = ({
       className={cn("inline-flex relative rounded group", className)}
       {...{ [DATA_ATTR]: slug }}
       ref={ref}
+      onClick={onClick}
     >
       <span
-        className="absolute inset-0 border-b-2 rounded transition-opacity duration-200 opacity-30 group-data-[active=true]:opacity-100"
+        className="absolute inset-0 border-b-2 transition-opacity duration-200 opacity-30 group-data-[active=true]:opacity-100"
         style={{ borderColor, backgroundColor }}
       />
-      <span className="relative">{children ?? name}</span>
+      <span className="relative">{children || name}</span>
     </span>
   );
 };

package/src/{app → lib}/plugins/openapi/MakeRequest.tsx

@@ -1,5 +1,16 @@
 import { useApiIdentities } from "../../components/context/DevPortalProvider.js";
 import type { OperationListItemResult } from "./OperationList.js";
+import { Playground } from "./playground/Playground.js";
+import { useOasConfig } from "./index.js";
+import { gql, useQuery } from "urql";
+
+const getServerQuery = gql`
+  query getServerQuery($input: JSON!, $type: SchemaType!) {
+    schema(input: $input, type: $type) {
+      url
+    }
+  }
+`;
 
 export const MakeRequest = ({
   operation,
@@ -7,9 +18,17 @@ export const MakeRequest = ({
   operation: OperationListItemResult;
 }) => {
   const identities = useApiIdentities();
+  const variables = useOasConfig();
+  const [server] = useQuery({ query: getServerQuery, variables });
 
   return (
     <div>
+      <Playground
+        host={server.data?.schema.url}
+        method={operation.method}
+        url={operation.path}
+        defaultHeaders={[]}
+      />
       {identities.data.map((identity) => (
         <button
           key={identity.id}