zudoku 0.1.1-dev.2 → 0.1.1-dev.20

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}

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

@@ -1,14 +1,14 @@
-import { type ResultOf } from "gql.tada";
 import { Heading } from "../../Heading.js";
 import { CategoryHeading } from "../../components/CategoryHeading.js";
 import { Markdown, ProseClasses } from "../../components/Markdown.js";
 import { cn } from "../../util/cn.js";
 import { OperationListItem } from "./OperationListItem.js";
-import { graphql } from "./graphql/index.js";
 import { useOasConfig } from "./index.js";
+import { graphql } from "./graphql/index.js";
 import { useQuery } from "./util/urql.js";
+import { ResultOf } from "@graphql-typed-document-node/core";
 
-export const OperationsFragment = graphql(`
+export const OperationsFragment = graphql(/* GraphQL */ `
   fragment OperationsFragment on OperationItem {
     slug
     summary
@@ -51,32 +51,30 @@ export const OperationsFragment = graphql(`
   }
 `);
 
-const AllOperationsQuery = graphql(
-  `
-    query AllOperations($input: JSON!, $type: SchemaType!) {
-      schema(input: $input, type: $type) {
+export type OperationListItemResult = ResultOf<typeof OperationsFragment>;
+
+const AllOperationsQuery = graphql(/* GraphQL */ `
+  query AllOperations($input: JSON!, $type: SchemaType!) {
+    schema(input: $input, type: $type) {
+      description
+      title
+      url
+      version
+      tags {
+        name
         description
-        title
-        url
-        version
-        tags {
-          name
-          description
-          operations {
-            slug
-            ...OperationsFragment
-          }
+        operations {
+          slug
+          ...OperationsFragment
         }
       }
     }
-  `,
-  [OperationsFragment],
-);
-
-export type OperationListItemResult = ResultOf<typeof OperationsFragment>;
+  }
+`);
 
 export const OperationList = () => {
   const { type, input } = useOasConfig();
+
   const [result] = useQuery({
     query: AllOperationsQuery,
     variables: { type, input },

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

@@ -1,10 +1,10 @@
-import { readFragment, type FragmentOf } from "gql.tada";
 import { Heading } from "../../Heading.js";
 import { Markdown, ProseClasses } from "../../components/Markdown.js";
 import { groupBy } from "../../util/groupBy.js";
 import { OperationsFragment } from "./OperationList.js";
 import { ParameterList } from "./ParameterList.js";
 import { Sidecar } from "./Sidecar.js";
+import { FragmentType, useFragment } from "./graphql/index.js";
 
 export const PARAM_GROUPS = ["path", "query", "header", "cookie"] as const;
 export type ParameterGroup = (typeof PARAM_GROUPS)[number];
@@ -12,9 +12,9 @@ export type ParameterGroup = (typeof PARAM_GROUPS)[number];
 export const OperationListItem = ({
   operationFragment,
 }: {
-  operationFragment: FragmentOf<typeof OperationsFragment>;
+  operationFragment: FragmentType<typeof OperationsFragment>;
 }) => {
-  const operation = readFragment(OperationsFragment, operationFragment);
+  const operation = useFragment(OperationsFragment, operationFragment);
   const groupedParameters = groupBy(operation?.parameters ?? [], "in");
 
   return (

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

@@ -0,0 +1,51 @@
+import { useState } from "react";
+import { SyntaxHighlight } from "../../components/SyntaxHighlight.js";
+import { type SchemaObject } from "../../oas/graphql/index.js";
+import type { OperationListItemResult } from "./OperationList.js";
+import { Select } from "./Select.js";
+import * as SidecarBox from "./SidecarBox.js";
+import { generateSchemaExample } from "./util/generateSchemaExample.js";
+
+type Content = NonNullable<
+  NonNullable<OperationListItemResult["requestBody"]>["content"]
+>;
+
+// @todo should we handle multiple content types?
+export const RequestBodySidecarBox = ({ content }: { content: Content }) => {
+  const [selected, setSelected] = useState("example");
+
+  if (!content.length) return null;
+
+  return (
+    <>
+      <div>lol</div>
+      <SidecarBox.Root>
+        <SidecarBox.Head className="text-xs flex justify-between items-center">
+          <span className="font-mono">Request Body</span>
+          <Select
+            onChange={(e) => setSelected(e.target.value)}
+            options={[
+              { value: "example", label: "Example" },
+              { value: "schema", label: "Schema" },
+            ]}
+          />
+        </SidecarBox.Head>
+        <SidecarBox.Body>
+          <SyntaxHighlight
+            language="json"
+            noBackground
+            copyable={false}
+            className="text-xs"
+            code={JSON.stringify(
+              selected === "example"
+                ? generateSchemaExample(content[0].schema as SchemaObject)
+                : content[0].schema,
+              null,
+              2,
+            )}
+          />
+        </SidecarBox.Body>
+      </SidecarBox.Root>
+    </>
+  );
+};

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

@@ -3,7 +3,7 @@ import { SyntaxHighlight } from "../../components/SyntaxHighlight.js";
 import { type SchemaObject } from "../../oas/graphql/index.js";
 import { cn } from "../../util/cn.js";
 import type { OperationListItemResult } from "./OperationList.js";
-import { SidecarBox } from "./SidecarBox.js";
+import * as SidecarBox from "./SidecarBox.js";
 import { generateSchemaExample } from "./util/generateSchemaExample.js";
 
 type Responses = OperationListItemResult["responses"];

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

@@ -1,4 +1,4 @@
-import { Fragment, useState } from "react";
+import { Fragment, useMemo, useState } from "react";
 import { SyntaxHighlight } from "../../components/SyntaxHighlight.js";
 import { cn } from "../../util/cn.js";
 import { ColorizedParam } from "./ColorizedParam.js";
@@ -8,8 +8,54 @@ import type { OperationListItemResult } from "./OperationList.js";
 import { RequestBodySidecarBox } from "./RequestBodySidecarBox.js";
 import { ResponsesSidecarBox } from "./ResponsesSidecarBox.js";
 import { Select } from "./Select.js";
-import { SidecarBox } from "./SidecarBox.js";
-import { getCode } from "./util/getCode.js";
+import * as SidecarBox from "./SidecarBox.js";
+import { HTTPSnippet } from "@zudoku/httpsnippet";
+import { generateSchemaExample } from "./util/generateSchemaExample.js";
+import type { SchemaObject } from "../../oas/parser/index.js";
+
+const getConverted = (snippet: HTTPSnippet, option: string) => {
+  let converted;
+  switch (option) {
+    case "shell":
+      converted = snippet.convert("shell", "curl");
+      break;
+    case "js":
+      converted = snippet.convert("javascript", "fetch");
+      break;
+    case "python":
+      converted = snippet.convert("python", "requests");
+      break;
+    case "java":
+      converted = snippet.convert("java", "okhttp");
+      break;
+    case "go":
+      converted = snippet.convert("go", "native");
+      break;
+    case "csharp":
+      converted = snippet.convert("csharp", "httpclient");
+      break;
+    case "kotlin":
+      converted = snippet.convert("kotlin", "okhttp");
+      break;
+    case "objc":
+      converted = snippet.convert("objc", "nsurlsession");
+      break;
+    case "php":
+      converted = snippet.convert("php", "http2");
+      break;
+    case "ruby":
+      converted = snippet.convert("ruby");
+      break;
+    case "swift":
+      converted = snippet.convert("swift");
+      break;
+    default:
+      converted = snippet.convert("shell");
+      break;
+  }
+
+  return converted ? converted[0] : "";
+};
 
 export const Sidecar = ({
   operation,
@@ -40,16 +86,27 @@ export const Sidecar = ({
     </Fragment>
   ));
 
-  const language =
-    {
-      js: "javascript",
-      go: "go",
-      rust: "rust",
-      curl: "bash",
-      wget: "bash",
-      ruby: "ruby",
-      php: "php",
-    }[option] ?? "bash";
+  const code = useMemo(() => {
+    const example = requestBodyContent?.[0]?.schema
+      ? generateSchemaExample(requestBodyContent[0].schema as SchemaObject)
+      : undefined;
+
+    const snippet = new HTTPSnippet(
+      {
+        method: operation.method.toLocaleUpperCase(),
+        url: operation.path.replaceAll("{", ":").replaceAll("}", ""),
+        headers: [{ name: "Authorization", value: "Bearer <token>" }],
+        postData: example
+          ? {
+              text: JSON.stringify(example, null, 2),
+              mimeType: "application/json",
+            }
+          : {},
+      } as never, // 👈 never touch this
+    );
+
+    return getConverted(snippet, option) ?? "";
+  }, [option, operation.method, operation.path, requestBodyContent]);
 
   return (
     <aside className="flex flex-col overflow-hidden sticky top-[--scroll-padding] gap-4">
@@ -67,23 +124,27 @@ export const Sidecar = ({
             className="self-start"
             onChange={(e) => setOption(e.target.value)}
             options={[
-              { value: "curl", label: "cURL" },
-              { value: "wget", label: "wget" },
+              { value: "shell", label: "cURL" },
               { value: "js", label: "Javascript" },
-              { value: "ruby", label: "Ruby" },
-              { value: "php", label: "PHP" },
+              { value: "python", label: "Python" },
+              { value: "java", label: "Java" },
               { value: "go", label: "Go" },
-              { value: "rust", label: "Rust" },
+              { value: "csharp", label: "C#" },
+              { value: "kotlin", label: "Kotlin" },
+              { value: "objc", label: "Objective C" },
+              { value: "php", label: "PHP" },
+              { value: "ruby", label: "Ruby" },
+              { value: "swift", label: "Swift" },
             ]}
           />
         </SidecarBox.Head>
         <SidecarBox.Body>
           <SyntaxHighlight
-            language={language}
+            language={option}
             copyable={false}
             noBackground
             className="text-xs"
-            code={getCode(operation, option.toLowerCase())}
+            code={code}
           />
         </SidecarBox.Body>
       </SidecarBox.Root>