zudoku 0.3.0-dev.10 → 0.3.0-dev.12

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

@@ -1,15 +1,7 @@
-import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
 import { useMutation } from "@tanstack/react-query";
-import { CirclePlayIcon } from "lucide-react";
 import { Fragment } from "react";
 import { FormProvider, useForm } from "react-hook-form";
 import { useApiIdentities } from "../../../components/context/DevPortalProvider.js";
-import {
-  Dialog,
-  DialogContent,
-  DialogTitle,
-  DialogTrigger,
-} from "../../../components/Dialog.js";
 import {
   Select,
   SelectContent,
@@ -28,6 +20,8 @@ import { Headers } from "./Headers.js";
 import { PathParams } from "./PathParams.js";
 import { QueryParams } from "./QueryParams.js";
 
+export const NO_IDENTITY = "__none";
+
 function mimeTypeToLanguage(mimeType: string) {
   const mimeTypeMapping = {
     "application/json": "json",
@@ -81,17 +75,7 @@ export type PlaygroundForm = {
   identity?: string;
 };
 
-export const NO_IDENTITY = "__none";
-
-const Playground = ({
-  url,
-  host,
-  method,
-  headers = [{ name: "", value: "" }],
-  queryParams = [],
-  pathParams = [],
-  hasParams,
-}: {
+export type PlaygroundContentProps = {
   host: string;
   url: string;
   method: string;
@@ -99,7 +83,17 @@ const Playground = ({
   queryParams?: QueryParam[];
   pathParams?: PathParam[];
   hasParams: boolean;
-}) => {
+};
+
+export const Playground = ({
+  host,
+  url,
+  method,
+  headers = [{ name: "", value: "" }],
+  queryParams = [],
+  pathParams = [],
+  hasParams,
+}: PlaygroundContentProps) => {
   const { register, control, handleSubmit, watch, ...form } =
     useForm<PlaygroundForm>({
       defaultValues: {
@@ -129,7 +123,7 @@ const Playground = ({
 
       if (data.identity !== NO_IDENTITY) {
         identities.data
-          .find((i) => i.id === data.identity)
+          ?.find((i) => i.id === data.identity)
           ?.authorizeRequest(request);
       }
       const response = await fetch(request);
@@ -181,181 +175,157 @@ const Playground = ({
         <wbr />
       </Fragment>
     ));
-
   return (
-    <Dialog>
-      <DialogTrigger asChild>
-        <CirclePlayIcon
-          className="cursor-pointer text-primary hover:text-primary/80"
-          size={16}
-        />
-      </DialogTrigger>
-
-      <DialogContent
-        className="max-w-screen-xl w-full h-5/6 overflow-auto p-0"
-        aria-describedby={undefined}
-      >
-        <VisuallyHidden>
-          <DialogTitle>Playground</DialogTitle>
-        </VisuallyHidden>
-        <FormProvider {...{ register, control, handleSubmit, watch, ...form }}>
-          <form
-            onSubmit={handleSubmit((data) => queryMutation.mutateAsync(data))}
-          >
-            <div className="grid grid-cols-2 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 gap-2 items-stretch">
-                  <div className="flex flex-1 items-center w-full border rounded-md border-border">
-                    <div className="border-r border-border p-2 bg-muted rounded-l-md self-stretch font-semibold font-mono">
-                      {method.toUpperCase()}
-                    </div>
-                    <div className="p-2 font-mono text-xs">
-                      {path}
-                      {urlQueryParams.length > 0 ? "?" : ""}
-                      {urlQueryParams}
+    <FormProvider {...{ register, control, handleSubmit, watch, ...form }}>
+      <form onSubmit={handleSubmit((data) => queryMutation.mutateAsync(data))}>
+        <div className="grid grid-cols-2 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 gap-2 items-stretch">
+              <div className="flex flex-1 items-center w-full border rounded-md border-border">
+                <div className="border-r border-border p-2 bg-muted rounded-l-md self-stretch font-semibold font-mono">
+                  {method.toUpperCase()}
+                </div>
+                <div className="p-2 font-mono text-xs">
+                  {path}
+                  {urlQueryParams.length > 0 ? "?" : ""}
+                  {urlQueryParams}
+                </div>
+              </div>
+              <Button type="submit" className="h-auto flex gap-1">
+                Send
+              </Button>
+            </div>
+            <Tabs defaultValue={hasParams ? "parameters" : "headers"}>
+              <div className="flex justify-between">
+                <TabsList>
+                  {hasParams && (
+                    <TabsTrigger value="parameters">Parameters</TabsTrigger>
+                  )}
+                  <TabsTrigger value="headers">
+                    Headers{" "}
+                    {formState.headers.length > 0 &&
+                      `(${formState.headers.length})`}
+                  </TabsTrigger>
+                  <TabsTrigger
+                    value="body"
+                    disabled={["POST", "PUT", "PATCH", "DELETE"].includes(
+                      method.toUpperCase(),
+                    )}
+                  >
+                    Body
+                  </TabsTrigger>
+                </TabsList>
+                <div className="flex gap-2 items-center">
+                  Auth:
+                  <Select
+                    onValueChange={(value) => form.setValue("identity", value)}
+                    defaultValue={formState.identity}
+                  >
+                    <SelectTrigger className="w-[180px] flex">
+                      {identities.isPending ? <Spinner /> : <SelectValue />}
+                    </SelectTrigger>
+                    <SelectContent align="center">
+                      <SelectItem value={NO_IDENTITY}>None</SelectItem>
+                      {identities.data?.map((identity) => (
+                        <SelectItem key={identity.id} value={identity.id}>
+                          {identity.label}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+              </div>
+              <TabsContent value="headers">
+                <Headers control={control} register={register} />
+              </TabsContent>
+              <TabsContent value="parameters">
+                <div className="grid grid-cols-[min-content_1fr_1fr_auto]">
+                  {pathParams.length > 0 && (
+                    <div className="font-semibold my-3 col-span-3">
+                      Path Parameters
                     </div>
-                  </div>
-                  <Button type="submit" className="h-auto flex gap-1">
-                    Send
-                  </Button>
+                  )}
+                  <PathParams control={control} register={register} />
+                  {queryParams.length > 0 && (
+                    <span className="font-semibold my-3 col-span-3">
+                      Query Parameters
+                    </span>
+                  )}
+                  <QueryParams control={control} />
                 </div>
-                <Tabs defaultValue={hasParams ? "parameters" : "headers"}>
-                  <div className="flex justify-between">
-                    <TabsList>
-                      {hasParams && (
-                        <TabsTrigger value="parameters">Parameters</TabsTrigger>
-                      )}
-                      <TabsTrigger value="headers">
-                        Headers{" "}
-                        {formState.headers.length > 0 &&
-                          `(${formState.headers.length})`}
-                      </TabsTrigger>
-                      <TabsTrigger
-                        value="body"
-                        disabled={["POST", "PUT", "PATCH", "DELETE"].includes(
-                          method.toUpperCase(),
-                        )}
-                      >
-                        Body
-                      </TabsTrigger>
-                    </TabsList>
-                    <div className="flex gap-2 items-center">
-                      Auth:
-                      <Select
-                        onValueChange={(value) =>
-                          form.setValue("identity", value)
-                        }
-                        defaultValue={formState.identity}
-                      >
-                        <SelectTrigger className="w-[180px]">
-                          <SelectValue />
-                        </SelectTrigger>
-                        <SelectContent align="center">
-                          <SelectItem value={NO_IDENTITY}>None</SelectItem>
-                          {identities.data.map((identity) => (
-                            <SelectItem key={identity.id} value={identity.id}>
-                              {identity.label}
-                            </SelectItem>
-                          ))}
-                        </SelectContent>
-                      </Select>
+              </TabsContent>
+              <TabsContent value="body">
+                <textarea
+                  {...register("body")}
+                  className="border border-border w-full rounded p-2 bg-muted h-40"
+                />
+              </TabsContent>
+            </Tabs>
+          </div>
+          <div className="flex flex-col gap-4 p-8 bg-muted/70">
+            {queryMutation.error ? (
+              <div>{queryMutation.error.message}</div>
+            ) : queryMutation.data ? (
+              <div className="flex flex-col gap-2">
+                <div className="flex gap-2">
+                  <div className="flex text-xs gap-6">
+                    <div>
+                      Status: {queryMutation.data.status}{" "}
+                      {statusCodeMap[queryMutation.data.status] ?? ""}
                     </div>
+                    <div>Time: {queryMutation.data.time.toFixed(0)}ms</div>
+                    <div>Size: {queryMutation.data.size} B</div>
                   </div>
-                  <TabsContent value="headers">
-                    <Headers control={control} register={register} />
-                  </TabsContent>
-                  <TabsContent value="parameters">
-                    <div className="grid grid-cols-[min-content_1fr_1fr_auto]">
-                      {pathParams.length > 0 && (
-                        <div className="font-semibold my-3 col-span-3">
-                          Path Parameters
-                        </div>
-                      )}
-                      <PathParams control={control} register={register} />
-                      {queryParams.length > 0 && (
-                        <span className="font-semibold my-3 col-span-3">
-                          Query Parameters
-                        </span>
-                      )}
-                      <QueryParams control={control} />
-                    </div>
+                </div>
+                {/*<UrlDisplay host={host} path={url} />*/}
+                <Tabs defaultValue="response">
+                  <TabsList>
+                    <TabsTrigger value="response">Response</TabsTrigger>
+                    <TabsTrigger value="headers">
+                      {headerEntries.length
+                        ? `Headers (${headerEntries.length})`
+                        : "No headers"}
+                    </TabsTrigger>
+                  </TabsList>
+
+                  <TabsContent value="response">
+                    <Card className="shadow-none p-4">
+                      <SyntaxHighlight
+                        language={lang ?? "json"}
+                        noBackground
+                        className="overflow-x-auto "
+                        code={queryMutation.data.body ?? JSON.stringify("")}
+                      />
+                    </Card>
                   </TabsContent>
-                  <TabsContent value="body">
-                    <textarea
-                      {...register("body")}
-                      className="border border-border w-full rounded p-2 bg-muted h-40"
-                    />
+                  <TabsContent value="headers">
+                    <Card className="grid grid-cols-2 w-full gap-2.5 font-mono text-xs shadow-none p-4">
+                      <div className="font-semibold">Key</div>
+                      <div className="font-semibold">Value</div>
+                      {headerEntries.map(([key, value]) => (
+                        <Fragment key={key}>
+                          <div>{key}</div>
+                          <div>{value}</div>
+                        </Fragment>
+                      ))}
+                    </Card>
                   </TabsContent>
                 </Tabs>
               </div>
-              <div className="flex flex-col gap-4 p-8 bg-muted/70">
-                {queryMutation.error ? (
-                  <div>{queryMutation.error.message}</div>
-                ) : queryMutation.data ? (
-                  <div className="flex flex-col gap-2">
-                    <div className="flex gap-2">
-                      <div className="flex text-xs gap-6">
-                        <div>
-                          Status: {queryMutation.data.status}{" "}
-                          {statusCodeMap[queryMutation.data.status] ?? ""}
-                        </div>
-                        <div>Time: {queryMutation.data.time.toFixed(0)}ms</div>
-                        <div>Size: {queryMutation.data.size} B</div>
-                      </div>
-                    </div>
-                    {/*<UrlDisplay host={host} path={url} />*/}
-                    <Tabs defaultValue="response">
-                      <TabsList>
-                        <TabsTrigger value="response">Response</TabsTrigger>
-                        <TabsTrigger value="headers">
-                          {headerEntries.length
-                            ? `Headers (${headerEntries.length})`
-                            : "No headers"}
-                        </TabsTrigger>
-                      </TabsList>
-
-                      <TabsContent value="response">
-                        <Card className="shadow-none p-4">
-                          <SyntaxHighlight
-                            language={lang ?? "json"}
-                            noBackground
-                            className="overflow-x-auto "
-                            code={queryMutation.data.body ?? JSON.stringify("")}
-                          />
-                        </Card>
-                      </TabsContent>
-                      <TabsContent value="headers">
-                        <Card className="grid grid-cols-2 w-full gap-2.5 font-mono text-xs shadow-none p-4">
-                          <div className="font-semibold">Key</div>
-                          <div className="font-semibold">Value</div>
-                          {headerEntries.map(([key, value]) => (
-                            <Fragment key={key}>
-                              <div>{key}</div>
-                              <div>{value}</div>
-                            </Fragment>
-                          ))}
-                        </Card>
-                      </TabsContent>
-                    </Tabs>
-                  </div>
-                ) : (
-                  <div className="grid place-items-center h-full">
-                    <span className="text-[16px] font-semibold text-muted-foreground">
-                      {queryMutation.isPending ? (
-                        <Spinner />
-                      ) : (
-                        "Send a request first to see the response here"
-                      )}
-                    </span>
-                  </div>
-                )}
+            ) : (
+              <div className="grid place-items-center h-full">
+                <span className="text-[16px] font-semibold text-muted-foreground">
+                  {queryMutation.isPending ? (
+                    <Spinner />
+                  ) : (
+                    "Send a request first to see the response here"
+                  )}
+                </span>
               </div>
-            </div>
-          </form>
-        </FormProvider>
-      </DialogContent>
-    </Dialog>
+            )}
+          </div>
+        </div>
+      </form>
+    </FormProvider>
   );
 };
-
-export { Playground };

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

@@ -0,0 +1,34 @@
+import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
+import { CirclePlayIcon } from "lucide-react";
+import {
+  Dialog,
+  DialogContent,
+  DialogTitle,
+  DialogTrigger,
+} from "../../../components/Dialog.js";
+import { Playground, type PlaygroundContentProps } from "./Playground.js";
+
+const PlaygroundDialog = (props: PlaygroundContentProps) => {
+  return (
+    <Dialog>
+      <DialogTrigger asChild>
+        <CirclePlayIcon
+          className="cursor-pointer text-primary hover:text-primary/80"
+          size={16}
+        />
+      </DialogTrigger>
+
+      <DialogContent
+        className="max-w-screen-xl w-full h-5/6 overflow-auto p-0"
+        aria-describedby={undefined}
+      >
+        <VisuallyHidden>
+          <DialogTitle>Playground</DialogTitle>
+        </VisuallyHidden>
+        <Playground {...props} />
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export { PlaygroundDialog };

package/src/lib/plugins/openapi/util/prose.ts

@@ -0,0 +1,7 @@
+import { ProseClasses } from "../../../components/Markdown.js";
+import { cn } from "../../../util/cn.js";
+
+export const SchemaProseClasses = cn(
+  ProseClasses,
+  "max-w-full prose-img:max-w-prose",
+);

package/src/lib/plugins/openapi/worker/worker.ts

@@ -1,7 +1,33 @@
+import { useLogger } from "@envelop/core";
 import { createGraphQLServer } from "../../../oas/graphql/index.js";
 import { type WorkerGraphQLMessage } from "./createSharedWorkerClient.js";
 
-const localServer = createGraphQLServer();
+const map = new Map<string, number>();
+
+const localServer = createGraphQLServer({
+  plugins: [
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useLogger({
+      logFn: (eventName, { args }) => {
+        if (import.meta.env.PROD) return;
+
+        if (eventName.endsWith("-start")) {
+          map.set(`${eventName}-${args.operationName}`, performance.now());
+        } else if (eventName.endsWith("-end")) {
+          const startEvent = eventName.replace("-end", "-start");
+          const start = map.get(`${startEvent}-${args.operationName}`);
+          if (start) {
+            // eslint-disable-next-line no-console
+            console.log(
+              `${args.operationName} query took ${performance.now() - start}ms`,
+            );
+            map.delete(`${startEvent}-${args.operationName}`);
+          }
+        }
+      },
+    }),
+  ],
+});
 
 const worker = self as unknown as SharedWorkerGlobalScope;
 

package/src/lib/util/MdxComponents.tsx

@@ -74,7 +74,7 @@ export const MdxComponents = {
       return (
         <SyntaxHighlight
           language={match?.[1] ?? "markup"}
-          className="rounded-xl overflow-x-auto p-4 border border-border dark:!bg-foreground/10 dark:border-transparent"
+          className="rounded-xl overflow-x-auto p-4 border border-border dark:!bg-foreground/10 dark:border-transparent whitespace-nowrap"
           showLanguageIndicator
           code={String(children).trim()}
         />

package/src/lib/util/objectEntries.ts

@@ -0,0 +1,5 @@
+type ValueOf<T> = T[keyof T];
+type Entries<T> = [keyof T, ValueOf<T>][];
+
+export const objectEntries = <T extends object>(obj: T): Entries<T> =>
+  Object.entries(obj) as Entries<T>;

package/src/lib/util/renderIf.ts

@@ -0,0 +1,4 @@
+export const renderIf = <G, R>(
+  variable: G | undefined | null,
+  callback: (variable: G) => R,
+): R | undefined => (variable ? callback(variable) : undefined);

package/dist/lib/plugins/openapi/MakeRequest.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MakeRequest.js","sourceRoot":"","sources":["../../../../src/lib/plugins/openapi/MakeRequest.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAEhC,MAAM,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;;;;;;CAM5C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,SAAS,GAGV,EAAE,EAAE;IACH,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;IAEhE,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU;QAClC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC;SACjC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,KAAK,EAAE,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,IAAI,EAAE;KACrD,CAAC,CAAC,CAAC;IACN,MAAM,WAAW,GAAG,SAAS,CAAC,UAAU;QACtC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC;SAChC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACpD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,OAAO;YACL,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,CAAC,CAAC,QAAQ,IAAI,KAAK;YAC3B,UAAU,EAAE,CAAC,CAAC,QAAQ,IAAI,KAAK;SAChC,CAAC;IACJ,CAAC,CAAC,CAAC;IACL,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU;QACrC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC;SAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,KAAK,EAAE,EAAE;KACV,CAAC,CAAC,CAAC;IAEN,MAAM,SAAS,GACb,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,IAAI,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC;QACtE,KAAK,CAAC;IAER,OAAO,CACL,KAAC,UAAU,IACT,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,IAAI,EAAE,EACnC,MAAM,EAAE,SAAS,CAAC,MAAM,EACxB,GAAG,EAAE,SAAS,CAAC,IAAI,EACnB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,GACpB,CACH,CAAC;AACJ,CAAC,CAAC"}