zudoku 0.0.0-e5be921 → 0.0.0-e614aaa

package/src/lib/plugins/openapi/playground/PlaygroundDialog.tsx

@@ -39,15 +39,18 @@ const PlaygroundDialog = (props: PlaygroundDialogProps) => {
     <Dialog onOpenChange={(open) => setOpen(open)}>
       <DialogTrigger asChild>
         {props.children ?? (
-          <button className="flex gap-1 items-center px-2 py-1 rounded-md bg-primary/80 hover:bg-primary transition text-primary-foreground text-xs">
+          <button
+            type="button"
+            className="flex gap-1 items-center px-2 py-1 rounded-md transition text-xs bg-primary  text-primary-foreground shadow-sm hover:bg-primary/80"
+          >
             Test
-            <HeroPlayIcon className="" size={14} />
+            <HeroPlayIcon size={14} />
           </button>
         )}
       </DialogTrigger>
 
       <DialogContent
-        className="max-w-screen-xl w-full h-5/6 overflow-auto p-0"
+        className="max-w-screen-xl w-full h-5/6 overflow-hidden p-0"
         aria-describedby={undefined}
       >
         <VisuallyHidden>

package/src/lib/plugins/openapi/playground/QueryParams.tsx

@@ -1,19 +1,16 @@
-import { EraserIcon } from "lucide-react";
 import {
   Control,
   Controller,
   useFieldArray,
   useFormContext,
 } from "react-hook-form";
-import { Button } from "../../../ui/Button.js";
+import { Card } from "zudoku/ui/Card.js";
+import { Checkbox } from "zudoku/ui/Checkbox.js";
+import { Autocomplete } from "../../../components/Autocomplete.js";
 import { Input } from "../../../ui/Input.js";
-import { cn } from "../../../util/cn.js";
 import { InlineInput } from "./InlineInput.js";
-import {
-  NO_IDENTITY,
-  type PlaygroundForm,
-  type QueryParam,
-} from "./Playground.js";
+import ParamsGrid, { ParamsGridItem } from "./ParamsGrid.js";
+import { type PlaygroundForm, type QueryParam } from "./Playground.js";
 
 export const QueryParams = ({
   control,
@@ -22,7 +19,7 @@ export const QueryParams = ({
   control: Control<PlaygroundForm>;
   queryParams: QueryParam[];
 }) => {
-  const { fields } = useFieldArray<PlaygroundForm>({
+  const { fields } = useFieldArray<PlaygroundForm, "queryParams">({
     control,
     name: "queryParams",
   });
@@ -30,101 +27,103 @@ export const QueryParams = ({
 
   const requiredFields = queryParams.map((param) => Boolean(param.isRequired));
 
-  const selectedIdentity = form.watch("identity");
-  const hasSelectedIdentity = selectedIdentity !== NO_IDENTITY;
-
   return (
-    <div className="">
-      <table className="w-full [&_td]:border [&_td]:p-1.5 [&_td]:px-2">
-        <tbody>
-          {fields
-            .filter(
-              // TODO remove this hack for Accu or make it more generic
-              (field) => !(hasSelectedIdentity && field.name === "apikey"),
-            )
-            .map((field, i) => (
-              <tr key={field.id} className="hover:bg-accent/40">
-                <td className="text-center">
+    <Card className="rounded-lg">
+      <div className="w-full ">
+        <ParamsGrid>
+          {fields.map((field, i) => {
+            const currentParam = queryParams.find(
+              (param) => param.name === form.watch(`queryParams.${i}.name`),
+            );
+            return (
+              <ParamsGridItem key={field.id}>
+                <div key={field.id} className="flex items-center gap-2">
                   <Controller
                     control={control}
                     name={`queryParams.${i}.active`}
                     render={({ field }) => (
-                      <input
-                        type="checkbox"
+                      <Checkbox
+                        variant="outline"
                         id={`queryParams.${i}.active`}
+                        className="mr-2"
                         checked={field.value}
-                        onChange={field.onChange}
+                        onCheckedChange={field.onChange}
                       />
                     )}
                   />
-                </td>
-                <td>
                   <Controller
                     control={control}
-                    render={({ field }) => (
-                      <InlineInput asChild>
-                        <label
-                          className="flex items-center cursor-pointer"
-                          htmlFor={`queryParams.${i}.active`}
-                          title={
-                            requiredFields[i] ? "Required field" : undefined
-                          }
-                        >
-                          {field.value}
-                          {requiredFields[i] && <sup>&nbsp;*</sup>}
-                        </label>
-                      </InlineInput>
-                    )}
+                    render={({ field }) =>
+                      !requiredFields[i] ? (
+                        <Autocomplete
+                          value={field.value}
+                          options={queryParams.map((param) => param.name)}
+                          onChange={(e) => {
+                            field.onChange(e);
+                          }}
+                          className="border-0 font-mono text-xs bg-transparent hover:bg-transparent"
+                        />
+                      ) : (
+                        <InlineInput asChild>
+                          <label
+                            className="flex items-center cursor-pointer gap-1"
+                            htmlFor={`queryParams.${i}.active`}
+                            title={
+                              requiredFields[i] ? "Required field" : undefined
+                            }
+                          >
+                            {field.value}
+                            {requiredFields[i] && <sup>&nbsp;*</sup>}
+                          </label>
+                        </InlineInput>
+                      )
+                    }
                     name={`queryParams.${i}.name`}
                   />
-                </td>
-                <td>
-                  <div className="flex justify-between items-center">
-                    <Controller
-                      control={control}
-                      render={({ field }) => (
-                        <Input
-                          {...field}
+                </div>
+                <div className="flex justify-between items-center">
+                  <Controller
+                    control={control}
+                    render={({ field }) => {
+                      const hasEnum =
+                        currentParam?.enum && currentParam.enum.length > 0;
+
+                      if (!hasEnum) {
+                        return (
+                          <Input
+                            {...field}
+                            onChange={(e) => {
+                              field.onChange(e.target.value);
+                              if (e.target.value.length > 0) {
+                                form.setValue(`queryParams.${i}.active`, true);
+                              }
+                            }}
+                            placeholder="Enter value"
+                            className="w-full border-0 shadow-none focus-visible:ring-0 text-xs font-mono"
+                          />
+                        );
+                      }
+
+                      return (
+                        <Autocomplete
+                          value={field.value}
+                          options={currentParam.enum ?? []}
                           onChange={(e) => {
-                            field.onChange(e.target.value);
-                            if (e.target.value.length > 0) {
-                              form.setValue(`queryParams.${i}.active`, true);
-                            }
+                            field.onChange(e);
+                            form.setValue(`queryParams.${i}.active`, true);
                           }}
-                          placeholder="Enter value"
-                          className="w-full border-0 shadow-none text-xs font-mono"
+                          className="font-mono text-xs border-0 ring-1 ring-ring"
                         />
-                      )}
-                      name={`queryParams.${i}.value`}
-                    />
-                    <Controller
-                      control={control}
-                      render={({ field }) => (
-                        <Button
-                          size="icon"
-                          type="button"
-                          variant="ghost"
-                          aria-label="Clear value"
-                          className={cn(
-                            "ms-2",
-                            field.value.length === 0
-                              ? "opacity-0 pointer-events-none"
-                              : "opacity-100",
-                          )}
-                          title="Clear value"
-                          onClick={() => field.onChange("")}
-                        >
-                          <EraserIcon size={16} />
-                        </Button>
-                      )}
-                      name={`queryParams.${i}.value`}
-                    />
-                  </div>
-                </td>
-              </tr>
-            ))}
-        </tbody>
-      </table>
-    </div>
+                      );
+                    }}
+                    name={`queryParams.${i}.value`}
+                  />
+                </div>
+              </ParamsGridItem>
+            );
+          })}
+        </ParamsGrid>
+      </div>
+    </Card>
   );
 };

package/src/lib/plugins/openapi/playground/SubmitButton.tsx

@@ -0,0 +1,75 @@
+import { ChevronDownIcon } from "lucide-react";
+import { useState } from "react";
+import { useFormContext } from "react-hook-form";
+import { Button } from "zudoku/ui/Button.js";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "zudoku/ui/DropdownMenu.js";
+import { RadioGroup, RadioGroupItem } from "zudoku/ui/RadioGroup.js";
+import { ApiIdentity } from "../../../core/ZudokuContext.js";
+import { NO_IDENTITY } from "./Playground.js";
+
+const SubmitButton = ({
+  identities,
+  formRef,
+  disabled,
+}: {
+  identities: ApiIdentity[];
+  formRef?: React.RefObject<HTMLFormElement | null>;
+  disabled?: boolean;
+}) => {
+  const { setValue } = useFormContext();
+  const [dropdownValue, setDropdownValue] = useState<string | undefined>();
+  if (identities.length === 0) {
+    return <Button disabled={disabled}>Send</Button>;
+  }
+  return (
+    <div className="flex">
+      <Button
+        className="rounded-r-none inset-shadow-sm"
+        disabled={disabled}
+        onClick={() => formRef?.current?.requestSubmit()}
+      >
+        Send
+      </Button>
+      <DropdownMenu>
+        <DropdownMenuTrigger asChild>
+          <Button
+            disabled={disabled}
+            className="rounded-l-none border-l border-border/40 inset-shadow-sm w-6"
+            size="icon"
+          >
+            <ChevronDownIcon className="w-4 h-4" />
+          </Button>
+        </DropdownMenuTrigger>
+        <RadioGroup value={dropdownValue}>
+          <DropdownMenuContent className="w-56" align="end" alignOffset={-150}>
+            {[{ id: NO_IDENTITY, label: "None" }, ...identities].map(
+              (identity) => (
+                <DropdownMenuItem
+                  key={identity.id}
+                  onClick={() => {
+                    setDropdownValue(identity.id);
+                    setValue("identity", identity.id);
+                    formRef?.current?.requestSubmit();
+                  }}
+                  onMouseEnter={() => setDropdownValue(identity.id)}
+                  onMouseLeave={() => setDropdownValue(undefined)}
+                >
+                  <RadioGroupItem value={identity.id} className="mr-2" />
+
+                  {identity.label}
+                </DropdownMenuItem>
+              ),
+            )}
+          </DropdownMenuContent>
+        </RadioGroup>
+      </DropdownMenu>
+    </div>
+  );
+};
+
+export default SubmitButton;

package/src/lib/plugins/openapi/playground/result-panel/RequestTab.tsx

@@ -0,0 +1,73 @@
+import { ChevronRightIcon } from "lucide-react";
+import { Fragment } from "react";
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "../../../../ui/Collapsible.js";
+import { cn } from "../../../../util/cn.js";
+import { methodForColor } from "../../util/methodToColor.js";
+
+export const RequestTab = ({
+  method,
+  url,
+  headers,
+  body,
+}: {
+  method: string;
+  url: string;
+  headers: Array<[string, string]>;
+  body?: string;
+}) => {
+  return (
+    <div className="flex flex-col gap-2 font-mono text-xs">
+      <div className="gap-2 p-2 bg-muted rounded-md">
+        <span className={cn(methodForColor(method), "font-semibold")}>
+          {method}
+        </span>
+        &nbsp;
+        <span className="break-all">{url}</span>&nbsp;
+        <span className="text-muted-foreground">HTTP/1.1</span>
+      </div>
+      <div className="mx-1.5 flex flex-col gap-3">
+        <Collapsible defaultOpen>
+          <CollapsibleTrigger className="flex items-center gap-2 hover:text-primary group">
+            <ChevronRightIcon className="h-4 w-4 transition-transform duration-200 group-data-[state=open]:rotate-[90deg]" />
+            <span className="font-semibold">Headers</span>
+          </CollapsibleTrigger>
+          <CollapsibleContent>
+            <div className="grid grid-cols-[auto,1fr] gap-x-8 gap-y-1 pl-1.5 pt-2">
+              {headers.map(([key, value]) => (
+                <Fragment key={key}>
+                  <div className="text-primary">{key}</div>
+                  <div className="break-all">{value}</div>
+                </Fragment>
+              ))}
+            </div>
+          </CollapsibleContent>
+        </Collapsible>
+
+        <Collapsible defaultOpen>
+          <CollapsibleTrigger className="flex items-center gap-2 hover:text-primary group">
+            <ChevronRightIcon className="h-4 w-4 transition-transform duration-200 group-data-[state=open]:rotate-[90deg]" />
+            <span className="font-semibold">Body</span>
+          </CollapsibleTrigger>
+          <CollapsibleContent>
+            <div className="pl-0 pt-2">
+              <div
+                className={cn(
+                  "whitespace-pre-wrap break-all bg-muted p-2 rounded-md",
+                  !body && "text-muted-foreground",
+                )}
+              >
+                {body ?? "Empty body"}
+              </div>
+            </div>
+          </CollapsibleContent>
+        </Collapsible>
+      </div>
+    </div>
+  );
+};
+
+export default RequestTab;

package/src/lib/plugins/openapi/playground/result-panel/ResponseTab.tsx

@@ -0,0 +1,210 @@
+import { useQuery } from "@tanstack/react-query";
+import { ChevronRightIcon } from "lucide-react";
+import { Fragment, useState } from "react";
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "zudoku/ui/Collapsible.js";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "zudoku/ui/Select.js";
+import { Card } from "../../../../ui/Card.js";
+import { SyntaxHighlight } from "../../../../ui/SyntaxHighlight.js";
+import { convertToTypes } from "./convertToTypes.js";
+
+const statusCodeMap: Record<number, string> = {
+  200: "OK",
+  201: "Created",
+  202: "Accepted",
+  204: "No Content",
+  400: "Bad Request",
+  401: "Unauthorized",
+  403: "Forbidden",
+  404: "Not Found",
+  405: "Method Not Allowed",
+  500: "Internal Server Error",
+};
+
+const mimeTypeToLanguage = (mimeType: string) => {
+  const mimeTypeMapping = {
+    "application/json": "json",
+    "text/json": "json",
+    "text/html": "html",
+    "text/css": "css",
+    "text/javascript": "javascript",
+    "application/xml": "xml",
+    "application/xhtml+xml": "xhtml",
+  };
+
+  return Object.entries(mimeTypeMapping).find(([mime]) =>
+    mimeType.includes(mime),
+  )?.[1];
+};
+
+const detectLanguage = (headers: Array<[string, string]>) => {
+  const contentType =
+    headers.find(([key, value]) => key === "Content-Type")?.[1] || "";
+  return mimeTypeToLanguage(contentType);
+};
+
+const tryParseJson = (body: string) => {
+  try {
+    return JSON.stringify(JSON.parse(body), null, 2);
+  } catch {
+    return null;
+  }
+};
+
+const sortHeadersByRelevance = (
+  headers: Array<[string, string]>,
+): Array<[string, string]> => {
+  const priorityOrder = [
+    "Content-Type",
+    "Content-Length",
+    "Authorization",
+    "X-RateLimit-Remaining",
+    "X-RateLimit-Limit",
+    "Cache-Control",
+    "ETag",
+  ].map((key) => key.toLowerCase());
+
+  return [...headers].sort(([keyA], [keyB]) => {
+    const indexA = priorityOrder.indexOf(keyA.toLowerCase());
+    const indexB = priorityOrder.indexOf(keyB.toLowerCase());
+    if (indexA === indexB) return 0;
+    if (indexA === -1) return 1;
+    if (indexB === -1) return -1;
+    return indexA - indexB;
+  });
+};
+
+export const ResponseTab = ({
+  body = "",
+  headers,
+  status,
+  time,
+  size,
+  url,
+}: {
+  body?: string;
+  headers: Array<[string, string]>;
+  status: number;
+  time: number;
+  size: number;
+  url: string;
+}) => {
+  const detectedLanguage = detectLanguage(headers);
+  const jsonContent = tryParseJson(body);
+  const beautifiedBody = jsonContent || body;
+  const [view, setView] = useState<"formatted" | "raw" | "types">(
+    jsonContent ? "formatted" : "raw",
+  );
+
+  const types = useQuery({
+    queryKey: ["types", beautifiedBody],
+    queryFn: async () => {
+      return convertToTypes(JSON.parse(beautifiedBody));
+    },
+    enabled: view === "types",
+  });
+
+  const sortedHeaders = sortHeadersByRelevance([...headers]);
+
+  return (
+    <div className="flex flex-col gap-2 h-full overflow-y-scroll max-h-[calc(100vh-220px)] py-4">
+      <Collapsible defaultOpen>
+        <CollapsibleTrigger className="flex items-center gap-2 hover:text-primary group">
+          <ChevronRightIcon className="h-4 w-4 transition-transform duration-200 group-data-[state=open]:rotate-[90deg]" />
+          <span className="font-semibold">Headers</span>
+        </CollapsibleTrigger>
+        <CollapsibleContent>
+          <div className="grid grid-cols-[auto,1fr] gap-x-8 gap-y-1 pl-1.5 pt-2 font-mono text-xs">
+            {sortedHeaders.slice(0, 5).map(([key, value]) => (
+              <Fragment key={key}>
+                <div className="text-primary whitespace-pre">{key}</div>
+                <div className="break-all">{value}</div>
+              </Fragment>
+            ))}
+            {sortedHeaders.length > 5 && (
+              <Collapsible className="col-span-full grid-cols-subgrid grid">
+                <CollapsibleTrigger className="col-span-2 text-xs text-muted-foreground hover:text-primary flex items-center gap-1 py-1">
+                  <ChevronRightIcon className="h-3 w-3 transition-transform duration-200 group-data-[state=open]:rotate-[90deg]" />
+                  Show {sortedHeaders.length - 5} more headers
+                </CollapsibleTrigger>
+                <CollapsibleContent className="col-span-full grid grid-cols-subgrid gap-x-8 gap-y-1 ">
+                  {sortedHeaders.slice(5).map(([key, value]) => (
+                    <Fragment key={key}>
+                      <div className="text-primary whitespace-pre">{key}</div>
+                      <div className="break-all">{value}</div>
+                    </Fragment>
+                  ))}
+                </CollapsibleContent>
+              </Collapsible>
+            )}
+          </div>
+        </CollapsibleContent>
+      </Collapsible>
+
+      <Card className="shadow-none">
+        <SyntaxHighlight
+          language={
+            view === "types"
+              ? "typescript"
+              : view === "raw"
+                ? jsonContent
+                  ? "plain"
+                  : detectedLanguage
+                : "json"
+          }
+          noBackground
+          // playground dialog has h-5/6 ≈ 83.333vh
+          className="overflow-x-auto p-4 text-xs max-h-[calc(83.333vh-180px)]"
+          code={
+            (view === "raw"
+              ? body
+              : view === "types"
+                ? types.data?.lines.join("\n")
+                : beautifiedBody) ?? ""
+          }
+        />
+      </Card>
+      <div className="flex gap-2 justify-between">
+        <div className="flex text-xs gap-2 border bg-muted rounded-md p-2 items-center h-8 font-mono divide-x">
+          <div>
+            <span className="text-muted-foreground">Status</span> {status}{" "}
+            {statusCodeMap[status] ?? ""}
+          </div>
+          <div>
+            <span className="text-muted-foreground">Time</span>{" "}
+            {time.toFixed(0)}ms
+          </div>
+          <div>
+            <span className="text-muted-foreground">Size</span> {size}B
+          </div>
+        </div>
+        {jsonContent && (
+          <div>
+            <Select
+              value={view}
+              onValueChange={(value) => setView(value as "formatted" | "raw")}
+            >
+              <SelectTrigger className="min-w-32">
+                <SelectValue placeholder="View" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="formatted">Formatted</SelectItem>
+                <SelectItem value="raw">Raw</SelectItem>
+                <SelectItem value="types">Types</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};