zudoku 0.3.0-dev.6 → 0.3.0-dev.60

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

@@ -1,15 +1,8 @@
-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 { useQuery } from "urql";
 import { useApiIdentities } from "../../../components/context/DevPortalProvider.js";
-import {
-  Dialog,
-  DialogContent,
-  DialogTitle,
-  DialogTrigger,
-} from "../../../components/Dialog.js";
 import {
   Select,
   SelectContent,
@@ -23,11 +16,23 @@ import { Button } from "../../../ui/Button.js";
 import { Card } from "../../../ui/Card.js";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "../../../ui/Tabs.js";
 import { ColorizedParam } from "../ColorizedParam.js";
+import { useOasConfig } from "../context.js";
+import { graphql } from "../graphql/index.js";
 import { createUrl } from "./createUrl.js";
 import { Headers } from "./Headers.js";
 import { PathParams } from "./PathParams.js";
 import { QueryParams } from "./QueryParams.js";
 
+export const NO_IDENTITY = "__none";
+
+const GetServerQuery = graphql(/* GraphQL */ `
+  query getServerQuery($input: JSON!, $type: SchemaType!) {
+    schema(input: $input, type: $type) {
+      url
+    }
+  }
+`);
+
 function mimeTypeToLanguage(mimeType: string) {
   const mimeTypeMapping = {
     "application/json": "json",
@@ -81,25 +86,26 @@ export type PlaygroundForm = {
   identity?: string;
 };
 
-const NO_IDENTITY = "__none";
+export type PlaygroundContentProps = {
+  url: string;
+  method: string;
+  headers?: Header[];
+  queryParams?: QueryParam[];
+  pathParams?: PathParam[];
+  hasParams: boolean;
+};
 
-const Playground = ({
+export const Playground = ({
   url,
-  host,
   method,
   headers = [{ name: "", value: "" }],
   queryParams = [],
   pathParams = [],
   hasParams,
-}: {
-  host: string;
-  url: string;
-  method: string;
-  headers?: Header[];
-  queryParams?: QueryParam[];
-  pathParams?: PathParam[];
-  hasParams: boolean;
-}) => {
+}: PlaygroundContentProps) => {
+  const variables = useOasConfig();
+  const [server] = useQuery({ query: GetServerQuery, variables });
+
   const { register, control, handleSubmit, watch, ...form } =
     useForm<PlaygroundForm>({
       defaultValues: {
@@ -115,13 +121,13 @@ const Playground = ({
 
   const queryMutation = useMutation({
     mutationFn: async (data: PlaygroundForm) => {
-      const requestUrl = createUrl(host, url, data);
+      const requestUrl = createUrl(server.data?.schema.url ?? "", url, data);
       const start = performance.now();
 
       const request = new Request(requestUrl, {
         method: method.toUpperCase(),
         headers: Object.fromEntries(
-          data.pathParams
+          data.headers
             .filter((h) => h.name)
             .map((header) => [header.name, header.value]),
         ),
@@ -129,10 +135,9 @@ 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);
 
       const body = await response.text();
@@ -182,185 +187,159 @@ 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 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 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}
-                      headers={formState.headers}
-                    />
-                  </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 };
+export default Playground;

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

@@ -0,0 +1,36 @@
+import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
+import { CirclePlayIcon } from "lucide-react";
+import { useState } from "react";
+import {
+  Dialog,
+  DialogContent,
+  DialogTitle,
+  DialogTrigger,
+} from "../../../components/Dialog.js";
+import { Playground, type PlaygroundContentProps } from "./Playground.js";
+
+const PlaygroundDialog = (props: PlaygroundContentProps) => {
+  const [open, setOpen] = useState(false);
+  return (
+    <Dialog onOpenChange={(open) => setOpen(open)}>
+      <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>
+        {open && <Playground {...props} />}
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export { PlaygroundDialog };

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

@@ -5,8 +5,9 @@ import {
   useFieldArray,
   useFormContext,
 } from "react-hook-form";
+import { cn } from "../../../util/cn.js";
 import { InlineInput } from "./InlineInput.js";
-import { PlaygroundForm } from "./Playground.js";
+import type { PlaygroundForm } from "./Playground.js";
 
 export const QueryParams = ({
   control,
@@ -73,7 +74,11 @@ export const QueryParams = ({
         render={({ field }) => {
           return (
             <button
-              className="hover:bg-black/5 p-1 rounded mr-2 text-muted-foreground invisible group-hover:visible peer-focus:visible"
+              type="button"
+              className={cn(
+                "hover:bg-black/5 p-1 rounded mr-2 text-muted-foreground invisible group-hover:visible peer-focus:visible",
+                field.value.length === 0 && "opacity-0 pointer-events-none",
+              )}
               onClick={() => field.onChange("")}
             >
               <XIcon size={16} />

package/src/lib/plugins/openapi/playground/createUrl.ts

@@ -1,4 +1,4 @@
-import { PlaygroundForm } from "./Playground.js";
+import type { PlaygroundForm } from "./Playground.js";
 
 export const createUrl = (host: string, path: string, data: PlaygroundForm) => {
   const url = new URL(

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.ts

@@ -1 +1 @@
-export { createSharedWorkerClient } from "./openapi/worker/createSharedWorkerClient.js";
+export { createClient } from "./openapi/client/createWorkerClient.js";

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

@@ -1,10 +1,9 @@
-import { Navigate } from "react-router-dom";
+import { redirect } from "react-router-dom";
 import type { DevPortalPlugin } from "../../core/plugins.js";
 
 export type Redirect = {
   from: string;
   to: string;
-  replace?: boolean;
 };
 
 export const redirectPlugin = (options: {
@@ -12,9 +11,9 @@ export const redirectPlugin = (options: {
 }): DevPortalPlugin => {
   return {
     getRoutes: () =>
-      options.redirects.map(({ from, to, replace }) => ({
+      options.redirects.map(({ from, to }) => ({
         path: from,
-        element: <Navigate to={to} replace={replace} />,
+        loader: () => redirect(to),
       })),
   };
 };

package/src/lib/ui/Callout.tsx

@@ -1,10 +1,10 @@
-import type { ReactNode } from "react";
 import {
   AlertTriangleIcon,
   InfoIcon,
   LightbulbIcon,
   ShieldAlertIcon,
-} from "../core/icons.js";
+} from "lucide-react";
+import type { ReactNode } from "react";
 import { cn } from "../util/cn.js";
 
 const stylesMap = {
@@ -64,9 +64,9 @@ export const Callout = ({ type, children, title, className }: CalloutProps) => {
   return (
     <div
       className={cn(
-        "not-prose grid grid-cols-[fit-content_1fr] grid-rows-[fit-content_1fr] gap-x-4 gap-y-2 text-md rounded-md border p-4",
+        "not-prose grid grid-cols-[min-content_1fr] grid-rows-[fit-content_1fr] gap-x-4 gap-y-2 text-md rounded-md border p-4",
         "[&_a]:underline [&_a]:decoration-current [&_a]:decoration-from-font [&_a]:underline-offset-4 hover:[&_a]:decoration-1",
-        "[&_code]:!bg-transparent [&_code]:!border-none",
+        "[&_code]:!bg-gray-50 [&_code]:dark:!bg-gray-800 [&_code]:!border-none",
         title && "items-center",
         border,
         bg,

package/src/lib/ui/Card.tsx

@@ -8,7 +8,7 @@ const Card = React.forwardRef<
   <div
     ref={ref}
     className={cn(
-      "rounded-xl border border-border bg-card text-card-foreground shadow",
+      "rounded-xl border bg-card text-card-foreground shadow",
       className,
     )}
     {...props}