zudoku 0.0.0-fix-downgrade-openapi-parser.aac00796 → 0.0.0-fix-prevent-full-deref-allof.b02efbe5

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

@@ -72,16 +72,20 @@ export type PathParam = {
 
 export type PlaygroundForm = {
   body: string;
-  queryParams: Array<{
+  bodyMode?: "text" | "file" | "multipart";
+  file?: File | null;
+  multipartFormFields: Array<{
     name: string;
-    value: string;
+    value: File | string;
     active: boolean;
-    enum?: string[];
   }>;
-  pathParams: Array<{
+  queryParams: Array<{
     name: string;
     value: string;
+    active: boolean;
+    enum?: string[];
   }>;
+  pathParams: Array<{ name: string; value: string }>;
   headers: Array<{
     name: string;
     value: string;
@@ -165,6 +169,9 @@ export const Playground = ({
     useForm<PlaygroundForm>({
       defaultValues: {
         body: defaultBody,
+        bodyMode: "text",
+        file: null,
+        multipartFormFields: [],
         queryParams:
           queryParams.length > 0
             ? queryParams.map((param) => ({
@@ -173,14 +180,7 @@ export const Playground = ({
                 active: param.defaultActive ?? false,
                 enum: param.enum ?? [],
               }))
-            : [
-                {
-                  name: "",
-                  value: "",
-                  active: false,
-                  enum: [],
-                },
-              ],
+            : [{ name: "", value: "", active: false, enum: [] }],
         pathParams: sortedPathParams.map((param) => ({
           name: param.name,
           value: param.defaultValue ?? "",
@@ -192,13 +192,7 @@ export const Playground = ({
                 value: header.defaultValue ?? "",
                 active: header.defaultActive ?? false,
               }))
-            : [
-                {
-                  name: "",
-                  value: "",
-                  active: false,
-                },
-              ],
+            : [{ name: "", value: "", active: false }],
         identity: getRememberedIdentity([
           NO_IDENTITY,
           ...(identities.data?.map((i) => i.id) ?? []),
@@ -223,18 +217,40 @@ export const Playground = ({
     mutationFn: async (data: PlaygroundForm) => {
       const start = performance.now();
 
-      const headers = Object.fromEntries([
-        ...data.headers
+      const headers = new window.Headers(
+        data.headers
           .filter((h) => h.name && h.active)
-          .map((header) => [header.name, header.value]),
-      ]);
+          .map<[string, string]>((h) => [h.name, h.value]),
+      );
+
+      let body: string | FormData | File | undefined;
+
+      switch (data.bodyMode) {
+        case "file":
+          body = data.file || undefined;
+          headers.delete("Content-Type");
+          break;
+        case "multipart": {
+          const formData = new FormData();
+          data.multipartFormFields
+            ?.filter((field) => field.name && field.active)
+            .forEach((field) => formData.append(field.name, field.value));
+
+          body = formData;
+          headers.delete("Content-Type");
+          break;
+        }
+        default:
+          body = data.body || undefined;
+          break;
+      }
 
       const request = new Request(
         createUrl(server ?? selectedServer, url, data),
         {
-          method: method.toUpperCase(),
+          method,
           headers,
-          body: data.body ? data.body : undefined,
+          body: ["GET", "HEAD"].includes(method.toUpperCase()) ? null : body,
         },
       );
 
@@ -283,6 +299,31 @@ export const Playground = ({
 
         const responseSize = response.headers.get("content-length");
 
+        let requestBody = "";
+
+        switch (data.bodyMode) {
+          case "text":
+            requestBody = data.body;
+            break;
+          case "file":
+            requestBody = `[File: ${data.file?.name ?? "Unknown"}]`;
+            break;
+          case "multipart":
+            requestBody = "[Multipart Form Data]\n";
+            requestBody += data.multipartFormFields
+              ?.filter((f) => f.name && f.active)
+              .map((f) =>
+                f.value instanceof File
+                  ? `${f.name}: [File: ${f.value.name}]`
+                  : `${f.name}: ${f.value}`,
+              )
+              .join("\n");
+            break;
+          default:
+            requestBody = data.body;
+            break;
+        }
+
         return {
           status: response.status,
           headers: responseHeaders,
@@ -300,7 +341,7 @@ export const Playground = ({
               ["User-Agent", "Zudoku Playground"],
               ...Array.from(request.headers.entries()),
             ],
-            body: data.body ? data.body : undefined,
+            body: requestBody,
           },
         } satisfies PlaygroundResult;
       } catch (error) {
@@ -375,6 +416,11 @@ export const Playground = ({
       <TooltipProvider delayDuration={150}>
         <form
           ref={formRef}
+          onKeyDown={(e) => {
+            if (e.key === "Enter" && e.target instanceof HTMLInputElement) {
+              e.preventDefault();
+            }
+          }}
           onSubmit={handleSubmit((data) => {
             if (identities.data?.length === 0 || data.identity) {
               queryMutation.mutate(data);
@@ -475,9 +521,7 @@ export const Playground = ({
                 <Collapsible defaultOpen>
                   <CollapsibleHeaderTrigger>
                     <IdCardLanyardIcon size={16} />
-                    <CollapsibleHeader className="col-span-2">
-                      Authentication
-                    </CollapsibleHeader>
+                    <CollapsibleHeader>Authentication</CollapsibleHeader>
                   </CollapsibleHeaderTrigger>
                   <CollapsibleContent className="CollapsibleContent">
                     <IdentitySelector
@@ -493,9 +537,7 @@ export const Playground = ({
                 <Collapsible defaultOpen>
                   <CollapsibleHeaderTrigger>
                     <ShapesIcon size={16} />
-                    <CollapsibleHeader className="col-span-2">
-                      Path Parameters
-                    </CollapsibleHeader>
+                    <CollapsibleHeader>Path Parameters</CollapsibleHeader>
                   </CollapsibleHeaderTrigger>
                   <CollapsibleContent className="CollapsibleContent">
                     <PathParams url={url} control={control} />

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

@@ -1,6 +1,8 @@
 import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
+import { PlayIcon } from "lucide-react";
 import { type PropsWithChildren, useState } from "react";
 import { useAuth } from "zudoku/hooks";
+import { Button } from "zudoku/ui/Button.js";
 import {
   Dialog,
   DialogContent,
@@ -11,29 +13,6 @@ import { Playground, type PlaygroundContentProps } from "./Playground.js";
 
 export type PlaygroundDialogProps = PropsWithChildren<PlaygroundContentProps>;
 
-const HeroPlayIcon = ({
-  className,
-  size = 16,
-}: {
-  className?: string;
-  size?: number;
-}) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 24 24"
-    fill="currentColor"
-    className={className}
-    width={size}
-    height={size}
-  >
-    <path
-      fillRule="evenodd"
-      d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12Zm14.024-.983a1.125 1.125 0 0 1 0 1.966l-5.603 3.113A1.125 1.125 0 0 1 9 15.113V8.887c0-.857.921-1.4 1.671-.983l5.603 3.113Z"
-      clipRule="evenodd"
-    />
-  </svg>
-);
-
 const PlaygroundDialog = (props: PlaygroundDialogProps) => {
   const [open, setOpen] = useState(false);
   const { isAuthEnabled, login, signup, isPending, isAuthenticated } =
@@ -43,13 +22,13 @@ const PlaygroundDialog = (props: PlaygroundDialogProps) => {
     <Dialog onOpenChange={(open) => setOpen(open)}>
       <DialogTrigger asChild>
         {props.children ?? (
-          <button
-            type="button"
-            className="flex gap-1 items-center px-2 py-1 rounded-md transition text-xs bg-primary  text-primary-foreground shadow-xs hover:bg-primary/80"
-          >
-            Test
-            <HeroPlayIcon size={14} />
-          </button>
+          <Button variant="ghost" size="icon-xs" className="group">
+            <PlayIcon
+              className="fill-muted-foreground group-hover:fill-foreground transition"
+              size={16}
+              strokeWidth={1.5}
+            />
+          </Button>
         )}
       </DialogTrigger>
 

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

@@ -1,23 +1,19 @@
-import { PlusCircleIcon, Unlink2Icon, XIcon } from "lucide-react";
-import { useEffect } from "react";
-import {
-  type Control,
-  Controller,
-  useFieldArray,
-  useFormContext,
-} from "react-hook-form";
-import { Button } from "zudoku/ui/Button.js";
+import { Unlink2Icon } from "lucide-react";
+import { type Control, useFormContext } from "react-hook-form";
 import { Checkbox } from "zudoku/ui/Checkbox.js";
 import { Collapsible, CollapsibleContent } from "zudoku/ui/Collapsible.js";
 import { Autocomplete } from "../../../components/Autocomplete.js";
-import { Input } from "../../../ui/Input.js";
 import {
   CollapsibleHeader,
   CollapsibleHeaderTrigger,
 } from "./CollapsibleHeader.js";
-import { InlineInput } from "./InlineInput.js";
-import ParamsGrid, { ParamsGridItem } from "./ParamsGrid.js";
+import ParamsGrid, {
+  ParamsGridInput,
+  ParamsGridItem,
+  ParamsGridRemoveButton,
+} from "./ParamsGrid.js";
 import type { PlaygroundForm, QueryParam } from "./Playground.js";
+import { useKeyValueFieldManager } from "./request-panel/useKeyValueFieldManager.js";
 
 export const QueryParams = ({
   control,
@@ -26,148 +22,98 @@ export const QueryParams = ({
   control: Control<PlaygroundForm>;
   schemaQueryParams: QueryParam[];
 }) => {
-  const { fields, remove, append } = useFieldArray<
-    PlaygroundForm,
-    "queryParams"
-  >({
+  const { watch } = useFormContext<PlaygroundForm>();
+  const watchedQueryParams = watch("queryParams");
+
+  const manager = useKeyValueFieldManager<PlaygroundForm, "queryParams">({
     control,
     name: "queryParams",
+    defaultValue: { name: "", value: "", active: false },
   });
-  const { setValue, getValues, watch } = useFormContext<PlaygroundForm>();
-  const watchedQueryParams = watch("queryParams");
-  useEffect(() => {
-    if (watchedQueryParams.length === 0) {
-      append({ name: "", value: "", active: false }, { shouldFocus: true });
-    }
-  }, [watchedQueryParams, append]);
 
   const requiredFields = schemaQueryParams.map((param) =>
     Boolean(param.isRequired),
   );
 
+  const hasSchemaParams = schemaQueryParams.length > 0;
+
   return (
     <Collapsible defaultOpen>
       <CollapsibleHeaderTrigger>
         <Unlink2Icon size={16} />
         <CollapsibleHeader>Query Parameters</CollapsibleHeader>
-        <Button
-          onClick={() => {
-            setValue("queryParams", [
-              ...getValues("queryParams"),
-              { name: "", value: "", active: false },
-            ]);
-          }}
-          type="button"
-          size="sm"
-          variant="ghost"
-          className="hover:bg-accent hover:brightness-95 flex gap-2"
-        >
-          Add parameter <PlusCircleIcon size={16} />
-        </Button>
       </CollapsibleHeaderTrigger>
       <CollapsibleContent className="CollapsibleContent">
-        <div className="overflow-hidden w-full">
-          <ParamsGrid>
-            {fields.map((field, i) => {
-              const currentParam = schemaQueryParams.find(
-                (param) => param.name === watchedQueryParams.at(i)?.name,
-              );
-              return (
-                <ParamsGridItem key={field.id}>
-                  <Controller
-                    control={control}
-                    name={`queryParams.${i}.active`}
-                    render={({ field }) => (
-                      <Checkbox
-                        id={`queryParams.${i}.active`}
-                        checked={field.value}
-                        onCheckedChange={field.onChange}
-                      />
-                    )}
-                  />
-                  <Controller
-                    control={control}
-                    render={({ field }) =>
-                      !requiredFields[i] ? (
-                        <Autocomplete
-                          placeholder="Name"
-                          value={field.value}
-                          options={schemaQueryParams.map((param) => param.name)}
-                          onChange={(e) => {
-                            field.onChange(e);
-                          }}
-                          className="border-0 p-0 m-0 shadow-none focus-visible:ring-0 bg-transparent hover:bg-transparent text-xs font-mono"
-                        />
-                      ) : (
-                        <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`}
-                  />
-                  <div className="flex justify-between items-center">
-                    <Controller
-                      control={control}
-                      render={({ field }) => {
-                        const hasEnum =
-                          currentParam?.enum && currentParam.enum.length > 0;
+        <ParamsGrid>
+          {manager.fields.map((field, i) => {
+            const currentParam = schemaQueryParams.find(
+              (param) => param.name === watchedQueryParams.at(i)?.name,
+            );
+            const hasEnum = currentParam?.enum && currentParam.enum.length > 0;
+            const nameInputProps = manager.getNameInputProps(i);
+            const valueInputProps = manager.getValueInputProps(i);
 
-                        if (!hasEnum) {
-                          return (
-                            <Input
-                              {...field}
-                              onChange={(e) => {
-                                field.onChange(e.target.value);
-                                if (e.target.value.length > 0) {
-                                  setValue(`queryParams.${i}.active`, true);
-                                }
-                              }}
-                              placeholder="Value"
-                              aria-label="Query parameter value"
-                              className="w-full border-0 p-0 m-0 shadow-none focus-visible:ring-0 text-xs font-mono"
-                            />
-                          );
+            return (
+              <ParamsGridItem key={field.id}>
+                <Checkbox {...manager.getCheckboxProps(i)} />
+                {!requiredFields[i] ? (
+                  hasSchemaParams ? (
+                    <ParamsGridInput asChild>
+                      <Autocomplete
+                        {...nameInputProps}
+                        value={String(manager.getValue(i, "name"))}
+                        placeholder="Name"
+                        options={schemaQueryParams.map((param) => param.name)}
+                        onChange={(v) => manager.setValue(i, "name", v)}
+                        onSelect={(v) =>
+                          manager.setValue(i, "name", v, { focus: "next" })
                         }
-
-                        return (
-                          <Autocomplete
-                            value={field.value}
-                            options={currentParam.enum ?? []}
-                            onChange={(e) => {
-                              field.onChange(e);
-                              setValue(`queryParams.${i}.active`, true);
-                            }}
-                            className="border-0 shadow-none focus-visible:ring-0 bg-transparent hover:bg-transparent text-xs font-mono"
-                          />
-                        );
-                      }}
-                      name={`queryParams.${i}.value`}
-                    />
-                    <Button
-                      size="icon-xs"
-                      variant="ghost"
-                      className="text-muted-foreground opacity-0 group-hover:brightness-95 group-hover:opacity-100"
-                      onClick={() => remove(i)}
-                      type="button"
+                      />
+                    </ParamsGridInput>
+                  ) : (
+                    <ParamsGridInput {...nameInputProps} placeholder="Name" />
+                  )
+                ) : (
+                  <ParamsGridInput asChild>
+                    <label
+                      className="flex items-center cursor-pointer gap-1"
+                      htmlFor={`queryParams.${i}.active`}
+                      title={requiredFields[i] ? "Required field" : undefined}
                     >
-                      <XIcon size={16} />
-                    </Button>
-                  </div>
-                </ParamsGridItem>
-              );
-            })}
-          </ParamsGrid>
-        </div>
+                      {watchedQueryParams[i]?.name}
+                      {requiredFields[i] && <sup>&nbsp;*</sup>}
+                    </label>
+                  </ParamsGridInput>
+                )}
+                <div className="flex justify-between items-center">
+                  {!hasEnum ? (
+                    <ParamsGridInput
+                      placeholder="Value"
+                      aria-label="Query parameter value"
+                      {...valueInputProps}
+                    />
+                  ) : (
+                    <ParamsGridInput asChild>
+                      <Autocomplete
+                        {...valueInputProps}
+                        value={String(manager.getValue(i, "value"))}
+                        shouldFilter={false}
+                        options={currentParam.enum ?? []}
+                        onChange={(v) => manager.setValue(i, "value", v)}
+                        onSelect={(v) =>
+                          manager.setValue(i, "value", v, { focus: "next" })
+                        }
+                      />
+                    </ParamsGridInput>
+                  )}
+                  <ParamsGridRemoveButton
+                    {...manager.getRemoveButtonProps(i)}
+                  />
+                </div>
+              </ParamsGridItem>
+            );
+          })}
+        </ParamsGrid>
       </CollapsibleContent>
     </Collapsible>
   );

package/src/lib/plugins/openapi/playground/request-panel/MultipartField.tsx

@@ -0,0 +1,91 @@
+import { PaperclipIcon, TrashIcon } from "lucide-react";
+import { useRef } from "react";
+import { Button } from "zudoku/components";
+import { Checkbox } from "zudoku/ui/Checkbox.js";
+import { humanFileSize } from "../../../../util/humanFileSize.js";
+import {
+  ParamsGridInput,
+  ParamsGridItem,
+  ParamsGridRemoveButton,
+} from "../ParamsGrid.js";
+import type { PlaygroundForm } from "../Playground.js";
+import type { useKeyValueFieldManager } from "./useKeyValueFieldManager.js";
+
+type MultipartFieldProps = {
+  index: number;
+  manager: ReturnType<
+    typeof useKeyValueFieldManager<PlaygroundForm, "multipartFormFields">
+  >;
+};
+
+export const MultipartField = ({ index, manager }: MultipartFieldProps) => {
+  const fieldFileInputRef = useRef<HTMLInputElement>(null);
+  const fieldValue = manager.getValue(index, "value");
+
+  return (
+    <ParamsGridItem>
+      <Checkbox
+        {...manager.getCheckboxProps(index)}
+        disabled={!manager.getValue(index, "name")}
+      />
+      <ParamsGridInput
+        {...manager.getNameInputProps(index)}
+        placeholder="Key"
+      />
+      <div className="flex items-center gap-1 flex-1">
+        {fieldValue instanceof File ? (
+          <div className="flex items-center gap-1 flex-1 min-w-0">
+            <div className="flex items-center gap-1 border-b cursor-default">
+              <PaperclipIcon size={12} className="text-muted-foreground" />
+              <span
+                className="text-xs truncate"
+                title={`${fieldValue.name} (${humanFileSize(fieldValue.size)})`}
+              >
+                {fieldValue.name}
+              </span>
+            </div>
+            <Button
+              type="button"
+              variant="ghost"
+              size="icon-xs"
+              className="opacity-50 hover:opacity-100 hover:brightness-95 transition-opacity"
+              onClick={() => manager.setValue(index, "value", "")}
+            >
+              <TrashIcon size={13} />
+            </Button>
+          </div>
+        ) : (
+          <>
+            <ParamsGridInput
+              {...manager.getValueInputProps(index)}
+              placeholder="Value"
+            />
+            <input
+              ref={fieldFileInputRef}
+              type="file"
+              className="hidden"
+              onChange={(e) => {
+                const file = e.target.files?.[0];
+                if (!file) return;
+
+                manager.setValue(index, "value", file);
+                manager.setValue(index, "active", true);
+              }}
+            />
+            <Button
+              type="button"
+              variant="ghost"
+              size="icon-xs"
+              onClick={() => fieldFileInputRef.current?.click()}
+              title="Attach file"
+              className="opacity-0 focus-visible:opacity-100 group-hover:opacity-100 group-hover:brightness-95 transition-opacity"
+            >
+              <PaperclipIcon size={14} />
+            </Button>
+          </>
+        )}
+        <ParamsGridRemoveButton {...manager.getRemoveButtonProps(index)} />
+      </div>
+    </ParamsGridItem>
+  );
+};

package/src/lib/plugins/openapi/playground/request-panel/UrlQueryParams.tsx

@@ -9,7 +9,7 @@ export const UrlQueryParams = () => {
   const urlQueryParams = queryParams
     .filter((p) => p.active && p.name)
     .map((p, i, arr) => (
-      <Fragment key={p.name}>
+      <Fragment key={`${i}-${p.name}`}>
         {p.name}={encodeURIComponent(p.value).replaceAll("%20", "+")}
         {i < arr.length - 1 && "&"}
         <wbr />