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

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

@@ -1,11 +1,13 @@
 import { Heading } from "../../components/Heading.js";
-import { Markdown, ProseClasses } from "../../components/Markdown.js";
+import { Markdown } from "../../components/Markdown.js";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "../../ui/Tabs.js";
+import { renderIf } from "../../util/renderIf.js";
 import { OperationsFragment } from "./OperationList.js";
 import { ParameterList } from "./ParameterList.js";
 import { SchemaListView } from "./SchemaListView.js";
 import { Sidecar } from "./Sidecar.js";
 import { FragmentType, useFragment } from "./graphql/index.js";
+import { SchemaProseClasses } from "./util/prose.js";
 
 export const PARAM_GROUPS = ["path", "query", "header", "cookie"] as const;
 export type ParameterGroup = (typeof PARAM_GROUPS)[number];
@@ -20,24 +22,24 @@ export const OperationListItem = ({
     operation.parameters ?? [],
     (param) => param.in,
   );
-  const first = operation.responses.find((re) => re.statusCode === "200");
+  const first = operation.responses.at(0);
   return (
     <div
       key={operation.operationId}
-      className="grid grid-cols-2 gap-8 items-start border-b-2 mb-16 pb-16 border-border"
+      className="grid grid-cols-[4fr_3fr] gap-8 items-start border-b-2 mb-16 pb-16 border-border"
     >
-      <div className={ProseClasses}>
-        <Heading
-          level={2}
-          className="mt-0"
-          id={operation.slug}
-          registerSidebarAnchor
-        >
+      <div className="flex flex-col gap-4">
+        <Heading level={2} id={operation.slug} registerSidebarAnchor>
           {operation.summary}
         </Heading>
-        {operation.description && <Markdown content={operation.description} />}
+        {operation.description && (
+          <Markdown
+            className={SchemaProseClasses}
+            content={operation.description}
+          />
+        )}
         {operation.parameters && operation.parameters.length > 0 && (
-          <div className="mt-4">
+          <>
             {PARAM_GROUPS.flatMap((group) =>
               groupedParameters[group]?.length ? (
                 <ParameterList
@@ -50,11 +52,22 @@ export const OperationListItem = ({
                 []
               ),
             )}
-          </div>
+          </>
         )}
+        {renderIf(operation.requestBody?.content?.at(0)?.schema, (schema) => (
+          <div className="mt-4 flex flex-col gap-4">
+            <Heading level={3} className="capitalize">
+              Request Body
+            </Heading>
+            <SchemaListView schema={schema} />
+          </div>
+        ))}
         {operation.responses.length > 0 && (
           <>
-            <Heading level={3} className="capitalize">
+            <Heading
+              level={3}
+              className="capitalize mt-8 pt-8 border-border border-t"
+            >
               Responses
             </Heading>
             <Tabs defaultValue={`${first?.statusCode}${first?.description}`}>
@@ -75,10 +88,18 @@ export const OperationListItem = ({
                     value={response.statusCode + response.description}
                     key={response.statusCode}
                   >
-                    <SchemaListView
-                      schema={response.content?.at(0)?.schema}
-                      name=""
-                    />
+                    {renderIf(
+                      response.content?.find((content) => content.schema),
+                      (content) => {
+                        return (
+                          <SchemaListView schema={content.schema} name="" />
+                        );
+                      },
+                    ) ?? (
+                      <div className="border-border font-mono text-sm border rounded p-4">
+                        No response body
+                      </div>
+                    )}
                   </TabsContent>
                 ))}
               </ul>

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

@@ -18,7 +18,7 @@ export const ParameterList = ({
     <Heading level={3} id={`${id}/${group}-parameters`} className="capitalize">
       {group === "header" ? "Headers" : `${group} Parameters`}
     </Heading>
-    <ul className="list-none m-0 px-0 overflow-hidden">
+    <ul className="list-none m-0 px-0 overflow-hidden border border-border divide-y divide-border rounded">
       {parameters.map((parameter) => (
         <ParameterListItem
           key={`${parameter.name}-${parameter.in}`}

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

@@ -28,14 +28,13 @@ export const ParameterListItem = ({
   group: ParameterGroup;
   id: string;
 }) => (
-  <li className="not-prose px-2 py-4 border-t border-border bg-border/20 text-sm flex flex-col gap-1">
+  <li className="p-4 bg-border/20 text-sm flex flex-col gap-1">
     <div className="flex items-center gap-2">
       <code>
         {group === "path" ? (
           <ColorizedParam
             name={parameter.name}
             backgroundOpacity="15%"
-            className="px-1"
             slug={id + "-" + parameter.name.toLocaleLowerCase()}
           />
         ) : (
@@ -43,12 +42,12 @@ export const ParameterListItem = ({
         )}
       </code>
       {parameter.required && (
-        <span className="py-px px-1.5 font-medium text-xs bg-primary/75 text-muted rounded-lg">
+        <span className="py-px px-1.5 font-medium bg-primary/75 text-muted rounded-lg">
           required
         </span>
       )}
       {getParameterSchema(parameter).type && (
-        <span className="text-xs text-muted-foreground">
+        <span className="text-muted-foreground">
           {getParameterSchema(parameter).type}
         </span>
       )}

package/src/lib/plugins/openapi/{MakeRequest.tsx → PlaygroundDialogWrapper.tsx}

@@ -1,7 +1,7 @@
 import { graphql } from "./graphql/index.js";
 import { useOasConfig } from "./index.js";
 import type { OperationListItemResult } from "./OperationList.js";
-import { Playground } from "./playground/Playground.js";
+import { PlaygroundDialog } from "./playground/PlaygroundDialog.js";
 
 import { useQuery } from "urql";
 
@@ -13,7 +13,7 @@ const GetServerQuery = graphql(/* GraphQL */ `
   }
 `);
 
-export const MakeRequest = ({
+export const PlaygroundDialogWrapper = ({
   operation,
 }: {
   operation: OperationListItemResult;
@@ -50,7 +50,7 @@ export const MakeRequest = ({
     false;
 
   return (
-    <Playground
+    <PlaygroundDialog
       host={server.data?.schema.url ?? ""}
       method={operation.method}
       url={operation.path}

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

@@ -1,9 +1,7 @@
-import { useState } from "react";
 import { SyntaxHighlight } from "../../components/SyntaxHighlight.js";
 import { type SchemaObject } from "../../oas/graphql/index.js";
 import type { OperationListItemResult } from "./OperationList.js";
 import * as SidecarBox from "./SidecarBox.js";
-import { SimpleSelect } from "./SimpleSelect.js";
 import { generateSchemaExample } from "./util/generateSchemaExample.js";
 
 type Content = NonNullable<
@@ -12,24 +10,13 @@ type Content = NonNullable<
 
 // @todo should we handle multiple content types?
 export const RequestBodySidecarBox = ({ content }: { content: Content }) => {
-  const [selected, setSelected] = useState("example");
-
   if (!content.length) return null;
 
   return (
     <>
-      <div>lol</div>
       <SidecarBox.Root>
         <SidecarBox.Head className="text-xs flex justify-between items-center">
-          <span className="font-mono">Request Body</span>
-          <SimpleSelect
-            value={selected}
-            onChange={(e) => setSelected(e.target.value)}
-            options={[
-              { value: "example", label: "Example" },
-              { value: "schema", label: "Schema" },
-            ]}
-          />
+          <span className="font-mono">Request Body Example</span>
         </SidecarBox.Head>
         <SidecarBox.Body>
           <SyntaxHighlight
@@ -38,9 +25,7 @@ export const RequestBodySidecarBox = ({ content }: { content: Content }) => {
             copyable
             className="text-xs"
             code={JSON.stringify(
-              selected === "example"
-                ? generateSchemaExample(content[0].schema as SchemaObject)
-                : content[0].schema,
+              generateSchemaExample(content[0].schema as SchemaObject),
               null,
               2,
             )}

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

@@ -52,7 +52,9 @@ export const ResponsesSidecarBox = ({
           </span>
         )}
         <hr className="border-border my-1" />
-        <div className="text-xs">{responses[tabIndex].description}</div>
+        <div className="text-xs  text-muted-foreground">
+          {responses[tabIndex].description}
+        </div>
       </SidecarBox.Body>
     </SidecarBox.Root>
   );

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

@@ -1,10 +1,8 @@
-import * as Collapsible from "@radix-ui/react-collapsible";
-import { ListPlusIcon } from "lucide-react";
-import { useState } from "react";
 import { Markdown } from "../../components/Markdown.js";
 import { SchemaObject } from "../../oas/parser/index.js";
-import { Button } from "../../ui/Button.js";
-import { cn } from "../../util/cn.js";
+import { objectEntries } from "../../util/objectEntries.js";
+import { SchemaListViewItemGroup } from "./SchemaListViewItemGroup.js";
+import { SchemaProseClasses } from "./util/prose.js";
 
 export const SchemaListView = ({
   name,
@@ -39,190 +37,25 @@ export const SchemaListView = ({
   );
 
   return (
-    <div
-      className={cn(
-        "not-prose",
-        level > 0 && "border border-border rounded text-sm",
-      )}
-    >
+    <div className="flex flex-col gap-2.5">
       {(schema.title ?? name) && (
         <div className="ml-2 my-1 font-bold">{schema.title ?? name}</div>
       )}
       {level === 0 && schema.description && (
-        <p className="prose">{schema.description}</p>
-      )}
-      <ul>
-        {Object.entries(groups).map(([group, properties]) => {
-          return (
-            <SchemaListViewItemGroup
-              key={group}
-              defaultOpen={defaultOpen}
-              group={group as any}
-              nestingLevel={level}
-              properties={properties}
-              required={schema.required ?? []}
-            />
-          );
-        })}
-      </ul>
-    </div>
-  );
-};
-
-const SchemaListViewItemGroup = ({
-  group,
-  properties,
-  nestingLevel,
-  required,
-  defaultOpen = false,
-}: {
-  group: "optional" | "required" | "deprecated";
-  defaultOpen?: boolean;
-  properties: [string, SchemaObject][];
-  nestingLevel: number;
-  required: string[];
-}) => {
-  const notCollapsible =
-    defaultOpen ||
-    group === "required" ||
-    properties.length === 1 ||
-    nestingLevel === 0;
-  const [open, setOpen] = useState(notCollapsible);
-  if (properties.length === 0) {
-    return;
-  }
-
-  return (
-    <Collapsible.Root
-      className="CollapsibleRoot"
-      open={open}
-      onOpenChange={setOpen}
-    >
-      {!open && (
-        <Collapsible.Trigger
-          className={cn(
-            "py-2 hover:bg-muted w-full",
-            group === "optional" && "font-semibold",
-            group === "deprecated" && "text-muted-foreground",
-          )}
-        >
-          {properties.length} {group} fields
-        </Collapsible.Trigger>
+        <Markdown className={SchemaProseClasses} content={schema.description} />
       )}
-
-      <Collapsible.Content>
-        {properties.map(([propertyName, property]) => (
-          <SchemaListViewItem
-            key={propertyName}
-            property={property}
-            propertyName={propertyName}
-            nestingLevel={nestingLevel}
-            isRequired={required.includes(propertyName)}
+      <ul className="border-border border rounded overflow-hidden">
+        {objectEntries(groups).map(([group, properties]) => (
+          <SchemaListViewItemGroup
+            key={group}
+            defaultOpen={defaultOpen}
+            group={group}
+            nestingLevel={level}
+            properties={properties ?? []}
+            required={schema.required ?? []}
           />
         ))}
-      </Collapsible.Content>
-    </Collapsible.Root>
-  );
-};
-
-const SchemaListViewItem = ({
-  propertyName,
-  property,
-  nestingLevel,
-  isRequired,
-}: {
-  propertyName: string;
-  isRequired: boolean;
-  property: SchemaObject;
-  nestingLevel: number;
-}) => {
-  return (
-    <div
-      key={propertyName}
-      className={cn(
-        nestingLevel > 0 ? "py-2" : "py-4",
-        "px-2 border-t border-border bg-border/20 hover:bg-border/30 flex gap-1 flex-col text-sm",
-        property.deprecated && "opacity-50",
-      )}
-    >
-      <div className="flex items-center gap-2 relative">
-        <code>
-          {propertyName} {property.title}
-        </code>
-
-        {property.type && (
-          <span className="text-xs text-muted-foreground">{property.type}</span>
-        )}
-        {property.deprecated && (
-          <span className="text-xs text-muted-foreground">Deprecated</span>
-        )}
-        {!isRequired && (
-          <span className="py-px px-1.5 font-medium text-xs border border-border rounded-lg">
-            optional {property.required}
-          </span>
-        )}
-      </div>
-      {property.description && (
-        <Markdown
-          content={property.description}
-          className="text-sm leading-normal line-clamp-4 "
-        />
-      )}
-
-      {property.enum && (
-        <span className="text-sm text-muted-foreground flex gap-1 flex-wrap items-center">
-          <span>Possible values</span>
-          {property.enum
-            .filter((value) => value)
-            .map((value) => (
-              <span
-                key={value}
-                className="font-mono text-xs border-border border bg-muted rounded px-1"
-              >
-                {value}
-              </span>
-            ))
-            .slice(0, 4)}
-          {property.enum.length > 4 && (
-            <span className="font-mono text-xs border-border border bg-muted rounded px-1">
-              ...
-            </span>
-          )}
-        </span>
-      )}
-
-      <Collapsible.Root className="CollapsibleRoot" defaultOpen={false}>
-        {property.type === "object" ||
-        (property.type === "array" && property.items.type === "object") ? (
-          <Collapsible.Trigger asChild>
-            <Button variant="ghost" size="sm">
-              Show nested fields
-              <ListPlusIcon size={18} className="ml-1.5" />
-            </Button>
-          </Collapsible.Trigger>
-        ) : null}
-
-        <Collapsible.Content>
-          {property.type === "object" && (
-            <div className="mt-2.5">
-              <SchemaListView
-                schema={property}
-                level={nestingLevel + 1}
-                defaultOpen
-              />
-            </div>
-          )}
-          {property.type === "array" && property.items.type === "object" && (
-            <div className="mt-2.5">
-              <SchemaListView
-                schema={property.items}
-                defaultOpen
-                level={nestingLevel + 1}
-              />
-            </div>
-          )}
-        </Collapsible.Content>
-      </Collapsible.Root>
+      </ul>
     </div>
   );
 };

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

@@ -0,0 +1,110 @@
+import * as Collapsible from "@radix-ui/react-collapsible";
+import { ListPlusIcon } from "lucide-react";
+import { Markdown } from "../../components/Markdown.js";
+import { SchemaObject } from "../../oas/parser/index.js";
+import { Button } from "../../ui/Button.js";
+import { cn } from "../../util/cn.js";
+import { SchemaListView } from "./SchemaListView.js";
+
+export const SchemaListViewItem = ({
+  propertyName,
+  property,
+  nestingLevel,
+  isRequired,
+}: {
+  propertyName: string;
+  isRequired: boolean;
+  property: SchemaObject;
+  nestingLevel: number;
+}) => {
+  return (
+    <div
+      key={propertyName}
+      className={cn(
+        "p-4 bg-border/20 hover:bg-border/30 flex gap-1 flex-col text-sm",
+        property.deprecated && "opacity-50",
+      )}
+    >
+      <div className="flex items-center gap-2 relative">
+        <code>
+          {propertyName} {property.title}
+        </code>
+
+        {property.type && (
+          <span className="text-muted-foreground">{property.type}</span>
+        )}
+        {property.deprecated && (
+          <span className="text-muted-foreground">Deprecated</span>
+        )}
+        {!isRequired && (
+          <span className="py-px px-1.5 font-medium border border-border rounded-lg">
+            optional {property.required}
+          </span>
+        )}
+      </div>
+      {property.description && (
+        <Markdown
+          content={property.description}
+          className="text-sm leading-normal line-clamp-4 "
+        />
+      )}
+
+      {property.enum && (
+        <span className="text-sm text-muted-foreground flex gap-1 flex-wrap items-center">
+          <span>Possible values</span>
+          {/* Make values unique, some schemas have duplicates */}
+          {[...new Set(property.enum.filter((value) => value))]
+            .map((value) => (
+              <span
+                key={value}
+                className="font-mono text-xs border-border border bg-muted rounded px-1"
+              >
+                {value}
+              </span>
+            ))
+            .slice(0, 4)}
+          {property.enum.length > 4 && (
+            <span className="font-mono text-xs border-border border bg-muted rounded px-1">
+              ...
+            </span>
+          )}
+        </span>
+      )}
+
+      {(property.type === "object" &&
+        (property.properties?.length ??
+          Object.entries(property.additionalProperties ?? {}).length > 0)) ||
+      (property.type === "array" && property.items.type === "object") ? (
+        <Collapsible.Root className="CollapsibleRoot" defaultOpen={false}>
+          <Collapsible.Trigger asChild>
+            <Button variant="ghost" size="sm">
+              Show nested fields
+              <ListPlusIcon size={18} className="ml-1.5" />
+            </Button>
+          </Collapsible.Trigger>
+
+          <Collapsible.Content>
+            {property.type === "object" && (
+              <div className="mt-2.5">
+                <SchemaListView
+                  schema={property}
+                  level={nestingLevel + 1}
+                  defaultOpen
+                />
+              </div>
+            )}
+            {property.type === "array" && property.items.type === "object" && (
+              <div className="mt-2.5">
+                <SchemaListView
+                  schema={property.items}
+                  defaultOpen
+                  level={nestingLevel + 1}
+                />
+              </div>
+            )}
+          </Collapsible.Content>
+        </Collapsible.Root>
+      ) : null}
+    </div>
+  );
+};

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

@@ -0,0 +1,63 @@
+import * as Collapsible from "@radix-ui/react-collapsible";
+import { useState } from "react";
+import { SchemaObject } from "../../oas/parser/index.js";
+import { cn } from "../../util/cn.js";
+import { SchemaListViewItem } from "./SchemaListViewItem.js";
+
+export const SchemaListViewItemGroup = ({
+  group,
+  properties,
+  nestingLevel,
+  required,
+  defaultOpen = false,
+}: {
+  group: "optional" | "required" | "deprecated";
+  defaultOpen?: boolean;
+  properties: [string, SchemaObject][];
+  nestingLevel: number;
+  required: string[];
+}) => {
+  const notCollapsible =
+    defaultOpen ||
+    group === "required" ||
+    properties.length === 1 ||
+    nestingLevel === 0;
+
+  const [open, setOpen] = useState(notCollapsible);
+
+  if (properties.length === 0) {
+    return;
+  }
+
+  return (
+    <Collapsible.Root
+      className="CollapsibleRoot"
+      open={open}
+      onOpenChange={setOpen}
+    >
+      {!open && (
+        <Collapsible.Trigger
+          className={cn(
+            "py-2 hover:bg-muted w-full",
+            group === "optional" && "font-semibold",
+            group === "deprecated" && "text-muted-foreground",
+          )}
+        >
+          {properties.length} {group} fields
+        </Collapsible.Trigger>
+      )}
+
+      <Collapsible.Content className="divide-y divide-border">
+        {properties.map(([propertyName, property]) => (
+          <SchemaListViewItem
+            key={propertyName}
+            property={property}
+            propertyName={propertyName}
+            nestingLevel={nestingLevel}
+            isRequired={required.includes(propertyName)}
+          />
+        ))}
+      </Collapsible.Content>
+    </Collapsible.Root>
+  );
+};

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

@@ -5,9 +5,9 @@ import { SyntaxHighlight } from "../../components/SyntaxHighlight.js";
 import type { SchemaObject } from "../../oas/parser/index.js";
 import { cn } from "../../util/cn.js";
 import { ColorizedParam } from "./ColorizedParam.js";
-import { MakeRequest } from "./MakeRequest.js";
 import { MethodTextColorMap } from "./MethodBadge.js";
 import type { OperationListItemResult } from "./OperationList.js";
+import { PlaygroundDialogWrapper } from "./PlaygroundDialogWrapper.js";
 import { RequestBodySidecarBox } from "./RequestBodySidecarBox.js";
 import { ResponsesSidecarBox } from "./ResponsesSidecarBox.js";
 import * as SidecarBox from "./SidecarBox.js";
@@ -142,7 +142,7 @@ export const Sidecar = ({
                 { value: "swift", label: "Swift" },
               ]}
             />
-            <MakeRequest operation={operation} />
+            <PlaygroundDialogWrapper operation={operation} />
           </div>
         </SidecarBox.Head>
         <SidecarBox.Body>

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

@@ -15,7 +15,6 @@ import {
 } from "./util/urql.js";
 
 import { createSharedWorkerClient } from "virtual:zudoku-openapi-worker";
-import type { createSharedWorkerClient as createSharedWorkerClientType } from "./worker/createSharedWorkerClient.js";
 
 const OasContext = createContext<{ config: OasPluginConfig } | undefined>(
   undefined,
@@ -85,11 +84,25 @@ export const openApiPlugin = (config: OasPluginConfig): DevPortalPlugin => {
         url: config.server,
         exchanges: [cacheExchange, fetchExchange],
       })
-    : (createSharedWorkerClient() as ReturnType<
-        typeof createSharedWorkerClientType
-      >);
+    : createSharedWorkerClient();
 
   return {
+    getHead: () => {
+      if (config.type === "url") {
+        return (
+          <link
+            rel="preload"
+            href={config.input}
+            as="fetch"
+            crossOrigin="anonymous"
+          />
+        );
+      }
+
+      if (config.server) {
+        return <link rel="preconnect" href={config.server} />;
+      }
+    },
     getNavigation: async (path: string) => {
       if (!matchPath({ path: basePath, end: false }, path)) {
         return [];