zudoku 0.25.2 → 0.25.3

package/src/lib/plugins/openapi/client/GraphQLClient.tsx

@@ -1,34 +1,16 @@
 import type { GraphQLError } from "graphql/error/index.js";
-import { ulid } from "ulidx";
-import { initializeWorker } from "zudoku/openapi-worker";
 import { ZudokuError } from "../../../util/invariant.js";
 import type { TypedDocumentString } from "../graphql/graphql.js";
 import type { OpenApiPluginOptions } from "../index.js";
 import type { LocalServer } from "./createServer.js";
-import type { WorkerGraphQLMessage } from "./worker.js";
 
 let localServerPromise: Promise<LocalServer> | undefined;
-let worker: SharedWorker | undefined;
 
 type GraphQLResponse<TResult> = {
   errors?: GraphQLError[];
   data: TResult;
 };
 
-const resolveVariables = async (variables?: unknown) => {
-  if (!variables) return;
-
-  if (
-    typeof variables === "object" &&
-    "type" in variables &&
-    variables.type === "file" &&
-    "input" in variables &&
-    typeof variables.input === "function"
-  ) {
-    variables.input = await variables.input();
-  }
-};
-
 const throwIfError = (response: GraphQLResponse<unknown>) => {
   if (!response.errors?.[0]) return;
 
@@ -39,119 +21,45 @@ const throwIfError = (response: GraphQLResponse<unknown>) => {
 };
 
 export class GraphQLClient {
-  readonly #mode: "remote" | "in-memory" | "worker";
-  #pendingRequests = new Map<string, (value: any) => void>();
-  #port: MessagePort | undefined;
+  constructor(private readonly config: OpenApiPluginOptions) {}
 
-  constructor(private config: OpenApiPluginOptions) {
-    if (config.server) {
-      this.#mode = "remote";
-    } else if (config.inMemory || typeof SharedWorker === "undefined") {
-      this.#mode = "in-memory";
-    } else {
-      this.#mode = "worker";
+  #getLocalServer = async () => {
+    if (!localServerPromise) {
+      localServerPromise = import("./createServer.js").then((m) =>
+        m.createServer(this.config),
+      );
     }
-  }
+    return localServerPromise;
+  };
 
-  #initializeLocalServer = () =>
-    import("./createServer.js").then((m) => m.createServer());
+  #executeFetch = async (init: RequestInit): Promise<Response> => {
+    if (this.config.server) {
+      return fetch(this.config.server, init);
+    }
+
+    const localServer = await this.#getLocalServer();
+    return localServer.fetch("http://localhost/graphql", init);
+  };
 
   fetch = async <TResult, TVariables>(
     query: TypedDocumentString<TResult, TVariables>,
     ...[variables]: TVariables extends Record<string, never> ? [] : [TVariables]
-  ) => {
+  ): Promise<TResult> => {
     const operationName = query.match(/query (\w+)/)?.[1];
 
-    await resolveVariables(variables);
-
-    const body = JSON.stringify({ query, variables, operationName });
-
-    switch (this.#mode) {
-      case "remote": {
-        const response = await fetch(this.config.server!, {
-          method: "POST",
-          body,
-          headers: { "Content-Type": "application/json" },
-        });
-
-        if (!response.ok) {
-          throw new Error("Network response was not ok");
-        }
-
-        const result = (await response.json()) as GraphQLResponse<TResult>;
-        throwIfError(result);
-
-        return result.data;
-      }
-
-      case "in-memory": {
-        if (!localServerPromise) {
-          localServerPromise = this.#initializeLocalServer();
-        }
-
-        const localServer = await localServerPromise;
-        if (!localServer) throw new Error("Local server not initialized");
+    const response = await this.#executeFetch({
+      method: "POST",
+      body: JSON.stringify({ query, variables, operationName }),
+      headers: { "Content-Type": "application/json" },
+    });
 
-        const response = await localServer.fetch(
-          new Request("http://localhost/graphql", {
-            method: "POST",
-            body,
-            headers: { "Content-Type": "application/json" },
-          }),
-        );
-
-        if (!response.ok) {
-          throw new Error("Network response was not ok");
-        }
-
-        const result = (await response.json()) as GraphQLResponse<TResult>;
-        throwIfError(result);
-
-        return result.data;
-      }
-
-      case "worker": {
-        if (!worker) {
-          worker = initializeWorker();
-        }
-
-        if (!this.#port) {
-          const channel = new MessageChannel();
-
-          worker.port.postMessage({ port: channel.port2 }, [channel.port2]);
-
-          this.#port = channel.port1;
-
-          this.#port.onmessage = (e: MessageEvent<WorkerGraphQLMessage>) => {
-            const { id, body } = e.data;
-            const resolve = this.#pendingRequests.get(id);
-            if (resolve) {
-              const result = JSON.parse(body);
-              resolve(result);
-              this.#pendingRequests.delete(id);
-            } else {
-              // eslint-disable-next-line no-console
-              console.error(`No pending request found for id: ${id}`);
-            }
-          };
-
-          this.#port.start();
-        }
-
-        const id = ulid();
-
-        const resultPromise = new Promise<GraphQLResponse<TResult>>(
-          (resolve) => {
-            this.#pendingRequests.set(id, resolve);
-            this.#port!.postMessage({ id, body } as WorkerGraphQLMessage);
-          },
-        );
+    if (!response.ok) {
+      throw new Error("Network response was not ok");
+    }
 
-        const result = await resultPromise;
-        throwIfError(result);
+    const result = (await response.json()) as GraphQLResponse<TResult>;
+    throwIfError(result);
 
-        return result.data;
-      }
-    }
+    return result.data;
   };
 }

package/src/lib/plugins/openapi/client/createServer.ts

@@ -1,13 +1,17 @@
 import { useLogger } from "@envelop/core";
 import { createGraphQLServer } from "../../../oas/graphql/index.js";
+import type { OpenApiPluginOptions } from "../index.js";
 
 const map = new Map<string, number>();
 
 /**
  * Creates the GraphQL server
  */
-export const createServer = () =>
+export const createServer = (config: OpenApiPluginOptions) =>
   createGraphQLServer({
+    context: {
+      schemaImports: config.schemaImports,
+    },
     plugins: [
       // eslint-disable-next-line react-hooks/rules-of-hooks
       useLogger({
@@ -22,7 +26,7 @@ export const createServer = () =>
             if (start) {
               // eslint-disable-next-line no-console
               console.log(
-                `${args.operationName} query took ${performance.now() - start}ms`,
+                `[zudoku:debug] ${args.operationName} query took ${performance.now() - start}ms`,
               );
               map.delete(`${startEvent}-${args.operationName}`);
             }

package/src/lib/plugins/openapi/client/useCreateQuery.ts

@@ -1,5 +1,4 @@
-import hashit from "object-hash";
-import { useContext, useMemo } from "react";
+import { useContext } from "react";
 import type { TypedDocumentString } from "../graphql/graphql.js";
 import { GraphQLContext } from "./GraphQLContext.js";
 
@@ -12,22 +11,8 @@ export const useCreateQuery = <TResult, TVariables>(
     throw new Error("useGraphQL must be used within a GraphQLProvider");
   }
 
-  const hash = useMemo(() => {
-    if (
-      typeof variables[0] === "object" &&
-      variables[0] != null &&
-      "input" in variables[0] &&
-      typeof variables[0].input === "function"
-    ) {
-      // This is a pre-hashed name to ensure that the query key is consistent across server and client
-      return variables[0].input.name;
-    }
-
-    return hashit(variables[0] ?? {});
-  }, [variables]);
-
   return {
     queryFn: () => graphQLClient.fetch(query, ...variables),
-    queryKey: [query, hash],
+    queryKey: [query, variables[0]],
   } as const;
 };

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

@@ -7,6 +7,7 @@ import { CirclePlayIcon, LogInIcon } from "lucide-react";
 import type { SidebarItem } from "../../../config/validators/SidebarSchema.js";
 import { useAuth } from "../../authentication/hook.js";
 import { ColorMap } from "../../components/navigation/SidebarBadge.js";
+import type { SchemaImports } from "../../oas/graphql/index.js";
 import { Button } from "../../ui/Button.js";
 import { joinPath } from "../../util/joinPath.js";
 import { GraphQLClient } from "./client/GraphQLClient.js";
@@ -35,7 +36,7 @@ const GetCategoriesQuery = graphql(`
   }
 `);
 
-type InternalOasPluginConfig = { inMemory?: boolean };
+type InternalOasPluginConfig = { schemaImports?: SchemaImports };
 
 const MethodColorMap: Record<string, keyof typeof ColorMap> = {
   get: "green",

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

@@ -0,0 +1,86 @@
+import { useState } from "react";
+import {
+  Command,
+  CommandEmpty,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from "../../../ui/Command.js";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "../../../ui/Popover.js";
+import { cn } from "../../../util/cn.js";
+
+interface EnumSelectorProps {
+  value: string;
+  enumValues: string[];
+  onChange: (value: string) => void;
+  onValueSelected: () => void;
+}
+
+export const EnumSelector = ({
+  value,
+  enumValues,
+  onChange,
+  onValueSelected,
+}: EnumSelectorProps) => {
+  const [searchValue, setSearchValue] = useState("");
+  const [open, setOpen] = useState(false);
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <button
+          type="button"
+          role="combobox"
+          className={cn(
+            "px-3 py-2 w-full border-0 shadow-none text-xs font-mono text-start hover:bg-accent/40 rounded border-transparent hover:bg-accent",
+            !value && "text-muted-foreground",
+          )}
+        >
+          {value || "Select value"}
+        </button>
+      </PopoverTrigger>
+      <PopoverContent
+        className="p-0 w-[--radix-popover-trigger-width] "
+        align="start"
+        sideOffset={3}
+        alignOffset={-3}
+        side="bottom"
+      >
+        <Command className="max-h-[180px]">
+          <CommandInput
+            placeholder="Enter value"
+            className="h-9 bg-transparent "
+            onValueChange={setSearchValue}
+            onKeyDown={(e) => {
+              if (e.key === "Enter") {
+                onChange(searchValue);
+                onValueSelected();
+                setOpen(false);
+              }
+            }}
+          />
+          <CommandList>
+            <CommandEmpty>Use "{searchValue}"</CommandEmpty>
+            {enumValues.map((enumValue) => (
+              <CommandItem
+                key={enumValue}
+                value={enumValue}
+                onSelect={(selected) => {
+                  onChange(selected);
+                  onValueSelected();
+                  setOpen(false);
+                }}
+              >
+                {enumValue}
+              </CommandItem>
+            ))}
+          </CommandList>
+        </Command>
+      </PopoverContent>
+    </Popover>
+  );
+};

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

@@ -1,11 +1,31 @@
 import { EraserIcon } from "lucide-react";
 import { Control, Controller, useFieldArray } from "react-hook-form";
+import { Card } from "zudoku/ui/Card.js";
 import { Button } from "../../../ui/Button.js";
 import { Input } from "../../../ui/Input.js";
 import { cn } from "../../../util/cn.js";
-import { ColorizedParam } from "../ColorizedParam.js";
+import { ColorizedParam, useParamColor } from "../ColorizedParam.js";
 import type { PlaygroundForm } from "./Playground.js";
 
+const PathParamLabel = ({ name }: { name: string }) => {
+  const color = useParamColor(name);
+
+  return (
+    <div className="flex items-center">
+      <div
+        className="w-2 h-2 rounded-full"
+        style={{ backgroundColor: `hsl(${color})` }}
+      />
+
+      <ColorizedParam
+        slug={name}
+        name={name}
+        className="font-mono text-xs m-2 px-1"
+      />
+    </div>
+  );
+};
+
 export const PathParams = ({
   control,
 }: {
@@ -17,72 +37,60 @@ export const PathParams = ({
   });
 
   return (
-    <table className="w-full table-auto [&_td]:border [&_td]:py-1 [&_td]:px-2">
-      <tbody>
-        {fields.map((part, i) => (
-          <tr key={part.id} className="hover:bg-accent/40">
-            <td>
-              <Controller
-                control={control}
-                name={`pathParams.${i}.value`}
-                render={({ field }) => (
-                  <div>
-                    <ColorizedParam
-                      slug={part.name}
-                      name={part.name}
-                      backgroundOpacity="25%"
-                      borderOpacity={field.value ? "100%" : "0"}
-                      className={cn(
-                        "font-mono text-xs m-2",
-                        !field.value && "opacity-60",
-                      )}
-                    />
-                    *
-                  </div>
-                )}
-              />
-            </td>
-            <td>
-              <div className="flex justify-between items-center">
-                <Controller
-                  control={control}
-                  name={`pathParams.${i}.value`}
-                  render={({ field }) => (
-                    <Input
-                      {...field}
-                      required
-                      placeholder="Enter value"
-                      className="border-0 shadow-none ring-0 font-mono text-xs"
-                    />
-                  )}
-                />
+    <Card className="rounded-lg">
+      <table className="w-full">
+        <tbody>
+          {fields.map((part, i) => (
+            <tr key={part.id} className="hover:bg-accent/40">
+              <td className="w-5/12">
                 <Controller
                   control={control}
                   name={`pathParams.${i}.value`}
-                  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>
-                  )}
+                  render={() => <PathParamLabel name={part.name} />}
                 />
-              </div>
-            </td>
-          </tr>
-        ))}
-      </tbody>
-    </table>
+              </td>
+              <td className="w-7/12">
+                <div className="flex justify-between items-center">
+                  <Controller
+                    control={control}
+                    name={`pathParams.${i}.value`}
+                    render={({ field }) => (
+                      <Input
+                        {...field}
+                        required
+                        placeholder="Enter value"
+                        className="w-full border-0 shadow-none text-xs font-mono hover:bg-accent"
+                      />
+                    )}
+                  />
+                  <Controller
+                    control={control}
+                    name={`pathParams.${i}.value`}
+                    render={({ field }) => (
+                      <Button
+                        size="icon"
+                        type="button"
+                        variant="ghost"
+                        aria-label="Clear value"
+                        className={cn(
+                          "ms-2 mr-1",
+                          field.value.length === 0
+                            ? "opacity-0 pointer-events-none"
+                            : "opacity-100",
+                        )}
+                        title="Clear value"
+                        onClick={() => field.onChange("")}
+                      >
+                        <EraserIcon size={16} />
+                      </Button>
+                    )}
+                  />
+                </div>
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </Card>
   );
 };

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

@@ -46,6 +46,8 @@ export type QueryParam = {
   defaultValue?: string;
   defaultActive?: boolean;
   isRequired?: boolean;
+  enum?: string[];
+  type?: string;
 };
 export type PathParam = {
   name: string;
@@ -55,9 +57,17 @@ export type PathParam = {
 
 export type PlaygroundForm = {
   body: string;
-  queryParams: Array<{ name: string; value: string; active: boolean }>;
+  queryParams: Array<{
+    name: string;
+    value: string;
+    active: boolean;
+    enum?: string[];
+  }>;
   pathParams: Array<{ name: string; value: string }>;
-  headers: Array<{ name: string; value: string }>;
+  headers: Array<{
+    name: string;
+    value: string;
+  }>;
   identity?: string;
 };
 
@@ -92,6 +102,7 @@ export const Playground = ({
           name: param.name,
           value: param.defaultValue ?? "",
           active: param.defaultActive ?? false,
+          enum: param.enum ?? [],
         })),
         pathParams: pathParams.map((param) => ({
           name: param.name,
@@ -171,17 +182,19 @@ export const Playground = ({
     const replaced = part.replace(/[:{}]/g, "");
     const value = formState.pathParams.find((p) => p.name === replaced)?.value;
 
-    const pathParamValue = value ? (
-      <ColorizedParam backgroundOpacity="25%" name={part} slug={part}>
-        {encodeURIComponent(value)}
-      </ColorizedParam>
-    ) : (
-      <span
-        className="underline decoration-wavy decoration-red-500"
-        title={`Missing value for path parameter \`${replaced}\``}
+    const pathParamValue = (
+      <ColorizedParam
+        backgroundOpacity="25%"
+        name={part}
+        slug={part}
+        title={
+          !value
+            ? `Missing value for path parameter \`${replaced}\``
+            : undefined
+        }
       >
-        {part}
-      </span>
+        {value ? encodeURIComponent(value) : part}
+      </ColorizedParam>
     );
 
     return (
@@ -240,7 +253,7 @@ export const Playground = ({
     >
       <form onSubmit={handleSubmit((data) => queryMutation.mutateAsync(data))}>
         <div className="grid grid-cols-[8fr_7fr] text-sm h-full">
-          <div className="flex flex-col gap-4 p-8 bg-muted/50 after:bg-muted-foreground/20 relative after:absolute after:w-px after:inset-0 after:left-auto">
+          <div className="flex flex-col gap-4 p-4 after:bg-muted-foreground/20 relative after:absolute after:w-px after:inset-0 after:left-auto">
             <div className="flex gap-2 items-stretch">
               <div className="flex flex-1 items-center w-full border rounded-md">
                 <div className="border-r p-2 bg-muted rounded-l-md self-stretch font-semibold font-mono">